update translations

diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index b7c4c4ffea71138ad905fcd8e0c759fd6525434a..ea042323603eb236d3d7ec95375b079fa8da50ad 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 0ca26fc5d8b022a99b17ebc40a6c6c7d7aaec23b..c57f4e916f9686cc4159aa9322c9072900e11b66 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"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2009-11-19 09:40+0100\n"
 "Last-Translator: Alfred Galitó <bratac@bratac.cat>\n"
 "Language-Team: Català <bratac@bratac.cat>\n"
@@ -17,100 +17,100 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Language: Catalan\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "Valors per defecte"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "No ho purguis mai"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "Al cap d'1 setmana"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Al cap de 2 setmanes"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "Al cap d'1 mes"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "Al cap de 2 mesos"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "Al cap de 3 mesos"
 
-#: backend.php:81
+#: backend.php:80
 msgid "Default interval"
 msgstr "Interval per defecte"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Deshabilita les actualitzacions"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Cada 15 minuts"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "cada  30 minuts"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Cada 4 hores"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Cada 12 hores"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Diàriament"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Setmanalment"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "Per defecte"
 
-#: backend.php:103
+#: backend.php:102
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "Usuari"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr "Súper usuari"
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 msgid "Feeds"
 msgstr "Canals"
 
@@ -119,17 +119,17 @@ msgstr "Canals"
 msgid "Article not found."
 msgstr "No s'ha trobat el canal."
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "No s'ha trobat el canal."
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "S'està obrint, preneu paciència..."
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -160,19 +160,19 @@ msgstr ", trobats:"
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr ""
 "Si us plau feu una còpia de seguretat de la base de dades abans de continuar."
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -181,38 +181,53 @@ msgstr ""
 "La base de dades de Tiny Tiny RSS s'ha d'actualitzar ( de la versió <b>%d</"
 "b> a la <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "Aplica les actualitzacions"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "S'estan realitzant les actualitzacions..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "S'està actualitzant a la versió %d..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "S'està comprovant la versió..."
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "D'acord!"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "Error!"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
 "\t\t\tversion <b>%d</b>."
 msgstr "Fet. S'ha actualitzat l'esquema de la versió <b>%d</b> a <b>%d</b>."
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 #, fuzzy
 msgid ""
@@ -225,11 +240,11 @@ msgstr ""
 "reviseu els vostres\n"
 "/t/t paràmetres del navegador."
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "Hola, "
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "Surt"
@@ -321,214 +336,222 @@ msgstr ""
 "Ha fallat la sortida de prova de SQL, reviseu la base configuració de la "
 "bases de dades i de PHP"
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr "El nom d'usuari o la contrasenya és incorrecte"
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "Tots els canals"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "Sense categoria"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "Etiquetes"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "Articles marcats"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "Articles publicats"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr "Articles nous"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 msgid "All articles"
 msgstr "Tots els articles"
 
-#: functions.php:3050
+#: functions.php:3217
 #, fuzzy
 msgid "Archived articles"
 msgstr "Articles mémorisés"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "Selecciona:"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "Tot"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "Per llegir"
 
-#: functions.php:4021
+#: functions.php:4244
 msgid "Invert"
 msgstr "Inverteix"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "Cap"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "Accions..."
 
-#: functions.php:4030
+#: functions.php:4253
 msgid "Selection toggle:"
 msgstr "Commuta la selecció"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "Marcats"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "Publicats"
 
-#: functions.php:4036
+#: functions.php:4259
 msgid "Selection:"
 msgstr "Selecció:"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "Marca'l com a llegit"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4043
+#: functions.php:4266
 #, fuzzy
 msgid "Move back"
 msgstr "Vés enrere"
 
-#: functions.php:4044
+#: functions.php:4267
 #, fuzzy
 msgid "Delete"
 msgstr "Per defecte"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 msgid "Feed:"
 msgstr "Flux&nbsp;:"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "Visualitza les etiquetes"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 #, fuzzy
 msgid "Visit the website"
 msgstr "Visiteu el web oficial"
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Visualitza els canals"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "Feu clic per editar"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 msgid " - "
 msgstr " - "
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "sense etiqueta"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr "Edita les etiquetes d'aquest article"
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Obre l'article en una finestra nova"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "Edita les etiquetes"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "Tanca la finestra"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 #, fuzzy
 msgid "Feed URL"
 msgstr "Canal"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "Tanca la finestra"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 msgid "mark as read"
 msgstr "Marca'l com a llegit"
 
-#: functions.php:5229
+#: functions.php:5457
 #, fuzzy
 msgid "Dismiss article"
 msgstr "Publica l'article"
 
-#: functions.php:5248
+#: functions.php:5476
 msgid "No unread articles found to display."
 msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
 
-#: functions.php:5251
+#: functions.php:5479
 msgid "No updated articles found to display."
 msgstr "No hi ha cap article actualitzat."
 
-#: functions.php:5254
+#: functions.php:5482
 msgid "No starred articles found to display."
 msgstr "No hi ha articles marcats per mostrar."
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -536,60 +559,57 @@ msgstr ""
 "No s'han trobat articles per a mostrar. Podeu assignar articles a etiquetes "
 "manualment (mireu el menú Accions) o utilitzeu un filtre."
 
-#: functions.php:5260
+#: functions.php:5488
 msgid "No articles found to display."
 msgstr "No s'han trobat articles per a mostrar."
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 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)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 msgid "Create label..."
 msgstr "Crea una etiqueta"
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "Suprimeix"
 
-#: functions.php:6110
+#: functions.php:6343
 #, fuzzy
 msgid "Assign:"
 msgstr "Assigna-l'hi l'etiqueta:"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "sense etiqueta"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+#, fuzzy
+msgid "(edit note)"
 msgstr "edita la nota"
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "No heu seleccionat cap canal."
 
-#: functions.php:6774
+#: functions.php:7013
 msgid "unknown type"
 msgstr "tipus desconegut"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr "Adjunció:"
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr "Adjuncions:"
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "Títol"
 
@@ -626,7 +646,7 @@ msgstr "Publica l'article"
 msgid "Assign tags"
 msgstr "Assigna etiquetes"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr "Assigna-li l'etiqueta"
 
@@ -704,15 +724,15 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
+
+#: localized_schema.php:27
 msgid "Purge old posts after this number of days (0 - disables)"
 msgstr ""
 "Purga els articles vells al cap d'aquest nombre de dies (0 - desactiva la "
 "purga)"
 
-#: localized_schema.php:27
-msgid "Update post on checksum change"
-msgstr "Actualitza una entrada si canvia la suma de verificació."
-
 #: localized_schema.php:28
 #, fuzzy
 msgid "Default interval between feed updates"
@@ -744,103 +764,98 @@ msgid "Long date format"
 msgstr "Format llarg de data"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr ""
-"Utilitzeu un format més accessible per a la data i hora de les capçaleres."
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "Mostra els canals combinats"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "Amaga els canals que no tinguin missatges per llegir."
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "Salta automàticament al canal següent"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "Ordena els canals per articles no llegits"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "En actualitzar, marca els articles com a no llegits."
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "Habilita el resum diari de capçaleres per correu electrònic."
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "Demana la confirmació quan es marqui un canal com a llegit"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "En mode combinat expandeix els articles automàticament."
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "Elimina les etiquetes dels articles que no siguin segures."
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "Llista negra d'etiquetes"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "Temps màxim per als articles marcats com a frescos (en hores)"
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 msgid "Mark articles in e-mail digest as read"
 msgstr ""
 "Marca tots els articles enviat en el resum via adreça electrònica com a "
 "llegits"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr "En mode combinat expandeix els articles automàticament."
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr "Purga els articles per llegir"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr "Mostra els canals especials quan s'amaguin els canals reals."
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr "Agrupa les capçaleres en canals virtuals"
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr "No mostris imatges en els articles"
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr ""
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 #, fuzzy
 msgid "Sort headlines by feed date"
 msgstr "Ordena els canals per articles no llegits"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la fulla d'estils personalitzada."
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "Usuari:"
@@ -874,51 +889,46 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "Eina OPML"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
 msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
 
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr ""
-"S'està important el fitxer OPML (s'està utilitzant l'extensió DOMDocument)..."
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-"No s'ha trobat l'extensió DOMXML. Fa falta per a versions de PHP inferiors a "
-"la 5."
-
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "Torna a les preferències"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "Surt de les preferències"
-
-#: prefs.php:91
+#: prefs.php:83
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "Surt de les preferències"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "Preferències"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 msgid "Users"
 msgstr "Usuaris"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "Enllaç"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr "L'administrador ha deshabilitat els registres de nous usuaris."
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -928,154 +938,158 @@ msgstr ""
 "especificada. Els comptes en els quals no s'hagi entrat almenys un cop "
 "s'eliminaran passades 24 hores des de l'enviament de la contrasenya."
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr "Usuari desitjat:"
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr "Comprova la disponibilitat"
 
-#: register.php:184
+#: register.php:185
 msgid "Email:"
 msgstr "Adreça electrònica:"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr "Quant és dos més dos:"
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr "Envia el registre"
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr "La vostra informació de registre és incompleta."
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr "Aquest nom d'usuari ja existeix."
 
-#: register.php:241
+#: register.php:242
 msgid "Registration failed."
 msgstr "Ha fallat el regsitre"
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr "S'ha creat el compte."
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr "Actualment no es permet el registre de nous usuaris."
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 msgid "Comments?"
 msgstr "Comentaris?"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 msgid "Collapse feedlist"
 msgstr "Redueix la llista de canals"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 #, fuzzy
 msgid "Show articles"
 msgstr "Articles mémorisés"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr "Adaptatiu"
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "Tots els articles"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr "Ignora la puntuació"
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "Actualitzat"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 #, fuzzy
 msgid "Sort articles"
 msgstr "Articles mémorisés"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 msgid "Date"
 msgstr "Data"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr "Puntuació"
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "Actualitza"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr "Cerca..."
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "Accions sobre els canals:"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 msgid "Subscribe to feed..."
 msgstr "Subscriviu-vos al canal"
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 msgid "Edit this feed..."
 msgstr "Edita aquest canal..."
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 msgid "Rescore feed"
 msgstr "Canvia la puntuació del canal"
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "Dóna't de baixa"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "Tots els canals"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "Altres accions:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Núvol d'etiquetes"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 msgid "Create filter..."
 msgstr "Crea un filtre..."
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Dreceres de teclat"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1088,26 +1102,26 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "Registrat"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "La vostra informació de registre és incompleta."
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "S'ha modificat la contrasenya."
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
@@ -1120,7 +1134,7 @@ msgstr "Ajuda"
 msgid "Help topic not found."
 msgstr "No s'ha trobat el tema a l'ajuda."
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "S'està afegint la categoria <b>%s</b>."
@@ -1130,28 +1144,24 @@ msgstr "S'està afegint la categoria <b>%s</b>."
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 #, fuzzy
 msgid "is already imported."
 msgstr "Ja s'ha importat"
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 #, fuzzy
 msgid "OK"
 msgstr "D'acord!"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "Error mentre s'analitza el document."
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "Error: si us plau carregueu el fitxer OPML."
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr "Error: no es pot trobar els elements del cos."
-
 #: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
@@ -1163,6 +1173,12 @@ msgid "Importing using DOMDocument."
 msgstr ""
 "S'està important el fitxer OPML (s'està utilitzant l'extensió DOMDocument)..."
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+"No s'ha trobat l'extensió DOMXML. Fa falta per a versions de PHP inferiors a "
+"la 5."
+
 #: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
@@ -1192,7 +1208,7 @@ msgstr ""
 msgid "Your Public OPML URL is:"
 msgstr "Enllaç als articles publicats del canal."
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Canals generats"
@@ -1226,13 +1242,13 @@ msgstr ""
 "un problema com la caiguda. Si us plau, reviseu dels processos del daemon o "
 "contacteu amb el seu propietari."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "Canal"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 msgid "Place in category:"
 msgstr "Posa'l a la categoria:"
 
@@ -1241,19 +1257,19 @@ msgstr "Posa'l a la categoria:"
 msgid "Available feeds"
 msgstr "Tots els canals"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "Entra"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
@@ -1272,17 +1288,18 @@ msgid "More feeds"
 msgstr "Més canals"
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "Cerca"
 
@@ -1301,9 +1318,10 @@ msgstr "Accions dels canals"
 msgid "limit:"
 msgstr "Límit:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "Suprimeix"
 
@@ -1327,128 +1345,145 @@ msgstr "Limita la cerca a:"
 msgid "This feed"
 msgstr "Aquest canal"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "Coincidència"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr "abans"
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 msgid "after"
 msgstr "després"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr "Revisa-ho"
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr "al camp"
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 msgid "in"
 msgstr "a"
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 msgid "Perform Action"
 msgstr "Acció a realitzar:"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr "amb els paràmetres:"
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "Opcions"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "Activat"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "Coincidència inversa"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr "Tester"
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "Crea"
 
-#: modules/popup-dialog.php:542
+#: modules/popup-dialog.php:571
 #, fuzzy
-msgid "Feeds with update errors"
-msgstr "Erreurs de mise à jour"
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
+
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "Feu clic per editar"
+
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetes per aquest article (separades per comes):"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "Desa"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvol d'etiquetes"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Tots els articles"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 #, fuzzy
 msgid "To:"
 msgstr "Dalt"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "Selecciona:"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Canvieu l'adreça electrònica"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 #, fuzzy
 msgid "Details"
 msgstr "Diàriament"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1456,196 +1491,255 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+msgid "URL:"
+msgstr "URL:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "Nivell d'accés:"
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "Nivell d'accés"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "Canals generats"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "Crea"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr "Seleccioneu-ho per activar els camps"
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "Títol"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-msgid "URL:"
-msgstr "URL:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr "s'està utilitzant"
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "Neteja d'articles:"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Amaga-ho de la llista de canals"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "Contingut escrit de dreta a esquerra"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr "Mostra les imatges adjuntes"
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 #, fuzzy
 msgid "Cache images locally (SimplePie only)"
 msgstr "Emmagatzema les imatges localment"
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 #, fuzzy
 msgid "Icon"
 msgstr "Action"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "Subscrit als canals:"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr "Emmagatzema les imatges localment"
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr "Fet!"
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Subscrit a <b>%s</b>."
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr "Edita les opcions de les subscripcions"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La categoria <b>%s</b> ja existeix a la base de dades."
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "Crea una categoria"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "No s'ha definit cap categoria per als canals."
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de canals"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Tots els canals"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "Selecciona:"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Subscriu-te al canal"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "S'estan purgant els canals seleccionats..."
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Reinicia la contrasenya"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "Catégorie&nbsp;:"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "Edita les categories"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 #, fuzzy
 msgid "More actions..."
 msgstr "Accions..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 msgid "Clear feed data"
 msgstr "Esborra les dades del canal"
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 msgid "Rescore articles"
 msgstr "Canvia la puntuació dels articles"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "Importeu"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "Exporta en format OPML"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1654,23 +1748,23 @@ msgstr ""
 "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot "
 "subscriure qualsevol que en conegui l'adreça URL."
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 #, fuzzy
 msgid "Display URL"
 msgstr "afficher les étiquettes"
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integració al Firefox"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1678,38 +1772,38 @@ msgstr ""
 "Podeu utilitzar Tiny Tiny RSS  com a lector de canals amb el Firefox fent "
 "clic en el següent enllaç."
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr "Feu clic aquí per a desar aquesta pàgina web com un canal."
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr ""
 "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
 "personalitzades?"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1717,58 +1811,95 @@ msgstr ""
 "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot "
 "subscriure qualsevol que en conegui l'adreça URL."
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "Títol"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Esborra les dades del canal"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Articles marcats"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 msgid "No feeds found."
 msgstr "No s'ha trobat cap canal."
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "No s'ha trobat cap fitxer que coincideixi."
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "S'ha creat el filtre <b>%s</b>"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "Crea un filtre"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "Edita"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr "No teniu  permisos per a obrir aquesta pestanya."
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "Més canals"
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "Feu clic per editar"
+
 #: modules/pref-labels.php:21
 msgid "Caption"
 msgstr "Descriptif"
@@ -1801,115 +1932,115 @@ msgstr "Crea una etiqueta"
 msgid "Clear colors"
 msgstr "Elimina els colors"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "El camp de contrasenya antiga no pot estar buit."
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "El camp de contrasenya nova no pot estar buit."
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "Les contrasenyes no coincideixen."
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "S'ha modificat la contrasenya."
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "La contrasenya antiga és incorrecta."
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "S'ha desat la configuració"
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Es desconeix l'opció %s"
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "Dades personals"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "Adreça electrònica"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 msgid "Access level"
 msgstr "Nivell d'accés"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "Desa"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "La contrasenya actual és la predeterminada,\n"
 "\t\t\t\t\t\t penseu en modificar-la."
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "Contrasenya antiga"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "Confirmeu la contrasenya"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "Seleccioneu una interfície"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "Sí"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "No"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "Desa la configuració"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "Torna als paràmetres per defecte"
 
-#: modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr "No teniu  permisos per a obrir aquesta pestanya."
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "Detalls de l'usuari"
@@ -2004,10 +2135,6 @@ msgstr "Permisos"
 msgid "Last login"
 msgstr "Última connexió"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr "Feu clic per editar"
-
 #: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "No s'han definit els usuaris."
@@ -2269,7 +2396,7 @@ msgstr "Mostra/amaga els canals llegits"
 msgid "Sort feeds by unread count"
 msgstr "Ordena els canals per articles no llegits"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 msgid "Mark all articles in %s as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
@@ -2334,8 +2461,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "La contrasenya antiga és incorrecta."
 
 #: functions.js:634
 #, fuzzy
@@ -2399,227 +2527,272 @@ msgstr "No esteu subscrit a cap canal."
 msgid "Create Filter"
 msgstr "Crea un filtre"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+#, fuzzy
+msgid "Filter Test Results"
+msgstr "Expression du filtre"
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "Us voleu donar de baixa de %s ?"
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: functions.js:1158
+#: functions.js:1197
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Edita el canal"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "Més canals"
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "No heu seleccionat cap canal."
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
+#: functions.js:1573
+#, fuzzy
+msgid "Feeds with update errors"
+msgstr "Erreurs de mise à jour"
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "(Invers)"
 
-#: prefs.js:91
+#: prefs.js:114
 msgid "Please enter login:"
 msgstr "Si us plau, introduïu la vostra identificació (login)"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr "No s'ha pogut crear l'usuari: no hi ha cap nom especificat."
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Filtres"
 
-#: prefs.js:164
+#: prefs.js:187
 msgid "Remove filter %s?"
 msgstr "Esteu segur que voleu suprimir el filtre %s?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "No heu seleccionat cap etiqueta."
 
-#: prefs.js:310
+#: prefs.js:350
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "No heu seleccionat cap usuari."
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "No heu seleccionat cap filtre."
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "Si us plau, seleccioneu només un canal."
 
-#: prefs.js:420
+#: prefs.js:459
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Esteu segur que voleu suprimir tots els articles que no estan marcats als "
 "canals seleccionats?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Quants dies voleu mantenir els articles (0 - per defecte)?"
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: prefs.js:490
-#, fuzzy
-msgid "No profiles selected."
-msgstr "No hi ha cap article seleccionat."
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "El nom del camp no es pot deixar en blanc."
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "Si us plau, seleccioneu només un usuari."
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "Voleu reiniciar la contrasenya de l'usuari seleccionat?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "Si us plau, seleccioneu només un filtre."
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor múltiple de canals"
 
-#: prefs.js:705
+#: prefs.js:716
 msgid "Save changes to selected feeds?"
 msgstr "Esteu segur que voleu desar els canvis als canals seleccionats?"
 
-#: prefs.js:776
+#: prefs.js:802
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importeu"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "Esteu segur que voleu establir els valors per defecte?"
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "Catégorie&nbsp;:"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "No heu seleccionat cap categoria."
 
-#: prefs.js:1198
+#: prefs.js:1226
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Erreurs de mise à jour"
+
+#: prefs.js:1275
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Voleu canviar l'adreça de publicació per una de nova?"
 
-#: prefs.js:1307
+#: prefs.js:1384
 msgid "Rescore articles in selected feeds?"
 msgstr ""
 "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
 "personalitzades?"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Esteu segur que voleu recuperar tots els articles? Aquesta operació pot "
 "durar molt temps."
 
-#: prefs.js:1350
+#: prefs.js:1427
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr ""
 "Esteu segur que voleu canviar els colors de les etiquetes pels colors per "
 "defecte?"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr ""
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "No hi ha cap article seleccionat."
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 msgid "Label Editor"
 msgstr "Éditeur d'intitulé"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Edita les etiquetes"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "No heu seleccionat cap filtre."
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Si us plau, seleccioneu només un filtre."
+
 #: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
@@ -2628,26 +2801,26 @@ msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 msgid "You can't unsubscribe from the category."
 msgstr "No us podeu donar de baixa de la categoria."
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 msgid "Rescore articles in %s?"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 #, fuzzy
 msgid "New version available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "No hi ha cap article seleccionat."
 
@@ -2708,40 +2881,65 @@ msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 msgid "Unable to load article."
 msgstr "Error: si us plau carregueu el fitxer OPML."
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "S'està carregant la llista de canals..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "Mostra el contingut original de l'article"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Obre l'article en una finestra nova"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "S'està carregant la llista de canals..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "Feu clic per editar"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr "Actualitza una entrada si canvia la suma de verificació."
+
+#~ msgid "Use more accessible date/time format for headlines"
+#~ msgstr ""
+#~ "Utilitzeu un format més accessible per a la data i hora de les capçaleres."
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "En actualitzar, marca els articles com a no llegits."
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr ""
+#~ "S'està important el fitxer OPML (s'està utilitzant l'extensió "
+#~ "DOMDocument)..."
+
+#~ msgid "Error: can't find body element."
+#~ msgstr "Error: no es pot trobar els elements del cos."
+
+#, fuzzy
+#~ msgid "No profiles selected."
+#~ msgstr "No hi ha cap article seleccionat."
+
 #~ msgid "Unknown error"
 #~ msgstr "Error desconegut"
 
@@ -2931,9 +3129,6 @@ msgstr "Feu clic per editar"
 #~ msgid "No filters defined."
 #~ msgstr "No s'ha definit cap filtre."
 
-#~ msgid "No matching filters found."
-#~ msgstr "No s'ha trobat cap fitxer que coincideixi."
-
 #~ msgid "Click to change color"
 #~ msgstr "Feu clic per canviar el color"
 
@@ -3180,9 +3375,6 @@ msgstr "Feu clic per editar"
 #~ msgid "Could not update headlines (missing XML object)"
 #~ msgstr "No s'ha pogut actualitzar les capçaleres (manca un objecte XML)"
 
-#~ msgid "Entire feed"
-#~ msgstr "Tots els canals"
-
 #~ msgid "Failed to load article in new window"
 #~ msgstr "No s'ha pogut obrir l'article en una nova finestra"
 
@@ -3702,16 +3894,10 @@ msgstr "Feu clic per editar"
 #~ msgid "Create Label"
 #~ msgstr "Créer un intitulé"
 
-#~ msgid "Test"
-#~ msgstr "Tester"
-
 #, fuzzy
 #~ msgid "Perform action"
 #~ msgstr "Exécuter les mises à jour"
 
-#~ msgid "Filter expression"
-#~ msgstr "Expression du filtre"
-
 #~ msgid "Enable icons in feedlist"
 #~ msgstr "Afficher les icônes dans la liste des flux"
 

diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 9496766a19df9c409f0e03509f567d94bb39f7ad..daa28640bbb169cb455296454116720052ec05ac 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 88e7d5dc5aaf737860d4cc2bdb6ca31ec080ea76..02dc6b1e9c587992f76b7eed84d8d39294121965 100644 (file)
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Kevin Kraft <kev@nurzen.de>\n"
 "Language-Team: Deutsch <de.org>\n"
@@ -20,100 +20,100 @@ msgstr ""
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "Standard verweden"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "Niemals löschen"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "Nach 1 Woche"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Nach 2 Wochen"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "Nach 1 Monat"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "Nach 2 Monaten"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "Nach 3 Monaten"
 
-#: backend.php:81
+#: backend.php:80
 msgid "Default interval"
 msgstr "Standard Intervall"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Aktualisierungen deaktivieren"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Alle 15 Minuten"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Alle 30 Minuten"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Stündlich"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Alle 4 Stunden"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Alle 12 Stunden"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Täglich"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Wöchentlich"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "Standard"
 
-#: backend.php:103
+#: backend.php:102
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "Benutzer"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr "Erfahrener Benutzer"
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "Administrator"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 msgid "Feeds"
 msgstr "Feeds"
 
@@ -122,17 +122,17 @@ msgstr "Feeds"
 msgid "Article not found."
 msgstr "Feed nicht gefunden."
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "Ladevorgang, bitte warten..."
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -162,18 +162,18 @@ msgstr ", gefunden:"
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS Datenbank ist auf den neusten Stand."
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr "Bitte sichern Sie ihre Datenbank bevor Sie fortfahren."
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -182,32 +182,32 @@ msgstr ""
 "Ihre Tiny Tiny RSS  Datenbank benötigt eine Aktualisierung auf die neuste "
 "Version (<b>%d</b> nach <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "Aktualisierungen durchführen"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "Führe Aktualisierungen durch..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Aktualisiere auf Version %d..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "Überprüfe Version..."
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "FEHLER!"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -216,6 +216,21 @@ msgstr ""
 "Beendet. <b>%d</b> Aktualisierung(en) auf Schema\n"
 "\t\tVersion <b>%d</b> durchgeführt."
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 #, fuzzy
 msgid ""
@@ -227,11 +242,11 @@ msgstr ""
 "\t\tfunktionieren, welches von Ihrem Browser nicht unterstützt wird.\t"
 "\tBitte überprüfen Sie Ihre Browser Einstellungen."
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "Hallo,"
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "Abmelden"
@@ -323,216 +338,224 @@ msgstr ""
 "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP "
 "Konfiguration"
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Session konnte nicht validiert werden (falsche IP)"
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr "falscher Benutzername oder Passwort"
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "Alle Feeds"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "Unsortiert"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "Sonderfeeds"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "Label"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "Bewertete Artikel"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "Veröffentlichte Artikel"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr "Neue Artikel"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 msgid "All articles"
 msgstr "Alle Artikel"
 
-#: functions.php:3050
+#: functions.php:3217
 #, fuzzy
 msgid "Archived articles"
 msgstr "Bewertete Artikel"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "Auswahl:"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "Alle"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: functions.php:4021
+#: functions.php:4244
 msgid "Invert"
 msgstr "Invertieren"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "Keine"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "Aktionen..."
 
-#: functions.php:4030
+#: functions.php:4253
 msgid "Selection toggle:"
 msgstr "Auswahl umschalten:"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "Bewertet"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: functions.php:4036
+#: functions.php:4259
 msgid "Selection:"
 msgstr "Auswahl:"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr "Archiv"
 
-#: functions.php:4043
+#: functions.php:4266
 #, fuzzy
 msgid "Move back"
 msgstr "Zurück gehen"
 
-#: functions.php:4044
+#: functions.php:4267
 #, fuzzy
 msgid "Delete"
 msgstr "Standard"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 #, fuzzy
 msgid "Feed:"
 msgstr "Feed"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "Tags Anzeigen"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 #, fuzzy
 msgid "Visit the website"
 msgstr "Offizielle Website besuchen"
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Feeds anzeigen"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "Zum Bearbeiten klicken"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 msgid " - "
 msgstr " - "
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "Keine Tags"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Artikel in neuem Fenster öffnen"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "Tags bearbeiten"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "Dieses Fenster schließen"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr "Original von:"
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 #, fuzzy
 msgid "mark as read"
 msgstr "Als gelesen markieren"
 
-#: functions.php:5229
+#: functions.php:5457
 #, fuzzy
 msgid "Dismiss article"
 msgstr "Artikel veröffentlichen"
 
-#: functions.php:5248
+#: functions.php:5476
 msgid "No unread articles found to display."
 msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
 
-#: functions.php:5251
+#: functions.php:5479
 msgid "No updated articles found to display."
 msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
 
-#: functions.php:5254
+#: functions.php:5482
 msgid "No starred articles found to display."
 msgstr "Keine bewerteten Artikel zum Anzeigen gefunden."
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -540,58 +563,55 @@ msgstr ""
 "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell "
 "hinzufügen (siehe obiges Aktionsmenü) oder einen Filter benutzen."
 
-#: functions.php:5260
+#: functions.php:5488
 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 msgid "Some feeds have update errors (click for details)"
 msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 msgid "Create label..."
 msgstr "Label erstellen..."
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "Entfernen"
 
-#: functions.php:6110
+#: functions.php:6343
 #, fuzzy
 msgid "Assign:"
 msgstr "Label zuweisen:"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "Keine Tags"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+#, fuzzy
+msgid "(edit note)"
 msgstr "Notiz bearbeiten"
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "Kein Feed ausgewählt."
 
-#: functions.php:6774
+#: functions.php:7013
 msgid "unknown type"
 msgstr "unbekannter Typ"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr "Anhang:"
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr "Anhänge:"
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "Titel"
 
@@ -628,7 +648,7 @@ msgstr "Artikel veröffentlichen"
 msgid "Assign tags"
 msgstr "Tags zuweisen"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr "Label zuweisen"
 
@@ -705,12 +725,12 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "Alte Nachrichten nach dieser Anzahl an Tagen löschen (0 - deaktivert)"
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
 
 #: localized_schema.php:27
-msgid "Update post on checksum change"
-msgstr "Nachricht aktualisieren wenn die Prüfsumme sich ändert"
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "Alte Nachrichten nach dieser Anzahl an Tagen löschen (0 - deaktivert)"
 
 #: localized_schema.php:28
 #, fuzzy
@@ -743,100 +763,96 @@ msgid "Long date format"
 msgstr "Langes Datumsformat"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr "Benutzerfreundlicheres Datum/Zeit Format in Schlagzeilen verwenden"
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "Kombinierte Feed-Anzeige"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "Feeds ohne unglesene Nachrichten verbergen"
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "Den nächsten Feed anzeigen"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "Aktualisierte Artikel auf ungelesen setzen"
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "Umgekehrte Schlagzeilen Sortierung (Älteste zuerst)"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "Aktiviere E-Mail Benachrichtigung"
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "Bestätigung um Feed als gelesen zu markieren"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "Artikel im Kombinierten Modus automatisch aufklappen"
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "Unsichere Tags aus den Artikeln entfernen"
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "Gesperrte Tags"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "Maximales Alter neuer Artikel (in Stunden)"
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 msgid "Mark articles in e-mail digest as read"
 msgstr "Artikel in E-Mail Bericht als gelesen markieren"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr "Artikel im Kombinierten Modus automatisch aufklappen"
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr "Ungelesene Artikel löschen"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr "Sonderfeeds anzeigen wenn gelesene Feeds verborgen werden"
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr "Schlagzeilen in virtuellen Feeds gruppieren"
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr "Keine Bilder in Artikeln anzeigen"
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr "externe API aktivieren"
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 #, fuzzy
 msgid "Sort headlines by feed date"
 msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "Benutzer Stylesheet URL"
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "Benutzer:"
@@ -870,50 +886,46 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "OPML Werkzeug"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
 msgstr "Importiere OPML (verwende DOMXML Erweiterung)..."
 
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "Importiere OPML (verwende DOMDocument Erweiterung)..."
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-"DOMXML Erweiterung wurde nicht gefunden. Sie wird benötigt für PHP vor "
-"Version 5."
-
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "Zu den Einstellungen zurückkehren"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "Einstellungen verlassen"
-
-#: prefs.php:91
+#: prefs.php:83
 msgid "Keyboard shortcuts"
 msgstr "Tastaturbefehle"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "Einstellungen verlassen"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 msgid "Filters"
 msgstr "Filter"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 msgid "Users"
 msgstr "Benutzer"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "Link"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr "Die Registrierung für neue Benutzer wurde administrativ deaktiviert."
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -923,154 +935,158 @@ msgstr ""
 "gesendet. Konten, die nicht innerhalb von 24 Stunden aktiviert wurden, "
 "werden gelöscht."
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr "Gewünschter Benutzername:"
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr "Verfügbarkeit prüfen"
 
-#: register.php:184
+#: register.php:185
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr "Wieviel ist zwei plus zwei:"
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr "Registrierung abschicken"
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr "Ihre Registrieungsinformationen sind unvollständig."
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr "Leider ist dieser Benutzername schon vergeben."
 
-#: register.php:241
+#: register.php:242
 msgid "Registration failed."
 msgstr "Registrierung fehlgeschlagen."
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr "Konto erfolgreich erstellt."
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr "Registrierung für neue Benutzer ist momentan geschlossen."
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 msgid "Comments?"
 msgstr "Kommentare?"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Neue Version von Tiny Tiny RSS verfügbar!"
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 msgid "Collapse feedlist"
 msgstr "Feedliste verbergen"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 #, fuzzy
 msgid "Show articles"
 msgstr "Neue Artikel"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr "Adaptiv"
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "Alle Artikel"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr "Bewertung ignorieren"
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 #, fuzzy
 msgid "Sort articles"
 msgstr "Artikel bewerten"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 msgid "Date"
 msgstr "Datum"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr "Bewertung"
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr "Suchen..."
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "Feed Aktionen:"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 msgid "Subscribe to feed..."
 msgstr "Feed abonnieren..."
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 msgid "Edit this feed..."
 msgstr "Diesen Feed bearbeiten..."
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 msgid "Rescore feed"
 msgstr "Feed neu bewerten"
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "Alle Feeds:"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "Gelesene ein-/ausblenden"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "Andere Aktionen:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Tagwolke"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 msgid "Create filter..."
 msgstr "Filter erstellen..."
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastaturbefehle"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1083,26 +1099,26 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "Registriert"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Ihre Registrieungsinformationen sind unvollständig."
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "Passwort wurde geändert."
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
@@ -1115,7 +1131,7 @@ msgstr "Hilfe"
 msgid "Help topic not found."
 msgstr "Hilfe Thema nicht gefunden."
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Füge Kategorie <b>%s</b> hinzu."
@@ -1125,28 +1141,24 @@ msgstr "Füge Kategorie <b>%s</b> hinzu."
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 #, fuzzy
 msgid "is already imported."
 msgstr "Bereits importiert."
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "Fehler beim analysieren des Dokuments."
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "Fehler: bitte eine OPML Datei hochladen."
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr "Fehler: kein Body-Element gefunden."
-
 #: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
@@ -1157,6 +1169,12 @@ msgstr "Importiere OPML (verwende DOMXML Erweiterung)..."
 msgid "Importing using DOMDocument."
 msgstr "Importiere OPML (verwende DOMDocument Erweiterung)..."
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+"DOMXML Erweiterung wurde nicht gefunden. Sie wird benötigt für PHP vor "
+"Version 5."
+
 #: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
@@ -1186,7 +1204,7 @@ msgstr "öffentliche OPML URL"
 msgid "Your Public OPML URL is:"
 msgstr "Link zum Feed für veröffentlichte Artikel."
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Erzeugter Feed"
@@ -1221,13 +1239,13 @@ msgstr ""
 "Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder "
 "benachrichtigen Sie den Besitzer des Instanz."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "Feed"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 msgid "Place in category:"
 msgstr "In Kategorie einordnen:"
 
@@ -1236,19 +1254,19 @@ msgstr "In Kategorie einordnen:"
 msgid "Available feeds"
 msgstr "Alle Feeds"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "Anmelden"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "Passwort:"
@@ -1267,17 +1285,18 @@ msgid "More feeds"
 msgstr "Weitere Feeds"
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "Suchen"
 
@@ -1296,9 +1315,10 @@ msgstr "Feed-Aktionen"
 msgid "limit:"
 msgstr "Grenzwert:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1323,127 +1343,145 @@ msgstr "Suche begrenzen auf:"
 msgid "This feed"
 msgstr "Diesen Feed"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "Übereinstimmung"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr "vorher"
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 msgid "after"
 msgstr "nacher"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr "Überprüfen"
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr "in Feld"
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 msgid "in"
 msgstr "in"
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 msgid "Perform Action"
 msgstr "Aktion ausführen"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr "mit Parametern:"
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "Optionen"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "Invertierte Übereinstimmung"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr ""
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "Erstellen"
 
-#: modules/popup-dialog.php:542
-msgid "Feeds with update errors"
-msgstr ""
+#: modules/popup-dialog.php:571
+#, fuzzy
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr "Folgende Feeds konnten aufgrund von Fehlern nicht aktualisiert werden:"
+
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "Zum Bearbeiten klicken"
+
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "Ausgewählte Feeds abbestellen?"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr "Folgende Feeds konnten aufgrund von Fehlern nicht aktualisiert werden:"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags für diesen Artikel (komma-getrennt)"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "Speichern"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Tagwolke"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Alle Artikel"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 #, fuzzy
 msgid "To:"
 msgstr "Die Ersten"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "Auswahl:"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "E-Mail Adresse ändern"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Neue Version von Tiny Tiny RSS verfügbar!"
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 #, fuzzy
 msgid "Details"
 msgstr "Täglich"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1451,195 +1489,254 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+msgid "URL:"
+msgstr "URL:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "Zugriffsberechtigung: "
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "Zugriffsberechtigung"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "Erzeugter Feed"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "Erstellen"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr "Ankreuzen um das Feld zu aktivieren"
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "Titel"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-msgid "URL:"
-msgstr "URL:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr "verwende"
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "Artikel löschen:"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Auf meiner Feedliste verbergen"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "Rechts-nach-links Inhalt"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "In E-Mail Bericht aufnehmen"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr "angehängte Bilder immer anzeigen"
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 #, fuzzy
 msgid "Cache images locally (SimplePie only)"
 msgstr "Bilder lokal zwischenspeichern"
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Alle Artikel als gelesen markieren?"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 msgid "Icon"
 msgstr "Icon"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr "Ersetze"
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "Abonnierte Feeds:"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr "Bilder lokal zwischenspeichern"
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr "Alle fertig."
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> abonniert."
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> bereits abonniert."
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> bereits abonniert."
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "<b>%s</b> bereits abonniert."
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Ausgewählte Feeds abbestellen?"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr "Abonnement Optionen bearbeiten"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Kategorie <b>$%s</b> existiert bereits in der Datenbank."
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "Kategorie erstellen"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "Keine Feedkategorien definiert."
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Ausgewählte Kategorien entfernen?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Feed-Editor"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Ganzer Feed"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "Auswahl:"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Lösche gewählten Feed..."
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Passwort zurücksetzen"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "Neu kategorisieren"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "Kategorien bearbeiten"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 #, fuzzy
 msgid "More actions..."
 msgstr "Aktionen..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr "Manuelle Säuberung"
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 msgid "Clear feed data"
 msgstr "Feed-Daten löschen"
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 msgid "Rescore articles"
 msgstr "Artikel neu bewerten"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "Importieren"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "OPML exportieren"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1648,22 +1745,22 @@ msgstr ""
 "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
 "können von jedem abonniert werden, der die nachstehende URL kennt."
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 msgid "Display URL"
 msgstr "Zeige URL an"
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox Integration"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1671,36 +1768,36 @@ msgstr ""
 "Tiny Tiny RSS kann durch den nachstehenden Link als Feedreader für Firefox "
 "verwendet werden."
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr "Diese Website als Feedreader registrieren."
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Artikel in gewählten Feeds neu bewerten?"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1708,58 +1805,96 @@ msgstr ""
 "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
 "können von jedem abonniert werden, der die nachstehende URL kennt."
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "Titel"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Feed-Daten löschen"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Bewertete Artikel"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "Keine übereinstimmenden Filter gefunden."
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filter <b>%s</b> erstellt"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "Filter erstellen"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "Bearbeiten"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr ""
+"Sie haben nicht die benötigten Rechte um diese Registerkarte zu öffnen."
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "Weitere Feeds"
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "Zum Bearbeiten klicken"
+
 #: modules/pref-labels.php:21
 #, fuzzy
 msgid "Caption"
@@ -1793,116 +1928,115 @@ msgstr "Label erstellen"
 msgid "Clear colors"
 msgstr "Farben löschen"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "Altes Passwort darf nicht leer sein."
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "Neues Passwort darf nicht leer sein."
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "Die eingegebenen Passwörter stimmen nicht überein."
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "Passwort wurde geändert."
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "Altes Passwort ist falsch."
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "Die Einstellungen wurden gespeichert."
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Unbekannte Option: %s"
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "Persönliche Daten"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 msgid "Access level"
 msgstr "Zugriffsberechtigung"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "Speichern"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "Sie nutzen das Standard Passwort, \n"
 "\t\t\t\t\t\tbitte ändern Sie das Passwort."
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "Passwort bestätigen"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "Thema auswählen"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "Ja"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "Nein"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "Einstellungen speichern"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr "Profile verwalten"
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "Auf Standardwerte zurücksetzen"
 
-#: modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr ""
-"Sie haben nicht die benötigten Rechte um diese Registerkarte zu öffnen."
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "Benutzer Details"
@@ -1997,10 +2131,6 @@ msgstr "Zugriffsberechtigung"
 msgid "Last login"
 msgstr "Zuletzt angemeldet"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr "Zum Bearbeiten klicken"
-
 #: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "Keine Benutzer definiert."
@@ -2268,7 +2398,7 @@ msgstr "Gelesene ein-/ausblenden"
 msgid "Sort feeds by unread count"
 msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 msgid "Mark all articles in %s as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
@@ -2333,8 +2463,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "Altes Passwort ist falsch."
 
 #: functions.js:634
 #, fuzzy
@@ -2398,40 +2529,50 @@ msgstr "Sie können die Kategorie nicht abbestellen."
 msgid "Create Filter"
 msgstr "Filter erstellen"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+msgid "Filter Test Results"
+msgstr ""
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "Abbestellen von %s?"
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Tags für diesen Artikel bearbeiten"
 
-#: functions.js:1158
+#: functions.js:1197
 #, fuzzy
 msgid "Generate new syndication address for this feed?"
 msgstr "Neues Icon für diesen Feed hochladen"
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Feed bearbeiten"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "Weitere Feeds"
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "Keine Feeds ausgewählt."
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2439,37 +2580,46 @@ msgstr ""
 "ausgewählte Feed aus dem Archiv löschen? Feeds mit gespeicherten Artikeln "
 "werden nicht gelöscht"
 
+#: functions.js:1573
+msgid "Feeds with update errors"
+msgstr ""
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "Ausgewählte Filter entfernen?"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "(Invertiert)"
 
-#: prefs.js:91
+#: prefs.js:114
 msgid "Please enter login:"
 msgstr "Bitte Benutzernamen eingeben:"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr "Kann den Benutzer nicht hinzufügen: kein Login angegeben."
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Filter"
 
-#: prefs.js:164
+#: prefs.js:187
 msgid "Remove filter %s?"
 msgstr "Filter entfernen %s?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "Ausgewählte Label entfernen?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "Keine Label ausgewählt."
 
-#: prefs.js:310
+#: prefs.js:350
 #, fuzzy
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
@@ -2478,149 +2628,172 @@ msgstr ""
 "ausgewählte Profile löschen? Das Aktive und das Standardprofil werden nicht "
 "gelöscht"
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "Keine Benutzer ausgewählt."
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "Ausgewählte Filter entfernen?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "Keine Filter ausgewählt."
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "Ausgewählte Feeds abbestellen?"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "Bitte nur einen Feed auswählen."
 
-#: prefs.js:420
+#: prefs.js:459
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Alle nicht bewerteten Artikel im ausgewählten Feed löschen?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Artikel von wievielen Tagen aufbewahren (0 - Standardwert nutzen)?"
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-"ausgewählte Profile löschen? Das Aktive und das Standardprofil werden nicht "
-"gelöscht"
-
-#: prefs.js:490
-#, fuzzy
-msgid "No profiles selected."
-msgstr "Kein Artikel ausgewählt."
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "Feld für Benutzername darf nicht leer sein."
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "Bitte nur einen Benutzer auswählen."
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "Passwort des ausgewählten Benutzers zurücksetzen?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "Bitte nur einen Filter auswählen."
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Mehrfach Feed-Editor"
 
-#: prefs.js:705
+#: prefs.js:716
 msgid "Save changes to selected feeds?"
 msgstr "Änderungen an den gewählten Feeds speichern?"
 
-#: prefs.js:776
+#: prefs.js:802
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importieren"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Bitte ein Profil zum aktivieren auswählen"
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "Auf Standardwerte zurücksetzen?"
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "Neu kategorisieren"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "Ausgewählte Kategorien entfernen?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "Keine Kategorien ausgewählt."
 
-#: prefs.js:1198
+#: prefs.js:1226
+msgid "Feeds without recent updates"
+msgstr ""
+
+#: prefs.js:1275
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
 
-#: prefs.js:1307
+#: prefs.js:1384
 msgid "Rescore articles in selected feeds?"
 msgstr "Artikel in gewählten Feeds neu bewerten?"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Alle Artikel neu bewerten? Dieser Vorgang kann viel Zeit in Anspruch nehmen."
 
-#: prefs.js:1350
+#: prefs.js:1427
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Label-Farben auf Standardwerte zurücksetzen?"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr "Einstellungsprofile"
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+"ausgewählte Profile löschen? Das Aktive und das Standardprofil werden nicht "
+"gelöscht"
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Kein Artikel ausgewählt."
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Ausgewählte Filter entfernen?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr "Bitte ein Profil zum aktivieren auswählen"
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 #, fuzzy
 msgid "Label Editor"
 msgstr "Feed-Editor"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Tags bearbeiten"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Ausgewählte Filter entfernen?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Keine Filter ausgewählt."
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Bitte nur einen Filter auswählen."
+
 #: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "Alle Artikel als gelesen markieren?"
@@ -2629,26 +2802,26 @@ msgstr "Alle Artikel als gelesen markieren?"
 msgid "You can't unsubscribe from the category."
 msgstr "Sie können die Kategorie nicht abbestellen."
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "Bitte erst einen Feed auswählen."
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr "Sie können diese Art von Feed nicht neu bewerten."
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 msgid "Rescore articles in %s?"
 msgstr "Artikel in %s neu bewerten?"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 #, fuzzy
 msgid "New version available!"
 msgstr "Neue Version von Tiny Tiny RSS verfügbar!"
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "Keine Artikel ausgewählt."
 
@@ -2701,40 +2874,62 @@ msgstr "%d Artikel als gelesen markieren?"
 msgid "Unable to load article."
 msgstr "Fehler: bitte eine OPML Datei hochladen."
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "Lade Feedliste..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "Inhalt des original Artikels anzeigen"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Artikel in neuem Fenster öffnen"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "Ausgewählte Label entfernen?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "Lade Feedliste..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "Zum Bearbeiten klicken"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr "Nachricht aktualisieren wenn die Prüfsumme sich ändert"
+
+#~ msgid "Use more accessible date/time format for headlines"
+#~ msgstr "Benutzerfreundlicheres Datum/Zeit Format in Schlagzeilen verwenden"
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "Aktualisierte Artikel auf ungelesen setzen"
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "Importiere OPML (verwende DOMXML Erweiterung)..."
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "Importiere OPML (verwende DOMDocument Erweiterung)..."
+
+#~ msgid "Error: can't find body element."
+#~ msgstr "Fehler: kein Body-Element gefunden."
+
+#, fuzzy
+#~ msgid "No profiles selected."
+#~ msgstr "Kein Artikel ausgewählt."
+
 #~ msgid "Unknown error"
 #~ msgstr "Unbekannter Fehler"
 
@@ -2922,9 +3117,6 @@ msgstr "Zum Bearbeiten klicken"
 #~ msgid "No filters defined."
 #~ msgstr "Keine Filter definiert."
 
-#~ msgid "No matching filters found."
-#~ msgstr "Keine übereinstimmenden Filter gefunden."
-
 #~ msgid "Click to change color"
 #~ msgstr "Zum Ändern der Farbe hier klicken"
 
@@ -3173,9 +3365,6 @@ msgstr "Zum Bearbeiten klicken"
 #~ msgid "Could not update headlines (missing XML object)"
 #~ msgstr "Konnte die Schlagzeilen nicht aktualisieren (fehlendes XML Objekt)"
 
-#~ msgid "Entire feed"
-#~ msgstr "Ganzer Feed"
-
 #~ msgid "Failed to load article in new window"
 #~ msgstr "Laden des Artikels im neuen Fenster fehlgeschlagen"
 

diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 1bcaf6ce95cb6d243d0d02ed0e16b65d8e838024..8a393ef7dcd663190a764fd731d421d87bb60fdb 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 e450af9c8f2795530adc07b22f5fec747c168c07..bd4e79c0b2f6f696825fecc0d933d51c66e1468e 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"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2009-11-10 00:12+0100\n"
 "Last-Translator: Manuel Gualda Caballero <manuel@utopiaverde.org>\n"
 "Language-Team: Español <manuel@utopiaverde.org>\n"
@@ -14,100 +14,100 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "Usar configuración por defecto"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "Nunca purgar"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 semana de antigüedad"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 semanas de antigüedad"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 mes de antigüedad"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 meses de antigüedad"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 meses de antigüedad"
 
-#: backend.php:81
+#: backend.php:80
 msgid "Default interval"
 msgstr "Intervalo por defecto"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Desactivar actualizaciones"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Cada 30 minutos"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Cada 4 horas"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Cada 12 horas"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Diariamente"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "Por defecto"
 
-#: backend.php:103
+#: backend.php:102
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "Usuario"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr "Usuario con poder"
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 msgid "Feeds"
 msgstr "Fuentes"
 
@@ -116,17 +116,17 @@ msgstr "Fuentes"
 msgid "Article not found."
 msgstr "Fuente no encontrada."
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "Fuente no encontrada."
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -157,20 +157,20 @@ msgstr ", encontrado:"
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "La base de datos de Tiny Tiny RSS está actualizada."
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr ""
 "Por favor, haga una copia de seguridad de su base de datos antes de "
 "continuar."
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -179,32 +179,32 @@ msgstr ""
 "Su base de datos Tiny Tiny RSS necesita ser actualizada a la última versión "
 "(<b>%d</b> to <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "Actualizar"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "Actualizando..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Actualizando a la versión %d..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "Comprobando la versión..."
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "¡TODO CORRECTO!"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "¡ERROR!"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -213,6 +213,21 @@ msgstr ""
 "Tarea terminada. Realizada(s) <b>%d</b> actualización(es) a la versión del "
 "esquema <b>%d</b>."
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 #, fuzzy
 msgid ""
@@ -224,11 +239,11 @@ msgstr ""
 "navegador no lo soporta actualmente. Por favor, revise las opciones de "
 "configuración de su navegador."
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "Hola,"
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "Cerrar sesión"
@@ -319,215 +334,223 @@ msgstr ""
 "La prueba de escape SQL ha fallado. Por favor, revise la configuración de su "
 "base de datos y PHP."
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr "No se pudo validar la sesión (IP incorrecta)"
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr "Nombre de usuario o contraseña incorrecta"
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "Todas las fuentes"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "Favoritos"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "Publicados"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr "Recientes"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 msgid "All articles"
 msgstr "Todos"
 
-#: functions.php:3050
+#: functions.php:3217
 #, fuzzy
 msgid "Archived articles"
 msgstr "Favoritos"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "Seleccione:"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "No"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "Sin leer"
 
-#: functions.php:4021
+#: functions.php:4244
 msgid "Invert"
 msgstr "Invertir"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "Ninguno"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "Acciones..."
 
-#: functions.php:4030
+#: functions.php:4253
 msgid "Selection toggle:"
 msgstr "Cambiar la selección:"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "Favoritos"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "Publicado"
 
-#: functions.php:4036
+#: functions.php:4259
 msgid "Selection:"
 msgstr "Selección:"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4043
+#: functions.php:4266
 #, fuzzy
 msgid "Move back"
 msgstr "Volver atrás"
 
-#: functions.php:4044
+#: functions.php:4267
 #, fuzzy
 msgid "Delete"
 msgstr "Por defecto"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 #, fuzzy
 msgid "Feed:"
 msgstr "Fuente"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "Ver etiquetas"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 #, fuzzy
 msgid "Visit the website"
 msgstr "Visitar el sitio oficial"
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Ver fuentes"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "Pulse aquí para editar"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 msgid " - "
 msgstr " - "
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "sin etiquetas"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr "Editar las etiquetas de este artículo"
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Abrir el artículo en una nueva pestaña o ventana"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "Editar etiquetas"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "Cerrar esta ventana"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 #, fuzzy
 msgid "Feed URL"
 msgstr "Fuente"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 msgid "mark as read"
 msgstr "marcar como leído"
 
-#: functions.php:5229
+#: functions.php:5457
 #, fuzzy
 msgid "Dismiss article"
 msgstr "Publicar artículo"
 
-#: functions.php:5248
+#: functions.php:5476
 msgid "No unread articles found to display."
 msgstr "No se han encontrado artículos sin leer."
 
-#: functions.php:5251
+#: functions.php:5479
 msgid "No updated articles found to display."
 msgstr "No se han encontrado artículos actualizados."
 
-#: functions.php:5254
+#: functions.php:5482
 msgid "No starred articles found to display."
 msgstr "No se han encontrado artículos favoritos."
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -536,59 +559,56 @@ msgstr ""
 "artículos a las etiquetas manualmente (ver el menú Acciones -arriba-) o usar "
 "un filtro."
 
-#: functions.php:5260
+#: functions.php:5488
 msgid "No articles found to display."
 msgstr "No se han encontrado artículos que desplegar."
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 msgid "Create label..."
 msgstr "Crear etiqueta..."
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "Eliminar"
 
-#: functions.php:6110
+#: functions.php:6343
 #, fuzzy
 msgid "Assign:"
 msgstr "Asignar etiqueta:"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "sin etiquetas"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+#, fuzzy
+msgid "(edit note)"
 msgstr "editar nota"
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "No se ha seleccionado ninguna fuente."
 
-#: functions.php:6774
+#: functions.php:7013
 msgid "unknown type"
 msgstr "tipo desconocido"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr "Adjunto:"
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr "Adjuntos:"
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "Título"
 
@@ -625,7 +645,7 @@ msgstr "Publicar artículo"
 msgid "Assign tags"
 msgstr "Asignar etiquetas"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr "Asignar etiqueta"
 
@@ -707,14 +727,13 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
-msgid "Purge old posts after this number of days (0 - disables)"
+msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
-"Purgar los envíos antiguos después de este número de días (0 = desactivado)"
 
 #: localized_schema.php:27
-msgid "Update post on checksum change"
+msgid "Purge old posts after this number of days (0 - disables)"
 msgstr ""
-"Actualizar el envío cuando cambie la suma de comprobación (\"checksum\")"
+"Purgar los envíos antiguos después de este número de días (0 = desactivado)"
 
 #: localized_schema.php:28
 #, fuzzy
@@ -748,100 +767,96 @@ msgid "Long date format"
 msgstr "Formato de fecha largo"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr "Usar el formato de fecha y hora más accesible para los titulares"
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "Despliegue combinado de la fuente"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "Ocultar las fuentes que no tengan mensajes sin leer"
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "Al ponerse al corriente, mostrar la siguiente fuente"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "Al actualizar, fijar los artículos como no leídos"
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "Invertir el orden de los titulares (los más antiguos primero)"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "Activar los correos recopilatorios"
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "Confirmar el marcado de la fuente como leída"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "Expandir automáticamente los artículos en el modo combinado"
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "Quitar las etiquetas peligrosas de los artículos"
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "Etiquetas añadidas a la lista negra"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "Antigüedad máxima de los artículos recientes (en horas)"
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 msgid "Mark articles in e-mail digest as read"
 msgstr "Marcar como leídos los artículos de los correos de recopilación"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr "Expandir automáticamente los artículos en el modo combinado"
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr "Purgar los artículos no leídos"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr "Mostrar las fuentes especiales cuando se oculten las fuentes leídas"
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr "Agrupar los titulares en fuentes virtuales"
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr "No mostrar imágenes en los artículos"
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr ""
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 #, fuzzy
 msgid "Sort headlines by feed date"
 msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la hoja de estilo del usuario"
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "Nombre de usuario:"
@@ -875,51 +890,47 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "Utilidad OPML"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
 msgstr "Importando OPML (usando la extensión DOMXML)..."
 
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "Importando OPML (usando la extensión DOMDocument)..."
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-"No se ha encontrado la extensión DOMXML, la cual es necesaria para las "
-"versiones de PHP inferiores a la 5."
-
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "Volver a las preferencias"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "Salir de las preferencias"
-
-#: prefs.php:91
+#: prefs.php:83
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "Salir de las preferencias"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 msgid "Filters"
 msgstr "Filtros"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 msgid "Users"
 msgstr "Usuarios"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "Enlace"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr ""
 "El registro de nuevos usuarios ha sido deshabilitado por el administrador."
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -929,154 +940,158 @@ msgstr ""
 "Las cuentas en las que no se entre una vez serán borradas automáticamente a "
 "las 24 horas de enviar la contraseña temporal."
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr "Nombre de usuario deseado:"
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr "Comprobar la disponibilidad"
 
-#: register.php:184
+#: register.php:185
 msgid "Email:"
 msgstr "Correo electrónico:"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr "¿Cuánto es dos más dos?"
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr "Enviar solicitud de registro"
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr "Su información de registro está incompleta"
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr "Lo sentimos, este nombre de usuario ya existe."
 
-#: register.php:241
+#: register.php:242
 msgid "Registration failed."
 msgstr "El registro ha fallado."
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr "Cuenta creada correctamente."
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr "El registro de nuevos usuarios está cerrado en estos momentos."
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 msgid "Comments?"
 msgstr "¿Comentarios?"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 msgid "Collapse feedlist"
 msgstr "Plegar la lista de fuentes"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 #, fuzzy
 msgid "Show articles"
 msgstr "Recientes"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr "Adaptable"
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "Todos"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr "Ignorar la puntuación"
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "Actualizados"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 #, fuzzy
 msgid "Sort articles"
 msgstr "Marcar el artículo como favorito"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 msgid "Date"
 msgstr "Fecha"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr "Puntos"
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "Actualizar"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr "Buscar..."
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 msgid "Subscribe to feed..."
 msgstr "Suscribir a la fuente..."
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 msgid "Edit this feed..."
 msgstr "Editar esta fuente..."
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 msgid "Rescore feed"
 msgstr "Reiniciar la puntuación"
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "Todas las fuentes:"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "Ocultar/Mostrar las leídas"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "Otras acciones:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "nube de etiquetas"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 msgid "Create filter..."
 msgstr "Crear filtro..."
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Atajos de teclado"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1089,26 +1104,26 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "Registrado"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Su información de registro está incompleta"
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "La contraseña ha sido cambiada."
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "No puede editar esta clase de fuente."
@@ -1121,7 +1136,7 @@ msgstr "Ayuda"
 msgid "Help topic not found."
 msgstr "Tema de ayuda no encontrado."
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Añadiendo categoría <b>%s</b>."
@@ -1131,28 +1146,24 @@ msgstr "Añadiendo categoría <b>%s</b>."
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 #, fuzzy
 msgid "is already imported."
 msgstr "Ya importado."
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 #, fuzzy
 msgid "OK"
 msgstr "¡TODO CORRECTO!"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "Error mientras se analizaba el documento."
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "Error: por favor, suba un fichero OPML."
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr "Error: no se puede encontrar el elemento \"body\"."
-
 #: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
@@ -1163,6 +1174,12 @@ msgstr "Importando OPML (usando la extensión DOMXML)..."
 msgid "Importing using DOMDocument."
 msgstr "Importando OPML (usando la extensión DOMDocument)..."
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+"No se ha encontrado la extensión DOMXML, la cual es necesaria para las "
+"versiones de PHP inferiores a la 5."
+
 #: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
@@ -1192,7 +1209,7 @@ msgstr ""
 msgid "Your Public OPML URL is:"
 msgstr "Enlace a la fuente de artículos publicados."
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Fuente generada"
@@ -1227,13 +1244,13 @@ msgstr ""
 "(rotura, cuelgue,...). Por favor, compruebe el proceso del demonio o avise "
 "al propietario de la instancia."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "Fuente"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 msgid "Place in category:"
 msgstr "Colocar en la categoría:"
 
@@ -1242,19 +1259,19 @@ msgstr "Colocar en la categoría:"
 msgid "Available feeds"
 msgstr "Todas las fuentes"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "Contraseña:"
@@ -1273,17 +1290,18 @@ msgid "More feeds"
 msgstr "Más fuentes"
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "Buscar"
 
@@ -1302,9 +1320,10 @@ msgstr "Acciones de las fuentes"
 msgid "limit:"
 msgstr "Límite:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1328,128 +1347,147 @@ msgstr "Limitar la búsqueda a:"
 msgid "This feed"
 msgstr "Esta fuente"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "Coincidir"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr "antes"
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 msgid "after"
 msgstr "después"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr "Comprobarlo"
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr "en el campo"
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 msgid "in"
 msgstr "en"
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 msgid "Perform Action"
 msgstr "Realizar la acción"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr "con los parámetros:"
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "Opciones"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "coincidencia inversa"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr ""
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "Crear"
 
-#: modules/popup-dialog.php:542
-msgid "Feeds with update errors"
+#: modules/popup-dialog.php:571
+#, fuzzy
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
 msgstr ""
+"Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "Pulse aquí para editar"
+
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
+
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetas para este artículo (separadas por comas):"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "Guardar"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Nube de etiquetas"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Todos"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 #, fuzzy
 msgid "To:"
 msgstr "Arriba"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "Seleccione:"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Cambiar el correo electrónico"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 #, fuzzy
 msgid "Details"
 msgstr "Diariamente"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1457,195 +1495,254 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+msgid "URL:"
+msgstr "URL:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "Nivel de acceso:"
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "Nivel de acceso"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "Fuente generada"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "Crear"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr "Marcar para habilitar el campo"
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "Título"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-msgid "URL:"
-msgstr "URL:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr "usando"
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "Purgando el artículo"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Ocultar en mi lista de fuentes"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "Contenido de derecha a izquierda"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "Incluir en el correo recopilatorio"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr "Desplegar siempre las imágenes adjuntas"
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 #, fuzzy
 msgid "Cache images locally (SimplePie only)"
 msgstr "Guardar las imágenes en la memoria caché local"
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "¿Marcar todos los artículos como leídos?"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 msgid "Icon"
 msgstr ""
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "Suscrito a las fuentes:"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr "Guardar las imágenes en la memoria caché local"
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr "Hecho."
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Suscrito a <strong>%s</strong>."
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr "Editar las opciones de suscripción"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La categoría <strong>$%s</strong> ya existe en la base de datos."
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "Crear categoría"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "No se han definido categorías de fuentes."
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "¿Eliminar las categorías seleccionadas?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de fuente"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Fuente completa"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "Seleccione:"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Suscribir a la fuente"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Purgando la fuente seleccionada..."
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Redefinir contraseña"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "Volver a categorizar"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "Editar categorías"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 #, fuzzy
 msgid "More actions..."
 msgstr "Acciones..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr "Purga manual"
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 msgid "Clear feed data"
 msgstr "Limpiar los datos de la fuente"
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 msgid "Rescore articles"
 msgstr "Reiniciar la puntuación de los artículos"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "Importar"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1655,22 +1752,22 @@ msgstr ""
 "cual podrá suscribirse cualquiera que conozca la URL especificada a "
 "continuación."
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 msgid "Display URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integración con Firefox"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1678,37 +1775,37 @@ msgstr ""
 "Este sitio Tiny tiny RSS puede ser usado como un lector de fuentes de "
 "Firefox si pulsa en el enlace de abajo."
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr "Pulse aquí para registrar este sitio como un lector de fuentes."
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Volver a Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1717,58 +1814,95 @@ msgstr ""
 "cual podrá suscribirse cualquiera que conozca la URL especificada a "
 "continuación."
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "Título"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Limpiar los datos de la fuente"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "No se han encontrado filtros coincidentes."
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Se ha creado el filtro <strong>%s</strong>"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "Crear filtro"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "Editar"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr "Su nivel de acceso es insuficiente para abrir esta pestaña."
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "Más fuentes"
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "Pulse aquí para editar"
+
 #: modules/pref-labels.php:21
 #, fuzzy
 msgid "Caption"
@@ -1802,113 +1936,113 @@ msgstr "Crear etiqueta"
 msgid "Clear colors"
 msgstr "Limpiar los colores"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "La antigua contraseña no puede dejarse en blanco."
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "La nueva contraseña no puede dejarse en blanco."
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "Las contraseñas introducidas no coinciden."
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "La contraseña ha sido cambiada."
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "La contraseña antigua es incorrecta."
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "La configuración ha sido guardada."
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Opción desconocida: %s"
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "Datos personales"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 msgid "Access level"
 msgstr "Nivel de acceso"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "Guardar"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr "Su contraseña tiene el valor por defecto. Por favor, modifíquela."
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "Antigua contraseña"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "Confirme la nueva contraseña"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "Seleccionar plantilla"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "Sí"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "No"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "Guardar la configuración"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "Opciones por defecto"
 
-#: modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr "Su nivel de acceso es insuficiente para abrir esta pestaña."
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "Detalles del usuario"
@@ -2005,10 +2139,6 @@ msgstr "Nivel de acceso"
 msgid "Last login"
 msgstr "Última sesión"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr "Pulse aquí para editar"
-
 #: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "No se han definido usuarios."
@@ -2276,7 +2406,7 @@ msgstr "Ocultar/Mostrar las leídas"
 msgid "Sort feeds by unread count"
 msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 msgid "Mark all articles in %s as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 
@@ -2341,8 +2471,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "La contraseña antigua es incorrecta."
 
 #: functions.js:634
 #, fuzzy
@@ -2406,225 +2537,267 @@ msgstr "No está suscrito a ninguna fuente."
 msgid "Create Filter"
 msgstr "Crear filtro"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+msgid "Filter Test Results"
+msgstr ""
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Por favor, introduzca una nota para este artículo:"
 
-#: functions.js:1158
+#: functions.js:1197
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr "No puede editar esta clase de fuente."
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Editar la fuente"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "Más fuentes"
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "No se han seleccionado fuentes."
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
+#: functions.js:1573
+msgid "Feeds with update errors"
+msgstr ""
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "¿Eliminar los filtros seleccionados?"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "(inverso)"
 
-#: prefs.js:91
+#: prefs.js:114
 msgid "Please enter login:"
 msgstr "Por favor, introduzca el nombre de usuario:"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr ""
 "No se puede crear el usuario: no se ha especificado el nombre de usuario."
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Filtros"
 
-#: prefs.js:164
+#: prefs.js:187
 msgid "Remove filter %s?"
 msgstr "¿Eliminar el filtro %s?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "¿Eliminar las etiquetas seleccionadas?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "No se han seleccionado etiquetas."
 
-#: prefs.js:310
+#: prefs.js:350
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "No se han seleccionado usuarios."
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "No se han seleccionado filtros."
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "Por favor, seleccione una única fuente."
 
-#: prefs.js:420
+#: prefs.js:459
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "¿Borrar todos los artículos no favoritos de la fuente seleccionada?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 "¿Cuántos días desea guardar el artículo? (0 = configuración por defecto)"
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: prefs.js:490
-#, fuzzy
-msgid "No profiles selected."
-msgstr "No se ha seleccionado ningún artículo."
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "El campo de nombre de usuario no puede dejarse en blanco."
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "Por favor, seleccione un único usuario."
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "¿Reajustar la contraseña del usuario seleccionado?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "Por favor, seleccione un único filtro."
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor de múltiples fuentes"
 
-#: prefs.js:705
+#: prefs.js:716
 msgid "Save changes to selected feeds?"
 msgstr "¿Guardar los cambios de las fuentes seleccionadas?"
 
-#: prefs.js:776
+#: prefs.js:802
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importar"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Por favor, seleccione alguna fuente primero."
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "¿Reajustar a las opciones por defecto?"
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "Volver a categorizar"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "¿Eliminar las categorías seleccionadas?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "No se han seleccionado categorías."
 
-#: prefs.js:1198
+#: prefs.js:1226
+msgid "Feeds without recent updates"
+msgstr ""
+
+#: prefs.js:1275
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "¿Reemplazar la actual dirección de publicación por una nueva?"
 
-#: prefs.js:1307
+#: prefs.js:1384
 msgid "Rescore articles in selected feeds?"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "¿Reiniciar la puntuación de todos los artículos? Esta operación puede tomar "
 "algo de tiempo."
 
-#: prefs.js:1350
+#: prefs.js:1427
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "¿Reajustar los colores de la etiqueta a las opciones por defecto?"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr ""
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "No se ha seleccionado ningún artículo."
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 #, fuzzy
 msgid "Label Editor"
 msgstr "Editor de fuente"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Editar etiquetas"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "¿Eliminar los filtros seleccionados?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "No se han seleccionado filtros."
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Por favor, seleccione un único filtro."
+
 #: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "¿Marcar todos los artículos como leídos?"
@@ -2633,26 +2806,26 @@ msgstr "¿Marcar todos los artículos como leídos?"
 msgid "You can't unsubscribe from the category."
 msgstr "No puede cancelar la suscripción a la categoría."
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "Por favor, seleccione alguna fuente primero."
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr "No puede reiniciar la puntuación de esta clase de fuente."
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos de %s?"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 #, fuzzy
 msgid "New version available!"
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
 
@@ -2705,40 +2878,63 @@ msgstr "¿Marcar %d artículo(s) como leído(s)?"
 msgid "Unable to load article."
 msgstr "Error: por favor, suba un fichero OPML."
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "Cargando la lista de la fuente..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "Desplegar el contenido original del artículo"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Abrir el artículo en una nueva pestaña o ventana"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "¿Eliminar las etiquetas seleccionadas?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "Cargando la lista de la fuente..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "Pulse aquí para editar"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr ""
+#~ "Actualizar el envío cuando cambie la suma de comprobación (\"checksum\")"
+
+#~ msgid "Use more accessible date/time format for headlines"
+#~ msgstr "Usar el formato de fecha y hora más accesible para los titulares"
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "Al actualizar, fijar los artículos como no leídos"
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "Importando OPML (usando la extensión DOMXML)..."
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "Importando OPML (usando la extensión DOMDocument)..."
+
+#~ msgid "Error: can't find body element."
+#~ msgstr "Error: no se puede encontrar el elemento \"body\"."
+
+#, fuzzy
+#~ msgid "No profiles selected."
+#~ msgstr "No se ha seleccionado ningún artículo."
+
 #~ msgid "Unknown error"
 #~ msgstr "Error desconocido"
 
@@ -2924,9 +3120,6 @@ msgstr "Pulse aquí para editar"
 #~ msgid "No filters defined."
 #~ msgstr "No se han definido filtros."
 
-#~ msgid "No matching filters found."
-#~ msgstr "No se han encontrado filtros coincidentes."
-
 #~ msgid "Click to change color"
 #~ msgstr "Pulse aquí para cambiar el color"
 
@@ -3177,9 +3370,6 @@ msgstr "Pulse aquí para editar"
 #~ msgid "Could not update headlines (missing XML object)"
 #~ msgstr "No se pueden actualizar los titulares (falta el objeto XML)"
 
-#~ msgid "Entire feed"
-#~ msgstr "Fuente completa"
-
 #~ msgid "Failed to load article in new window"
 #~ msgstr "No se puedo cargar el artículo en una nueva pestaña o ventana"
 

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 2ff4621798b40814cedf8aef054721b979712b12..9a79c6bfa14ccddf263d6fae4a5f53dcb0bfa11c 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 0f86a3bda44b685a9e4e85181caa6215f74b9b4e..b71a6d5272c657f8e9b04846f9d322af9ca8b1f8 100644 (file)
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2007-11-20 23:01+0100\n"
 "Last-Translator: Ploc\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -19,100 +19,100 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "Utiliser la valeur par défaut"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "Ne jamais purger"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "Au bout d'une semaine"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Au bout de 2 semaines"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "Au bout d'un mois"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "Au bout de 2 mois"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "Au bout de 3 mois"
 
-#: backend.php:81
+#: backend.php:80
 msgid "Default interval"
 msgstr "Fréquence de mise à jour par défaut"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Désactiver les mises à jour"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Toutes les 15 minutes"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Toutes les 30 minutes"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Toutes les heures"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Toutes les 4 heures"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Toutes les 12 heures"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Une fois par jour"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
-#: backend.php:103
+#: backend.php:102
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr "Twitter OAuth"
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "Utilisateur"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr "Utilisateur avancé"
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 msgid "Feeds"
 msgstr "Flux"
 
@@ -120,17 +120,17 @@ msgstr "Flux"
 msgid "Article not found."
 msgstr "Article non trouvé."
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "Chargement en cours, veuillez patienter..."
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 msgid "Default profile"
 msgstr "Profil par défaut"
@@ -159,18 +159,18 @@ msgstr ", trouvée : "
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "La base de données de Tiny Tiny RSS est à jour."
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr "Merci de sauvegardez votre base de données avant de poursuivre."
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -179,38 +179,53 @@ msgstr ""
 "La base de données de Tiny Tiny RSS a besoin d'être mise à jour (version <b>"
 "%d</b> à <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "Exécuter les mises à jour"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "Exécution des mises à jour..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Passage à la version %d..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "Vérification de la version..."
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "OK !"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "ERREUR !"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
 "\t\t\tversion <b>%d</b>."
 msgstr "Terminé. Le schéma est passé de la version <b>%d</b> à <b>%d</b>."
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -221,11 +236,11 @@ msgstr ""
 "\t\t\tpour le bon fonctionnement de ce logiciel. Veuillez modifier la\n"
 "\t\t\tconfiguration de votre navigateur."
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "Bonjour,"
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "Déconnexion"
@@ -318,204 +333,212 @@ msgstr ""
 "Le test d'échappement sql a échoué, vérifier votre base de donnée et votre "
 "configuration de PHP."
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Echec de la validation de la session (adresse ip incorrecte)"
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr "Login ou mot de passe incorrect"
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "Etiquettes"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 msgid "All articles"
 msgstr "Tous les articles"
 
-#: functions.php:3050
+#: functions.php:3217
 msgid "Archived articles"
 msgstr "Articles archivés"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "Sélectionner :"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "Tout"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:4021
+#: functions.php:4244
 msgid "Invert"
 msgstr "Inverse"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "Aucun"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "Actions..."
 
-#: functions.php:4030
+#: functions.php:4253
 msgid "Selection toggle:"
 msgstr "Sélectionner :"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:4036
+#: functions.php:4259
 msgid "Selection:"
 msgstr "Sélection :"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr "Archive"
 
-#: functions.php:4043
+#: functions.php:4266
 msgid "Move back"
 msgstr "Revenir"
 
-#: functions.php:4044
+#: functions.php:4267
 msgid "Delete"
 msgstr "Supprimer"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr "Transférer par email"
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 msgid "Feed:"
 msgstr "Flux :"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 msgid "View as RSS"
 msgstr "Voir comme RSS"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 msgid "Visit the website"
 msgstr "Visiter le site web"
 
-#: functions.php:4114
+#: functions.php:4332
 msgid "View as RSS feed"
 msgstr "Voir comme flux RSS"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "Cliquer pour éditer"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 msgid " - "
 msgstr " - "
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "aucun tag"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr "Editer les tags pour cet article"
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 msgid "Open article in new tab"
 msgstr "Ouvrir les articles dans un nouvel onglet"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "Editer les étiquettes de l'article"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr "Partager sur Twitter"
 
-#: functions.php:4627
+#: functions.php:4853
 msgid "Close this panel"
 msgstr "Fermer ce panel"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr "Origine :"
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 msgid "Feed URL"
 msgstr "URL du flux"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 msgid "mark as read"
 msgstr "marquer comme lu"
 
-#: functions.php:5229
+#: functions.php:5457
 msgid "Dismiss article"
 msgstr "Exclure l'article"
 
-#: functions.php:5248
+#: functions.php:5476
 msgid "No unread articles found to display."
 msgstr "Aucun article non-lu à afficher"
 
-#: functions.php:5251
+#: functions.php:5479
 msgid "No updated articles found to display."
 msgstr "Aucun article mis à jour à afficher"
 
-#: functions.php:5254
+#: functions.php:5482
 msgid "No starred articles found to display."
 msgstr "Aucun article remarquable à afficher"
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -524,58 +547,55 @@ msgstr ""
 "articles manuellement (voir les actions du menu ci-dessus) ou utiliser un "
 "filtre."
 
-#: functions.php:5260
+#: functions.php:5488
 msgid "No articles found to display."
 msgstr "Aucun article à afficher"
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flux mis à jour à %s"
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 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)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 msgid "Create label..."
 msgstr "Créer une étiquette..."
 
-#: functions.php:6106
+#: functions.php:6339
 msgid "Remove:"
 msgstr "Supprimer :"
 
-#: functions.php:6110
+#: functions.php:6343
 msgid "Assign:"
 msgstr "Assigner :"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "aucun tag"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+#, fuzzy
+msgid "(edit note)"
 msgstr "éditer la note"
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
-#: functions.php:6774
+#: functions.php:7013
 msgid "unknown type"
 msgstr "type inconnu"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr "Fichier attaché :"
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr "Fichiers attachés :"
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "Titre"
 
@@ -612,7 +632,7 @@ msgstr "Publier l'article"
 msgid "Assign tags"
 msgstr "Assigner des tags"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr "Assigner l'étiquette"
 
@@ -694,15 +714,15 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr "Personnaliser les feuilles de style CSS"
 
 #: localized_schema.php:26
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
+
+#: localized_schema.php:27
 msgid "Purge old posts after this number of days (0 - disables)"
 msgstr ""
 "Purger les articles plus vieux que le nombre de jours donné (0 pour ne "
 "jamais purger)"
 
-#: localized_schema.php:27
-msgid "Update post on checksum change"
-msgstr "Mettre à jour lors d'un changement du code de contrôle"
-
 #: localized_schema.php:28
 msgid "Default interval between feed updates"
 msgstr "Intervalle par défaut entre les mises à jour de flux"
@@ -732,98 +752,94 @@ msgid "Long date format"
 msgstr "Format de date long"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr "Afficher la date et l'heure de manière plus lisible dans les en-têtes"
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "Affichage combiné des flux"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "Masquer les flux sans article non lu"
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "Sauter automatiquement au flux suivant"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "Trier les flux par nombre d'articles non lus"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "Marquer les articles comme non lus lors des mises à jour"
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "Inverser l'order des en-têtes (les plus anciens en premier)"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "Activer la synthèse quotidienne par courrier électronique"
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "Demander confirmation pour marquer un flux comme lu"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "Développer automatiquement les articles en affichage combiné"
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "Éliminer les tags non sûrs des articles"
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "Tags exclus"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "Ancienneté maximale pour un nouvel article (en heures)"
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 msgid "Mark articles in e-mail digest as read"
 msgstr "Marquer tous les articles du compte-rendu par email comme lus"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr "Développer automatiquement les articles en affichage combiné"
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr "Purger les articles non lus"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr "Afficher les flux spéciaux en masquant les flux lus"
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr "Regrouper les entêtes dans des flux virtuels"
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr "Ne pas afficher les images dans les articles"
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr "Activer les API externes"
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr "Fuseau horaire de l'utilisateur"
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 msgid "Sort headlines by feed date"
 msgstr "Trier les en-têtes par date de flux"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 msgid "Customize stylesheet"
 msgstr "Personnaliser la feuille de style"
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "Login :"
@@ -856,52 +872,47 @@ msgstr "Minimiser l'usage du trafic"
 msgid "OPML Utility"
 msgstr "Outil OPML"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
-msgstr "Importation OPML (utilisant l'extension DOMXML)..."
-
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "Importation OPML (utilisation l'extension DOMDocument)..."
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-"Extension DOMXML non trouvée. Cette extension est requise pour les versions "
-"de php inférieures à 5.Extension DOMXML non trouvée. Elle est nécessaire "
-"pour les versions de PHP antérieures à la 5."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
+msgstr "Import en utilisant DOMXML."
 
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "Revenir à la configuration"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "Quitter la configuration"
-
-#: prefs.php:91
+#: prefs.php:83
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "Quitter la configuration"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "Configuration"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 msgid "Users"
 msgstr "Utilisateurs"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "Lien"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr ""
 "L'inscription de nouveaux utilisateurs est désactivée par l'administrateur."
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -911,150 +922,154 @@ msgstr ""
 "ne s'étant pas connectés au moins une fois dans les 24 heures qui suivent "
 "l'envoi du mail seront supprimés."
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr "Login souhaité :"
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr "Vérifier la disponibilité"
 
-#: register.php:184
+#: register.php:185
 msgid "Email:"
 msgstr "Adresse email :"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr "Combien dont 2 plus 2 :"
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr "Envoyer l'inscription"
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr "Vos informations d'inscription sont incomplètes."
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr "Désolé, ce login est déjà utilisé."
 
-#: register.php:241
+#: register.php:242
 msgid "Registration failed."
 msgstr "L'inscription a échoué."
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr "Compte créé avec succès."
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr "L'inscription de nouveaux utilisateurs est actuellement fermée."
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 msgid "Comments?"
 msgstr "Commentaires ?"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible !"
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 msgid "Collapse feedlist"
 msgstr "Contracter la liste des flux"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 msgid "Show articles"
 msgstr "Afficher les articles"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr "Ignorer le score"
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 msgid "Sort articles"
 msgstr "Classer les articles"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 msgid "Date"
 msgstr "Date"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr "Score"
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr "Rechercher..."
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "Actions sur ce flux :"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 msgid "Subscribe to feed..."
 msgstr "S'abonner au flux..."
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 msgid "Edit this feed..."
 msgstr "Editer ce flux..."
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 msgid "Rescore feed"
 msgstr "Recalculer le score du flux"
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "Tous les flux :"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "(Dé)Masquer les flux lus"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "Autres actions :"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr "Basculer en mode résumé..."
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 msgid "Show tag cloud..."
 msgstr "Afficher le nuage d'étiquettes"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 msgid "Create filter..."
 msgstr "Créer un filtre..."
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 msgid "Keyboard shortcuts help"
 msgstr "Aide sur les raccourcis clavier"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr "S'inscrire via Twitter"
@@ -1069,23 +1084,23 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr "Félicitation ! Vous vous êtes inscrit via Twitter avec succès."
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 msgid "Register"
 msgstr "S'inscrire"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 msgid "Your request could not be completed."
 msgstr "Votre requête ne peut être traitée."
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr "La mise à jour des flux a été planifiée."
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 msgid "Category update has been scheduled."
 msgstr "La mise à jour des catégories a été planifiée."
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 msgid "Can't update this kind of feed."
 msgstr "Impossible de mettre à jour ce type de flux."
 
@@ -1097,7 +1112,7 @@ msgstr "Aide"
 msgid "Help topic not found."
 msgstr "Sujet non trouvé dans l'aide."
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "<li>Ajout de la catégorie <b>%s</b>.</li>"
@@ -1107,26 +1122,22 @@ msgstr "<li>Ajout de la catégorie <b>%s</b>.</li>"
 msgid "Setting preference key %s to %s"
 msgstr "Paramétrage de la préférence %s à %s"
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 msgid "is already imported."
 msgstr "est déjà importé."
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 msgid "OK"
 msgstr "OK"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "Erreur lors de l'analyse du document."
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "Erreur : veuillez envoyer un document OPML."
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr "Erreur : impossible de trouver la balise body."
-
 #: modules/popup-dialog.php:34
 msgid "Importing using DOMXML."
 msgstr "Import en utilisant DOMXML."
@@ -1135,6 +1146,13 @@ msgstr "Import en utilisant DOMXML."
 msgid "Importing using DOMDocument."
 msgstr "Import en utilisant DOMDocument."
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+"Extension DOMXML non trouvée. Cette extension est requise pour les versions "
+"de php inférieures à 5.Extension DOMXML non trouvée. Elle est nécessaire "
+"pour les versions de PHP antérieures à la 5."
+
 #: modules/popup-dialog.php:80
 msgid "Create profile"
 msgstr "Création d'un profil"
@@ -1159,7 +1177,7 @@ msgstr "URL OPML publique"
 msgid "Your Public OPML URL is:"
 msgstr "Votre URL OPML publique est :"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 msgid "Generate new URL"
 msgstr "Générer une nouvelle URL"
 
@@ -1191,13 +1209,13 @@ msgstr ""
 "de flux. Cela peut indiquer un problème comme un crash ou un suspension du "
 "processus. Veuillez vérifier son état ou bien contacter l'administrateur."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "Flux"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 msgid "Place in category:"
 msgstr "Placer dans la catégorie :"
 
@@ -1205,19 +1223,19 @@ msgstr "Placer dans la catégorie :"
 msgid "Available feeds"
 msgstr "Flux disponibles"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "Identification"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "Se connecter"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1234,17 +1252,18 @@ msgid "More feeds"
 msgstr "D'autres flux"
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "Annuler"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1260,9 +1279,10 @@ msgstr "Archive du flux"
 msgid "limit:"
 msgstr "limite :"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1286,121 +1306,139 @@ msgstr "Restreindre la recherche à :"
 msgid "This feed"
 msgstr "Ce flux"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "Correspondance"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr "avant"
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 msgid "after"
 msgstr "après"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr "Vérifier"
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr "sur le champ"
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 msgid "in"
 msgstr "dans"
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 msgid "Perform Action"
 msgstr "Exécuter l'action"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr "avec les paramètres :"
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "Options"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "Activé"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "Correspondance inverse"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr ""
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "Créer"
 
-#: modules/popup-dialog.php:542
-msgid "Feeds with update errors"
-msgstr "Flux avec des erreurs de mise à jour"
+#: modules/popup-dialog.php:571
+#, fuzzy
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs :"
+
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "Cliquer pour éditer"
+
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "Se désabonner des flux sélectionnés ?"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs :"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags pour cet article (séparés par des virgules) :"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "Enregistrer"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 msgid "Tag Cloud"
 msgstr "Nuage d'étiquettes"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr "[Transféré]"
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 msgid "Multiple articles"
 msgstr "Articles multiples"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr "De :"
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 msgid "To:"
 msgstr "A :"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 msgid "Send e-mail"
 msgstr "Envoyer l'email"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Vous pouvez consulter ce flux comme RSS en utilisant l'URL suivante :"
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible (%s)."
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 msgid "Details"
 msgstr "Détails"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr "Télécharger"
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1412,27 +1450,62 @@ msgstr ""
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ce fichier</a> peut être "
 "utilisé comme base de départ."
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+msgid "URL:"
+msgstr "URL du flux :"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "Permissions :"
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "Permissions"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "Générer une nouvelle URL"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "Créer"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr "Cocher pour activer le champ"
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 msgid "Feed Title"
 msgstr "Titre du flux"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-msgid "URL:"
-msgstr "URL du flux :"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr "en utilisant"
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "Purge des articles :"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -1440,163 +1513,187 @@ msgstr ""
 "<b>Astuce :</b> vous devez renseigner vos informations d'identification si "
 "le flux nécessite une authentification, sauf pour les flux Twitter."
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 msgid "Hide from Popular feeds"
 msgstr "Masquer dans la liste des flux populaires"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "Contenu écrit de droite à gauche"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr "Toujours afficher les images jointes"
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 msgid "Cache images locally (SimplePie only)"
 msgstr "Enregistrer les images dans le cache local (seulement avec SimplePie)"
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Marquer tous les articles comme lus ?"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 msgid "Icon"
 msgstr "Icône"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr "Remplacer"
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "Abonné à %s"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr "Enregistrer localement les images"
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr "Tout est terminé."
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonné à <b>%s</b>."
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossible de s'abonner à <b>%s</b>."
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà abonné à <b>%s</b>."
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Impossible de s'abonner à <b>%s</b>."
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Se désabonner des flux sélectionnés ?"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr "Editer les options d'abonnement"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La catégorie <b>%s</b> existe déjà dans la base de données."
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "Créer la catégorie"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "Aucune catégorie de flux définie."
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 msgid "Remove selected categories"
 msgstr "Supprimer les catégories sélectionnées"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 msgid "Feeds with errors"
 msgstr "Flux avec des erreurs"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Mettre à jour le flux actif"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 msgid "Select"
 msgstr "Sélectionner"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 msgid "Edit selected feeds"
 msgstr "Editer les flux sélectionnés"
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 msgid "Reset sort order"
 msgstr "Réinitialiser le critère de tri"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 msgid "Categories"
 msgstr "Catégories"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "Editer les catégories"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 msgid "More actions..."
 msgstr "Autres actions..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 msgid "Rescore articles"
 msgstr "Recalculer le score des articles"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr "<b>Astuce :</b> vous pouvez faire glisser les flux et les catagories."
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 "En utilisant OPML, vous pouvez exporter et importer vos flux et vos "
 "paramètres de Tiny Tiny RSS."
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 "Note : seul les paramètres principaux du profil peuvent être migrés en "
 "utilisant OPML."
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -1604,7 +1701,7 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
@@ -1613,15 +1710,15 @@ msgstr ""
 "qui requièrent une authentification, ni les flux masqués parmi flux "
 "populaires."
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 msgid "Display URL"
 msgstr "Afficher l'URL"
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 msgid "Firefox integration"
 msgstr "Intégration à Firefox"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1629,15 +1726,15 @@ msgstr ""
 "Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox "
 "en cliquant sur le lien ci-dessous."
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux."
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr "S'abonner via bookmarklet"
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 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."
@@ -1646,20 +1743,20 @@ msgstr ""
 "le flux qui vous intéresse et cliquez sur le lien pour vous abonner à ce "
 "flux."
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "S'abonner à %s dans Tiny Tiny RSS ?"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "S'abonner dans Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 msgid "Published articles and generated feeds"
 msgstr "Articles publiés et flux générés"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1667,15 +1764,15 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr "Supprimer toutes les URL générées"
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 msgid "Twitter"
 msgstr "Twitter"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
@@ -1683,7 +1780,7 @@ msgstr ""
 "Avant de mettre à jour vos flux Twitter, vous devez enregistrer cette "
 "instance de Tiny Tiny RSS avec Twitter.com."
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
@@ -1691,36 +1788,73 @@ msgstr ""
 "Vous vous êtes inscrit avec succès sur Twitter.com et vous devriez être en "
 "mesure d'accéder à vos flux Twitter."
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr "S'inscrire sur Twitter.com"
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 msgid "Clear stored credentials"
 msgstr "Effacer les données d'authentification stockées"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, php-format
 msgid "%d archived articles"
 msgstr "%d articles archivés"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "Aucun utilisateur correspondant trouvé."
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filtre <b>%s</b> créé"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "Créer un filtre"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "Editer"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "D'autres flux"
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "Cliquer pour éditer"
+
 #: modules/pref-labels.php:21
 msgid "Caption"
 msgstr "Légende"
@@ -1750,111 +1884,111 @@ msgstr "Créer une étiquette"
 msgid "Clear colors"
 msgstr "Ré-initialiser les couleurs"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "L'ancien mot de passe ne peut pas être vide."
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "Le nouveau mot de passe ne peut pas être vide."
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "Les mots de passe saisie ne sont pas identiques."
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "Le mot de passe a été modifié."
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "L'ancien mot de passe n'est pas correct."
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "La configuration a été enregistrée."
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Option inconnue : %s"
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr "Vos données personnelles ont été sauvegardées."
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "Données personnelles"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr "Nom"
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "Adresse électronique"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 msgid "Access level"
 msgstr "Permissions"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 msgid "Save data"
 msgstr "Enregistrer les données"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 msgid "Your password is at default value, please change it."
 msgstr "Votre mot de passe est celui par défaut, veuillez le modifier."
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "Confirmation du mot de passe"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "Sélectionner un thème"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr "Personnaliser"
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "Oui"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "Non"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "Enregistrer la configuration"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr "Gérer les profils"
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "Revenir aux valeurs par défaut"
 
-#: modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "Détails de l'utilisateur"
@@ -1949,10 +2083,6 @@ msgstr "Permissions"
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr "Cliquer pour éditer"
-
 #: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "Aucun utilisateur défini."
@@ -2214,7 +2344,7 @@ msgstr "Masquer les flux lus"
 msgid "Sort feeds by unread count"
 msgstr "Trier les flux par nombre d'articles non lus"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
@@ -2273,7 +2403,8 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
+#, fuzzy
+msgid "Date syntax appears to be correct:"
 msgstr "La syntaxe des dates semble correcte."
 
 #: functions.js:634
@@ -2332,36 +2463,46 @@ msgstr "Vous êtes déjà abonné à ce flux."
 msgid "Create Filter"
 msgstr "Créer un filtre"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+msgid "Filter Test Results"
+msgstr ""
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "Se désabonner de %s ?"
 
-#: functions.js:1127
+#: functions.js:1166
 msgid "Please enter category title:"
 msgstr "Veuillez saisir un titre pour cette catégorie :"
 
-#: functions.js:1158
+#: functions.js:1197
 msgid "Generate new syndication address for this feed?"
 msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas éditer ce type de flux."
 
-#: functions.js:1354
+#: functions.js:1393
 msgid "Edit Feed"
 msgstr "Editer le flux"
 
-#: functions.js:1392
+#: functions.js:1431
 msgid "More Feeds"
 msgstr "D'autres flux"
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2369,35 +2510,44 @@ msgstr ""
 "Supprimer les flux sélectionnés de l'archive ? Les flux contenant des "
 "articles stockés ne seront pas supprimés."
 
+#: functions.js:1573
+msgid "Feeds with update errors"
+msgstr "Flux avec des erreurs de mise à jour"
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "Supprimer les filtres sélectionnés ?"
+
 #: PrefFilterTree.js:32
 msgid "Inverse"
 msgstr "Inverse"
 
-#: prefs.js:91
+#: prefs.js:114
 msgid "Please enter login:"
 msgstr "Veuillez saisir le login :"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr "Impossible de créer l'utilisateur : aucun login spécifié."
 
-#: prefs.js:160
+#: prefs.js:183
 msgid "Edit Filter"
 msgstr "Editer le filtres"
 
-#: prefs.js:164
+#: prefs.js:187
 msgid "Remove filter %s?"
 msgstr "Supprimer le filtre %s ?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "Supprimer les étiquettes sélectionnées ?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "Aucune étiquette sélectionnée."
 
-#: prefs.js:310
+#: prefs.js:350
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
@@ -2405,147 +2555,172 @@ msgstr ""
 "Supprimer les utilisateurs sélectionnés ? l'administrateur par défaut et "
 "votre compte utilisateur ne seront pas supprimés."
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "Aucun utilisateur sélectionné."
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "Supprimer les filtres sélectionnés ?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "Aucun filtre sélectionné."
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "Se désabonner des flux sélectionnés ?"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "Veuillez sélectionner un seul flux."
 
-#: prefs.js:420
+#: prefs.js:459
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Supprimer tous les articles non-remarquables dans le flux sélectionné ?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 "Combien de jour faut-il conserver l'article (entrer 0 pour utiliser la "
 "valeur par défaut)"
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-"Supprimer les profils sélectionnés ? Les profils actifs et par défaut ne "
-"seront pas supprimés."
-
-#: prefs.js:490
-msgid "No profiles selected."
-msgstr "Aucun profil sélectionné."
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "Le nom ne peut pas être vide."
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "Veuillez sélectionner un seul utilisateur."
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "Ré-initialiser le mot de passe de l'utilisateur sélectionné ?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "Veuillez sélectionner un seul filtre."
 
-#: prefs.js:681
+#: prefs.js:692
 msgid "Edit Multiple Feeds"
 msgstr "Editer plusieurs flux"
 
-#: prefs.js:705
+#: prefs.js:716
 msgid "Save changes to selected feeds?"
 msgstr "Enregistrer les modifications aux flux sélectionnés ?"
 
-#: prefs.js:776
+#: prefs.js:802
 msgid "OPML Import"
 msgstr "Import OPML"
 
-#: prefs.js:795
+#: prefs.js:821
 msgid "Please choose an OPML file first."
 msgstr "Veuillez d'abord sélectionner un fichier OPML."
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "Revenir aux valeurs par défaut ?"
 
-#: prefs.js:1131
+#: prefs.js:1157
 msgid "Feed Categories"
 msgstr "Catégories de flux"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "Supprimer les catégories sélectionnées ?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "Aucune catégorie sélectionnée."
 
-#: prefs.js:1198
+#: prefs.js:1226
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Flux avec des erreurs de mise à jour"
+
+#: prefs.js:1275
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Remplacer l'adresse de publication OPML actuelle par une nouvelle ?"
 
-#: prefs.js:1307
+#: prefs.js:1384
 msgid "Rescore articles in selected feeds?"
 msgstr "Recalculer le score des articles des flux sélectionnés ?"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Recalculer le score de tous les articles ? Cette opération peut prendre "
 "beaucoup de temps."
 
-#: prefs.js:1350
+#: prefs.js:1427
 msgid "Reset selected labels to default colors?"
 msgstr "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr "Paramètres des profils"
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+"Supprimer les profils sélectionnés ? Les profils actifs et par défaut ne "
+"seront pas supprimés."
+
+#: prefs.js:1491
 msgid "No profiles are selected."
 msgstr "Aucun profil sélectionné."
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 msgid "Activate selected profile?"
 msgstr "Activer le profil selectionné ?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr "Veuillez sélectionner un profil à activer"
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 "Cela va invalider toutes les URL de flux générées auparavant. Souhaitez-vous "
 "continuer ?"
 
-#: prefs.js:1583
+#: prefs.js:1660
 msgid "Label Editor"
 msgstr "Editeur d'étiquette"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Cela va effacer les informations d'authentification pour Twitter. Voulez-"
 "vous continuer ?"
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Editer les tags"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Supprimer les filtres sélectionnés ?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Aucun filtre sélectionné."
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Veuillez sélectionner un seul filtre."
+
 #: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "Marquer tous les articles comme lus ?"
@@ -2554,25 +2729,25 @@ msgstr "Marquer tous les articles comme lus ?"
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 msgid "Rescore articles in %s?"
 msgstr "Recalculer le score des articles de %s ?"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 msgid "New version available!"
 msgstr "Une nouvelle version est disponible !"
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
 
@@ -2620,38 +2795,60 @@ msgstr "Marquer %d article(s) comme lu(s) ?"
 msgid "Unable to load article."
 msgstr "Chargement de l'article impossible."
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 msgid "Loading..."
 msgstr "Chargement en cours..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr "Transférer l'article par email"
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 msgid "Open original article"
 msgstr "Ouvrir l'article original"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Voir dans un nouvel onglet"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "Supprimer les étiquettes sélectionnées ?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "Chargement en cours..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "Cliquer pour éditer"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr "Mettre à jour lors d'un changement du code de contrôle"
+
+#~ msgid "Use more accessible date/time format for headlines"
+#~ msgstr ""
+#~ "Afficher la date et l'heure de manière plus lisible dans les en-têtes"
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "Marquer les articles comme non lus lors des mises à jour"
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "Importation OPML (utilisant l'extension DOMXML)..."
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "Importation OPML (utilisation l'extension DOMDocument)..."
+
+#~ msgid "Error: can't find body element."
+#~ msgstr "Erreur : impossible de trouver la balise body."
+
+#~ msgid "No profiles selected."
+#~ msgstr "Aucun profil sélectionné."
+
 #~ msgid "Unknown error"
 #~ msgstr "Erreur inconnue"
 

diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index cc3a639180d069fa3f3aa49d18f71da45180bf47..cb8c52e09039a8f8414d37b48f98706a22039df8 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 b24c1bae306d760baf3b24d8e5e25d14bfa15c0b..c2ca3eea3c3a2e2c521d0df57c826f27568fd8e5 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"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2009-08-17 23:04+0100\n"
 "Last-Translator: MoJo2009\n"
 "Language-Team: HUNGARIAN\n"
@@ -18,100 +18,100 @@ msgstr ""
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "Alapértelmezett beállítás"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "Sose töröld a régi híreket"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 hetes"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 hetes"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 hónapos"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 hónapos"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 hónapos"
 
-#: backend.php:81
+#: backend.php:80
 msgid "Default interval"
 msgstr "Frissítési intervallum:"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Frissítések kikapcsolása"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Minden 15 percben"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Minden 30 percben"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Óránként"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Minden 4 órában"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Minden 12 órában"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Napi"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Heti"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: backend.php:103
+#: backend.php:102
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "Felhasználó"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr "Kiemelt felhasználó"
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 msgid "Feeds"
 msgstr "Hírcsatornák"
 
@@ -120,17 +120,17 @@ msgstr "Hírcsatornák"
 msgid "Article not found."
 msgstr "Hírcsatorna nem található"
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "Hírcsatorna nem található"
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "Töltés, kérem várjon..."
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -160,18 +160,18 @@ msgstr ""
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "A Tiny Tiny RSS adatbázis friss."
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "Vissza az RSS-olvasóhoz"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr "A továbbhaladás előtt készítsen biztosági másolatot adatbázisáról."
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -180,38 +180,53 @@ msgstr ""
 "A Tiny Tiny RSS adatbázisát frissíteni kell a legújabb verzióra (<b>%d</b> "
 "to <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "Frissítések végrehajtása"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "Frissítések folyamatban..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Frissítés %d verzióra..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "Verzió ellenőrzése"
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "HIBA!"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
 "\t\t\tversion <b>%d</b>."
 msgstr ""
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 #, fuzzy
 msgid ""
@@ -223,11 +238,11 @@ msgstr ""
 "\t\telengedhetetlen a program működéséhez.\n"
 "\t\tKérem ellenőrizze böngészőbeállításait, és engedélyezze a Javascriptet!"
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "Üdv,"
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "Kijelentkezés"
@@ -311,215 +326,223 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr "Hibás felhasználói név vagy jelszó"
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "Összes hírcsatorna"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "Kiemelt"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "Címkék"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "Csillagos hírek"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "Publikált hírek"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr "Friss hírek"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 msgid "All articles"
 msgstr "Az összes hír"
 
-#: functions.php:3050
+#: functions.php:3217
 #, fuzzy
 msgid "Archived articles"
 msgstr "Tárolt hírek"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "Kiválaszt:"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "Mind"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: functions.php:4021
+#: functions.php:4244
 msgid "Invert"
 msgstr "Fordított"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "Kijelölés törlése"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "Műveletek"
 
-#: functions.php:4030
+#: functions.php:4253
 msgid "Selection toggle:"
 msgstr "Kiválasztott legyen:"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "Csillagos"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "Publikált"
 
-#: functions.php:4036
+#: functions.php:4259
 msgid "Selection:"
 msgstr "Kiválasztott hírcsatornák:"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "Olvasottá tesz"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4043
+#: functions.php:4266
 #, fuzzy
 msgid "Move back"
 msgstr "Vissza"
 
-#: functions.php:4044
+#: functions.php:4267
 #, fuzzy
 msgid "Delete"
 msgstr "Alapértelmezett"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 #, fuzzy
 msgid "Feed:"
 msgstr "Hírcsatorna"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "Címkék megtekintése"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 #, fuzzy
 msgid "Visit the website"
 msgstr "Hivatalos weboldal megtekintése"
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Hírcsatornák megtekintése"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "Kattintson ide a szerkesztéshez"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 msgid " - "
 msgstr "-"
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "nincs címke"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr "Címkék hozzáadása a hírhez"
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Hír megnyitása új ablakban"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "Címkék szerkesztése"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "Ablak bezárása"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 #, fuzzy
 msgid "Feed URL"
 msgstr "Hírcsatorna"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "Ablak bezárása"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 msgid "mark as read"
 msgstr "olvasottként jelöl"
 
-#: functions.php:5229
+#: functions.php:5457
 #, fuzzy
 msgid "Dismiss article"
 msgstr "Hír publikálása"
 
-#: functions.php:5248
+#: functions.php:5476
 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető olvasatlan hír."
 
-#: functions.php:5251
+#: functions.php:5479
 msgid "No updated articles found to display."
 msgstr "Nincs megjeleníthető friss hír."
 
-#: functions.php:5254
+#: functions.php:5482
 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető csillagos hír."
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -528,59 +551,56 @@ 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."
 
-#: functions.php:5260
+#: functions.php:5488
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír."
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 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!)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 msgid "Create label..."
 msgstr "Új címke létrehozása..."
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "Eltávolít"
 
-#: functions.php:6110
+#: functions.php:6343
 #, fuzzy
 msgid "Assign:"
 msgstr "Besorolás címke alá:"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "nincs címke"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+#, fuzzy
+msgid "(edit note)"
 msgstr "jegyzet szerkesztése"
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
-#: functions.php:6774
+#: functions.php:7013
 msgid "unknown type"
 msgstr "ismeretlen hírcsatornatípus"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr "Csatolmány:"
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr "Csatolmányok:"
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "Cím"
 
@@ -617,7 +637,7 @@ msgstr "Hír publikálása"
 msgid "Assign tags"
 msgstr "Címke hozzáadása"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr "Címke hozzáadása"
 
@@ -693,12 +713,12 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "Régi postok törlése ennyi nap után: (0 - kikapcsol)"
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
 
 #: localized_schema.php:27
-msgid "Update post on checksum change"
-msgstr "Hírcsatorna frissítése az ellenőrzőösszeg megváltozásakor"
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "Régi postok törlése ennyi nap után: (0 - kikapcsol)"
 
 #: localized_schema.php:28
 #, fuzzy
@@ -731,100 +751,96 @@ msgid "Long date format"
 msgstr "Dátum/idő hosszú formátuma"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr "Hírek fejlécéhez használjon rövidebb formátumú dátumot/időt."
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "Kombinált hírcsatorna-megjelenítés"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "Olvasatlan hírekkel nem rendelkező hírcsatorna elrejtése"
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "Hírcsatorna végén mutassa a következő hírcsatornát"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "Frissítéskor hírek olvasatlanná tétele"
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "Fordított hírcím-sorrend (régiebbiek előbb)"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "Hírösszefoglaló e-mail elküldésének engedélyezése"
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "Egész hírcsatornák olvasottá tételekor megerősítés"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "Hírek automatikus szétnyitása kombinált üzemmódban"
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "Nem biztonságos kódok eltávolítása a hírekből"
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "Feketelistás címkék"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "Meddig legyen friss egy hír (órákban megadva)"
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 msgid "Mark articles in e-mail digest as read"
 msgstr "Az e-mail összefoglalóban elküldött hírek olvasottá tétele"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr "Hírek automatikus szétnyitása kombinált üzemmódban"
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr "Régi hírek törlésekor törölje az olvasatlanokat is"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr "Különleges hírcsatornák mutatása olvasott hírcsatornák rejtésekor"
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr "Hírcímek csoportosítása virtuális hírcsatornákba"
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr "Képek rejtése a hírekben"
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr ""
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 #, fuzzy
 msgid "Sort headlines by feed date"
 msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "Felhasználói stíluslap URL-je"
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "Felhasználó:"
@@ -858,50 +874,46 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "OMPL-segédprogram"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
 msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
 
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "OPML importálása (DOMDocument kiterjesztés használatával)"
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-"Az ötösnél alacsonyabb verziószámű PHP-hez szükséges DOMXMLkiterjesztés nem "
-"található."
-
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "Vissza a beállításokhoz"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "Kilépés a beállításokból"
-
-#: prefs.php:91
+#: prefs.php:83
 msgid "Keyboard shortcuts"
 msgstr "Billentyűparancsok"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "Kilépés a beállításokból"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 msgid "Filters"
 msgstr "Szűrők"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 msgid "Users"
 msgstr "Felhasználók"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "Link"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr "Új felhasználók regisztrációja adminisztrátor által letilva."
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -911,154 +923,158 @@ msgstr ""
 "fiókok, amelyekbe az ideiglenes jelszó kipostázásától számított 24 órán "
 "belül nem lépnek be, automatikusan törlődnek."
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr "Felhasználói név:"
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr "Ellenőrizze, hogy nem foglalt-e már:"
 
-#: register.php:184
+#: register.php:185
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr "Mennyi kettő meg kettő?"
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr "Regisztráció elküldése"
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr "Regisztrációs adatai hiányosak"
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr "Ez a felhasználónév már foglalt."
 
-#: register.php:241
+#: register.php:242
 msgid "Registration failed."
 msgstr "Regisztráció sikertelen."
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr "Felhasználói fiók sikeresen létrehozva"
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr "Új felhasználók regisztrációja jelenleg nem engedélyezett."
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 msgid "Comments?"
 msgstr "Hozzászólások?"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 msgid "Collapse feedlist"
 msgstr "Hírcsatornalista összecsukása"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 #, fuzzy
 msgid "Show articles"
 msgstr "Tárolt hírek"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr "Adaptív"
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "Minden hír"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "Frissített"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 #, fuzzy
 msgid "Sort articles"
 msgstr "Tárolt hírek"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 msgid "Date"
 msgstr "Dátum"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "Frissítés"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr "Keresés..."
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "Műveletek hírcsatornákkal:"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 msgid "Subscribe to feed..."
 msgstr "Feliratkozás hírcsatornára..."
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 msgid "Edit this feed..."
 msgstr "Hírcsatorna szerkesztése..."
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 msgid "Rescore feed"
 msgstr ""
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "Az összes hírcsatorna:"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "Olvasottak rejtése/mutatása"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "Egyéb műveletek:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "címkefelhő"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 msgid "Create filter..."
 msgstr "Szűrő létrehozása..."
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Billentyűparancsok"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1071,26 +1087,26 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "Regisztrált"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Regisztrációs adatai hiányosak"
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "A jelszó megváltoztatva."
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
@@ -1103,7 +1119,7 @@ msgstr "Segítség"
 msgid "Help topic not found."
 msgstr "Súgótéma nem tlálható."
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Kategória hozzáadása <b>%s</b>...<br>"
@@ -1113,28 +1129,24 @@ msgstr "Kategória hozzáadása <b>%s</b>...<br>"
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 #, fuzzy
 msgid "is already imported."
 msgstr "Már importálva."
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "Hiba történt a dokuementum feldoglozása közben"
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "Hiba: kérem töltse fel az OPML fájlt!"
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr ""
-
 #: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
@@ -1145,6 +1157,12 @@ msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
 msgid "Importing using DOMDocument."
 msgstr "OPML importálása (DOMDocument kiterjesztés használatával)"
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+"Az ötösnél alacsonyabb verziószámű PHP-hez szükséges DOMXMLkiterjesztés nem "
+"található."
+
 #: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
@@ -1174,7 +1192,7 @@ msgstr ""
 msgid "Your Public OPML URL is:"
 msgstr "Link a publikált hírek hírcsatornájához"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generált hírcsatorna"
@@ -1207,13 +1225,13 @@ msgstr ""
 "összeomlás vagy hiba jele is lehet, kérem lépjen kapcsolatba az oldal/"
 "szerver tulajdonosával!"
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "Hírcsatorna"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 msgid "Place in category:"
 msgstr "Hozzáadás a következő kategóriához:"
 
@@ -1222,19 +1240,19 @@ msgstr "Hozzáadás a következő kategóriához:"
 msgid "Available feeds"
 msgstr "Összes hírcsatorna"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "Belépés"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "Jelszó:"
@@ -1253,17 +1271,18 @@ msgid "More feeds"
 msgstr "Hírcsatornák..."
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "Mégse"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "Keresés"
 
@@ -1282,9 +1301,10 @@ msgstr "Hírcsatorna-műveletek"
 msgid "limit:"
 msgstr "Határ:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "Eltávolít"
 
@@ -1309,128 +1329,145 @@ msgstr "Keresés korlátozása ezekre:"
 msgid "This feed"
 msgstr "Ez a hírcsatorna"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "Egyezés"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 msgid "after"
 msgstr "elteltével"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr "...szerepeljen ebben a mezőben: "
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 msgid "in"
 msgstr "itt"
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 msgid "Perform Action"
 msgstr "Műveletek"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr "Beállítás:"
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "Beállítások"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "Fordított egyezés"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr "Teszt"
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "Létrehoz"
 
-#: modules/popup-dialog.php:542
+#: modules/popup-dialog.php:571
 #, fuzzy
-msgid "Feeds with update errors"
-msgstr "Frissítési hiba"
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr "Váratlan hibák miatt ezek a hírcsatornák nem frissültek:"
+
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "Kattintson ide a szerkesztéshez"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
+
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr "Váratlan hibák miatt ezek a hírcsatornák nem frissültek:"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "A hír címkéi (vesszőkkel elválasztva):"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "Mentés"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Címkefelhő"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Az összes hír"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 #, fuzzy
 msgid "To:"
 msgstr "Legfelső"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "Kiválaszt:"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "E-mail megváltoztatása"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 #, fuzzy
 msgid "Details"
 msgstr "Napi"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1438,196 +1475,255 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+msgid "URL:"
+msgstr "Hírcsatorna URL:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "Hozzáférési szint:"
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "Hozzáférési szint"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "Generált hírcsatorna"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "Létrehoz"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr ""
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "Cím"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-msgid "URL:"
-msgstr "Hírcsatorna URL:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr ""
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "Régi hírek törlése:"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Elrejtés a hírcsatornalistámról"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "Jobbról balra tartó tartalom"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "Hozzáadás az e-mail összefoglalóhou"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 #, fuzzy
 msgid "Cache images locally (SimplePie only)"
 msgstr "Képek helyi tárolása"
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Minden hírt olvasottá tesz?"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 #, fuzzy
 msgid "Icon"
 msgstr "Művelet"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "Feliratkozva a következő hírcsatornákra:"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr "Képek helyi tárolása"
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr "Kész."
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Feliratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr "Feliratkozási beállítások szerkesztése"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "A következő kategória <b>$%s</b> már létezik az adatbázisban."
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "Kategória létrehozása"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "Nincs megadva hírcsatorna-kategória."
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Kiválasztott kategóriák eltávolítása?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Hírcsatornaszerkesztő"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Egész hírcsatornát"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "Kiválaszt:"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Feliratkozás hírcsatornára"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Kijelölt hírcsatorna takarítása..."
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Jelszó reset"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "Kategória:"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 #, fuzzy
 msgid "More actions..."
 msgstr "Műveletek"
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr "Kézi takarítás (régi hírek törlése)"
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 msgid "Clear feed data"
 msgstr "Hírcsatorna-adatok törlése"
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 msgid "Rescore articles"
 msgstr ""
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "Importálás"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1636,22 +1732,22 @@ msgstr ""
 "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre "
 "bárki feliratkozhat, aki tudja a lenti címet."
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 msgid "Display URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox-integráció"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1659,36 +1755,36 @@ msgstr ""
 "Ez a Tiny Tiny RSS oldal beállítható a Firefox böngésző alapértelmezett "
 "hírcsatorna-olvasójaként. Ehhez kattintson az alábbi linkre!"
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr "Kattintson ide az oldal hírcsatorna-olvasóként való beállításához!"
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Vissza az RSS-olvasóhoz"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Vissza az RSS-olvasóhoz"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Link a publikált hírek hírcsatornájához"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1696,58 +1792,95 @@ msgstr ""
 "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre "
 "bárki feliratkozhat, aki tudja a lenti címet."
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "Cím"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Hírcsatorna-adatok törlése"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Csillagos hírek"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 msgid "No feeds found."
 msgstr "Nem található hírcsatorna."
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "Nem található a feltételeknek megfelelő szűrő."
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Szűrő létrehozva: <b>%s</b>"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "Szűrő létrehozása"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "Szerkesztése"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr "Hozzáférési szintje elégtelen ehhez a művelethez."
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "Hírcsatornák..."
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "Kattintson ide a szerkesztéshez"
+
 #: modules/pref-labels.php:21
 msgid "Caption"
 msgstr "Aláírás"
@@ -1780,115 +1913,115 @@ msgstr "Címke létrehozása"
 msgid "Clear colors"
 msgstr "Színek visszaállítása"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "A régi jelszó mező nem maradhat üresen."
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "Az új jelszó mező nem maradhat üresen."
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "A megadott jelszavak nem egyeznek."
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "A jelszó megváltoztatva."
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "A régi jelszó helytelen."
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "Beállítások elmentve."
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ismeretlen beállítás: %s"
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "Személyes adatok"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "E-mail"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 msgid "Access level"
 msgstr "Hozzáférési szint"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "Mentés"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "A jelszava alapértelmezett értékén van, \n"
 "\t\t\t\t\t\tkérem változtassa meg!"
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "Új jelszó"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "Jelszó még egyszer"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "Stílusválasztó"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "Igen"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "Nem"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "Beállítások mentése"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "Alapértelmezett beállítások"
 
-#: modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr "Hozzáférési szintje elégtelen ehhez a művelethez."
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "Felhasználói adatok"
@@ -1984,10 +2117,6 @@ msgstr "Hozzáférési szint"
 msgid "Last login"
 msgstr "Utolsó belépés"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr "Kattintson ide a szerkesztéshez"
-
 #: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "Nincs megadva felhasználó."
@@ -2239,7 +2368,7 @@ msgstr "Olvasottak rejtése/mutatása"
 msgid "Sort feeds by unread count"
 msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 msgid "Mark all articles in %s as read?"
 msgstr "Minden hírt olvasottá tesz itt: %s?"
 
@@ -2304,8 +2433,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "A régi jelszó helytelen."
 
 #: functions.js:634
 #, fuzzy
@@ -2370,222 +2500,266 @@ msgstr "Ebből a kategóriából nem ."
 msgid "Create Filter"
 msgstr "Szárő létrehozása"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+msgid "Filter Test Results"
+msgstr ""
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "Leiratkozik innen: %s?"
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Megyjegyzés csatolása ehhez a hírhez:"
 
-#: functions.js:1158
+#: functions.js:1197
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Hírcsatorna szerkesztése"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "Hírcsatornák..."
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
+#: functions.js:1573
+#, fuzzy
+msgid "Feeds with update errors"
+msgstr "Frissítési hiba"
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "Eltávolítja a kiválasztott szűrőket?"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "(Fordított)"
 
-#: prefs.js:91
+#: prefs.js:114
 msgid "Please enter login:"
 msgstr "Kérem adja meg a felhasználói nevét:"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr "Felhasználó létrehozása sikertelen, nincs megadva felhasználói név."
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Szűrők"
 
-#: prefs.js:164
+#: prefs.js:187
 msgid "Remove filter %s?"
 msgstr "Eltávolítja a következő szűrőt: %s?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "Eltávolítja a kiválasztott címkéket?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "Nincs kiválasztott címke."
 
-#: prefs.js:310
+#: prefs.js:350
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "Nincs kijelölt felhasználó."
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "Nincs kiválasztott szűrő."
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "Kérem csak egy hírcsatornát jelöljön meg!"
 
-#: prefs.js:420
+#: prefs.js:459
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Eltávolítja az összes csillag nélküli hírt a kijelölt hírcsatornából?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 "Milyen régi híreket szeretne megtartani  (napokban; 0 - alapértelmezett)?"
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: prefs.js:490
-#, fuzzy
-msgid "No profiles selected."
-msgstr "Nincs kiválasztott hír."
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "A felhasználói név nem maradhat üresen."
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "Kérem csak egy felhasználót jelöljön meg!"
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "Visszaállítja  akiválasztott felhasználók jelszavakit?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "Kérem csak egy szűrőt jelöljön meg!"
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Hírcsatorna szerkesztése"
 
-#: prefs.js:705
+#: prefs.js:716
 msgid "Save changes to selected feeds?"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#: prefs.js:776
+#: prefs.js:802
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importálás"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "Visszaállítja a gyári beállításokat?"
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "Kategória:"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "Kiválasztott kategóriák eltávolítása?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "Nincs kategória kiválaszta."
 
-#: prefs.js:1198
+#: prefs.js:1226
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Frissítési hiba"
+
+#: prefs.js:1275
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 "Biztosan lecseréli a jelenlegi publikált hírek hírcsatornájának címét egy "
 "újra?"
 
-#: prefs.js:1307
+#: prefs.js:1384
 msgid "Rescore articles in selected feeds?"
 msgstr ""
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: prefs.js:1350
+#: prefs.js:1427
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Visszaállítja a címkeszíneket az alapértelmezettre?"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr ""
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Nincs kiválasztott hír."
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 msgid "Label Editor"
 msgstr "Címke Szerkesztő"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Címkék szerkesztése"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Eltávolítja a kiválasztott szűrőket?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Nincs kiválasztott szűrő."
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Kérem csak egy szűrőt jelöljön meg!"
+
 #: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "Minden hírt olvasottá tesz?"
@@ -2594,26 +2768,26 @@ msgstr "Minden hírt olvasottá tesz?"
 msgid "You can't unsubscribe from the category."
 msgstr "Ebből a kategóriából nem ."
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 msgid "Rescore articles in %s?"
 msgstr ""
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 #, fuzzy
 msgid "New version available!"
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "Nincsen kiválasztott hír."
 
@@ -2666,40 +2840,59 @@ msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
 msgid "Unable to load article."
 msgstr "Hiba: kérem töltse fel az OPML fájlt!"
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "Hírcsatornák töltése, kérem várjon..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "Eredeti hír tartalmának megjelenítése"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Hír megnyitása új ablakban"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "Eltávolítja a kiválasztott címkéket?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "Hírcsatornák töltése, kérem várjon..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "Kattintson ide a szerkesztéshez"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr "Hírcsatorna frissítése az ellenőrzőösszeg megváltozásakor"
+
+#~ msgid "Use more accessible date/time format for headlines"
+#~ msgstr "Hírek fejlécéhez használjon rövidebb formátumú dátumot/időt."
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "Frissítéskor hírek olvasatlanná tétele"
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "OPML importálása (DOMDocument kiterjesztés használatával)"
+
+#, fuzzy
+#~ msgid "No profiles selected."
+#~ msgstr "Nincs kiválasztott hír."
+
 #~ msgid "Unknown error"
 #~ msgstr "Ismeretlen hiba"
 
@@ -2875,9 +3068,6 @@ msgstr "Kattintson ide a szerkesztéshez"
 #~ msgid "No filters defined."
 #~ msgstr "Nincs szűrő definiálva."
 
-#~ msgid "No matching filters found."
-#~ msgstr "Nem található a feltételeknek megfelelő szűrő."
-
 #~ msgid "Click to change color"
 #~ msgstr "Színek módosításához kattintson ide"
 
@@ -3124,9 +3314,6 @@ msgstr "Kattintson ide a szerkesztéshez"
 #~ msgid "Could not update headlines (missing XML object)"
 #~ msgstr "Hírcímek frissítése sikertelen (hiányzó XML objektum)"
 
-#~ msgid "Entire feed"
-#~ msgstr "Egész hírcsatornát"
-
 #~ msgid "Failed to load article in new window"
 #~ msgstr "Cikk beöltése új ablakban sikertelen"
 
@@ -3448,9 +3635,6 @@ msgstr "Kattintson ide a szerkesztéshez"
 #~ msgid "Create Label"
 #~ msgstr "Címke készítése"
 
-#~ msgid "Test"
-#~ msgstr "Teszt"
-
 #, fuzzy
 #~ msgid "Perform action"
 #~ msgstr "Művelet"

diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 5ccf9fd6bdb04b093c97b6687b5f01da6ef838ab..a30398d331083948f8d4574269fafe255146a82b 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 96eb38de73828ea8a12d44d76923dfded7a8b5f6..c1d4bf9d36d1b1a224dfafdbbb1b845607a595df 100644 (file)
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ttrss-1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2010-04-19 16:36+0200\n"
 "Last-Translator: Andrea Zagli <azagli@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -15,100 +15,100 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "Utilizza predefiniti"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "Non pulire mai"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "Vecchi di 1 settimana"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Vecchi di 2 settimane"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "Vecchi di 1 mese"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "Vecchi di 2 mesi"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "Vecchi di 3 mesi"
 
-#: backend.php:81
+#: backend.php:80
 msgid "Default interval"
 msgstr "Intervallo predefinito"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Disabilitare aggiornamenti"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Ogni 15 minuti"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Ogni 30 minuti"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "A ogni ora"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Ogni 4 ore"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Ogni 12 ore"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Giornalmente"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Settimanalmente"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "Predefinito"
 
-#: backend.php:103
+#: backend.php:102
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "Utente"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr "Utente con più autorizzazioni"
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 msgid "Feeds"
 msgstr "Notiziari"
 
@@ -117,17 +117,17 @@ msgstr "Notiziari"
 msgid "Article not found."
 msgstr "Notiziario non trovato."
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "Caricamento, attendere prego..."
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 msgid "Default profile"
 msgstr "Profilo predefinito"
@@ -156,18 +156,18 @@ msgstr ", trovato: "
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Il database di Tiny Tiny RSS è aggiornato."
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr "Fare il backup del database prima di procedere."
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -176,32 +176,32 @@ msgstr ""
 "Il database di Tiny Tiny RSS deve essere aggiornato all&apos;ultima versione "
 "(<b>%d</b> a <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "Effettuare gli aggiornamenti"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "Esecuzione aggiornamenti..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Aggiornamento alla versione %d..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "Controllo della versione..."
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "OK"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "ERRORE"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -210,6 +210,21 @@ msgstr ""
 "Fine. Eseguito/i <b>%d</b> aggiornamento/i fino\n"
 "\t\t\tallo schema versione <b>%d</b>."
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 #, fuzzy
 msgid ""
@@ -221,11 +236,11 @@ msgstr ""
 "\t\tda questa applicazione per funzionare correttamente. Controllare\n"
 "\t\tle impostazioni del browser."
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "Salve,"
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "Esci"
@@ -317,211 +332,219 @@ msgstr ""
 "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
 "configurazione del PHP"
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr "La validazione della sessione è fallita (IP non corretto)"
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr "Nome utente o password sbagliati"
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "Tutti i notiziari"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "Speciale"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "Etichette"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "Articoli con stella"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "Articoli pubblicati"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr "Articoli nuovi"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 msgid "All articles"
 msgstr "Tutti gli articoli"
 
-#: functions.php:3050
+#: functions.php:3217
 msgid "Archived articles"
 msgstr "Articoli archiviati"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "Seleziona:"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "Tutti"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "Non letti"
 
-#: functions.php:4021
+#: functions.php:4244
 msgid "Invert"
 msgstr "Inverti"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "Nessuno"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "Azioni..."
 
-#: functions.php:4030
+#: functions.php:4253
 msgid "Selection toggle:"
 msgstr "Inverti selezione:"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "Con stella"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "Pubblicati"
 
-#: functions.php:4036
+#: functions.php:4259
 msgid "Selection:"
 msgstr "Selezione:"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "Segna come letto"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr "Archivio"
 
-#: functions.php:4043
+#: functions.php:4266
 msgid "Move back"
 msgstr "Sposta indietro"
 
-#: functions.php:4044
+#: functions.php:4267
 msgid "Delete"
 msgstr "Elimina"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 #, fuzzy
 msgid "Feed:"
 msgstr "Notiziario"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "Visualizza etichette"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 #, fuzzy
 msgid "Visit the website"
 msgstr "Visita sito ufficiale"
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Visualizza notiziari"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "Fare clic per modificare"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 msgid " - "
 msgstr " - "
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "nessuna etichetta"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Aprire gli articoli in una nuova finestra"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "Modifica etichette"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "Chiudi questa finestra"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr "Originariamente da:"
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 msgid "Feed URL"
 msgstr "URL del notiziario"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 msgid "mark as read"
 msgstr "segna come letto"
 
-#: functions.php:5229
+#: functions.php:5457
 #, fuzzy
 msgid "Dismiss article"
 msgstr "Pubblica articolo"
 
-#: functions.php:5248
+#: functions.php:5476
 msgid "No unread articles found to display."
 msgstr "Nessun articolo non letto trovato da visualizzare."
 
-#: functions.php:5251
+#: functions.php:5479
 msgid "No updated articles found to display."
 msgstr "Nessun articolo non aggiornato trovato da visualizzare."
 
-#: functions.php:5254
+#: functions.php:5482
 msgid "No starred articles found to display."
 msgstr "Nessun articolo con stella trovato da visualizzare."
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -530,59 +553,56 @@ msgstr ""
 "gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un "
 "filtro."
 
-#: functions.php:5260
+#: functions.php:5488
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 msgid "Create label..."
 msgstr "Crea etichetta..."
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "Rimuovi"
 
-#: functions.php:6110
+#: functions.php:6343
 #, fuzzy
 msgid "Assign:"
 msgstr "Assegna etichetta:"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "nessuna etichetta"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+#, fuzzy
+msgid "(edit note)"
 msgstr "modifica note"
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
-#: functions.php:6774
+#: functions.php:7013
 msgid "unknown type"
 msgstr "tipo sconosciuto"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr "Allegato:"
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr "Allegati:"
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "Titolo"
 
@@ -619,7 +639,7 @@ msgstr "Pubblica articolo"
 msgid "Assign tags"
 msgstr "Assegna etichette"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr "Assegna etichetta"
 
@@ -699,13 +719,13 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
-msgid "Purge old posts after this number of days (0 - disables)"
+msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
-"Eliminare le notizie vecchie dopo questo numero di giorni (0 - disabilitato)"
 
 #: localized_schema.php:27
-msgid "Update post on checksum change"
-msgstr "Aggiornare la notizia al cambiamento della somma di controllo"
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr ""
+"Eliminare le notizie vecchie dopo questo numero di giorni (0 - disabilitato)"
 
 #: localized_schema.php:28
 #, fuzzy
@@ -738,101 +758,97 @@ msgid "Long date format"
 msgstr "Formato data lunga"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr "Utilizzare un formato data/ora più accessibile per i sommari"
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "Visualizzazione combinata di notiziari"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "Nascondere i notiziari senza messaggi non letti"
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "Su lettura passare al prossimo notiziario"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "Ordinare i notiziari per numero di articoli non letti"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "Impostare gli articoli come non letti durante l&apos;aggiornamento"
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "Invertire l&apos;ordine del sommario (prima i più vecchi)"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "Abilitare email riassunto"
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "Richiedere conferma segnatura del notiziario come letto"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "Espandere automaticamente gli articoli nella modalità combinata"
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "Togliere le etichette non buone dagli articoli"
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "Etichette in lista nera"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "Età massima degli articoli nuovi (in ore)"
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 msgid "Mark articles in e-mail digest as read"
 msgstr "Segna gli articoli del riassunto email come letti"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr "Espandere automaticamente gli articoli nella modalità combinata"
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr "Eliminare articoli non letti"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 "Mostrare i notiziari speciali quando vengono nascosti i notiziari letti"
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr "Raggruppare i sommari in notiziari virtuali"
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr "Non mostrare le immagini negli articoli"
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr "Abilita API esterna"
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 #, fuzzy
 msgid "Sort headlines by feed date"
 msgstr "Ordinare i notiziari per numero di non letti"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL del foglio di stile utente"
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "Accesso:"
@@ -865,51 +881,47 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "Utilità OPML"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
-msgstr "Importazione OPML (utilizzando l&apos;estensione DOMXML)..."
-
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "Importazione OPML (utilizzando l&apos;estensione DOMDocument)..."
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-"L&apos;estensione DOMXML non è stata trovata. È richiesta per versioni di "
-"PHP inferiori alla 5."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
+msgstr "Importazione utilizzando DOMXML."
 
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "Ritorna alle preferenze"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "Esci dalle preferenze"
-
-#: prefs.php:91
+#: prefs.php:83
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "Esci dalle preferenze"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 msgid "Users"
 msgstr "Utenti"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "Collegamento"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr ""
 "La registrazione di nuovi utenti è disabilitata dall&apos;amministratore."
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -919,152 +931,156 @@ msgstr ""
 "eseguono l'accesso almeno una volta, vengono cancellati automaticamente 24 "
 "ore dopo che la password temporanea è stata inviata."
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr "Accesso desiderato:"
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr "Controlla disponibilità"
 
-#: register.php:184
+#: register.php:185
 msgid "Email:"
 msgstr "Email:"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr "Quanto fa due più due:"
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr "Invia registrazione"
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr "Le informazioni di registrazione sono incomplete."
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr "Il nome utente esiste già."
 
-#: register.php:241
+#: register.php:242
 msgid "Registration failed."
 msgstr "Registrazione fallita."
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr "Utente creato con successo."
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr "La registrazione di nuovi utenti è attualmente chiusa."
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 msgid "Comments?"
 msgstr "Commenti?"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "È disponibile la nuova versione di Tiny Tiny RSS."
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 msgid "Collapse feedlist"
 msgstr "Contrai elenco notiziari"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 msgid "Show articles"
 msgstr "Mostra articoli"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr "Adattivo"
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "Tutti gli articoli"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr "Ignora punteggio"
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 msgid "Sort articles"
 msgstr "Ordina articoli"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 msgid "Date"
 msgstr "Data"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr "Punteggio"
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "Aggiorna"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr "Cerca..."
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "Azioni notiziari:"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 msgid "Subscribe to feed..."
 msgstr "Sottoscrivi il notiziario..."
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 msgid "Edit this feed..."
 msgstr "Modifica questo notiziario..."
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 msgid "Rescore feed"
 msgstr "Cambia punteggio notiziario"
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "Tutti i notiziari:"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "Altre azioni:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "nuvola etichette"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 msgid "Create filter..."
 msgstr "Crea filtro..."
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Scorciatoie da tastiera"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1077,26 +1093,26 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "Registrato"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Le informazioni di registrazione sono incomplete."
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "La password è stata cambiata"
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
@@ -1109,7 +1125,7 @@ msgstr "Aiuto"
 msgid "Help topic not found."
 msgstr "Argomento dell&apos;aiuto non trovato."
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "<li>Aggiunta della categoria <b>%s</b>.</li>"
@@ -1119,26 +1135,22 @@ msgstr "<li>Aggiunta della categoria <b>%s</b>.</li>"
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 msgid "is already imported."
 msgstr "già importato."
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 msgid "OK"
 msgstr "OK"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "Errore durante l&apos;analisi del documento."
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "Errore: caricare il file OPML."
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr "Errore: impossibile trovare l&apos;elemento body"
-
 #: modules/popup-dialog.php:34
 msgid "Importing using DOMXML."
 msgstr "Importazione utilizzando DOMXML."
@@ -1147,6 +1159,12 @@ msgstr "Importazione utilizzando DOMXML."
 msgid "Importing using DOMDocument."
 msgstr "Importazione utilizzando DOMDocument."
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+"L&apos;estensione DOMXML non è stata trovata. È richiesta per versioni di "
+"PHP inferiori alla 5."
+
 #: modules/popup-dialog.php:80
 msgid "Create profile"
 msgstr "Crea profilo"
@@ -1174,7 +1192,7 @@ msgstr ""
 msgid "Your Public OPML URL is:"
 msgstr "L'URL degli articoli pubblicati è:"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 msgid "Generate new URL"
 msgstr "Genera nuovo URL"
 
@@ -1208,13 +1226,13 @@ msgstr ""
 "crash o uno stallo. Controllare il processo del demone o contattare il "
 "proprietario dell&apos;istanza."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "Notiziario"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 msgid "Place in category:"
 msgstr "Mettere nella categoria:"
 
@@ -1223,19 +1241,19 @@ msgstr "Mettere nella categoria:"
 msgid "Available feeds"
 msgstr "Tutti i notiziari"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "Accesso"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "Password:"
@@ -1253,17 +1271,18 @@ msgid "More feeds"
 msgstr "Altri notiziari"
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "Annulla"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "Cerca"
 
@@ -1279,9 +1298,10 @@ msgstr "Archivio notiziari"
 msgid "limit:"
 msgstr "limite:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1305,125 +1325,143 @@ msgstr "Limitare la ricerca a:"
 msgid "This feed"
 msgstr "Questo notiziario"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "Corrisponde"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr "prima"
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 msgid "after"
 msgstr "dopo"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr "Controllalo"
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr "al campo"
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 msgid "in"
 msgstr "in"
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 msgid "Perform Action"
 msgstr "Esegui azione"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr "con parametri:"
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "Opzioni"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "Corrispondenza inversa"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr "Prova"
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "Crea"
 
-#: modules/popup-dialog.php:542
-msgid "Feeds with update errors"
-msgstr ""
+#: modules/popup-dialog.php:571
+#, fuzzy
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr "Questi notiziari non sono stati aggiornati a causa di errori:"
+
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "Fare clic per modificare"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
+
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr "Questi notiziari non sono stati aggiornati a causa di errori:"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "Salva"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 msgid "Tag Cloud"
 msgstr "Nuvola etichette"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Tutti gli articoli"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 #, fuzzy
 msgid "To:"
 msgstr "N°"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "Seleziona:"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Cambia email"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "È disponibile la nuova versione di Tiny Tiny RSS."
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 msgid "Details"
 msgstr "Dettagli"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1431,193 +1469,252 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+msgid "URL:"
+msgstr "URL:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "Livello di accesso: "
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "Livello di accesso"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "Genera nuovo URL"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "Crea"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr "Spuntare per abilitare il campo"
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "Titolo"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-msgid "URL:"
-msgstr "URL:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr "utilizzando"
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "Eliminazione articoli:"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 msgid "Hide from Popular feeds"
 msgstr "Nascondere nei notiziari popolari"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "Contenuto da destra a sinistra"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "Includere nell&apos;email riassunto"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr "Mostrare sempre le immagini allegate"
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 #, fuzzy
 msgid "Cache images locally (SimplePie only)"
 msgstr "Memorizzare le immagini localmente"
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Segnare tutti gli articoli come letti?"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 msgid "Icon"
 msgstr "Icona"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "Sottoscrizione effettuata a «%s»"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr "Memorizzare le immagini localmente"
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr "Fatto tutto."
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Sottoscrizione avvenuta a <b>%s</b>."
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossibile sottoscrivere <b>%s</b>."
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Si ha già una sottoscrizione a <b>%s</b>."
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Impossibile sottoscrivere <b>%s</b>."
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr "Modifica opzioni di sottoscrizione"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La categoria <b>%s</b> esiste già nel database."
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "Crea categoria"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "Nessuna categoria notiziari definita."
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Rimuovere le categorie selezionate?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor notiziari"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Intero notiziario"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "Seleziona:"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Pulizia dei notiziari selezionati..."
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Reimposta password"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "Reimposta categoria"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "Modifica categorie"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 msgid "More actions..."
 msgstr "Altre azioni..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr "Eliminazione manuale"
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 msgid "Clear feed data"
 msgstr "Pulisci i dati del notiziario"
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 msgid "Rescore articles"
 msgstr "Cambio punteggio degli articoli"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "Importa"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "Esporta OPML"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1627,22 +1724,22 @@ msgstr ""
 "possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
 "sotto."
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 msgid "Display URL"
 msgstr "Visualizza URL"
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integrazione con Firefox"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1650,36 +1747,36 @@ msgstr ""
 "Questo sito di Tiny Tiny RSS può essere utilizzato come lettore di notiziari "
 "di Firefox facendo clic sul collegamento qui sotto."
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr "Fare clic qui per registrare questo sito come lettore di notiziari."
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Ritorna a Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1688,58 +1785,95 @@ msgstr ""
 "possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
 "sotto."
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "Titolo"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Pulisci i dati del notiziario"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, php-format
 msgid "%d archived articles"
 msgstr "%d articoli archiviati"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "Nessun filtro trovato che corrisponde."
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filtro <b>%s</b> creato"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "Crea filtro"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "Modifica"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "Altri notiziari"
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "Fare clic per modificare"
+
 #: modules/pref-labels.php:21
 msgid "Caption"
 msgstr "Intestazione"
@@ -1772,115 +1906,115 @@ msgstr "Crea etichetta"
 msgid "Clear colors"
 msgstr "Pulisci colori"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "La vecchia password non può essere vuota."
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "La nuova password non può essere vuota."
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "Le password inserite non corrispondono."
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "La password è stata cambiata"
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "La vecchia password non è corretta."
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "La configurazione è stata salvata."
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Opzione sconosciuta: %s"
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "Dati personali"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "Email"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 msgid "Access level"
 msgstr "Livello di accesso"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "Salva"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "La password è impostata al valore predefinito, \n"
 "\t\t\t\t\t\tcambiarla."
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "Vecchia password"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "Nuova password"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "Conferma password"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "Cambia password"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "Seleziona tema"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "Sì"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "No"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "Salva configurazione"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr "Gestisci profili"
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "Reimposta ai valori predefiniti"
 
-#: modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "Dettagli utente"
@@ -1975,10 +2109,6 @@ msgstr "Livello di accesso"
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr "Fare clic per modificare"
-
 #: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "Nessun utente definito."
@@ -2242,7 +2372,7 @@ msgstr "Nascondi notiziari letti"
 msgid "Sort feeds by unread count"
 msgstr "Ordinare i notiziari per numero di non letti"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
 
@@ -2308,8 +2438,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "La vecchia password non è corretta."
 
 #: functions.js:634
 #, fuzzy
@@ -2369,40 +2500,51 @@ msgstr "La sottoscrizione a questo notiziario è già stata effettuata."
 msgid "Create Filter"
 msgstr "Crea filtro"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+#, fuzzy
+msgid "Filter Test Results"
+msgstr "Espressione del filtro"
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "Annullare la sottoscrizione a «%s»?"
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Inserire una nota per questo articolo:"
 
-#: functions.js:1158
+#: functions.js:1197
 #, fuzzy
 msgid "Generate new syndication address for this feed?"
 msgstr "Caricare una nuova icona per questo notiziario?"
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Modifica notiziario"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "Altri notiziari"
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2410,37 +2552,46 @@ msgstr ""
 "Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli "
 "archiviati non saranno rimossi."
 
+#: functions.js:1573
+msgid "Feeds with update errors"
+msgstr ""
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "Rimuovere i filtri selezionati?"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "(inverso)"
 
-#: prefs.js:91
+#: prefs.js:114
 msgid "Please enter login:"
 msgstr "Inserire l'accesso:"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr "Impossibile creare l'utente: nessun accesso specificato."
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Filtri"
 
-#: prefs.js:164
+#: prefs.js:187
 msgid "Remove filter %s?"
 msgstr "Rimuovere il filtro «%s»?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "Rimuovere le etichette selezionate?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "Nessuna etichetta selezionata."
 
-#: prefs.js:310
+#: prefs.js:350
 #, fuzzy
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
@@ -2449,147 +2600,171 @@ msgstr ""
 "Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non "
 "saranno rimossi."
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "Nessun utente selezionato."
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "Rimuovere i filtri selezionati?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "Nessun filtro selezionato."
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "Selezionare solo un notiziario."
 
-#: prefs.js:420
+#: prefs.js:459
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Quanti giorni di articoli tenere (0 - utilizza il valore predefinito)?"
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-"Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non "
-"saranno rimossi."
-
-#: prefs.js:490
-msgid "No profiles selected."
-msgstr "Nessun profilo selezionato."
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "Il campo accesso non può essere vuoto."
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "Selezionare un solo utente."
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "Reimpostare la password per l&apos;utente selezionato?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "Selezionare solo un filtro."
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor di notiziari multipli"
 
-#: prefs.js:705
+#: prefs.js:716
 msgid "Save changes to selected feeds?"
 msgstr "Salvare i cambiamenti ai notiziari selezionati?"
 
-#: prefs.js:776
+#: prefs.js:802
 msgid "OPML Import"
 msgstr "Importazione OPML"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Scegliere un profilo da attivare"
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "Reimpostare ai valori predefiniti?"
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "Reimposta categoria"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "Rimuovere le categorie selezionate?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "Nessuna categoria selezionata."
 
-#: prefs.js:1198
+#: prefs.js:1226
+msgid "Feeds without recent updates"
+msgstr ""
+
+#: prefs.js:1275
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Sostituire l&apos;indirizzo di pubblicazione attuale con uno nuovo?"
 
-#: prefs.js:1307
+#: prefs.js:1384
 msgid "Rescore articles in selected feeds?"
 msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Cambiare il punteggio a tutti i notiziari? Questa operazione può durare "
 "molto tempo."
 
-#: prefs.js:1350
+#: prefs.js:1427
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Reimpostare i colori delle etichette ai valori predefiniti?"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr "Impostazioni dei profili"
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+"Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non "
+"saranno rimossi."
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Nessun profilo selezionato."
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 msgid "Activate selected profile?"
 msgstr "Attivare il profilo selezionato?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr "Scegliere un profilo da attivare"
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 msgid "Label Editor"
 msgstr "Editor etichette"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Modifica etichette"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Rimuovere i filtri selezionati?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Nessun filtro selezionato."
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Selezionare solo un filtro."
+
 #: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "Segnare tutti gli articoli come letti?"
@@ -2598,26 +2773,26 @@ msgstr "Segnare tutti gli articoli come letti?"
 msgid "You can't unsubscribe from the category."
 msgstr "Impossibile annullare la sottoscrizione alla categoria."
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "Selezionare prima qualche notiziario."
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 msgid "Rescore articles in %s?"
 msgstr "Cambiare il punteggio degli articoli in «%s»?"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 #, fuzzy
 msgid "New version available!"
 msgstr "È disponibile la nuova versione di Tiny Tiny RSS."
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
 
@@ -2667,40 +2842,61 @@ msgstr "Segnare %d articolo/i come letto/i?"
 msgid "Unable to load article."
 msgstr "Errore: caricare il file OPML."
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "Caricamento elenco notiziari..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "Visualizza il contenuto originale dell&apos;articolo"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Aprire gli articoli in una nuova finestra"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "Rimuovere le etichette selezionate?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "Caricamento elenco notiziari..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "Fare clic per modificare"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr "Aggiornare la notizia al cambiamento della somma di controllo"
+
+#~ msgid "Use more accessible date/time format for headlines"
+#~ msgstr "Utilizzare un formato data/ora più accessibile per i sommari"
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "Impostare gli articoli come non letti durante l&apos;aggiornamento"
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "Importazione OPML (utilizzando l&apos;estensione DOMXML)..."
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "Importazione OPML (utilizzando l&apos;estensione DOMDocument)..."
+
+#~ msgid "Error: can't find body element."
+#~ msgstr "Errore: impossibile trovare l&apos;elemento body"
+
+#~ msgid "No profiles selected."
+#~ msgstr "Nessun profilo selezionato."
+
 #~ msgid "Unknown error"
 #~ msgstr "Errore sconosciuto"
 
@@ -2886,9 +3082,6 @@ msgstr "Fare clic per modificare"
 #~ msgid "No filters defined."
 #~ msgstr "Nessun filtro definito."
 
-#~ msgid "No matching filters found."
-#~ msgstr "Nessun filtro trovato che corrisponde."
-
 #~ msgid "Click to change color"
 #~ msgstr "Fare clic per cambiare il colore"
 
@@ -3228,9 +3421,6 @@ msgstr "Fare clic per modificare"
 #~ msgid "Could not update headlines (missing XML object)"
 #~ msgstr "Impossibile aggiornare i sommari (oggetto XML mancante)"
 
-#~ msgid "Entire feed"
-#~ msgstr "Intero notiziario"
-
 #~ msgid "Failed to load article in new window"
 #~ msgstr "Fallito il caricamento dell'articolo in una nuova finestra"
 
@@ -3702,9 +3892,3 @@ msgstr "Fare clic per modificare"
 
 #~ msgid "Create Label"
 #~ msgstr "Crea etichetta"
-
-#~ msgid "Test"
-#~ msgstr "Prova"
-
-#~ msgid "Filter expression"
-#~ msgstr "Espressione del filtro"

diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 43425f4d5c214d90854324866c2cd777f885a519..afc5be26c3d33fef97741054b435191dd5116622 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 72ca18af1c89e3cba0c9f6b33f0bbebe1c8497d2..0435124536fc8f30b68da6698fc107f39cf75af3 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"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2009-05-12 03:25+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -16,100 +16,100 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "標準を使用する"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "ずっと削除しない"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 週間前"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 週間前"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 ヶ月前"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 日月前"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 ヶ月前"
 
-#: backend.php:81
+#: backend.php:80
 msgid "Default interval"
 msgstr "更新の間隔"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "更新を無効にする"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "各 15 分"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "各 30 分"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "毎時"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "各 4 時間"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "各 12 時間"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "毎日"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "毎週"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "標準"
 
-#: backend.php:103
+#: backend.php:102
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "ユーザー"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr "パワーユーザー"
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "管理者"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 msgid "Feeds"
 msgstr "フィード"
 
@@ -118,17 +118,17 @@ msgstr "フィード"
 msgid "Article not found."
 msgstr "フィードが見つかりません。"
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -159,18 +159,18 @@ msgstr ""
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr "実行前にデータベースのバックアップをしてください。"
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -179,32 +179,32 @@ msgstr ""
 "Tiny Tiny RSS は最新のバージョンに更新する必要があります (<b>%d</b> から <b>"
 "%d</b>)。"
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "更新の実行"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "更新を実行しています..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "バージョン %d を確認しています..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "バージョンを確認しています..."
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "エラー!"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -213,6 +213,21 @@ msgstr ""
 "完了しました。<b>%d</b> 個のテーブルをスキーマーバージョン<b>%d</b> に更新し"
 "ました。"
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -220,11 +235,11 @@ msgid ""
 "\t\t\tbrowser settings."
 msgstr ""
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "ようこそ、"
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "ログアウト"
@@ -316,214 +331,222 @@ msgstr ""
 "SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を"
 "確認してください。"
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr "セッションの検査に失敗しました (IP が正しくない)"
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "特別"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "ラベル"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 msgid "All articles"
 msgstr "すべての記事"
 
-#: functions.php:3050
+#: functions.php:3217
 #, fuzzy
 msgid "Archived articles"
 msgstr "未読記事"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "選択:"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "すべて"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "未読"
 
-#: functions.php:4021
+#: functions.php:4244
 msgid "Invert"
 msgstr "反転"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "なし"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "操作..."
 
-#: functions.php:4030
+#: functions.php:4253
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "お気に入り"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "公開済み"
 
-#: functions.php:4036
+#: functions.php:4259
 msgid "Selection:"
 msgstr "選択:"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4043
+#: functions.php:4266
 #, fuzzy
 msgid "Move back"
 msgstr "戻る"
 
-#: functions.php:4044
+#: functions.php:4267
 #, fuzzy
 msgid "Delete"
 msgstr "標準"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 msgid "Feed:"
 msgstr "フィード:"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "タグを閲覧する"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 #, fuzzy
 msgid "Visit the website"
 msgstr "オフィシャルサイトに訪問する"
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "フィードを閲覧する"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "編集するにはクリック"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 msgid " - "
 msgstr " - "
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "タグがありません"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "新しいウィンドウで記事を開く"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "タグを編集する"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "このウィンドウを閉じる"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 msgid "mark as read"
 msgstr "既読にする"
 
-#: functions.php:5229
+#: functions.php:5457
 #, fuzzy
 msgid "Dismiss article"
 msgstr "公開記事"
 
-#: functions.php:5248
+#: functions.php:5476
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: functions.php:5251
+#: functions.php:5479
 msgid "No updated articles found to display."
 msgstr "表示する更新された記事が見つかりませんでした。"
 
-#: functions.php:5254
+#: functions.php:5482
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -531,58 +554,55 @@ msgstr ""
 "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
 "ニューを参照します)、フィルターを使うことができます。"
 
-#: functions.php:5260
+#: functions.php:5488
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 msgid "Create label..."
 msgstr "ラベルを作成する..."
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "削除"
 
-#: functions.php:6110
+#: functions.php:6343
 #, fuzzy
 msgid "Assign:"
 msgstr "ラベルの割り当て:"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "タグがありません"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+#, fuzzy
+msgid "(edit note)"
 msgstr "ノートの編集"
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
-#: functions.php:6774
+#: functions.php:7013
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr "添付:"
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr "添付:"
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "題名"
 
@@ -619,7 +639,7 @@ msgstr "公開記事"
 msgid "Assign tags"
 msgstr "タグの割り当て"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr "ラベルの割り当て"
 
@@ -681,12 +701,12 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "この日数よりあとの古い投稿を削除する (0 は無効です)"
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
 
 #: localized_schema.php:27
-msgid "Update post on checksum change"
-msgstr "ã\83\81ã\82§ã\83\83ã\82¯ã\82µã\83 ã\81®å¤\89æ\9b´ã\81§æ\8a\95稿ã\82\92æ\9b´æ\96°ã\81\99ã\82\8b"
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "ã\81\93ã\81®æ\97¥æ\95°ã\82\88ã\82\8aã\81\82ã\81¨ã\81®å\8f¤ã\81\84æ\8a\95稿ã\82\92å\89\8aé\99¤ã\81\99ã\82\8b (0 ã\81¯ç\84¡å\8a¹ã\81§ã\81\99)"
 
 #: localized_schema.php:28
 #, fuzzy
@@ -719,100 +739,96 @@ msgid "Long date format"
 msgstr "完全な日付の形式"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr ""
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "フィード表示の組み合わせ"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "未読でないメッセージとフィードを隠す"
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "次のフィードの表示をキャッチアップする"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "更新時に未読として記事を設定する"
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "ヘッドラインの逆順 (古いものがはじめに)"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "電子メールでのダイジェストを有効にする"
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "既読としてフィードのマーキングについて確認する"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "組み合わせモードで記事を自動的に展開する"
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "記事から安全でないタグを取り除く"
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "ブラックリスト化したタグ"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "新規記事としての取り扱い期限 (単位: 時間)"
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 msgid "Mark articles in e-mail digest as read"
 msgstr "既読として電子メールのダイジェストに含まれる記事を設定する"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr "組み合わせモードで記事を自動的に展開する"
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr "未読記事を削除する"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr "仮想フィードのグループヘッドライン"
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr "記事内に画像を表示しない"
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr ""
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 #, fuzzy
 msgid "Sort headlines by feed date"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "ユーザースタイルシートの URL"
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "ログイン:"
@@ -846,203 +862,204 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "OPML ユーティリティ"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
 msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "OPML のインポート中 (DOMDocument 機能拡張を用いて)..."
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-"DOMXML 機能拡張が見つかりません。PHP バージョン 5 未満はそれを要求します。"
-
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "設定に戻る"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "設定を終了する"
-
-#: prefs.php:91
+#: prefs.php:83
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "設定を終了する"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "設定"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 msgid "Filters"
 msgstr "フィルター"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 msgid "Users"
 msgstr "ユーザー"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "リンク"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr "新規ユーザーの登録は管理者によって無効になっています。"
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
 "password is sent."
 msgstr ""
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr ""
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr ""
 
-#: register.php:184
+#: register.php:185
 msgid "Email:"
 msgstr "電子メール:"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr ""
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr "登録を送信する"
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr "登録情報が完成していません。"
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr "すみませんがこのユーザー名は既にいます。"
 
-#: register.php:241
+#: register.php:242
 msgid "Registration failed."
 msgstr "登録に失敗しました。"
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr "アカウントの作成に成功しました。"
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr "新規ユーザーの登録は現在行っていません。"
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 msgid "Comments?"
 msgstr "コメントしますか?"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 #, fuzzy
 msgid "Show articles"
 msgstr "記事を保管しました"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "更新日時"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 #, fuzzy
 msgid "Sort articles"
 msgstr "記事を保管しました"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 msgid "Date"
 msgstr "日付"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr "スコア"
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr "検索..."
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "フィード操作"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 msgid "Edit this feed..."
 msgstr "フィードを編集する..."
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 msgid "Rescore feed"
 msgstr "フィードのスコアを再計算しています..."
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "タグクラウド"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 msgid "Create filter..."
 msgstr "フィルターを作成しています..."
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "キーボードショートカット"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1055,26 +1072,26 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "登録済み"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "登録情報が完成していません。"
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "パスワードを変更しました。"
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
@@ -1087,7 +1104,7 @@ msgstr "ヘルプ"
 msgid "Help topic not found."
 msgstr "ヘルプのトピックが見つかりません。"
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "カテゴリー <b>%s</b> の追加中です。"
@@ -1097,28 +1114,24 @@ msgstr "カテゴリー <b>%s</b> の追加中です。"
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 #, fuzzy
 msgid "is already imported."
 msgstr "既にインポート済みです。"
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "ドキュメントの解析中のエラーです。"
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "エラー: OPML ファイルをアップロードしてください。"
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr "エラー: 本文要素を見つけることができませんでした。"
-
 #: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
@@ -1129,6 +1142,11 @@ msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 msgid "Importing using DOMDocument."
 msgstr "OPML のインポート中 (DOMDocument 機能拡張を用いて)..."
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+"DOMXML 機能拡張が見つかりません。PHP バージョン 5 未満はそれを要求します。"
+
 #: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
@@ -1157,7 +1175,7 @@ msgstr ""
 msgid "Your Public OPML URL is:"
 msgstr "公開記事フィードへのリンクです。"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 #, fuzzy
 msgid "Generate new URL"
 msgstr "生成したフィード"
@@ -1184,13 +1202,13 @@ msgid ""
 "contact instance owner."
 msgstr ""
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "フィード"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 msgid "Place in category:"
 msgstr "カテゴリーの場所:"
 
@@ -1199,19 +1217,19 @@ msgstr "カテゴリーの場所:"
 msgid "Available feeds"
 msgstr "すべてのフィード"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "認証"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "ログイン"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "パスワード:"
@@ -1230,17 +1248,18 @@ msgid "More feeds"
 msgstr "さらなるフィード"
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "取り消し"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "検索"
 
@@ -1259,9 +1278,10 @@ msgstr "フィード操作"
 msgid "limit:"
 msgstr "制限:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "削除"
 
@@ -1286,127 +1306,145 @@ msgstr "対象範囲"
 msgid "This feed"
 msgstr "このフィード"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "一致"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr "前"
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 msgid "after"
 msgstr "後"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr ""
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 msgid "in"
 msgstr ""
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 msgid "Perform Action"
 msgstr "操作の実行"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr "パラメーター:"
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "オプション"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "有効にする"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "一致しない"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr "テスト"
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "作成"
 
-#: modules/popup-dialog.php:542
-msgid "Feeds with update errors"
-msgstr ""
+#: modules/popup-dialog.php:571
+#, fuzzy
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr "エラーのため、フィードは更新されませんでした:"
+
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "編集するにはクリック"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "選択されたフィードの購読をやめますか?"
+
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "タグクラウド"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "すべての記事"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 #, fuzzy
 msgid "To:"
 msgstr "トップ"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "選択:"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "電子メールを変更する"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 #, fuzzy
 msgid "Details"
 msgstr "毎日"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1414,218 +1452,277 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+msgid "URL:"
+msgstr "URL:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "アクセスレベル: "
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "アクセスレベル"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "生成したフィード"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "作成"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr ""
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "題名"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-msgid "URL:"
-msgstr "URL:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr ""
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "記事の削除:"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "自分のフィード一覧から隠す"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "右から左のコンテンツ"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "電子メールダイジェストに含む"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 #, fuzzy
 msgid "Cache images locally (SimplePie only)"
 msgstr "ローカルに画像をキャッシュする"
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "すべての記事を既読にしますか?"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 #, fuzzy
 msgid "Icon"
 msgstr "操作"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "フィードを購読する:"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr "ローカルに画像をキャッシュする"
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr "購読オプションの編集"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "カテゴリーの作成"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "フィードカテゴリーが定義されていません。"
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "選択されたカテゴリーを削除しますか?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "フィードエディター"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "元のフィード"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "選択:"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "選択したフィードを削除しています..."
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "パスワードのリセット"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "カテゴリー:"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "カテゴリーの編集"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 #, fuzzy
 msgid "More actions..."
 msgstr "操作..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "インポート"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 #, fuzzy
 msgid "Display URL"
 msgstr "タグの表示"
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox 統合"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1633,93 +1730,130 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "題名"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "フィードデータの消去"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "お気に入りの記事"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "一致するフィルターが見つかりません。"
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "フィルター <b>%s</b> を作成しました"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "編集"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr "このタブを開くにはアクセスレベルが不十分です。"
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "さらなるフィード"
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "編集するにはクリック"
+
 #: modules/pref-labels.php:21
 msgid "Caption"
 msgstr "キャプション"
@@ -1752,115 +1886,115 @@ msgstr "ラベルを作成する"
 msgid "Clear colors"
 msgstr "色の消去"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "古いパスワードを空にできません。"
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "新しいパスワードを空にできません。"
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "パスワードを変更しました。"
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "古いパスワードが不正確です。"
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "設定を保存しました。"
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr "不明なオプション: %s"
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "個人データ"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "電子メール"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 msgid "Access level"
 msgstr "アクセスレベル"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "保存"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "パスワードが標準のままです。\n"
 "                                                変更してください。"
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "現在のパスワード"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "新しいパスワード(確認)"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "パスワードを変更する"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "テーマを選択する"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "はい"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "いいえ"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "設定を保存する"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "標準に戻す"
 
-#: modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr "このタブを開くにはアクセスレベルが不十分です。"
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "ユーザーの詳細"
@@ -1955,10 +2089,6 @@ msgstr "アクセスレベル"
 msgid "Last login"
 msgstr "最終ログイン"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr "編集するにはクリック"
-
 #: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "ユーザーが定義されていません。"
@@ -2210,7 +2340,7 @@ msgstr "読んだフィードを隠す/再表示する"
 msgid "Sort feeds by unread count"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
@@ -2275,8 +2405,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "古いパスワードが不正確です。"
 
 #: functions.js:634
 #, fuzzy
@@ -2340,221 +2471,264 @@ msgstr "カテゴリーから購読をやめることができません。"
 msgid "Create Filter"
 msgstr "フィルターを作成する"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+#, fuzzy
+msgid "Filter Test Results"
+msgstr "フィルター表現"
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "このアーティクルのノートを入力してください:"
 
-#: functions.js:1158
+#: functions.js:1197
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "フィードを編集する"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "さらなるフィード"
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "選択されたフィードはありません。"
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
+#: functions.js:1573
+msgid "Feeds with update errors"
+msgstr ""
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "選択されたフィルターを削除しますか?"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "反転"
 
-#: prefs.js:91
+#: prefs.js:114
 msgid "Please enter login:"
 msgstr "ログイン名を入力してください:"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr "ユーザーが追加できません: ログイン名が指定されていません。"
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "フィルター"
 
-#: prefs.js:164
+#: prefs.js:187
 msgid "Remove filter %s?"
 msgstr "フィルター %s を削除しますか?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "選択したラベルを削除しますか?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "選択されたラベルはありません。"
 
-#: prefs.js:310
+#: prefs.js:350
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "選択されたユーザーはありません。"
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "選択されたフィルターはありません。"
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "フィードをひとつだけ選択してください。"
 
-#: prefs.js:420
+#: prefs.js:459
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "選択したフィード内のすべてのお気に入りしていない記事をすべて削除しますか?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "記事を維持したい日数は? (0: 標準を使う)"
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: prefs.js:490
-#, fuzzy
-msgid "No profiles selected."
-msgstr "選択された記事はありません。"
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "ログイン名の項目は空にできません。"
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "ひとつだけユーザーを選択してください。"
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "選択したユーザーのパスワードをリセットしますか?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "フィルターをひとつだけ選択してください。"
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "複数フィードエディター"
 
-#: prefs.js:705
+#: prefs.js:716
 msgid "Save changes to selected feeds?"
 msgstr "選択したフィードの変更を保存しますか?"
 
-#: prefs.js:776
+#: prefs.js:802
 #, fuzzy
 msgid "OPML Import"
 msgstr "インポート"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "標準に戻しますか?"
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "カテゴリー:"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "選択されたカテゴリーを削除しますか?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "選択されたカテゴリーはありません。"
 
-#: prefs.js:1198
+#: prefs.js:1226
+msgid "Feeds without recent updates"
+msgstr ""
+
+#: prefs.js:1275
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "新しいもので現在の公開アドレスを置き換えますか?"
 
-#: prefs.js:1307
+#: prefs.js:1384
 msgid "Rescore articles in selected feeds?"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "すべての記事のスコアを再計算しますか? この操作は大量の時間を使うでしょう。"
 
-#: prefs.js:1350
+#: prefs.js:1427
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "ラベルの色を標準にリセットしますか?"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr ""
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "選択された記事はありません。"
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 msgid "Label Editor"
 msgstr "ラベルエディター"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "タグを編集する"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "選択されたフィルターを削除しますか?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "選択されたフィルターはありません。"
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "フィルターをひとつだけ選択してください。"
+
 #: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "すべての記事を既読にしますか?"
@@ -2563,26 +2737,26 @@ msgstr "すべての記事を既読にしますか?"
 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 #, fuzzy
 msgid "New version available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
 
@@ -2635,40 +2809,59 @@ msgstr "%d 件のマークした記事を既読として設定しますか?"
 msgid "Unable to load article."
 msgstr "エラー: OPML ファイルをアップロードしてください。"
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "フィード一覧を読み込んでいます..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "元の記事内容を表示する"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "新しいウィンドウで記事を開く"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "選択したラベルを削除しますか?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "フィード一覧を読み込んでいます..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "編集するにはクリック"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr "チェックサムの変更で投稿を更新する"
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "更新時に未読として記事を設定する"
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "OPML のインポート中 (DOMDocument 機能拡張を用いて)..."
+
+#~ msgid "Error: can't find body element."
+#~ msgstr "エラー: 本文要素を見つけることができませんでした。"
+
+#, fuzzy
+#~ msgid "No profiles selected."
+#~ msgstr "選択された記事はありません。"
+
 #~ msgid "Unknown error"
 #~ msgstr "未知のエラー"
 
@@ -2805,9 +2998,6 @@ msgstr "編集するにはクリック"
 #~ msgid "No filters defined."
 #~ msgstr "フィルターが定義されていません。"
 
-#~ msgid "No matching filters found."
-#~ msgstr "一致するフィルターが見つかりません。"
-
 #~ msgid "Click to change color"
 #~ msgstr "色を変えるためにクリック"
 
@@ -3055,9 +3245,6 @@ msgstr "編集するにはクリック"
 #~ msgid "Could not update headlines (missing XML object)"
 #~ msgstr "ヘッドラインを更新できません (XML オブジェクトが見当たりません)"
 
-#~ msgid "Entire feed"
-#~ msgstr "元のフィード"
-
 #~ msgid "Failed to load article in new window"
 #~ msgstr "新しいウィンドウで記事を開くことができません"
 
@@ -3451,9 +3638,6 @@ msgstr "編集するにはクリック"
 #~ msgid "Match SQL"
 #~ msgstr "SQL の一致"
 
-#~ msgid "Test"
-#~ msgstr "テスト"
-
 #~ msgid "Feed information:"
 #~ msgstr "フィード情報:"
 
@@ -3518,9 +3702,6 @@ msgstr "編集するにはクリック"
 #~ msgid "Perform action"
 #~ msgstr "操作の実行"
 
-#~ msgid "Filter expression"
-#~ msgstr "フィルター表現"
-
 #~ msgid "Change password:"
 #~ msgstr "変更パスワード:"
 

diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 08ae527a88a1995929a9be4b2a8d36da12eab80e..cff4e6cda7ceffadd8bd0d5a2c3b285d85fda964 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 26888d6722e8258294eef78218272fd147b6b2cc..140f4ab72a0b39d71b91ddfe095bd5742a1fd9a8 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"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2009-05-02 00:10+0100\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
@@ -16,100 +16,100 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "Bruk standard"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "Slett aldri"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 uke gammel"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 uker gammel"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 måned gammel"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 måneder gammel"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 måneder gammel"
 
-#: backend.php:81
+#: backend.php:80
 msgid "Default interval"
 msgstr "Standard intervall:"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Slå av oppdateringer"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Hvert 15. minutt"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Hvert 30. minutt"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "På timen"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Hver 4. time"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Hver 12. time"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Daglig"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "Standard"
 
-#: backend.php:103
+#: backend.php:102
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "Bruker"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr "Superbruker"
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "Administrator"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
@@ -118,17 +118,17 @@ msgstr "Nyhetsstrømmer"
 msgid "Article not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -158,18 +158,18 @@ msgstr ", funnet: "
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr "Vennligst gjør backup av din database før du fortsetter."
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -178,32 +178,32 @@ msgstr ""
 "Din Tiny Tiny RSS-database trenger å oppdateres til siste utgave (<b>%d</b> "
 "til  <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "Utfør oppdateringene"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "Utfører oppdateringer..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Oppdaterer til versjon %d..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "Sjekker utgave..."
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "Feil!"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -212,6 +212,21 @@ msgstr ""
 "Ferdig. <b>%d</b> utførte oppdatering(er)i følge skjema\n"
 "\t\t\tversjon <b>%d</b>."
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 #, fuzzy
 msgid ""
@@ -223,11 +238,11 @@ msgstr ""
 "\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n"
 "\t\tnettlesers instillinger."
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "Hei, "
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "Logg ut"
@@ -318,214 +333,222 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "Snarveier"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: functions.php:3050
+#: functions.php:3217
 #, fuzzy
 msgid "Archived articles"
 msgstr "Lagrede artikler"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "Velg:"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "Alle"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "Ulest"
 
-#: functions.php:4021
+#: functions.php:4244
 msgid "Invert"
 msgstr "Motsatt"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "Ingen"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: functions.php:4030
+#: functions.php:4253
 msgid "Selection toggle:"
 msgstr "Marker utvalg:"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "Favoritter"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "Publisert"
 
-#: functions.php:4036
+#: functions.php:4259
 msgid "Selection:"
 msgstr "Utvalg:"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "Marker som lest"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4043
+#: functions.php:4266
 #, fuzzy
 msgid "Move back"
 msgstr "Gå tilbake"
 
-#: functions.php:4044
+#: functions.php:4267
 #, fuzzy
 msgid "Delete"
 msgstr "Standard"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 msgid "Feed:"
 msgstr "Nyhetsstrøm:"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "Se stikkord"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 #, fuzzy
 msgid "Visit the website"
 msgstr "Besøk den offisielle siden"
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Se nyhetsstrømmene"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "Trykk for å endre"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 msgid " - "
 msgstr "-"
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "Ingen stikkord"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "Endre Stikkord"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "Lukk dette vinduet"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 msgid "mark as read"
 msgstr "marker som lest"
 
-#: functions.php:5229
+#: functions.php:5457
 #, fuzzy
 msgid "Dismiss article"
 msgstr "Publiser artiklen"
 
-#: functions.php:5248
+#: functions.php:5476
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: functions.php:5251
+#: functions.php:5479
 msgid "No updated articles found to display."
 msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 
-#: functions.php:5254
+#: functions.php:5482
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -533,58 +556,55 @@ msgstr ""
 "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
 "menyen ovenfor) eller bruke et filter."
 
-#: functions.php:5260
+#: functions.php:5488
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 msgid "Create label..."
 msgstr "Lag merkelapp..."
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "Fjern"
 
-#: functions.php:6110
+#: functions.php:6343
 #, fuzzy
 msgid "Assign:"
 msgstr "Tildel stikkord:"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "Ingen stikkord"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+#, fuzzy
+msgid "(edit note)"
 msgstr "Rediger notat"
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
-#: functions.php:6774
+#: functions.php:7013
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr "Vedlegg:"
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr "Vedlegg:"
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "Tittel"
 
@@ -621,7 +641,7 @@ msgstr "Publiser artiklen"
 msgid "Assign tags"
 msgstr "Tildel stikkord"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr "Tildel stikkord"
 
@@ -699,12 +719,12 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "Slett gamle poster etter så mange dager (0 - fjerner denne funksjonen)"
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
 
 #: localized_schema.php:27
-msgid "Update post on checksum change"
-msgstr "Oppdaterer artikkel etter checksumbytte"
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "Slett gamle poster etter så mange dager (0 - fjerner denne funksjonen)"
 
 #: localized_schema.php:28
 #, fuzzy
@@ -737,100 +757,96 @@ msgid "Long date format"
 msgstr "Langt datoformat"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr "Bruk mer brukervennlige dato/tidsformater for artiklene"
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "Kombinert nyhetsstrømsvisning"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "Skjul nyhetsstrømmer med ingen uleste meldinger"
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "Ved oppdatering vis neste nyhetsstrøm"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "Sett artikler som uleste ved oppdatering"
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "Motsatt titteloversikt (eldste først)"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "Tillatt e-postsammendrag"
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "Bekreft markeringen av nyhetsstrøm som lest"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "Utvid artikler automatisk i kombinert modus"
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "Fjern utrygge html-koder fra artiklene"
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "Svartelistede stikkord"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "Maksimal alder på ferske artikler (i timer)"
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 msgid "Mark articles in e-mail digest as read"
 msgstr "Marker artikler i e--postsammendrag som leste"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr "Utvid artikler automatisk i kombinert modus"
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr "Slett uleste artikler"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr "Vis snarveier selv om leste nyhetskanaler skjules"
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr "Grupper overskriftene i virtuelle nyhetskanaler"
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr "Ikke vis bilder i artiklene"
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr ""
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 #, fuzzy
 msgid "Sort headlines by feed date"
 msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "Brukernavn:"
@@ -864,49 +880,46 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "OPML-verktøy"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "Importerer OPML (bruker DOMDocument-utvidelsen)..."
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-"DOMXML-utvidelsen ble ikke funnet. Den er påkrevet for PHPversjoner under 5."
-
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "Returner til innstillinger"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "Forlat innstillinger"
-
-#: prefs.php:91
+#: prefs.php:83
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "Forlat innstillinger"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 msgid "Filters"
 msgstr "Filtre"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 msgid "Users"
 msgstr "Brukere"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "Lenke"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr "Registrering av nye brukere er administrativt avskrudd"
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -916,154 +929,158 @@ msgstr ""
 "som ikke blir logget inn på, blir slettet automatisk 24 timer etter at "
 "passordet ble sendt."
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr "Ønsket brukernavn:"
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr "Sjekk tilgjengeligheten"
 
-#: register.php:184
+#: register.php:185
 msgid "Email:"
 msgstr "E-post:"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr "Hvor mye er to pluss to:"
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr "Send registreringen"
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr "Registreringsinformasjonen din er ufullstendig."
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr "Beklager, brukernavn er allerede tatt."
 
-#: register.php:241
+#: register.php:242
 msgid "Registration failed."
 msgstr "Registrering feilet"
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr "Kontoen ble opprettet med suksess."
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 msgid "Comments?"
 msgstr "Kommentarer?"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 #, fuzzy
 msgid "Show articles"
 msgstr "Lagrede artikler"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 #, fuzzy
 msgid "Sort articles"
 msgstr "Lagrede artikler"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 msgid "Date"
 msgstr "Dato"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr "Poeng"
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "Oppdater"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr "Søk..."
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Tag-sky"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 msgid "Create filter..."
 msgstr "Lag filter..."
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1076,26 +1093,26 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "Registrert"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Registreringsinformasjonen din er ufullstendig."
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "Passord har blitt endret."
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
@@ -1108,7 +1125,7 @@ msgstr "Hjelp"
 msgid "Help topic not found."
 msgstr "Hjelp-emne kunne ikke bli funnet"
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Legger til kategori <b>%s</b>."
@@ -1118,28 +1135,24 @@ msgstr "Legger til kategori <b>%s</b>."
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 #, fuzzy
 msgid "is already imported."
 msgstr "Allerede importert."
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "Feil under behandling av dokumentet"
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr "Feil: Kan ikke finne hovedelement."
-
 #: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
@@ -1150,6 +1163,11 @@ msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 msgid "Importing using DOMDocument."
 msgstr "Importerer OPML (bruker DOMDocument-utvidelsen)..."
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+"DOMXML-utvidelsen ble ikke funnet. Den er påkrevet for PHPversjoner under 5."
+
 #: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
@@ -1179,7 +1197,7 @@ msgstr ""
 msgid "Your Public OPML URL is:"
 msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generert nyhetsstrøm"
@@ -1213,13 +1231,13 @@ msgstr ""
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
 "nyhetsstrømmen."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 
@@ -1228,19 +1246,19 @@ msgstr "Plasser i kategori..."
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "Autentifisering"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "Logg inn"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
@@ -1259,17 +1277,18 @@ msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "Søk"
 
@@ -1288,9 +1307,10 @@ msgstr "Nyhetsstrømshandlinger"
 msgid "limit:"
 msgstr "Antall:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1315,128 +1335,145 @@ msgstr "Begrens søket til:"
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "Match"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr "før"
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 msgid "after"
 msgstr "etter"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr "Sjekk det"
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr "På felt:"
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 msgid "in"
 msgstr "i"
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 msgid "Perform Action"
 msgstr "Utfør handlingen"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr "med parametrene:"
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "Alternativer:"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "Tillatt"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "Motsatt markering"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr "Test"
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "Lag"
 
-#: modules/popup-dialog.php:542
+#: modules/popup-dialog.php:571
 #, fuzzy
-msgid "Feeds with update errors"
-msgstr "Oppdateringsfeil"
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "Trykk for å endre"
+
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "Fjern abonnement på valgte nyhetsstrømmer"
+
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "Lagre"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Tag-sky"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Alle artikler"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 #, fuzzy
 msgid "To:"
 msgstr "Topp"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "Velg:"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Skift e-post"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 #, fuzzy
 msgid "Details"
 msgstr "Daglig"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1444,196 +1481,255 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+msgid "URL:"
+msgstr "Nettadresse:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "Tilgangsnivå:"
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "Tilgangsnivå"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "Generert nyhetsstrøm"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "Lag"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr "Marker for å tillate felt"
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "Tittel"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-msgid "URL:"
-msgstr "Nettadresse:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr "bruker"
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "Innhold som vises fra høyre til venstre"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 #, fuzzy
 msgid "Cache images locally (SimplePie only)"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Marker alle artikler som leste?"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 #, fuzzy
 msgid "Icon"
 msgstr "Handling"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "Abonnerer på følgende nyhetsstrømmer:"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr "Rediger abonnementsalternativer"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Kategorien <b>$%s</b> eksisterer allerede i databasen"
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "Ingen kategorier ble markert"
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Fjerne valgte kategorier?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Nyhetsstrømsredigerer"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Hele nyhetsstrømmen"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "Velg:"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Nullstill passordet"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "Kategori:"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 #, fuzzy
 msgid "More actions..."
 msgstr "Handlinger..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1642,23 +1738,23 @@ msgstr ""
 "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
 "kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 #, fuzzy
 msgid "Display URL"
 msgstr "Vis stikkord"
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox integrering"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1666,36 +1762,36 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1703,58 +1799,95 @@ msgstr ""
 "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
 "kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "Tittel"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Slett nyhetsstrømsdata"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favorittartikler"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "Ingen filtre ble funnet."
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Laget filter <b>%s</b>"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "Rediger"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "Flere nyhetsstrømmer"
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "Trykk for å endre"
+
 #: modules/pref-labels.php:21
 msgid "Caption"
 msgstr "Overskrift"
@@ -1787,115 +1920,115 @@ msgstr "Lag merkelapp"
 msgid "Clear colors"
 msgstr "Fjern farger"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "Gammelt passord kan ikke være blankt."
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "Nytt passord kan ikke vært blankt."
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "Innskrivne passord matcher ikke."
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "Passord har blitt endret."
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "Gammelt passord er feil"
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "Konfigurasjonen er lagret."
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ukjent valg: %s"
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "Personlig informasjon"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "E-post"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 msgid "Access level"
 msgstr "Tilgangsnivå"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "Lagre"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "Passordet ditt er et standardpassord, \n"
 "\t\t\t\t\t\tVennligst bytt."
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "Nytt passord"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "Endre passord"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "Velg utseende"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "Ja"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "Nei"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "Lagre konfigurasjonen"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "Tilbake til standard"
 
-#: modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "Brukerdetaljer"
@@ -1990,10 +2123,6 @@ msgstr "Tilgangsnivå"
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr "Trykk for å endre"
-
 #: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "Ingen brukere er valgt"
@@ -2261,7 +2390,7 @@ msgstr "Skjul/vis leste nyhetsstrømmer"
 msgid "Sort feeds by unread count"
 msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
@@ -2326,8 +2455,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "Gammelt passord er feil"
 
 #: functions.js:634
 #, fuzzy
@@ -2391,219 +2521,264 @@ msgstr "Du kan ikke fjerne abonnement fra kategorien."
 msgid "Create Filter"
 msgstr "Lag filter"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+#, fuzzy
+msgid "Filter Test Results"
+msgstr "Filteruttrykk"
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: functions.js:1158
+#: functions.js:1197
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
+#: functions.js:1573
+#, fuzzy
+msgid "Feeds with update errors"
+msgstr "Oppdateringsfeil"
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "Fjerne valgte filtre?"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "(Motsatt)"
 
-#: prefs.js:91
+#: prefs.js:114
 msgid "Please enter login:"
 msgstr "Vennligst skriv inn brukernavn:"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr "Kan ikke legge til bruker: brukernavn mangler."
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Filtre"
 
-#: prefs.js:164
+#: prefs.js:187
 msgid "Remove filter %s?"
 msgstr "Fjerne %s filteret?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "Fjerne merkede merkelapper?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 
-#: prefs.js:310
+#: prefs.js:350
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "Ingen bruker er markert"
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "Fjerne valgte filtre?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "Ingen filtre er valgt"
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "Vennligst velg kun en nyhetsstrøm"
 
-#: prefs.js:420
+#: prefs.js:459
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Fjern alle ikke-favoriserte artikler i den valgte nyhetsstrømmen?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Hvor mange dager med artikler skal beholdes (0 - bruk standard)?"
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: prefs.js:490
-#, fuzzy
-msgid "No profiles selected."
-msgstr "Ingen artikkel er valgt."
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "Brukernavn kan ikke være blankt"
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "Vennligst velg kun en bruker"
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "Nullstill passordet til utvalgte bruker?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "Vennligst velg kun et filter"
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Nyhetsstrømsredigerer"
 
-#: prefs.js:705
+#: prefs.js:716
 msgid "Save changes to selected feeds?"
 msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 
-#: prefs.js:776
+#: prefs.js:802
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importer"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "Tilbakefør til standardinnstillingene"
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "Kategori:"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "Fjerne valgte kategorier?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "Ingen kategorier er valgt."
 
-#: prefs.js:1198
+#: prefs.js:1226
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Oppdateringsfeil"
+
+#: prefs.js:1275
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
 
-#: prefs.js:1307
+#: prefs.js:1384
 msgid "Rescore articles in selected feeds?"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
 
-#: prefs.js:1350
+#: prefs.js:1427
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Sett merkelappsfargene til standard?"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr ""
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Ingen artikkel er valgt."
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Fjerne valgte filtre?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 msgid "Label Editor"
 msgstr "Merkelappredigerer"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Endre stikkord"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Fjerne valgte filtre?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Ingen filtre er valgt"
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Vennligst velg kun et filter"
+
 #: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "Marker alle artikler som leste?"
@@ -2612,26 +2787,26 @@ msgstr "Marker alle artikler som leste?"
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 #, fuzzy
 msgid "New version available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
@@ -2684,40 +2859,62 @@ msgstr "Marker %d artikkel/artikler som leste?"
 msgid "Unable to load article."
 msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "Laster nyhetsstrømmer..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "Fjerne merkede merkelapper?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "Laster nyhetsstrømmer..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "Trykk for å endre"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr "Oppdaterer artikkel etter checksumbytte"
+
+#~ msgid "Use more accessible date/time format for headlines"
+#~ msgstr "Bruk mer brukervennlige dato/tidsformater for artiklene"
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "Sett artikler som uleste ved oppdatering"
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "Importerer OPML (bruker DOMDocument-utvidelsen)..."
+
+#~ msgid "Error: can't find body element."
+#~ msgstr "Feil: Kan ikke finne hovedelement."
+
+#, fuzzy
+#~ msgid "No profiles selected."
+#~ msgstr "Ingen artikkel er valgt."
+
 #~ msgid "Unknown error"
 #~ msgstr "Ukjent feil"
 
@@ -2907,9 +3104,6 @@ msgstr "Trykk for å endre"
 #~ msgid "No filters defined."
 #~ msgstr "Ingen filtre er valgt"
 
-#~ msgid "No matching filters found."
-#~ msgstr "Ingen filtre ble funnet."
-
 #~ msgid "Click to change color"
 #~ msgstr "Trykk for å endre farge"
 
@@ -3158,9 +3352,6 @@ msgstr "Trykk for å endre"
 #~ msgid "Could not update headlines (missing XML object)"
 #~ msgstr "Kunne ikke oppdatere overskriftene (manglende XML objekt)."
 
-#~ msgid "Entire feed"
-#~ msgstr "Hele nyhetsstrømmen"
-
 #~ msgid "Failed to load article in new window"
 #~ msgstr "Feilet med å åpne artikkel i nytt nettleservindu."
 
@@ -3719,16 +3910,10 @@ msgstr "Trykk for å endre"
 #~ msgid "Create Label"
 #~ msgstr "Lag merkelapp"
 
-#~ msgid "Test"
-#~ msgstr "Test"
-
 #, fuzzy
 #~ msgid "Perform action"
 #~ msgstr "Utfør handlingen"
 
-#~ msgid "Filter expression"
-#~ msgstr "Filteruttrykk"
-
 #~ msgid "Enable icons in feedlist"
 #~ msgstr "Tillat ikoner i nyhetsstrømslisten"
 

diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index e1c543378b9545d9648b05dbbd69e1b34fa31ceb..e7995dd364061dc4cda6ba8c48a023568ff0a2e3 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 1ebdf421ba8a9f1e8993756267d8301aba08622d..0c1364084bc78707c7ac8f822511c4a0fff566e7 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"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <metal@alucinados.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -17,102 +17,102 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "Usar o padrão"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "Nunca remover"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 semana atrás"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 semanas atrás"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 mês atrás"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 meses atrás"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 meses atrás"
 
-#: backend.php:81
+#: backend.php:80
 #, fuzzy
 msgid "Default interval"
 msgstr "Padrão"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Desabilitar updates"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Cada 30 minutos"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Toda hora"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Cada 4 horas"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Cada 12 horas"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Diariamente"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "Padrão"
 
-#: backend.php:103
+#: backend.php:102
 #, fuzzy
 msgid "Magpie"
 msgstr "Página"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "Usuário"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr ""
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 #, fuzzy
 msgid "Feeds"
 msgstr "Feed"
@@ -122,17 +122,17 @@ msgstr "Feed"
 msgid "Article not found."
 msgstr "Feed não encontrado."
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr ""
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -162,56 +162,71 @@ msgstr ", encontrou:"
 msgid "Tiny Tiny RSS database is up to date."
 msgstr ""
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr "Faça uma cópia-de-segurança de seus dados antes de prosseguir."
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
 "<b>%d</b>)."
 msgstr ""
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr ""
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr ""
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Atualizando para a versão %d..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "Verificando a versão…"
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "ERRO!"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
 "\t\t\tversion <b>%d</b>."
 msgstr ""
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -219,11 +234,11 @@ msgid ""
 "\t\t\tbrowser settings."
 msgstr ""
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "Olá,"
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "Sair"
@@ -302,278 +317,282 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr ""
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr ""
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr ""
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr ""
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr ""
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 #, fuzzy
 msgid "All articles"
 msgstr "Favoritos"
 
-#: functions.php:3050
+#: functions.php:3217
 #, fuzzy
 msgid "Archived articles"
 msgstr "Favoritos"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "Selecione:"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "Todos"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "Não Lido"
 
-#: functions.php:4021
+#: functions.php:4244
 #, fuzzy
 msgid "Invert"
 msgstr "(Inverso)"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "Nenhum"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "Ações..."
 
-#: functions.php:4030
+#: functions.php:4253
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Seleção"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "Favoritos"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "Publicado"
 
-#: functions.php:4036
+#: functions.php:4259
 #, fuzzy
 msgid "Selection:"
 msgstr "Seleção"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4043
+#: functions.php:4266
 msgid "Move back"
 msgstr ""
 
-#: functions.php:4044
+#: functions.php:4267
 #, fuzzy
 msgid "Delete"
 msgstr "Padrão"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 msgid "Feed:"
 msgstr "Feed:"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "Editar Tags"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 msgid "Visit the website"
 msgstr ""
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Todos os feeds"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "Favoritos"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "sem tags"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 msgid "Open article in new tab"
 msgstr ""
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "Editar Tags"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "Fechar esta janela"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 #, fuzzy
 msgid "mark as read"
 msgstr "Marcar como lido"
 
-#: functions.php:5229
+#: functions.php:5457
 msgid "Dismiss article"
 msgstr ""
 
-#: functions.php:5248
+#: functions.php:5476
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5251
+#: functions.php:5479
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5254
+#: functions.php:5482
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5260
+#: functions.php:5488
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 #, fuzzy
 msgid "Create label..."
 msgstr "Criar um usuário"
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "Remover"
 
-#: functions.php:6110
+#: functions.php:6343
 msgid "Assign:"
 msgstr ""
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "sem tags"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+msgid "(edit note)"
 msgstr ""
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: functions.php:6774
+#: functions.php:7013
 #, fuzzy
 msgid "unknown type"
 msgstr "Erro desconhecido"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr ""
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "Título"
 
@@ -612,7 +631,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr "sem tags"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr ""
 
@@ -672,11 +691,11 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
-msgid "Purge old posts after this number of days (0 - disables)"
+msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
 
 #: localized_schema.php:27
-msgid "Update post on checksum change"
+msgid "Purge old posts after this number of days (0 - disables)"
 msgstr ""
 
 #: localized_schema.php:28
@@ -710,99 +729,95 @@ msgid "Long date format"
 msgstr "Formato de data longo"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr ""
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr ""
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr ""
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr ""
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr ""
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr ""
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr ""
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr ""
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "Confirme marcando o Feed como lido"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr ""
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr ""
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr ""
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 #, fuzzy
 msgid "Mark articles in e-mail digest as read"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr ""
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr ""
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr ""
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr ""
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr ""
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 msgid "Sort headlines by feed date"
 msgstr ""
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 msgid "Customize stylesheet"
 msgstr ""
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "Login:"
@@ -837,216 +852,216 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "Utilitário OPML"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
 msgstr "Importando OPML (usando a extensão DOMXML)..."
 
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "Importando OPML (usando a extensão DOMDocument)…"
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-"A extensão DOMXML não foi encontrada. Ela é exigida para versões do PHP "
-"menores que 5."
-
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "Retornar às preferências"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "Sair das preferências"
-
-#: prefs.php:91
+#: prefs.php:83
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "Sair das preferências"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "Preferências"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 #, fuzzy
 msgid "Filters"
 msgstr "Arquivo:"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 #, fuzzy
 msgid "Users"
 msgstr "Usuário"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "Link"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr ""
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
 "password is sent."
 msgstr ""
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr ""
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr ""
 
-#: register.php:184
+#: register.php:185
 #, fuzzy
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr ""
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr ""
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr ""
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr ""
 
-#: register.php:241
+#: register.php:242
 #, fuzzy
 msgid "Registration failed."
 msgstr "A checagem da configuração falhou"
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr ""
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 #, fuzzy
 msgid "Comments?"
 msgstr "Conteúdo"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Todos os feeds"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 #, fuzzy
 msgid "Show articles"
 msgstr "Favoritos"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr ""
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "Atualizado"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 #, fuzzy
 msgid "Sort articles"
 msgstr "Favoritos"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 #, fuzzy
 msgid "Date"
 msgstr "Atualizar"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "Atualizar"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr ""
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "Ações do Feed:"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "Removendo o Feed..."
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "Editar"
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 #, fuzzy
 msgid "Rescore feed"
 msgstr "Removendo o Feed..."
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr ""
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "Todos os Feeds:"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr ""
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "Outras ações:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "núvem de tags"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 #, fuzzy
 msgid "Create filter..."
 msgstr "Criar um usuário"
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1059,24 +1074,24 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "Remover as categorias selecionadas?"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 msgid "Your request could not be completed."
 msgstr ""
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 msgid "Category update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 msgid "Can't update this kind of feed."
 msgstr ""
 
@@ -1089,7 +1104,7 @@ msgstr "Olá,"
 msgid "Help topic not found."
 msgstr "Tópico de ajuda não encontrado."
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Adicionando a categoria <b>%s</b>."
@@ -1099,27 +1114,23 @@ msgstr "Adicionando a categoria <b>%s</b>."
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 msgid "is already imported."
 msgstr ""
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr ""
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr ""
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr ""
-
 #: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
@@ -1130,6 +1141,12 @@ msgstr "Importando OPML (usando a extensão DOMXML)..."
 msgid "Importing using DOMDocument."
 msgstr "Importando OPML (usando a extensão DOMDocument)…"
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+"A extensão DOMXML não foi encontrada. Ela é exigida para versões do PHP "
+"menores que 5."
+
 #: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
@@ -1157,7 +1174,7 @@ msgstr ""
 msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Gerar um outro endereço"
@@ -1184,13 +1201,13 @@ msgid ""
 "contact instance owner."
 msgstr ""
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "Feed"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 #, fuzzy
 msgid "Place in category:"
 msgstr "Salvando categoria..."
@@ -1200,19 +1217,19 @@ msgstr "Salvando categoria..."
 msgid "Available feeds"
 msgstr "Todos os feeds"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr ""
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "Login"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
@@ -1231,17 +1248,18 @@ msgid "More feeds"
 msgstr "Removendo o Feed..."
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr ""
 
@@ -1260,9 +1278,10 @@ msgstr "Ações do Feed:"
 msgid "limit:"
 msgstr "Limite:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "Remover"
 
@@ -1286,131 +1305,147 @@ msgstr ""
 msgid "This feed"
 msgstr ""
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr ""
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 #, fuzzy
 msgid "after"
 msgstr "Atualizar"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr ""
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 #, fuzzy
 msgid "in"
 msgstr "Link"
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 #, fuzzy
 msgid "Perform Action"
 msgstr "Ação"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 #, fuzzy
 msgid "Options"
 msgstr "Opções:"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "Ativado"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr ""
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr "Teste"
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "Criar"
 
-#: modules/popup-dialog.php:542
+#: modules/popup-dialog.php:571
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr ""
+
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
 #, fuzzy
-msgid "Feeds with update errors"
-msgstr "Atualizar"
+msgid "Click to edit feed"
+msgstr "Favoritos"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "Removendo o Feed..."
+
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "Salvar"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvem de tags"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Favoritos"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 msgid "To:"
 msgstr ""
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "Selecione:"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Mudar E-mail"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 #, fuzzy
 msgid "Details"
 msgstr "Diariamente"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1418,310 +1453,407 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+#, fuzzy
+msgid "URL:"
+msgstr "Feed URL:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "Nível de acesso:"
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "Nível de acesso:"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "Gerar um outro endereço"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "Criar"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr ""
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "Título"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-#, fuzzy
-msgid "URL:"
-msgstr "Feed URL:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr ""
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr ""
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr ""
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 msgid "Cache images locally (SimplePie only)"
 msgstr ""
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Marcando todos os feeds como lidos..."
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 #, fuzzy
 msgid "Icon"
 msgstr "Ação"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "Removendo o Feed..."
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Removendo o Feed..."
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "A categoria <b>$%s</b> já existe na base de dados."
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "Criar categoria"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr ""
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Remover as categorias selecionadas?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de Feed"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Editar"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "Selecione:"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr ""
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Removendo filtros selecionados…"
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Remover as categorias selecionadas?"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "Categoria:"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 #, fuzzy
 msgid "More actions..."
 msgstr "Ações..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 #, fuzzy
 msgid "Clear feed data"
 msgstr "Salvando o Feed..."
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "Importar"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 msgid "Display URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Informações do Feed:"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Removendo o Feed..."
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr ""
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Remover os filtros selecionados?"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "Título"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Salvando o Feed..."
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 #, fuzzy
 msgid "No feeds found."
 msgstr "Sem Feeds para exibir."
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "Sem Feeds para exibir."
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr ""
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "Editar"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+#, fuzzy
+msgid "Your access level is insufficient to open this tab."
+msgstr "Seu nível de acesso é insuficiente para executar esse script."
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "Removendo o Feed..."
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr ""
+
 #: modules/pref-labels.php:21
 #, fuzzy
 msgid "Caption"
@@ -1754,117 +1886,116 @@ msgstr ""
 msgid "Clear colors"
 msgstr "Favoritos"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "A senha antiga não pode ser vazia."
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "A nova senha não pode ser vazia."
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "As senhas informadas não conferem."
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr ""
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "Senha antiga incorreta"
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr ""
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr ""
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr ""
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "E-mail"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 #, fuzzy
 msgid "Access level"
 msgstr "Nível de acesso:"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "Salvar"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "Sua senha é a padrão, \n"
 "\t\t\t\t\t\tvocê deve mudá-la."
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "Senha nova"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "Confirmar senha"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "Mudar senha"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "Selecionar o tema"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "Sim"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "Não"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "Salvar configuração"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/pref-users.php:7
-#, fuzzy
-msgid "Your access level is insufficient to open this tab."
-msgstr "Seu nível de acesso é insuficiente para executar esse script."
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "Detalhes do usuário"
@@ -1965,10 +2096,6 @@ msgstr "Nível de acesso"
 msgid "Last login"
 msgstr "Último Login"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr ""
-
 #: modules/pref-users.php:489
 #, fuzzy
 msgid "No users defined."
@@ -2239,7 +2366,7 @@ msgstr "Favoritos"
 msgid "Sort feeds by unread count"
 msgstr ""
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
@@ -2305,8 +2432,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "Senha antiga incorreta"
 
 #: functions.js:634
 #, fuzzy
@@ -2370,223 +2498,267 @@ msgstr ""
 msgid "Create Filter"
 msgstr "Criar um usuário"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+msgid "Filter Test Results"
+msgstr ""
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr ""
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Salvando categoria..."
 
-#: functions.js:1158
+#: functions.js:1197
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Editar"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "Removendo o Feed..."
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
+#: functions.js:1573
+#, fuzzy
+msgid "Feeds with update errors"
+msgstr "Atualizar"
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "Remover os filtros selecionados?"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "(Inverso)"
 
-#: prefs.js:91
+#: prefs.js:114
 #, fuzzy
 msgid "Please enter login:"
 msgstr "Último Login"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr ""
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Arquivo:"
 
-#: prefs.js:164
+#: prefs.js:187
 #, fuzzy
 msgid "Remove filter %s?"
 msgstr "Remover os filtros selecionados?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr ""
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr ""
 
-#: prefs.js:310
+#: prefs.js:350
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "Nenhum usuário foi selecionado."
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "Remover os filtros selecionados?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr ""
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "Por favor selecione somente um feed"
 
-#: prefs.js:420
+#: prefs.js:459
 #, fuzzy
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Remover os filtros selecionados?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: prefs.js:490
-#, fuzzy
-msgid "No profiles selected."
-msgstr "Nenhum filtro foi selecionado."
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "O campo de Login não pode ser vazio."
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "Por favor selecione somente um usuário."
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr ""
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "Por favor selecione somente um filtro."
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor de Feed"
 
-#: prefs.js:705
+#: prefs.js:716
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "Remover os filtros selecionados?"
 
-#: prefs.js:776
+#: prefs.js:802
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importar"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Por favor selecione somente um filtro."
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr ""
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "Categoria:"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "Remover as categorias selecionadas?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "Nenhuma categoria foi selecionada."
 
-#: prefs.js:1198
+#: prefs.js:1226
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Atualizar"
+
+#: prefs.js:1275
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
-#: prefs.js:1307
+#: prefs.js:1384
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "Remover os filtros selecionados?"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: prefs.js:1350
+#: prefs.js:1427
 msgid "Reset selected labels to default colors?"
 msgstr ""
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr ""
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Remover os filtros selecionados?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 #, fuzzy
 msgid "Label Editor"
 msgstr "Editor de Feed"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Editar Tags"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Remover os filtros selecionados?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Nenhum filtro foi selecionado."
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Por favor selecione somente um filtro."
+
 #: tt-rss.js:147
 #, fuzzy
 msgid "Mark all articles as read?"
@@ -2596,26 +2768,26 @@ msgstr "Marcando todos os feeds como lidos..."
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr ""
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "Favoritos"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 msgid "New version available!"
 msgstr ""
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr ""
 
@@ -2668,39 +2840,49 @@ msgstr ""
 msgid "Unable to load article."
 msgstr "Favoritos"
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "Salvando o Feed..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "Favoritos"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 msgid "View in a tt-rss tab"
 msgstr ""
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "Remover"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "Salvando o Feed..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "Favoritos"
 
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "Importando OPML (usando a extensão DOMXML)..."
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "Importando OPML (usando a extensão DOMDocument)…"
+
+#, fuzzy
+#~ msgid "No profiles selected."
+#~ msgstr "Nenhum filtro foi selecionado."
+
 #~ msgid "Unknown error"
 #~ msgstr "Erro desconhecido"
 
@@ -2740,10 +2922,6 @@ msgstr "Favoritos"
 #~ msgid "Edit feeds"
 #~ msgstr "Editar"
 
-#, fuzzy
-#~ msgid "No matching feeds found."
-#~ msgstr "Sem Feeds para exibir."
-
 #, fuzzy
 #~ msgid "Filter Editor"
 #~ msgstr "Editor de Feed"
@@ -2877,10 +3055,6 @@ msgstr "Favoritos"
 #~ msgid "comments"
 #~ msgstr "Conteúdo"
 
-#, fuzzy
-#~ msgid "Entire feed"
-#~ msgstr "Editar"
-
 #, fuzzy
 #~ msgid "Feed icon removed."
 #~ msgstr "Feed não encontrado."
@@ -3131,9 +3305,6 @@ msgstr "Favoritos"
 #~ msgid "Match all unread articles:"
 #~ msgstr "Favoritos"
 
-#~ msgid "Test"
-#~ msgstr "Teste"
-
 #, fuzzy
 #~ msgid "Perform action"
 #~ msgstr "Ação"

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index cdcb5023d7aac58318d0c613c556c311dd3b4eb6..f1b75d6fe40afd8f9e7524ff573731cafb0b2793 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 5c99c6a6ffacc90b38b83bbc19b75658ea772fd6..62f2bf17cbdcc9a635771e7074335147bbf8082f 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"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2009-05-29 14:38+0300\n"
 "Last-Translator: Max Kamashev <max.kamashev@floscoeli.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -22,100 +22,100 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "По умолчанию"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "Никогда"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "Неделя"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "Две недели"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "Один месяц"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "Два месяца"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "Три месяца"
 
-#: backend.php:81
+#: backend.php:80
 msgid "Default interval"
 msgstr "Интервал обновления:"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "Не обновлять"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "Каждые 15 минут"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "Каждые 30 минут"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "Каждый час"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "Каждые 4 часа"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "Каждые 12 часов"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "Раз в день"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "Раз в неделю"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "По умолчанию"
 
-#: backend.php:103
+#: backend.php:102
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "Пользователь"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr "Активный пользователь"
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "Администратор"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 msgid "Feeds"
 msgstr "Каналы"
 
@@ -124,17 +124,17 @@ msgstr "Каналы"
 msgid "Article not found."
 msgstr "Канал не найден."
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -164,18 +164,18 @@ msgstr ", найдена: "
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS база данных обновлена."
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr "Пожалуйста, сохраните вашу базу данных перед продолжением."
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -184,32 +184,32 @@ msgstr ""
 "Вашей базе данных Tiny Tiny RSS необходимо обновиться до последней версии  "
 "(<b>%d</b> до <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "Применить обновления"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "Идет обновление..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Обновляется до версии %d..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "Проверяется версия... "
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "Ошибка!"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -218,6 +218,21 @@ msgstr ""
 "Обновление завершено. Выполнено <b>%d</b> обновление(ий) схемы базы данных "
 "до версии <b>%d</b>."
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 #, fuzzy
 msgid ""
@@ -229,11 +244,11 @@ msgstr ""
 "\t\tдля функционала этой программы. Пожалуйста, проверьте\n"
 "\t\tнастройки вашего браузера."
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "Привет,"
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "Выход"
@@ -322,214 +337,222 @@ msgstr ""
 "неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
 "конфигурацию PHP"
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Ошибка проверки сессии (некорректный IP)"
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr "Некорректное имя пользователя или пароль"
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr "Свежие"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 msgid "All articles"
 msgstr "Все статьи"
 
-#: functions.php:3050
+#: functions.php:3217
 #, fuzzy
 msgid "Archived articles"
 msgstr "Сохранённые статьи"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "Все"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:4021
+#: functions.php:4244
 msgid "Invert"
 msgstr "Инвертировать"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "Действия..."
 
-#: functions.php:4030
+#: functions.php:4253
 msgid "Selection toggle:"
 msgstr "Переключить выбранное:"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:4036
+#: functions.php:4259
 msgid "Selection:"
 msgstr "Выбрано:"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4043
+#: functions.php:4266
 #, fuzzy
 msgid "Move back"
 msgstr "Идти назад"
 
-#: functions.php:4044
+#: functions.php:4267
 #, fuzzy
 msgid "Delete"
 msgstr "По умолчанию"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 msgid "Feed:"
 msgstr "Канал:"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "Теги"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 #, fuzzy
 msgid "Visit the website"
 msgstr "Посетить официальный сайт"
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Каналы"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "Щёлкните для редактирования"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 msgid " - "
 msgstr " - "
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "нет тегов"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Открыть статью в новом окне"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "Редактировать теги"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "Закрыть это окно"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 #, fuzzy
 msgid "Feed URL"
 msgstr "Канал"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 msgid "mark as read"
 msgstr "Отметить как прочитанные"
 
-#: functions.php:5229
+#: functions.php:5457
 #, fuzzy
 msgid "Dismiss article"
 msgstr "Опубликовать"
 
-#: functions.php:5248
+#: functions.php:5476
 msgid "No unread articles found to display."
 msgstr "Не найдено не прочитанных статей"
 
-#: functions.php:5251
+#: functions.php:5479
 msgid "No updated articles found to display."
 msgstr "Не найдено не прочитанных статей."
 
-#: functions.php:5254
+#: functions.php:5482
 msgid "No starred articles found to display."
 msgstr "Не найдено отмеченных статей"
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -537,58 +560,55 @@ msgstr ""
 "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
 "Действия) или используйте фильтр."
 
-#: functions.php:5260
+#: functions.php:5488
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 msgid "Create label..."
 msgstr "Создать метку..."
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "Удалить"
 
-#: functions.php:6110
+#: functions.php:6343
 #, fuzzy
 msgid "Assign:"
 msgstr "Применить метку:"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "нет тегов"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+#, fuzzy
+msgid "(edit note)"
 msgstr "править заметку"
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
-#: functions.php:6774
+#: functions.php:7013
 msgid "unknown type"
 msgstr "Неизвестный тип"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr "Вложение:"
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr "Вложения:"
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "Заголовок"
 
@@ -625,7 +645,7 @@ msgstr "Опубликовать"
 msgid "Assign tags"
 msgstr "Применить теги"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr "Применить метку"
 
@@ -701,12 +721,12 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "Стирать статьи старше этого количества дней (0 - выключает)"
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
 
 #: localized_schema.php:27
-msgid "Update post on checksum change"
-msgstr "Ð\9eбновлÑ\8fÑ\82Ñ\8c Ñ\81Ñ\82аÑ\82Ñ\8cÑ\8e пÑ\80и изменении конÑ\82Ñ\80олÑ\8cной Ñ\81Ñ\83ммÑ\8b"
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "СÑ\82иÑ\80аÑ\82Ñ\8c Ñ\81Ñ\82аÑ\82Ñ\8cи Ñ\81Ñ\82аÑ\80Ñ\88е Ñ\8dÑ\82ого колиÑ\87еÑ\81Ñ\82ва дней (0 - вÑ\8bклÑ\8eÑ\87аеÑ\82)"
 
 #: localized_schema.php:28
 #, fuzzy
@@ -739,100 +759,96 @@ msgid "Long date format"
 msgstr "Длинный формат даты"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr "Использовать более удобный формат отображения даты/времени"
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "Комбинированный режим отображения"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "Спрятать каналы без непрочитанных статей"
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "Показывать следующий канал при отметке как прочитанный"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "Сортировать каналы по количеству непрочитанных статей"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "Установить статьи как не прочитанные при обновлении"
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "Обратный порядок заголовков (старые впереди)"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "Включить почтовый дайджест"
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "Подтвердить отметку каналка как прочитанный"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "Автоматически раскрывать статьи в комбинированном режиме"
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "Вырезать небезопасные теги из статей"
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "Черный список тегов"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "Максимальный возраст свежих статей (в часах)"
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 msgid "Mark articles in e-mail digest as read"
 msgstr "Отметить все статьи в e-mail дайджесте как прочитанные?"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr "Автоматически раскрывать статьи в комбинированном режиме"
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr "Очистить непрочитанные статьи"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr "Показывать специальные каналы, когда скрываются прочитанные каналы"
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr "Группировать заголовки в виртуальные каналы"
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr "Не показывать изображения в статьях"
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr ""
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 #, fuzzy
 msgid "Sort headlines by feed date"
 msgstr "Сортировать каналы по количеству непрочитанных статей"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL пользовательского файла стилей"
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "Логин:"
@@ -866,48 +882,46 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "Утилита OPML"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
 msgstr "Импортирую OPML (с помощью расширения DOMXML)..."
 
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "Импортирую OPML (с помощью расширения DOMDocument)..."
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr "Расширение DOMXML не найдено. Оно необходимо для версий PHP старее 5."
-
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "Вернуться к настройкам"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "Закрыть настройки"
-
-#: prefs.php:91
+#: prefs.php:83
 msgid "Keyboard shortcuts"
 msgstr "Горячие Клавиши"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "Закрыть настройки"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "Настройки"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 msgid "Filters"
 msgstr "Фильтры"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 msgid "Users"
 msgstr "Пользователи"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "Ссылка"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr "Регистрация новых пользователей запрещена."
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -916,154 +930,158 @@ msgstr ""
 "Временный пароль будет отправлен на указанный e-mail. Если аккаунт не будет "
 "активирован в течении 24 часов, то он будет удалён."
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr "Желаемый логин:"
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr "Проверить доступность"
 
-#: register.php:184
+#: register.php:185
 msgid "Email:"
 msgstr "E-mail: "
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr "Сколько будет, два плюс два:"
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr "Зарегистрироваться"
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr "Не полностью заполнена ваша регистрационная информация."
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr "Извините, такое имя пользователя уже существует."
 
-#: register.php:241
+#: register.php:242
 msgid "Registration failed."
 msgstr "Неудачная регистрация."
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr "Аккаунт успешно создан."
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr "Регистрация новых пользователей временно закрыта."
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 msgid "Comments?"
 msgstr "Комментарии?"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 msgid "Collapse feedlist"
 msgstr "Свернуть список каналов"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 #, fuzzy
 msgid "Show articles"
 msgstr "Сохранённые статьи"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr "Игнорировать Оценки"
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "Обновлено"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 #, fuzzy
 msgid "Sort articles"
 msgstr "Сохранённые статьи"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 msgid "Date"
 msgstr "Дата"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr "Оценка"
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "Обновить"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr "Поиск..."
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "Действия над каналами:"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 msgid "Subscribe to feed..."
 msgstr "Подписаться на канал..."
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 msgid "Edit this feed..."
 msgstr "Редактировать канал..."
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 msgid "Rescore feed"
 msgstr "Заново оценить канал"
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "Все каналы:"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "облако тегов"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 msgid "Create filter..."
 msgstr "Создать фильтр..."
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Горячие Клавиши"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1076,26 +1094,26 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "Зарегистрирован"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Не полностью заполнена ваша регистрационная информация."
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "Пароль был изменен."
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
@@ -1108,7 +1126,7 @@ msgstr "Помощь"
 msgid "Help topic not found."
 msgstr "Раздел помощи не найден."
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Добавляется категория <b>%s</b>."
@@ -1118,28 +1136,24 @@ msgstr "Добавляется категория <b>%s</b>."
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 #, fuzzy
 msgid "is already imported."
 msgstr "Уже импортирован."
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "Ошибка при разборе документа."
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "Ошибка: пожалуйста загрузите OPML файл."
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr "Ошибка: не могу найти тело элемента"
-
 #: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
@@ -1150,6 +1164,10 @@ msgstr "Импортирую OPML (с помощью расширения DOMXML
 msgid "Importing using DOMDocument."
 msgstr "Импортирую OPML (с помощью расширения DOMDocument)..."
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr "Расширение DOMXML не найдено. Оно необходимо для версий PHP старее 5."
+
 #: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
@@ -1179,7 +1197,7 @@ msgstr ""
 msgid "Your Public OPML URL is:"
 msgstr "Ссылка на общий канал со статьями."
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Генерировать канал"
@@ -1212,13 +1230,13 @@ msgstr ""
 "Это обозначает что существует проблема подобная краху или зависанию демона.\n"
 "Пожалуйста проверьте процесс демона или сообщите администратору."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "Канал"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 msgid "Place in category:"
 msgstr "Поместить в категорию..."
 
@@ -1227,19 +1245,19 @@ msgstr "Поместить в категорию..."
 msgid "Available feeds"
 msgstr "Все каналы"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "Авторизация"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "Пользователь:"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -1258,17 +1276,18 @@ msgid "More feeds"
 msgstr "Больше каналов"
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "Отмена"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "Поиск"
 
@@ -1287,9 +1306,10 @@ msgstr "Действия над каналом:"
 msgid "limit:"
 msgstr "Сколько:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "Удалить"
 
@@ -1314,128 +1334,145 @@ msgstr "Ограничить поиск:"
 msgid "This feed"
 msgstr "Этот канал"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "Искать"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr "перед"
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 msgid "after"
 msgstr "после"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr "Проверить"
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr "по полю:"
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 msgid "in"
 msgstr "в"
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 msgid "Perform Action"
 msgstr "Выполнить действия"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr "с параметрами:"
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "Опции:"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "Включен"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "Инвертировать фильтр"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr "Проверить"
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "Создать"
 
-#: modules/popup-dialog.php:542
+#: modules/popup-dialog.php:571
 #, fuzzy
-msgid "Feeds with update errors"
-msgstr "Ошибки обновления"
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr "Эти каналы не были обновлены из-за ошибок:"
+
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "Щёлкните для редактирования"
+
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "Отписаться от выбранных каналов?"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не были обновлены из-за ошибок:"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "Сохранить"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Облако тегов"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Все статьи"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 #, fuzzy
 msgid "To:"
 msgstr "Топ"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "Выбрать:"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Изменить e-mail"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 #, fuzzy
 msgid "Details"
 msgstr "Раз в день"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1443,196 +1480,255 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+msgid "URL:"
+msgstr "URL:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "Уровень доступа:"
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "Уровень доступа:"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "Генерировать канал"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "Создать"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr "Проверить доступность поля"
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "Заголовок"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-msgid "URL:"
-msgstr "URL:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr "использование"
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "Удаление сообщений:"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Спрятать из моего списка каналов"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "Язык канала пишется справа налево"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "Включить в e-mail дайджест"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 #, fuzzy
 msgid "Cache images locally (SimplePie only)"
 msgstr "Кэшировать изображения локально"
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Пометить все статьи как прочитанные?"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 #, fuzzy
 msgid "Icon"
 msgstr "Действие"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "Подписаны каналы:"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr "Кэшировать изображения локально"
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr "Всё выполнено."
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Отписаться от выбранных каналов?"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr "Редактировать опции  подписки"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Удалить выбранные категории?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Редактор канала"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "Весь канал"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "Выбрать:"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Очистка выбранных каналов..."
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Сбросить пароль"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "Категория:"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 #, fuzzy
 msgid "More actions..."
 msgstr "Действия..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr "Ручная очистка"
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 msgid "Clear feed data"
 msgstr "Очистить данные канала."
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 msgid "Rescore articles"
 msgstr "Заново оценить статьи"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "Импортировать"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1641,23 +1737,23 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 #, fuzzy
 msgid "Display URL"
 msgstr "показать теги"
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Интеграция в Firefox"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1665,36 +1761,36 @@ msgstr ""
 "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
 "Для этого щёлкните по ссылке ниже."
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1702,58 +1798,95 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "Заголовок"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Очистить данные канала."
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Отмеченные"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "Не найдено совпадений с фильтром."
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Добавлен фильтр <b>%s</b>"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "Редактировать"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr "Вашего уровня доступа недостаточно для открытия этой вкладки."
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "Больше каналов"
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "Щёлкните для редактирования"
+
 #: modules/pref-labels.php:21
 msgid "Caption"
 msgstr "Заголовок"
@@ -1786,115 +1919,115 @@ msgstr "Создать метку"
 msgid "Clear colors"
 msgstr "Очистить цвета"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "Старый пароль не может быть пустым."
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "Новый пароль не может быть пустым."
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "Пароль был изменен."
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "Старый пароль неправилен."
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "Конфигурация сохранена."
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Неизвестная опция: %s"
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "Личные данные"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "E-mail"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 msgid "Access level"
 msgstr "Уровень доступа:"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "Сохранить"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "Используется пароль по умолчанию, \n"
 "\t\t\t\t\t\tпожалуйста, измените его."
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "Новый пароль"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "Выбор темы"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "Да"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "Нет"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "Сохранить конфигурацию"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "Сбросить настройки"
 
-#: modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr "Вашего уровня доступа недостаточно для открытия этой вкладки."
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "Подробнее..."
@@ -1987,10 +2120,6 @@ msgstr "Уровень доступа:"
 msgid "Last login"
 msgstr "Последний вход"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr "Щёлкните для редактирования"
-
 #: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "Пользователи не определены."
@@ -2258,7 +2387,7 @@ msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
 msgid "Sort feeds by unread count"
 msgstr "Сортировать каналы по количеству непрочитанных статей"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 msgid "Mark all articles in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
@@ -2323,8 +2452,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "Старый пароль неправилен."
 
 #: functions.js:634
 #, fuzzy
@@ -2388,220 +2518,265 @@ msgstr "Нельзя отписаться от категории."
 msgid "Create Filter"
 msgstr "Создать фильтр"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+#, fuzzy
+msgid "Filter Test Results"
+msgstr "Выражение"
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "Отписаться от %s?"
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Пожалуйста, укажите заметку для статьи:"
 
-#: functions.js:1158
+#: functions.js:1197
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Редактировать канал"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "Больше каналов"
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "Нет выбранных каналов."
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
+#: functions.js:1573
+#, fuzzy
+msgid "Feeds with update errors"
+msgstr "Ошибки обновления"
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "Удалить выбранные фильтры?"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "(Инвертирован)"
 
-#: prefs.js:91
+#: prefs.js:114
 msgid "Please enter login:"
 msgstr "Пожалуйста, введите логин:"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr "Не могу добавить пользователя: не указан логин."
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Фильтры"
 
-#: prefs.js:164
+#: prefs.js:187
 msgid "Remove filter %s?"
 msgstr "Удалить фильтр %s?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "Удалить выбранные метки?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "Нет выбранных меток."
 
-#: prefs.js:310
+#: prefs.js:350
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "Нет выбранных пользователей."
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "Удалить выбранные фильтры?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "Нет выбранных фильтров."
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "Отписаться от выбранных каналов?"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "Пожалуйста выберите только один канал."
 
-#: prefs.js:420
+#: prefs.js:459
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Стереть все не отмеченные статьи в выбранном канале?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Сколько дней хранить статьи (0 - по умолчанию)?"
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: prefs.js:490
-#, fuzzy
-msgid "No profiles selected."
-msgstr "Статья не выбрана"
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "Поле логина не может быть пустым."
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "Пожалуйста выберите только одного пользователя."
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "Сбросить пароль выбранного пользователя?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "Пожалуйста выберите только один фильтр."
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Редактор канала"
 
-#: prefs.js:705
+#: prefs.js:716
 msgid "Save changes to selected feeds?"
 msgstr "Сохранить изменения выбранных каналов?"
 
-#: prefs.js:776
+#: prefs.js:802
 #, fuzzy
 msgid "OPML Import"
 msgstr "Импортировать"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "Сбросить настройки?"
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "Категория:"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "Удалить выбранные категории?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "Нет выбранных категорий."
 
-#: prefs.js:1198
+#: prefs.js:1226
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Ошибки обновления"
+
+#: prefs.js:1275
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Изменить текущий адрес публикации на новый?"
 
-#: prefs.js:1307
+#: prefs.js:1384
 msgid "Rescore articles in selected feeds?"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Оценить заново все статьи? Эта операция может продолжаться длительное время."
 
-#: prefs.js:1350
+#: prefs.js:1427
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Сбросить метку цветов, на цвета по умолчанию?"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr ""
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Статья не выбрана"
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Удалить выбранные фильтры?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 msgid "Label Editor"
 msgstr "Редактор Меток"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Редактировать теги"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Удалить выбранные фильтры?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Нет выбранных фильтров."
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Пожалуйста выберите только один фильтр."
+
 #: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "Пометить все статьи как прочитанные?"
@@ -2610,26 +2785,26 @@ msgstr "Пометить все статьи как прочитанные?"
 msgid "You can't unsubscribe from the category."
 msgstr "Нельзя отписаться от категории."
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr "Вы не можете снова оценить этот канал."
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 msgid "Rescore articles in %s?"
 msgstr "Установить оценку статьям в %s?"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 #, fuzzy
 msgid "New version available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 
@@ -2682,40 +2857,62 @@ msgstr "Отметить %d статью(ей) как прочитанные?"
 msgid "Unable to load article."
 msgstr "Ошибка: пожалуйста загрузите OPML файл."
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "Загрузка списка каналов..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Открыть статью в новом окне"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "Удалить выбранные метки?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "Загрузка списка каналов..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "Щёлкните для редактирования"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr "Обновлять статью при изменении контрольной суммы"
+
+#~ msgid "Use more accessible date/time format for headlines"
+#~ msgstr "Использовать более удобный формат отображения даты/времени"
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "Установить статьи как не прочитанные при обновлении"
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "Импортирую OPML (с помощью расширения DOMXML)..."
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "Импортирую OPML (с помощью расширения DOMDocument)..."
+
+#~ msgid "Error: can't find body element."
+#~ msgstr "Ошибка: не могу найти тело элемента"
+
+#, fuzzy
+#~ msgid "No profiles selected."
+#~ msgstr "Статья не выбрана"
+
 #~ msgid "Unknown error"
 #~ msgstr "Неизвестная ошибка"
 
@@ -2902,9 +3099,6 @@ msgstr "Щёлкните для редактирования"
 #~ msgid "No filters defined."
 #~ msgstr "Фильтры отсутствуют."
 
-#~ msgid "No matching filters found."
-#~ msgstr "Не найдено совпадений с фильтром."
-
 #~ msgid "Click to change color"
 #~ msgstr "Щёлкните для изменения цвета"
 
@@ -3150,9 +3344,6 @@ msgstr "Щёлкните для редактирования"
 #~ msgid "Could not update headlines (missing XML object)"
 #~ msgstr "Не могу обновить заголовки (отсутствует XML объект)"
 
-#~ msgid "Entire feed"
-#~ msgstr "Весь канал"
-
 #~ msgid "Failed to load article in new window"
 #~ msgstr "Ошибка загрузки статей в новом окне"
 
@@ -3697,16 +3888,10 @@ msgstr "Щёлкните для редактирования"
 #~ msgid "Create Label"
 #~ msgstr "Создать метку"
 
-#~ msgid "Test"
-#~ msgstr "Проверить"
-
 #, fuzzy
 #~ msgid "Perform action"
 #~ msgstr "Применить обновления"
 
-#~ msgid "Filter expression"
-#~ msgstr "Выражение"
-
 #~ msgid "Caption:"
 #~ msgstr "Заголовок:"
 

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 01f8e77a7350bc99703bb0cbed80f2cd4ec2673f..aa0fa63f5093a155bdedac1afc6303e393172778 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 f53556f7b03cc87d73cb13eb5efd5eee3d6f9003..e3157618eb0d8df033ac0943d6d271aea39d2bc9 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -13,102 +13,102 @@ msgstr ""
 "X-Poedit-Country: china\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "用户默认"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "从未"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "1周前"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2周前"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "1月前"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "2月前"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "3月前"
 
-#: backend.php:81
+#: backend.php:80
 #, fuzzy
 msgid "Default interval"
 msgstr "更新间隔:"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "禁用更新"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "每15分钟"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "每30分钟"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "每小时"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "每4小时"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "每12小时"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "每天"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "默认"
 
-#: backend.php:103
+#: backend.php:102
 #, fuzzy
 msgid "Magpie"
 msgstr "页"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "用户"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr ""
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 #, fuzzy
 msgid "Feeds"
 msgstr "Feed"
@@ -118,17 +118,17 @@ msgstr "Feed"
 msgid "Article not found."
 msgstr "未找到Feed."
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "读取中，请等待..."
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -158,50 +158,50 @@ msgstr "，找到"
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr ""
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
 "<b>%d</b>)."
 msgstr "您的 Tiny Tiny RSS 数据库需要升级到 (<b>%d</b> to <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "完成更新"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "更新完成中..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "更新到版本 %d..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "检查版本"
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "OK！"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "错误！"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -210,6 +210,21 @@ msgstr ""
 "完成。完成 <b>%d</b> 更新(s)  schema\n"
 "\t\t\t版本 <b>%d</b>."
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 #, fuzzy
 msgid ""
@@ -218,11 +233,11 @@ msgid ""
 "\t\t\tbrowser settings."
 msgstr "您的浏览器不支持Javascript, 请检查设置。"
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "你好,"
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "注销"
@@ -303,282 +318,286 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr ""
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
 
-#: functions.php:3050
+#: functions.php:3217
 #, fuzzy
 msgid "Archived articles"
 msgstr "星级文章"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "所有"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:4021
+#: functions.php:4244
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "无"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4030
+#: functions.php:4253
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4036
+#: functions.php:4259
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4043
+#: functions.php:4266
 msgid "Move back"
 msgstr ""
 
-#: functions.php:4044
+#: functions.php:4267
 #, fuzzy
 msgid "Delete"
 msgstr "默认"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 msgid "Feed:"
 msgstr "Feed:"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "编辑标签"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 msgid "Visit the website"
 msgstr ""
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "隐藏我的Feed列表"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "星级文章"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "无标签"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "编辑标签"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "关闭此窗口"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 #, fuzzy
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: functions.php:5229
+#: functions.php:5457
 #, fuzzy
 msgid "Dismiss article"
 msgstr "发布文章"
 
-#: functions.php:5248
+#: functions.php:5476
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5251
+#: functions.php:5479
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5254
+#: functions.php:5482
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5260
+#: functions.php:5488
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 #, fuzzy
 msgid "Create label..."
 msgstr "创建标记"
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "移除"
 
-#: functions.php:6110
+#: functions.php:6343
 #, fuzzy
 msgid "Assign:"
 msgstr "指定标签"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "无标签"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+msgid "(edit note)"
 msgstr ""
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "无选定feed."
 
-#: functions.php:6774
+#: functions.php:7013
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr ""
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "标题"
 
@@ -616,7 +635,7 @@ msgstr "发布文章"
 msgid "Assign tags"
 msgstr "指定标签"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 #, fuzzy
 msgid "Assign label"
 msgstr "指定标签"
@@ -681,12 +700,12 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "从这个天数之后清除旧的文章（0为不启用）"
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
 
 #: localized_schema.php:27
-msgid "Update post on checksum change"
-msgstr "更新后校验修改"
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "从这个天数之后清除旧的文章（0为不启用）"
 
 #: localized_schema.php:28
 #, fuzzy
@@ -719,102 +738,98 @@ msgid "Long date format"
 msgstr "长的时间格式"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr "提要使用更方便的 日期／时间 格式"
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "feed联合显示。"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "隐藏feed源以读信息"
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "自动显示未读"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "以未读文章数量排序feed源"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "更新后标记文章为未读"
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "反向提要排列（从旧到新）"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "开启电子邮件摘要"
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "确认标记所有Feed为已读..."
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "从文章中过滤不安全标签"
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "被列入黑名单的标签"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr ""
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 #, fuzzy
 msgid "Mark articles in e-mail digest as read"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr ""
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 #, fuzzy
 msgid "Purge unread articles"
 msgstr "星级文章"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr ""
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr ""
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr ""
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 #, fuzzy
 msgid "Sort headlines by feed date"
 msgstr "以未读文章数量排序feed源"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "用户样式表 URL"
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "登陆:"
@@ -849,217 +864,219 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "通用OPML"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
 msgstr "导入 OPML（需要DOMXML扩展）"
 
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "导入 OPML（需要DOMXMDocmentL扩展）"
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
-
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "返回 我的最爱"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "退出我的最爱"
-
-#: prefs.php:91
+#: prefs.php:83
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "退出我的最爱"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "我的最爱"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 #, fuzzy
 msgid "Filters"
 msgstr "标题:"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 #, fuzzy
 msgid "Users"
 msgstr "用户"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "链接"
+
 #: register.php:149
 #, fuzzy
 msgid "New user registrations are administratively disabled."
 msgstr "Feed 浏览器有限制"
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
 "password is sent."
 msgstr ""
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr ""
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr ""
 
-#: register.php:184
+#: register.php:185
 #, fuzzy
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr ""
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr ""
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr ""
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr ""
 
-#: register.php:241
+#: register.php:242
 #, fuzzy
 msgid "Registration failed."
 msgstr "设置检查失败"
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr ""
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 #, fuzzy
 msgid "Comments?"
 msgstr "内容"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "隐藏我的Feed列表"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 #, fuzzy
 msgid "Show articles"
 msgstr "星级文章"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "已更新"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 #, fuzzy
 msgid "Sort articles"
 msgstr "星级文章"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 #, fuzzy
 msgid "Date"
 msgstr "更新"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 #, fuzzy
 msgid "Search..."
 msgstr "搜索"
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "Feed 操作："
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "订阅feed"
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "输入feed"
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 #, fuzzy
 msgid "Rescore feed"
 msgstr "移除feed中..."
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "所有feed:"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 #, fuzzy
 msgid "(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "标签簇"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 #, fuzzy
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1072,25 +1089,25 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "重置密码"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 msgid "Your request could not be completed."
 msgstr ""
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "密码已更改."
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "您不能编辑本分类feed"
@@ -1104,7 +1121,7 @@ msgstr "你好,"
 msgid "Help topic not found."
 msgstr "未找到帮助主题。"
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "添加分类 <b>%s</b>."
@@ -1114,28 +1131,24 @@ msgstr "添加分类 <b>%s</b>."
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 #, fuzzy
 msgid "is already imported."
 msgstr "已导入"
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 #, fuzzy
 msgid "OK"
 msgstr "OK！"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "解析文档时发生错误。"
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "错误：请上传OPML文件。"
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr "错误：未找到body元素"
-
 #: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
@@ -1146,6 +1159,10 @@ msgstr "导入 OPML（需要DOMXML扩展）"
 msgid "Importing using DOMDocument."
 msgstr "导入 OPML（需要DOMXMDocmentL扩展）"
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
+
 #: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
@@ -1175,7 +1192,7 @@ msgstr ""
 msgid "Your Public OPML URL is:"
 msgstr "已发布文章"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 #, fuzzy
 msgid "Generate new URL"
 msgstr "产生feed"
@@ -1207,13 +1224,13 @@ msgid ""
 "contact instance owner."
 msgstr "TT-RSS检测到更新时间过长，请刷新或者检查RSS源地址。"
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "Feed"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 #, fuzzy
 msgid "Place in category:"
 msgstr "保存分类..."
@@ -1223,19 +1240,19 @@ msgstr "保存分类..."
 msgid "Available feeds"
 msgstr "所有feed"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "认证"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "登陆"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "密码:"
@@ -1254,17 +1271,18 @@ msgid "More feeds"
 msgstr "移除feed中..."
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "取消"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "搜索"
 
@@ -1283,9 +1301,10 @@ msgstr "Feed 操作："
 msgid "limit:"
 msgstr "限制:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "移除"
 
@@ -1310,133 +1329,150 @@ msgstr ""
 msgid "This feed"
 msgstr "本feed"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "匹配"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 #, fuzzy
 msgid "after"
 msgstr "更新"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 #, fuzzy
 msgid "on field"
 msgstr "于:"
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 #, fuzzy
 msgid "in"
 msgstr "链接"
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 #, fuzzy
 msgid "Perform Action"
 msgstr "完成更新"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 #, fuzzy
 msgid "Options"
 msgstr "选项:"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "可用"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "逆匹配"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr "测试"
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "创建"
 
-#: modules/popup-dialog.php:542
+#: modules/popup-dialog.php:571
 #, fuzzy
-msgid "Feeds with update errors"
-msgstr "更新错误"
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr "这些feed更新错误:"
+
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "链接:"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "退订选定feed?"
+
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr "这些feed更新错误:"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开:"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "标签簇"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "所有文章"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 #, fuzzy
 msgid "To:"
 msgstr "Top"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "选择："
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "更改 e-mail"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 #, fuzzy
 msgid "Details"
 msgstr "每天"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1444,315 +1480,412 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+#, fuzzy
+msgid "URL:"
+msgstr "Feed URL:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "等级:"
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "等级:"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "产生feed"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "创建"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr ""
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "标题"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-#, fuzzy
-msgid "URL:"
-msgstr "Feed URL:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr ""
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "文章清理:"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "隐藏我的Feed列表"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "由右-左阅读习惯"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "包括电子邮件文摘"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 msgid "Cache images locally (SimplePie only)"
 msgstr ""
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "标记  %s 中所有访问过的主题为已读"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 #, fuzzy
 msgid "Icon"
 msgstr "操作"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "订阅feed:"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "退订选定feed?"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "移除选定分类?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Feed编辑"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "输入feed"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "选择："
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "移除选定的过滤器..."
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "重置密码"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "分类:"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 #, fuzzy
 msgid "More actions..."
 msgstr "激活..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 #, fuzzy
 msgid "Clear feed data"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 #, fuzzy
 msgid "Rescore articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 #, fuzzy
 msgid "Display URL"
 msgstr "显示标签"
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Feed 信息："
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "返回Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "返回Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "无选定文章。"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 #, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "标题"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 #, fuzzy
 msgid "No feeds found."
 msgstr "无feed可订阅。"
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "未找到文章。"
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "创建过滤器 <b>%s</b>"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "编辑"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+#, fuzzy
+msgid "Your access level is insufficient to open this tab."
+msgstr "权限不足。"
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "移除feed中..."
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr ""
+
 #: modules/pref-labels.php:21
 msgid "Caption"
 msgstr "标题"
@@ -1784,116 +1917,115 @@ msgstr "创建标记"
 msgid "Clear colors"
 msgstr "过滤文章"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "原密码不可留空."
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "新密码不可留空."
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "两次输入密码不通."
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "密码已更改."
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "原密码错误."
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "设置已保存."
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr ""
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "个人数据"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail:"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 #, fuzzy
 msgid "Access level"
 msgstr "等级:"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "保存"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr "您的密码是默认的，请修改。"
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "原密码"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "新密码"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "验证密码"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "更改密码"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "选择模板"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "是"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "否"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "恢复到默认？"
 
-#: modules/pref-users.php:7
-#, fuzzy
-msgid "Your access level is insufficient to open this tab."
-msgstr "权限不足。"
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "用户详细"
@@ -1996,10 +2128,6 @@ msgstr "等级:"
 msgid "Last login"
 msgstr "最后登陆"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr ""
-
 #: modules/pref-users.php:489
 #, fuzzy
 msgid "No users defined."
@@ -2278,7 +2406,7 @@ msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 msgid "Sort feeds by unread count"
 msgstr "以未读文章数量排序feed源"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
@@ -2348,8 +2476,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "原密码错误."
 
 #: functions.js:634
 #, fuzzy
@@ -2417,225 +2546,270 @@ msgstr "您不能从分类中取消订阅。"
 msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+#, fuzzy
+msgid "Filter Test Results"
+msgstr "过滤器表达式"
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "退订%s?"
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "请输入标签主题"
 
-#: functions.js:1158
+#: functions.js:1197
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "输入feed"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "移除feed中..."
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "未选择feed."
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
+#: functions.js:1573
+#, fuzzy
+msgid "Feeds with update errors"
+msgstr "更新错误"
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "移除选定的过滤器？"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "(逆)"
 
-#: prefs.js:91
+#: prefs.js:114
 #, fuzzy
 msgid "Please enter login:"
 msgstr "请输入标签主题"
 
-#: prefs.js:98
+#: prefs.js:121
 #, fuzzy
 msgid "Can't create user: no login specified."
 msgstr "添加用户失败：未登录。"
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "标题:"
 
-#: prefs.js:164
+#: prefs.js:187
 #, fuzzy
 msgid "Remove filter %s?"
 msgstr "移除选定的过滤器？"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "移除选定标记?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "未选定标记."
 
-#: prefs.js:310
+#: prefs.js:350
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "未选定用户."
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "未选定过滤器。"
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "退订选定feed?"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "请只选择一个feed."
 
-#: prefs.js:420
+#: prefs.js:459
 #, fuzzy
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: prefs.js:490
-#, fuzzy
-msgid "No profiles selected."
-msgstr "无选定文章。"
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "登陆框不能留空。"
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "请只选择一个用户."
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "重置选定用户密码?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "请只选择一个过滤器."
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Feed编辑"
 
-#: prefs.js:705
+#: prefs.js:716
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "无选定文章。"
 
-#: prefs.js:776
+#: prefs.js:802
 #, fuzzy
 msgid "OPML Import"
 msgstr "导入"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "请先选择若干feed"
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "重置默认项？"
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "分类:"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "移除选定分类?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "未选定分类。"
 
-#: prefs.js:1198
+#: prefs.js:1226
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "更新错误"
+
+#: prefs.js:1275
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "使用新地址替换当前地址？"
 
-#: prefs.js:1307
+#: prefs.js:1384
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "无选定文章。"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: prefs.js:1350
+#: prefs.js:1427
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "重置默认项？"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr ""
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "无选定文章。"
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "移除选定的过滤器？"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 msgid "Label Editor"
 msgstr "标记编辑"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "编辑标签"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "移除选定的过滤器？"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "未选定过滤器。"
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "请只选择一个过滤器."
+
 #: tt-rss.js:147
 #, fuzzy
 msgid "Mark all articles as read?"
@@ -2645,27 +2819,27 @@ msgstr "标记  %s 中所有访问过的主题为已读"
 msgid "You can't unsubscribe from the category."
 msgstr "您不能从分类中取消订阅。"
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "请先选择若干feed"
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "星级文章"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 msgid "New version available!"
 msgstr ""
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "无选定文章。"
 
@@ -2722,40 +2896,62 @@ msgstr "标记  %s 中所有所选Feed为已读..."
 msgid "Unable to load article."
 msgstr "错误：请上传OPML文件。"
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "读取中，请等待..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "显示最近文章时间"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "新窗口打开文章连结"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "移除选定标记?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "读取中，请等待..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "星级文章"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr "更新后校验修改"
+
+#~ msgid "Use more accessible date/time format for headlines"
+#~ msgstr "提要使用更方便的 日期／时间 格式"
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "更新后标记文章为未读"
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "导入 OPML（需要DOMXML扩展）"
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "导入 OPML（需要DOMXMDocmentL扩展）"
+
+#~ msgid "Error: can't find body element."
+#~ msgstr "错误：未找到body元素"
+
+#, fuzzy
+#~ msgid "No profiles selected."
+#~ msgstr "无选定文章。"
+
 #~ msgid "Unknown error"
 #~ msgstr "未知错误"
 
@@ -2906,10 +3102,6 @@ msgstr "星级文章"
 #~ msgid "No filters defined."
 #~ msgstr "未定义过滤器。"
 
-#, fuzzy
-#~ msgid "No matching filters found."
-#~ msgstr "未找到文章。"
-
 #, fuzzy
 #~ msgid "Click to change color"
 #~ msgstr "星级文章"
@@ -3006,10 +3198,6 @@ msgstr "星级文章"
 #~ msgid "more tags"
 #~ msgstr "无标签"
 
-#, fuzzy
-#~ msgid "Link to feed:"
-#~ msgstr "链接:"
-
 #~ msgid "Not linked"
 #~ msgstr "无链接"
 
@@ -3126,9 +3314,6 @@ msgstr "星级文章"
 #~ msgid "Could not update headlines (missing XML object)"
 #~ msgstr "更新提要失败（缺少XML支持）"
 
-#~ msgid "Entire feed"
-#~ msgstr "输入feed"
-
 #, fuzzy
 #~ msgid "Failed to load article in new window"
 #~ msgstr "新窗口打开文章连结"
@@ -3559,16 +3744,10 @@ msgstr "星级文章"
 #~ msgid "Create Label"
 #~ msgstr "创建标记"
 
-#~ msgid "Test"
-#~ msgstr "测试"
-
 #, fuzzy
 #~ msgid "Perform action"
 #~ msgstr "完成更新"
 
-#~ msgid "Filter expression"
-#~ msgstr "过滤器表达式"
-
 #~ msgid "Enable icons in feedlist"
 #~ msgstr "feed列表中不启用ico"