rebase translations, update script to maybe extract more translations from js files (fuck you xgettext you piece of shit)

2 files changed, 1010 insertions, 863 deletions

diff --git a/locale/es_LA/LC_MESSAGES/messages.mo b/locale/es_LA/LC_MESSAGES/messages.mo
index 965370689..51d57bfb0 100644
--- a/locale/es_LA/LC_MESSAGES/messages.mo
+++ b/locale/es_LA/LC_MESSAGES/messages.mo
diff --git a/locale/es_LA/LC_MESSAGES/messages.po b/locale/es_LA/LC_MESSAGES/messages.po
index ab6375867..41b6b1cba 100644
--- a/locale/es_LA/LC_MESSAGES/messages.po
+++ b/locale/es_LA/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-06 15:10+0400\n"
+"POT-Creation-Date: 2014-12-18 18:25+0300\n"
 "Last-Translator: Brendan <[email protected]>\n"
 "Language-Team: OpenSRS [email protected]>\n"
 "Language: es_LA\n"
@@ -86,8 +86,8 @@ msgid "Weekly"
 msgstr "Semanalmente"
 
 #: backend.php:103
-#: classes/pref/users.php:119
 #: classes/pref/system.php:51
+#: classes/pref/users.php:119
 msgid "User"
 msgstr "Usuario"
 
@@ -152,24 +152,35 @@ msgstr ""
 #: index.php:273
 #: prefs.php:102
 #: classes/backend.php:5
-#: classes/pref/labels.php:296
-#: classes/pref/filters.php:704
 #: classes/pref/feeds.php:1367
+#: classes/pref/filters.php:704
+#: classes/pref/labels.php:296
 #: js/feedlist.js:126
-#: js/functions.js:1218
-#: js/functions.js:1352
-#: js/functions.js:1664
+#: js/functions.js:1221
+#: js/functions.js:1355
+#: js/functions.js:1667
 #: js/prefs.js:653
 #: js/prefs.js:854
 #: js/prefs.js:1760
 #: js/prefs.js:1776
 #: js/prefs.js:1794
 #: js/tt-rss.js:55
-#: js/tt-rss.js:515
+#: js/tt-rss.js:521
 #: js/viewfeed.js:741
 #: js/viewfeed.js:1316
-#: plugins/import_export/import_export.js:17
 #: plugins/updater/updater.js:17
+#: plugins/import_export/import_export.js:17
+#: js/feedlist.js:450
+#: js/functions.js:449
+#: js/functions.js:787
+#: js/prefs.js:1441
+#: js/prefs.js:1494
+#: js/prefs.js:1534
+#: js/prefs.js:1551
+#: js/prefs.js:1567
+#: js/prefs.js:1587
+#: js/tt-rss.js:538
+#: js/viewfeed.js:859
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
@@ -190,13 +201,13 @@ msgid "All Articles"
 msgstr "Todos"
 
 #: index.php:176
-#: include/functions2.php:99
+#: include/functions2.php:102
 #: classes/feeds.php:102
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:177
-#: include/functions2.php:100
+#: include/functions2.php:103
 #: classes/feeds.php:103
 msgid "Published"
 msgstr "Publicados"
@@ -241,7 +252,7 @@ msgstr "Título"
 
 #: index.php:194
 #: index.php:242
-#: include/functions2.php:89
+#: include/functions2.php:92
 #: classes/feeds.php:107
 #: js/FeedTree.js:132
 #: js/FeedTree.js:160
@@ -286,7 +297,7 @@ msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
 #: index.php:237
-#: classes/handler/public.php:629
+#: classes/handler/public.php:628
 msgid "Subscribe to feed..."
 msgstr "Suscribirse a una fuente..."
 
@@ -318,7 +329,7 @@ msgid "Other actions:"
 msgstr "Otras acciones:"
 
 #: index.php:245
-#: include/functions2.php:75
+#: include/functions2.php:78
 msgid "Toggle widescreen mode"
 msgstr "Alternar modo de pantalla ancha"
 
@@ -344,7 +355,7 @@ msgstr "Cerrar sesión"
 
 #: prefs.php:33
 #: prefs.php:120
-#: include/functions2.php:102
+#: include/functions2.php:105
 #: classes/pref/prefs.php:441
 msgid "Preferences"
 msgstr "Preferencias"
@@ -370,8 +381,8 @@ msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:129
-#: include/functions.php:1264
-#: include/functions.php:1916
+#: include/functions.php:1265
+#: include/functions.php:1917
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Marcadores"
@@ -401,13 +412,13 @@ msgstr ""
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:699
-#: classes/handler/public.php:770
-#: classes/handler/public.php:868
-#: classes/handler/public.php:947
-#: classes/handler/public.php:961
-#: classes/handler/public.php:968
-#: classes/handler/public.php:993
+#: classes/handler/public.php:698
+#: classes/handler/public.php:769
+#: classes/handler/public.php:867
+#: classes/handler/public.php:946
+#: classes/handler/public.php:960
+#: classes/handler/public.php:967
+#: classes/handler/public.php:992
 #, fuzzy
 msgid "Return to Tiny Tiny RSS"
 msgstr "Actualizar Tiny Tiny RSS"
@@ -425,12 +436,12 @@ msgid "Check availability"
 msgstr "Comprobar la disponibilidad"
 
 #: register.php:229
-#: classes/handler/public.php:786
+#: classes/handler/public.php:785
 msgid "Email:"
 msgstr "Correo electrónico:"
 
 #: register.php:232
-#: classes/handler/public.php:791
+#: classes/handler/public.php:790
 msgid "How much is two plus two:"
 msgstr ""
 
@@ -463,10 +474,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
 #: include/digest.php:109
-#: include/functions.php:1273
-#: include/functions.php:1817
-#: include/functions.php:1902
-#: include/functions.php:1924
+#: include/functions.php:1274
+#: include/functions.php:1818
+#: include/functions.php:1903
+#: include/functions.php:1925
 #: classes/opml.php:421
 #: classes/pref/feeds.php:226
 msgid "Uncategorized"
@@ -483,246 +494,248 @@ msgstr[1] "Artículos archivados"
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions2.php:49
+#: include/functions2.php:52
 msgid "Navigation"
 msgstr "Navegación"
 
-#: include/functions2.php:50
+#: include/functions2.php:53
 msgid "Open next feed"
 msgstr "Abrir la fuente siguiente"
 
-#: include/functions2.php:51
+#: include/functions2.php:54
 msgid "Open previous feed"
 msgstr "Abrir la fuente anterior"
 
-#: include/functions2.php:52
+#: include/functions2.php:55
 msgid "Open next article"
 msgstr "Abrir el artículo siguiente"
 
-#: include/functions2.php:53
+#: include/functions2.php:56
 msgid "Open previous article"
 msgstr "Abrir el artículo anterior"
 
-#: include/functions2.php:54
+#: include/functions2.php:57
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:55
+#: include/functions2.php:58
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:56
+#: include/functions2.php:59
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:57
+#: include/functions2.php:60
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:58
+#: include/functions2.php:61
 msgid "Show search dialog"
 msgstr "Mostrar el diálogo de búsqueda"
 
-#: include/functions2.php:59
+#: include/functions2.php:62
 msgid "Article"
 msgstr "Artículo"
 
-#: include/functions2.php:60
+#: include/functions2.php:63
 #: js/viewfeed.js:2009
 msgid "Toggle starred"
 msgstr "Alternar favoritos"
 
-#: include/functions2.php:61
+#: include/functions2.php:64
 #: js/viewfeed.js:2020
 msgid "Toggle published"
 msgstr "Alternar publicados"
 
-#: include/functions2.php:62
+#: include/functions2.php:65
 #: js/viewfeed.js:1998
 msgid "Toggle unread"
 msgstr "Alternar sin leer"
 
-#: include/functions2.php:63
+#: include/functions2.php:66
 msgid "Edit tags"
 msgstr "Editar etiquetas"
 
-#: include/functions2.php:64
+#: include/functions2.php:67
 msgid "Dismiss selected"
 msgstr "Desechar la selección"
 
-#: include/functions2.php:65
+#: include/functions2.php:68
 msgid "Dismiss read"
 msgstr "Desechar leídos"
 
-#: include/functions2.php:66
+#: include/functions2.php:69
 msgid "Open in new window"
 msgstr "Abrir en nueva ventana"
 
-#: include/functions2.php:67
+#: include/functions2.php:70
+#: js/viewfeed.js:2039
 msgid "Mark below as read"
 msgstr "Marcar artículos posteriores como leídos"
 
-#: include/functions2.php:68
+#: include/functions2.php:71
 #: js/viewfeed.js:2033
 msgid "Mark above as read"
 msgstr "Marcar artículos anteriores como leídos"
 
-#: include/functions2.php:69
+#: include/functions2.php:72
 msgid "Scroll down"
 msgstr "Desplazarse hacia abajo"
 
-#: include/functions2.php:70
+#: include/functions2.php:73
 msgid "Scroll up"
 msgstr "Desplazarse hacia arriba"
 
-#: include/functions2.php:71
+#: include/functions2.php:74
 msgid "Select article under cursor"
 msgstr "Seleccionar el artículo bajo el puntero del mouse"
 
-#: include/functions2.php:72
+#: include/functions2.php:75
 msgid "Email article"
 msgstr "Enviar artículo por correo electrónico"
 
-#: include/functions2.php:73
+#: include/functions2.php:76
 msgid "Close/collapse article"
 msgstr "Cerrar/plegar artículo"
 
-#: include/functions2.php:74
+#: include/functions2.php:77
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Alternar modo combinado"
 
-#: include/functions2.php:76
+#: include/functions2.php:79
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Alternar incrustación del artículo original"
 
-#: include/functions2.php:77
+#: include/functions2.php:80
 msgid "Article selection"
 msgstr "Selección de artículos"
 
-#: include/functions2.php:78
+#: include/functions2.php:81
 msgid "Select all articles"
 msgstr "Seleccionar todos los artículos"
 
-#: include/functions2.php:79
+#: include/functions2.php:82
 msgid "Select unread"
 msgstr "Seleccionar artículos sin leer"
 
-#: include/functions2.php:80
+#: include/functions2.php:83
 msgid "Select starred"
 msgstr "Seleccionar artículos favoritos"
 
-#: include/functions2.php:81
+#: include/functions2.php:84
 msgid "Select published"
 msgstr "Seleccionar artículos publicados"
 
-#: include/functions2.php:82
+#: include/functions2.php:85
 msgid "Invert selection"
 msgstr "Invertir selección"
 
-#: include/functions2.php:83
+#: include/functions2.php:86
 msgid "Deselect everything"
 msgstr "Deseleccionar todo"
 
-#: include/functions2.php:84
+#: include/functions2.php:87
 #: classes/pref/feeds.php:550
 #: classes/pref/feeds.php:794
 msgid "Feed"
 msgstr "Fuente"
 
-#: include/functions2.php:85
+#: include/functions2.php:88
 msgid "Refresh current feed"
 msgstr "Actualizar la fuente activa"
 
-#: include/functions2.php:86
+#: include/functions2.php:89
 msgid "Un/hide read feeds"
 msgstr "Ocultar/mostrar fuentes leídas"
 
-#: include/functions2.php:87
+#: include/functions2.php:90
 #: classes/pref/feeds.php:1314
 msgid "Subscribe to feed"
 msgstr "Suscribirse a una fuente"
 
-#: include/functions2.php:88
+#: include/functions2.php:91
 #: js/FeedTree.js:139
 #: js/PrefFeedTree.js:68
 msgid "Edit feed"
 msgstr "Editar fuente"
 
-#: include/functions2.php:90
+#: include/functions2.php:93
 msgid "Reverse headlines"
 msgstr "Invertir orden de titulares"
 
-#: include/functions2.php:91
+#: include/functions2.php:94
 msgid "Debug feed update"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions2.php:92
+#: include/functions2.php:95
 #: js/FeedTree.js:182
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Marcar fuente como leída"
 
-#: include/functions2.php:93
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr "Desplegar/plegar la categoría"
 
-#: include/functions2.php:94
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr "Alternar modo combinado"
 
-#: include/functions2.php:95
+#: include/functions2.php:98
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Alternar modo combinado"
 
-#: include/functions2.php:96
+#: include/functions2.php:99
 msgid "Go to"
 msgstr "Ir a"
 
-#: include/functions2.php:97
-#: include/functions.php:1975
+#: include/functions2.php:100
+#: include/functions.php:1976
 msgid "All articles"
 msgstr "Todos"
 
-#: include/functions2.php:98
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr "Reciente"
 
-#: include/functions2.php:101
-#: js/tt-rss.js:461
+#: include/functions2.php:104
+#: js/tt-rss.js:467
+#: js/tt-rss.js:649
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: include/functions2.php:103
+#: include/functions2.php:106
 msgid "Other"
 msgstr "Otro"
 
-#: include/functions2.php:104
+#: include/functions2.php:107
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Crear marcador"
 
-#: include/functions2.php:105
+#: include/functions2.php:108
 #: classes/pref/filters.php:678
 msgid "Create filter"
 msgstr "Crear filtro"
 
-#: include/functions2.php:106
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: include/functions2.php:107
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr "Mostrar el diálogo de ayuda"
 
-#: include/functions2.php:651
+#: include/functions2.php:654
 #, php-format
 msgid "Search results: %s"
 msgstr "Resultados de búsqueda: %s"
 
-#: include/functions2.php:1263
+#: include/functions2.php:1288
 #: classes/feeds.php:714
 #, fuzzy
 msgid "comment"
@@ -730,38 +743,44 @@ msgid_plural "comments"
 msgstr[0] "comentarios"
 msgstr[1] "comentarios"
 
-#: include/functions2.php:1267
+#: include/functions2.php:1292
 #: classes/feeds.php:718
 msgid "comments"
 msgstr "comentarios"
 
-#: include/functions2.php:1308
+#: include/functions2.php:1333
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1341
-#: include/functions2.php:1589
+#: include/functions2.php:1366
+#: include/functions2.php:1614
 #: classes/article.php:280
 msgid "no tags"
 msgstr "sin etiquetas"
 
-#: include/functions2.php:1351
+#: include/functions2.php:1376
 #: classes/feeds.php:700
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions2.php:1383
+#: include/functions2.php:1408
 #: classes/feeds.php:652
 msgid "Originally from:"
 msgstr "Original de:"
 
-#: include/functions2.php:1396
+#: include/functions2.php:1421
 #: classes/feeds.php:665
 #: classes/pref/feeds.php:569
 msgid "Feed URL"
 msgstr "URL de la fuente"
 
-#: include/functions2.php:1430
+#: include/functions2.php:1455
+#: classes/backend.php:105
+#: classes/pref/users.php:95
+#: classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1677
+#: classes/pref/filters.php:145
+#: classes/pref/prefs.php:1103
 #: classes/dlg.php:36
 #: classes/dlg.php:59
 #: classes/dlg.php:92
@@ -770,72 +789,66 @@ msgstr "URL de la fuente"
 #: classes/dlg.php:216
 #: classes/dlg.php:249
 #: classes/dlg.php:261
-#: classes/backend.php:105
-#: classes/pref/users.php:95
-#: classes/pref/filters.php:145
-#: classes/pref/prefs.php:1102
-#: classes/pref/feeds.php:1611
-#: classes/pref/feeds.php:1677
+#: plugins/googlereaderimport/init.php:194
+#: plugins/updater/init.php:389
 #: plugins/import_export/init.php:407
 #: plugins/import_export/init.php:452
-#: plugins/googlereaderimport/init.php:194
 #: plugins/share/init.php:123
-#: plugins/updater/init.php:375
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: include/functions2.php:1626
+#: include/functions2.php:1651
 msgid "(edit note)"
 msgstr "(editar nota)"
 
-#: include/functions2.php:1874
+#: include/functions2.php:1899
 msgid "unknown type"
 msgstr "tipo desconocido"
 
-#: include/functions2.php:1942
+#: include/functions2.php:1967
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: include/functions.php:1262
-#: include/functions.php:1914
+#: include/functions.php:1263
+#: include/functions.php:1915
 msgid "Special"
 msgstr "Especial"
 
-#: include/functions.php:1765
+#: include/functions.php:1766
 #: classes/feeds.php:1124
 #: classes/pref/filters.php:169
 #: classes/pref/filters.php:447
 msgid "All feeds"
 msgstr "Todas las fuentes"
 
-#: include/functions.php:1969
+#: include/functions.php:1970
 msgid "Starred articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1971
+#: include/functions.php:1972
 msgid "Published articles"
 msgstr "Publicados"
 
-#: include/functions.php:1973
+#: include/functions.php:1974
 msgid "Fresh articles"
 msgstr "Recientes"
 
-#: include/functions.php:1977
+#: include/functions.php:1978
 msgid "Archived articles"
 msgstr "Artículos archivados"
 
-#: include/functions.php:1979
+#: include/functions.php:1980
 msgid "Recently read"
 msgstr "Leídos recientemente"
 
 #: include/login_form.php:190
-#: classes/handler/public.php:526
-#: classes/handler/public.php:781
+#: classes/handler/public.php:525
+#: classes/handler/public.php:780
 msgid "Login:"
 msgstr "Nombre de usuario:"
 
 #: include/login_form.php:200
-#: classes/handler/public.php:529
+#: classes/handler/public.php:528
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -848,9 +861,9 @@ msgid "Profile:"
 msgstr "Perfil:"
 
 #: include/login_form.php:216
-#: classes/handler/public.php:267
+#: classes/handler/public.php:266
 #: classes/rpc.php:63
-#: classes/pref/prefs.php:1040
+#: classes/pref/prefs.php:1041
 msgid "Default profile"
 msgstr "Perfil por defecto"
 
@@ -867,7 +880,7 @@ msgid "Remember me"
 msgstr "Recordarme"
 
 #: include/login_form.php:242
-#: classes/handler/public.php:534
+#: classes/handler/public.php:533
 msgid "Log in"
 msgstr "Iniciar sesión"
 
@@ -891,247 +904,170 @@ msgstr ""
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "Artículo no encontrado."
-
-#: classes/article.php:178
-msgid "Tags for this article (separated by commas):"
+#: classes/backend.php:33
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: classes/article.php:203
-#: classes/pref/users.php:168
-#: classes/pref/labels.php:79
-#: classes/pref/filters.php:425
-#: classes/pref/prefs.php:986
-#: classes/pref/feeds.php:773
-#: classes/pref/feeds.php:900
-#: plugins/nsfw/init.php:85
-#: plugins/mail/init.php:64
-#: plugins/note/init.php:51
-#: plugins/instances/init.php:245
-msgid "Save"
-msgstr "Guardar"
+#: classes/backend.php:38
+msgid "Keyboard Shortcuts"
+msgstr "Atajos de teclado"
 
-#: classes/article.php:205
-#: classes/handler/public.php:503
-#: classes/handler/public.php:537
-#: classes/feeds.php:1053
-#: classes/feeds.php:1103
-#: classes/feeds.php:1163
-#: classes/pref/users.php:170
-#: classes/pref/labels.php:81
-#: classes/pref/filters.php:428
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:908
-#: classes/pref/filters.php:975
-#: classes/pref/prefs.php:988
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:903
-#: classes/pref/feeds.php:1817
-#: plugins/mail/init.php:172
-#: plugins/note/init.php:53
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-msgid "Cancel"
-msgstr "Cancelar"
+#: classes/backend.php:61
+msgid "Shift"
+msgstr "Mayúsculas"
 
-#: classes/handler/public.php:467
+#: classes/backend.php:64
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#: classes/backend.php:99
+msgid "Help topic not found."
+msgstr "Tema de ayuda no encontrado."
+
+#: classes/handler/public.php:466
 #: plugins/bookmarklets/init.php:40
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Actualizar Tiny Tiny RSS"
 
-#: classes/handler/public.php:475
+#: classes/handler/public.php:474
 msgid "Title:"
 msgstr "Título:"
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:476
 #: classes/pref/feeds.php:567
 #: plugins/instances/init.php:212
 #: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:479
+#: classes/handler/public.php:478
 msgid "Content:"
 msgstr "Contenido:"
 
-#: classes/handler/public.php:481
+#: classes/handler/public.php:480
 msgid "Labels:"
 msgstr "Marcadores:"
 
-#: classes/handler/public.php:500
+#: classes/handler/public.php:499
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:502
+#: classes/handler/public.php:501
 msgid "Share"
 msgstr "Compartir"
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:502
+#: classes/handler/public.php:536
+#: classes/feeds.php:1053
+#: classes/feeds.php:1103
+#: classes/feeds.php:1163
+#: classes/article.php:205
+#: classes/pref/users.php:170
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:903
+#: classes/pref/feeds.php:1817
+#: classes/pref/filters.php:428
+#: classes/pref/filters.php:827
+#: classes/pref/filters.php:908
+#: classes/pref/filters.php:975
+#: classes/pref/labels.php:81
+#: classes/pref/prefs.php:989
+#: plugins/note/init.php:53
+#: plugins/mail/init.php:172
+#: plugins/instances/init.php:248
+#: plugins/instances/init.php:436
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: classes/handler/public.php:523
 msgid "Not logged in"
 msgstr "No ha iniciado sesión"
 
-#: classes/handler/public.php:583
+#: classes/handler/public.php:582
 msgid "Incorrect username or password"
 msgstr "Nombre de usuario o contraseña incorrectos"
 
-#: classes/handler/public.php:635
+#: classes/handler/public.php:634
 #, fuzzy, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Se ha suscrito a %s"
 
-#: classes/handler/public.php:638
+#: classes/handler/public.php:637
 #, fuzzy, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Se ha suscrito a %s"
 
-#: classes/handler/public.php:641
+#: classes/handler/public.php:640
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:644
+#: classes/handler/public.php:643
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "No se han encontrado fuentes."
 
-#: classes/handler/public.php:647
+#: classes/handler/public.php:646
 msgid "Multiple feed URLs found."
 msgstr "Múltiples fuentes encontradas."
 
-#: classes/handler/public.php:651
+#: classes/handler/public.php:650
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/handler/public.php:669
+#: classes/handler/public.php:668
 msgid "Subscribe to selected feed"
 msgstr "Suscribirse a la fuente seleccionada"
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:693
 msgid "Edit subscription options"
 msgstr "Editar las opciones de suscripción"
 
-#: classes/handler/public.php:731
+#: classes/handler/public.php:730
 msgid "Password recovery"
 msgstr "Recuperación de contraseña"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:773
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:796
+#: classes/handler/public.php:795
 #: classes/pref/users.php:352
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
-#: classes/handler/public.php:806
+#: classes/handler/public.php:805
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:810
-#: classes/handler/public.php:876
+#: classes/handler/public.php:809
+#: classes/handler/public.php:875
 msgid "Go back"
 msgstr "Volver"
 
-#: classes/handler/public.php:847
+#: classes/handler/public.php:846
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] Notificación de cambio de contraseña"
 
-#: classes/handler/public.php:872
+#: classes/handler/public.php:871
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:894
+#: classes/handler/public.php:893
 msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/handler/public.php:920
+#: classes/handler/public.php:919
 msgid "Database Updater"
 msgstr "Actualizador de la base de datos"
 
-#: classes/handler/public.php:985
+#: classes/handler/public.php:984
 msgid "Perform updates"
 msgstr "Actualizar"
 
-#: classes/dlg.php:16
-msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
-msgstr ""
-
-#: classes/dlg.php:47
-#, fuzzy
-msgid "Your Public OPML URL is:"
-msgstr "URL del archivo OPML público"
-
-#: classes/dlg.php:56
-#: classes/dlg.php:213
-#: plugins/share/init.php:120
-msgid "Generate new URL"
-msgstr "Generar URL nueva"
-
-#: classes/dlg.php:70
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:74
-#: classes/dlg.php:83
-msgid "Last update:"
-msgstr "Última actualización:"
-
-#: classes/dlg.php:79
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:165
-msgid "Match:"
-msgstr "Coincidir:"
-
-#: classes/dlg.php:167
-msgid "Any"
-msgstr "Cualquiera"
-
-#: classes/dlg.php:170
-msgid "All tags."
-msgstr "Todas las etiquetas."
-
-#: classes/dlg.php:172
-msgid "Which Tags?"
-msgstr "¿Qué etiquetas?"
-
-#: classes/dlg.php:185
-msgid "Display entries"
-msgstr "Mostrar artículos"
-
-#: classes/dlg.php:204
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: classes/dlg.php:232
-#: plugins/updater/init.php:334
-#, fuzzy, php-format
-msgid "New version of Tiny Tiny RSS is available (%s)."
-msgstr "¡Nueva versión disponible!"
-
-#: classes/dlg.php:240
-msgid "You can update using built-in updater in the Preferences or by using update.php"
-msgstr ""
-
-#: classes/dlg.php:244
-#: plugins/updater/init.php:338
-msgid "See the release notes"
-msgstr "Ver las notas de la versión"
-
-#: classes/dlg.php:246
-msgid "Download"
-msgstr "Descargar"
-
-#: classes/dlg.php:254
-msgid "Error receiving version information or no new version available."
-msgstr ""
-
 #: classes/feeds.php:51
 msgid "View as RSS feed"
 msgstr "Ver como fuente RSS"
@@ -1149,16 +1085,16 @@ msgstr "Última actualización: %s"
 
 #: classes/feeds.php:88
 #: classes/pref/users.php:337
-#: classes/pref/labels.php:275
+#: classes/pref/feeds.php:1305
+#: classes/pref/feeds.php:1562
+#: classes/pref/feeds.php:1626
 #: classes/pref/filters.php:302
 #: classes/pref/filters.php:350
 #: classes/pref/filters.php:672
 #: classes/pref/filters.php:760
 #: classes/pref/filters.php:787
-#: classes/pref/prefs.php:1000
-#: classes/pref/feeds.php:1305
-#: classes/pref/feeds.php:1562
-#: classes/pref/feeds.php:1626
+#: classes/pref/labels.php:275
+#: classes/pref/prefs.php:1001
 #: plugins/instances/init.php:287
 msgid "All"
 msgstr "Todos"
@@ -1169,16 +1105,16 @@ msgstr "Invertir"
 
 #: classes/feeds.php:91
 #: classes/pref/users.php:339
-#: classes/pref/labels.php:277
+#: classes/pref/feeds.php:1307
+#: classes/pref/feeds.php:1564
+#: classes/pref/feeds.php:1628
 #: classes/pref/filters.php:304
 #: classes/pref/filters.php:352
 #: classes/pref/filters.php:674
 #: classes/pref/filters.php:762
 #: classes/pref/filters.php:789
-#: classes/pref/prefs.php:1002
-#: classes/pref/feeds.php:1307
-#: classes/pref/feeds.php:1564
-#: classes/pref/feeds.php:1628
+#: classes/pref/labels.php:277
+#: classes/pref/prefs.php:1003
 #: plugins/instances/init.php:289
 msgid "None"
 msgstr "Ninguno"
@@ -1316,10 +1252,10 @@ msgid "Login"
 msgstr "Iniciar sesión"
 
 #: classes/feeds.php:1032
-#: classes/pref/prefs.php:261
 #: classes/pref/feeds.php:639
 #: classes/pref/feeds.php:847
 #: classes/pref/feeds.php:1798
+#: classes/pref/prefs.php:261
 msgid "Password"
 msgstr "Contraseña"
 
@@ -1340,8 +1276,8 @@ msgstr "Más fuentes"
 #: classes/feeds.php:1073
 #: classes/feeds.php:1162
 #: classes/pref/users.php:324
-#: classes/pref/filters.php:665
 #: classes/pref/feeds.php:1298
+#: classes/pref/filters.php:665
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Buscar"
@@ -1360,10 +1296,10 @@ msgstr "límite:"
 
 #: classes/feeds.php:1102
 #: classes/pref/users.php:350
-#: classes/pref/labels.php:284
+#: classes/pref/feeds.php:744
 #: classes/pref/filters.php:418
 #: classes/pref/filters.php:691
-#: classes/pref/feeds.php:744
+#: classes/pref/labels.php:284
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Eliminar"
@@ -1384,25 +1320,27 @@ msgstr "Esta fuente"
 msgid "Search syntax"
 msgstr "Sintaxis de búsqueda"
 
-#: classes/backend.php:33
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
-#: classes/backend.php:38
-msgid "Keyboard Shortcuts"
-msgstr "Atajos de teclado"
-
-#: classes/backend.php:61
-msgid "Shift"
-msgstr "Mayúsculas"
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artículo no encontrado."
 
-#: classes/backend.php:64
-msgid "Ctrl"
-msgstr "Ctrl"
+#: classes/article.php:178
+msgid "Tags for this article (separated by commas):"
+msgstr ""
 
-#: classes/backend.php:99
-msgid "Help topic not found."
-msgstr "Tema de ayuda no encontrado."
+#: classes/article.php:203
+#: classes/pref/users.php:168
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:900
+#: classes/pref/filters.php:425
+#: classes/pref/labels.php:79
+#: classes/pref/prefs.php:987
+#: plugins/note/init.php:51
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:64
+#: plugins/instances/init.php:245
+msgid "Save"
+msgstr "Guardar"
 
 #: classes/opml.php:28
 #: classes/opml.php:33
@@ -1452,39 +1390,67 @@ msgid "Processing category: %s"
 msgstr "Procesando categoría: %s"
 
 #: classes/opml.php:470
-#: plugins/import_export/init.php:420
 #: plugins/googlereaderimport/init.php:66
+#: plugins/import_export/init.php:420
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr ""
 
 #: classes/opml.php:484
-#: plugins/import_export/init.php:434
 #: plugins/googlereaderimport/init.php:80
+#: plugins/import_export/init.php:434
 msgid "Unable to move uploaded file."
 msgstr ""
 
 #: classes/opml.php:488
-#: plugins/import_export/init.php:438
 #: plugins/googlereaderimport/init.php:84
+#: plugins/import_export/init.php:438
 msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/opml.php:497
+#: classes/opml.php:499
 msgid "Error: unable to find moved OPML file."
 msgstr ""
 
-#: classes/opml.php:504
+#: classes/opml.php:506
 #: plugins/googlereaderimport/init.php:187
 msgid "Error while parsing document."
 msgstr "Error mientras se analizaba el documento."
 
-#: classes/pref/users.php:6
 #: classes/pref/system.php:8
+#: classes/pref/users.php:6
 #: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr ""
 
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "Registro de errores"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr "Borrar registro"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "Error"
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr "Nombre de archivo"
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "Mensaje"
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "Fecha"
+
 #: classes/pref/users.php:34
 msgid "User not found"
 msgstr "Usuario no encontrado"
@@ -1546,16 +1512,16 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificación de cambio de contraseña"
 
 #: classes/pref/users.php:334
-#: classes/pref/labels.php:272
+#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1559
+#: classes/pref/feeds.php:1623
 #: classes/pref/filters.php:299
 #: classes/pref/filters.php:347
 #: classes/pref/filters.php:669
 #: classes/pref/filters.php:757
 #: classes/pref/filters.php:784
-#: classes/pref/prefs.php:997
-#: classes/pref/feeds.php:1302
-#: classes/pref/feeds.php:1559
-#: classes/pref/feeds.php:1623
+#: classes/pref/labels.php:272
+#: classes/pref/prefs.php:998
 #: plugins/instances/init.php:284
 msgid "Select"
 msgstr "Seleccionar"
@@ -1595,32 +1561,240 @@ msgstr "No se han definido usuarios."
 msgid "No matching users found."
 msgstr "No se han encontrado usuarios coincidentes."
 
-#: classes/pref/labels.php:22
-#: classes/pref/filters.php:288
-#: classes/pref/filters.php:748
-msgid "Caption"
-msgstr "Leyenda"
+#: classes/pref/feeds.php:13
+msgid "Check to enable field"
+msgstr "Marcar para habilitar el campo"
 
-#: classes/pref/labels.php:37
-msgid "Colors"
-msgstr "Colores"
+#: classes/pref/feeds.php:63
+#: classes/pref/feeds.php:212
+#: classes/pref/feeds.php:256
+#: classes/pref/feeds.php:262
+#: classes/pref/feeds.php:288
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "Editar fuente"
+msgstr[1] "Editar fuente"
 
-#: classes/pref/labels.php:42
-msgid "Foreground:"
-msgstr "Primer plano:"
+#: classes/pref/feeds.php:556
+msgid "Feed Title"
+msgstr "Título de la fuente"
 
-#: classes/pref/labels.php:42
-msgid "Background:"
-msgstr "Fondo:"
+#: classes/pref/feeds.php:598
+#: classes/pref/feeds.php:812
+msgid "Update"
+msgstr "Actualizar"
 
-#: classes/pref/labels.php:232
-#, fuzzy, php-format
-msgid "Created label <b>%s</b>"
-msgstr "Crear marcador"
+#: classes/pref/feeds.php:613
+#: classes/pref/feeds.php:828
+msgid "Article purging:"
+msgstr "Purga de artículos:"
 
-#: classes/pref/labels.php:287
-msgid "Clear colors"
-msgstr "Limpiar los colores"
+#: classes/pref/feeds.php:643
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:659
+#: classes/pref/feeds.php:857
+msgid "Hide from Popular feeds"
+msgstr "No incluir en fuentes populares"
+
+#: classes/pref/feeds.php:671
+#: classes/pref/feeds.php:863
+msgid "Include in e-mail digest"
+msgstr "Incluir en el correo recopilatorio"
+
+#: classes/pref/feeds.php:684
+#: classes/pref/feeds.php:869
+msgid "Always display image attachments"
+msgstr "Mostrar siempre imágenes adjuntas"
+
+#: classes/pref/feeds.php:697
+#: classes/pref/feeds.php:877
+msgid "Do not embed images"
+msgstr "No mostrar imágenes"
+
+#: classes/pref/feeds.php:710
+#: classes/pref/feeds.php:885
+msgid "Cache images locally"
+msgstr "Guardar las imágenes en la memoria caché local"
+
+#: classes/pref/feeds.php:722
+#: classes/pref/feeds.php:891
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "Marcar fuente como leída"
+
+#: classes/pref/feeds.php:728
+msgid "Icon"
+msgstr "Icono"
+
+#: classes/pref/feeds.php:742
+msgid "Replace"
+msgstr "Reemplazar"
+
+#: classes/pref/feeds.php:764
+msgid "Resubscribe to push updates"
+msgstr "Volver a suscribirse a las actualizaciones push"
+
+#: classes/pref/feeds.php:771
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:1146
+#: classes/pref/feeds.php:1199
+msgid "All done."
+msgstr "Hecho."
+
+#: classes/pref/feeds.php:1254
+msgid "Feeds with errors"
+msgstr "Fuentes con errores"
+
+#: classes/pref/feeds.php:1279
+msgid "Inactive feeds"
+msgstr "Fuentes inactivas"
+
+#: classes/pref/feeds.php:1316
+msgid "Edit selected feeds"
+msgstr "Editar fuentes seleccionadas"
+
+#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1332
+#: classes/pref/filters.php:687
+msgid "Reset sort order"
+msgstr "Reiniciar orden"
+
+#: classes/pref/feeds.php:1320
+#: js/prefs.js:1732
+msgid "Batch subscribe"
+msgstr "Suscripción en lote"
+
+#: classes/pref/feeds.php:1327
+msgid "Categories"
+msgstr "Categorías"
+
+#: classes/pref/feeds.php:1330
+msgid "Add category"
+msgstr "Añadir categoría"
+
+#: classes/pref/feeds.php:1334
+msgid "Remove selected"
+msgstr "Eliminar seleccionadas"
+
+#: classes/pref/feeds.php:1345
+msgid "More actions..."
+msgstr "Más acciones..."
+
+#: classes/pref/feeds.php:1349
+msgid "Manual purge"
+msgstr "Purga manual"
+
+#: classes/pref/feeds.php:1353
+msgid "Clear feed data"
+msgstr "Limpiar los datos de la fuente"
+
+#: classes/pref/feeds.php:1354
+#: classes/pref/filters.php:695
+msgid "Rescore articles"
+msgstr "Reiniciar la puntuación de los artículos"
+
+#: classes/pref/feeds.php:1404
+msgid "OPML"
+msgstr "OPML"
+
+#: classes/pref/feeds.php:1406
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr ""
+
+#: classes/pref/feeds.php:1406
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1419
+msgid "Import my OPML"
+msgstr "Importar OPML"
+
+#: classes/pref/feeds.php:1423
+msgid "Filename:"
+msgstr "Nombre de archivo:"
+
+#: classes/pref/feeds.php:1425
+msgid "Include settings"
+msgstr "Incluir preferencias"
+
+#: classes/pref/feeds.php:1429
+msgid "Export OPML"
+msgstr "Exportar OPML"
+
+#: classes/pref/feeds.php:1433
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr ""
+
+#: classes/pref/feeds.php:1435
+msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:1437
+msgid "Public OPML URL"
+msgstr "URL del archivo OPML público"
+
+#: classes/pref/feeds.php:1438
+msgid "Display published OPML URL"
+msgstr "Mostrar la URL del OPML público"
+
+#: classes/pref/feeds.php:1447
+msgid "Firefox integration"
+msgstr "Integración con Firefox"
+
+#: classes/pref/feeds.php:1449
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr ""
+
+#: classes/pref/feeds.php:1456
+msgid "Click here to register this site as a feed reader."
+msgstr ""
+
+#: classes/pref/feeds.php:1464
+msgid "Published & shared articles / Generated feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1466
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr ""
+
+#: classes/pref/feeds.php:1474
+msgid "Display URL"
+msgstr "Mostrar URL"
+
+#: classes/pref/feeds.php:1477
+msgid "Clear all generated URLs"
+msgstr "Limpiar todas las URL generadas"
+
+#: classes/pref/feeds.php:1555
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr ""
+
+#: classes/pref/feeds.php:1589
+#: classes/pref/feeds.php:1653
+msgid "Click to edit feed"
+msgstr "Haga clic para editar fuente"
+
+#: classes/pref/feeds.php:1607
+#: classes/pref/feeds.php:1673
+msgid "Unsubscribe from selected feeds"
+msgstr "Cancelar la suscripción a las fuentes seleccionadas"
+
+#: classes/pref/feeds.php:1778
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1787
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1809
+msgid "Feeds require authentication."
+msgstr "Las fuentes requieren autenticación."
 
 #: classes/pref/filters.php:93
 msgid "Articles matching this filter:"
@@ -1646,6 +1820,12 @@ msgstr "(inverso)"
 msgid "%s on %s in %s %s"
 msgstr ""
 
+#: classes/pref/filters.php:288
+#: classes/pref/filters.php:748
+#: classes/pref/labels.php:22
+msgid "Caption"
+msgstr "Leyenda"
+
 #: classes/pref/filters.php:294
 #: classes/pref/filters.php:752
 #: classes/pref/filters.php:867
@@ -1688,17 +1868,6 @@ msgstr "Probar"
 msgid "Combine"
 msgstr "Combinar"
 
-#: classes/pref/filters.php:687
-#: classes/pref/feeds.php:1318
-#: classes/pref/feeds.php:1332
-msgid "Reset sort order"
-msgstr "Reiniciar orden"
-
-#: classes/pref/filters.php:695
-#: classes/pref/feeds.php:1354
-msgid "Rescore articles"
-msgstr "Reiniciar la puntuación de los artículos"
-
 #: classes/pref/filters.php:824
 msgid "Create"
 msgstr "Crear"
@@ -1725,6 +1894,7 @@ msgid "Save rule"
 msgstr "Guardar regla"
 
 #: classes/pref/filters.php:905
+#: js/functions.js:1025
 msgid "Add rule"
 msgstr "Añadir regla"
 
@@ -1741,7 +1911,7 @@ msgid "Save action"
 msgstr "Guardar acción"
 
 #: classes/pref/filters.php:972
-#: js/functions.js:1048
+#: js/functions.js:1051
 msgid "Add action"
 msgstr "Añadir acción"
 
@@ -1763,6 +1933,27 @@ msgid_plural "%s (+%d actions)"
 msgstr[0] "Añadir acción"
 msgstr[1] "Añadir acción"
 
+#: classes/pref/labels.php:37
+msgid "Colors"
+msgstr "Colores"
+
+#: classes/pref/labels.php:42
+msgid "Foreground:"
+msgstr "Primer plano:"
+
+#: classes/pref/labels.php:42
+msgid "Background:"
+msgstr "Fondo:"
+
+#: classes/pref/labels.php:232
+#, fuzzy, php-format
+msgid "Created label <b>%s</b>"
+msgstr "Crear marcador"
+
+#: classes/pref/labels.php:287
+msgid "Clear colors"
+msgstr "Limpiar los colores"
+
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "General"
@@ -1951,6 +2142,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
 #: classes/pref/prefs.php:54
+#: js/prefs.js:1687
 msgid "Customize stylesheet"
 msgstr "Personalizar hoja de estilo"
 
@@ -2111,405 +2303,233 @@ msgstr ""
 msgid "Customize"
 msgstr "Personalizar"
 
-#: classes/pref/prefs.php:630
+#: classes/pref/prefs.php:631
 msgid "Register"
 msgstr "Registro"
 
-#: classes/pref/prefs.php:634
+#: classes/pref/prefs.php:635
 msgid "Clear"
 msgstr "Limpiar"
 
-#: classes/pref/prefs.php:640
+#: classes/pref/prefs.php:641
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:672
+#: classes/pref/prefs.php:673
 msgid "Save configuration"
 msgstr "Guardar la configuración"
 
-#: classes/pref/prefs.php:676
+#: classes/pref/prefs.php:677
 msgid "Save and exit preferences"
 msgstr "Guardar preferencias y salir"
 
-#: classes/pref/prefs.php:681
+#: classes/pref/prefs.php:682
 msgid "Manage profiles"
 msgstr "Gestionar perfiles"
 
-#: classes/pref/prefs.php:684
+#: classes/pref/prefs.php:685
 msgid "Reset to defaults"
 msgstr "Opciones por defecto"
 
-#: classes/pref/prefs.php:707
+#: classes/pref/prefs.php:708
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/prefs.php:709
+#: classes/pref/prefs.php:710
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
-#: classes/pref/prefs.php:711
+#: classes/pref/prefs.php:712
 msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
 msgstr ""
 
-#: classes/pref/prefs.php:737
+#: classes/pref/prefs.php:738
 msgid "System plugins"
 msgstr "Plugins de sistema"
 
-#: classes/pref/prefs.php:741
-#: classes/pref/prefs.php:797
+#: classes/pref/prefs.php:742
+#: classes/pref/prefs.php:798
 msgid "Plugin"
 msgstr "Plugin"
 
-#: classes/pref/prefs.php:742
-#: classes/pref/prefs.php:798
+#: classes/pref/prefs.php:743
+#: classes/pref/prefs.php:799
 msgid "Description"
 msgstr "Descripción"
 
-#: classes/pref/prefs.php:743
-#: classes/pref/prefs.php:799
+#: classes/pref/prefs.php:744
+#: classes/pref/prefs.php:800
 msgid "Version"
 msgstr "Versión"
 
-#: classes/pref/prefs.php:744
-#: classes/pref/prefs.php:800
+#: classes/pref/prefs.php:745
+#: classes/pref/prefs.php:801
 msgid "Author"
 msgstr "Autor"
 
-#: classes/pref/prefs.php:775
-#: classes/pref/prefs.php:834
+#: classes/pref/prefs.php:776
+#: classes/pref/prefs.php:835
 msgid "more info"
 msgstr "más información"
 
-#: classes/pref/prefs.php:784
-#: classes/pref/prefs.php:843
+#: classes/pref/prefs.php:785
+#: classes/pref/prefs.php:844
 msgid "Clear data"
 msgstr "Borrar datos"
 
-#: classes/pref/prefs.php:793
+#: classes/pref/prefs.php:794
 msgid "User plugins"
 msgstr "Plugins de usuario"
 
-#: classes/pref/prefs.php:858
+#: classes/pref/prefs.php:859
 msgid "Enable selected plugins"
 msgstr "Activar los plugins seleccionados"
 
-#: classes/pref/prefs.php:926
+#: classes/pref/prefs.php:927
 msgid "Incorrect one time password"
 msgstr "Contraseña de un solo uso incorrecta"
 
-#: classes/pref/prefs.php:929
-#: classes/pref/prefs.php:946
+#: classes/pref/prefs.php:930
+#: classes/pref/prefs.php:947
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
-#: classes/pref/prefs.php:971
+#: classes/pref/prefs.php:972
 #, php-format
 msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/pref/prefs.php:1011
+#: classes/pref/prefs.php:1012
 msgid "Create profile"
 msgstr "Crear perfil"
 
-#: classes/pref/prefs.php:1034
-#: classes/pref/prefs.php:1062
+#: classes/pref/prefs.php:1035
+#: classes/pref/prefs.php:1063
 msgid "(active)"
 msgstr "(activo)"
 
-#: classes/pref/prefs.php:1096
+#: classes/pref/prefs.php:1097
 msgid "Remove selected profiles"
 msgstr "Borrar los perfiles seleccionados"
 
-#: classes/pref/prefs.php:1098
+#: classes/pref/prefs.php:1099
 msgid "Activate profile"
 msgstr "Activar perfil"
 
-#: classes/pref/feeds.php:13
-msgid "Check to enable field"
-msgstr "Marcar para habilitar el campo"
-
-#: classes/pref/feeds.php:63
-#: classes/pref/feeds.php:212
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:262
-#: classes/pref/feeds.php:288
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Editar fuente"
-msgstr[1] "Editar fuente"
-
-#: classes/pref/feeds.php:556
-msgid "Feed Title"
-msgstr "Título de la fuente"
-
-#: classes/pref/feeds.php:598
-#: classes/pref/feeds.php:812
-msgid "Update"
-msgstr "Actualizar"
-
-#: classes/pref/feeds.php:613
-#: classes/pref/feeds.php:828
-msgid "Article purging:"
-msgstr "Purga de artículos:"
-
-#: classes/pref/feeds.php:643
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+#: classes/dlg.php:16
+msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
-msgid "Hide from Popular feeds"
-msgstr "No incluir en fuentes populares"
-
-#: classes/pref/feeds.php:671
-#: classes/pref/feeds.php:863
-msgid "Include in e-mail digest"
-msgstr "Incluir en el correo recopilatorio"
-
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:869
-msgid "Always display image attachments"
-msgstr "Mostrar siempre imágenes adjuntas"
-
-#: classes/pref/feeds.php:697
-#: classes/pref/feeds.php:877
-msgid "Do not embed images"
-msgstr "No mostrar imágenes"
-
-#: classes/pref/feeds.php:710
-#: classes/pref/feeds.php:885
-msgid "Cache images locally"
-msgstr "Guardar las imágenes en la memoria caché local"
-
-#: classes/pref/feeds.php:722
-#: classes/pref/feeds.php:891
+#: classes/dlg.php:47
 #, fuzzy
-msgid "Mark updated articles as unread"
-msgstr "Marcar fuente como leída"
-
-#: classes/pref/feeds.php:728
-msgid "Icon"
-msgstr "Icono"
-
-#: classes/pref/feeds.php:742
-msgid "Replace"
-msgstr "Reemplazar"
+msgid "Your Public OPML URL is:"
+msgstr "URL del archivo OPML público"
 
-#: classes/pref/feeds.php:764
-msgid "Resubscribe to push updates"
-msgstr "Volver a suscribirse a las actualizaciones push"
+#: classes/dlg.php:56
+#: classes/dlg.php:213
+#: plugins/share/init.php:120
+msgid "Generate new URL"
+msgstr "Generar URL nueva"
 
-#: classes/pref/feeds.php:771
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#: classes/dlg.php:70
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/pref/feeds.php:1146
-#: classes/pref/feeds.php:1199
-msgid "All done."
-msgstr "Hecho."
-
-#: classes/pref/feeds.php:1254
-msgid "Feeds with errors"
-msgstr "Fuentes con errores"
-
-#: classes/pref/feeds.php:1279
-msgid "Inactive feeds"
-msgstr "Fuentes inactivas"
-
-#: classes/pref/feeds.php:1316
-msgid "Edit selected feeds"
-msgstr "Editar fuentes seleccionadas"
-
-#: classes/pref/feeds.php:1320
-#: js/prefs.js:1732
-msgid "Batch subscribe"
-msgstr "Suscripción en lote"
-
-#: classes/pref/feeds.php:1327
-msgid "Categories"
-msgstr "Categorías"
-
-#: classes/pref/feeds.php:1330
-msgid "Add category"
-msgstr "Añadir categoría"
-
-#: classes/pref/feeds.php:1334
-msgid "Remove selected"
-msgstr "Eliminar seleccionadas"
-
-#: classes/pref/feeds.php:1345
-msgid "More actions..."
-msgstr "Más acciones..."
-
-#: classes/pref/feeds.php:1349
-msgid "Manual purge"
-msgstr "Purga manual"
-
-#: classes/pref/feeds.php:1353
-msgid "Clear feed data"
-msgstr "Limpiar los datos de la fuente"
-
-#: classes/pref/feeds.php:1404
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref/feeds.php:1406
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr ""
+#: classes/dlg.php:74
+#: classes/dlg.php:83
+msgid "Last update:"
+msgstr "Última actualización:"
 
-#: classes/pref/feeds.php:1406
-msgid "Only main settings profile can be migrated using OPML."
+#: classes/dlg.php:79
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/pref/feeds.php:1419
-msgid "Import my OPML"
-msgstr "Importar OPML"
+#: classes/dlg.php:165
+msgid "Match:"
+msgstr "Coincidir:"
 
-#: classes/pref/feeds.php:1423
-msgid "Filename:"
-msgstr "Nombre de archivo:"
+#: classes/dlg.php:167
+msgid "Any"
+msgstr "Cualquiera"
 
-#: classes/pref/feeds.php:1425
-msgid "Include settings"
-msgstr "Incluir preferencias"
+#: classes/dlg.php:170
+msgid "All tags."
+msgstr "Todas las etiquetas."
 
-#: classes/pref/feeds.php:1429
-msgid "Export OPML"
-msgstr "Exportar OPML"
+#: classes/dlg.php:172
+msgid "Which Tags?"
+msgstr "¿Qué etiquetas?"
 
-#: classes/pref/feeds.php:1433
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr ""
+#: classes/dlg.php:185
+msgid "Display entries"
+msgstr "Mostrar artículos"
 
-#: classes/pref/feeds.php:1435
-msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
+#: classes/dlg.php:204
+msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/pref/feeds.php:1437
-msgid "Public OPML URL"
-msgstr "URL del archivo OPML público"
-
-#: classes/pref/feeds.php:1438
-msgid "Display published OPML URL"
-msgstr "Mostrar la URL del OPML público"
-
-#: classes/pref/feeds.php:1447
-msgid "Firefox integration"
-msgstr "Integración con Firefox"
+#: classes/dlg.php:232
+#: plugins/updater/init.php:348
+#, fuzzy, php-format
+msgid "New version of Tiny Tiny RSS is available (%s)."
+msgstr "¡Nueva versión disponible!"
 
-#: classes/pref/feeds.php:1449
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+#: classes/dlg.php:240
+msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/pref/feeds.php:1456
-msgid "Click here to register this site as a feed reader."
-msgstr ""
+#: classes/dlg.php:244
+#: plugins/updater/init.php:352
+msgid "See the release notes"
+msgstr "Ver las notas de la versión"
 
-#: classes/pref/feeds.php:1464
-msgid "Published & shared articles / Generated feeds"
-msgstr ""
+#: classes/dlg.php:246
+msgid "Download"
+msgstr "Descargar"
 
-#: classes/pref/feeds.php:1466
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+#: classes/dlg.php:254
+msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/pref/feeds.php:1474
-msgid "Display URL"
-msgstr "Mostrar URL"
-
-#: classes/pref/feeds.php:1477
-msgid "Clear all generated URLs"
-msgstr "Limpiar todas las URL generadas"
+#: plugins/af_comics/init.php:39
+msgid "Feeds supported by af_comics"
+msgstr ""
 
-#: classes/pref/feeds.php:1555
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+#: plugins/af_comics/init.php:41
+msgid "The following comics are currently supported:"
 msgstr ""
 
-#: classes/pref/feeds.php:1589
-#: classes/pref/feeds.php:1653
-msgid "Click to edit feed"
-msgstr "Haga clic para editar fuente"
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Editar nota del artículo"
 
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1673
-msgid "Unsubscribe from selected feeds"
-msgstr "Cancelar la suscripción a las fuentes seleccionadas"
+#: plugins/googlereaderimport/init.php:92
+#: plugins/import_export/init.php:446
+msgid "No file uploaded."
+msgstr "No se ha cargado ningún archivo."
 
-#: classes/pref/feeds.php:1778
-msgid "Add one valid RSS feed per line (no feed detection is done)"
+#: plugins/googlereaderimport/init.php:179
+#, php-format
+msgid "All done. %d out of %d articles imported."
 msgstr ""
 
-#: classes/pref/feeds.php:1787
-msgid "Feeds to subscribe, One per line"
+#: plugins/googlereaderimport/init.php:183
+msgid "The document has incorrect format."
 msgstr ""
 
-#: classes/pref/feeds.php:1809
-msgid "Feeds require authentication."
-msgstr "Las fuentes requieren autenticación."
-
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Registro de errores"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "Actualizar"
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr "Borrar registro"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "Error"
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr "Nombre de archivo"
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "Mensaje"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "Fecha"
-
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "Cerrar artículo"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/googlereaderimport/init.php:354
+msgid "Import starred or shared items from Google Reader"
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Plugin NSFW"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: plugins/googlereaderimport/init.php:358
+msgid "Paste your starred.json or shared.json into the form below."
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Configuración guardada."
-
-#: plugins/auth_internal/init.php:65
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Contraseña de un solo uso incorrecta"
-
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "La contraseña ha sido cambiada."
-
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "La contraseña antigua es incorrecta."
+#: plugins/googlereaderimport/init.php:372
+msgid "Import my Starred items"
+msgstr "Importar mis ítems favoritos"
 
 #: plugins/mailto/init.php:49
 #: plugins/mailto/init.php:55
@@ -2540,28 +2560,44 @@ msgstr ""
 msgid "Close this dialog"
 msgstr "Cerrar este diálogo"
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
+#: plugins/updater/init.php:338
+#: plugins/updater/init.php:355
+#: plugins/updater/updater.js:10
+msgid "Update Tiny Tiny RSS"
+msgstr "Actualizar Tiny Tiny RSS"
 
-#: plugins/bookmarklets/init.php:22
-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."
+#: plugins/updater/init.php:358
+msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr ""
 
-#: plugins/bookmarklets/init.php:26
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Se ha suscrito a %s"
+#: plugins/updater/init.php:361
+msgid "Force update"
+msgstr "Forzar actualización"
 
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Actualizar Tiny Tiny RSS"
+#: plugins/updater/init.php:370
+msgid "Do not close this dialog until updating is finished."
+msgstr ""
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/updater/init.php:379
+msgid "It is suggested to backup your tt-rss directory first."
 msgstr ""
 
+#: plugins/updater/init.php:380
+msgid "Your database will not be modified."
+msgstr ""
+
+#: plugins/updater/init.php:381
+msgid "Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes."
+msgstr ""
+
+#: plugins/updater/init.php:382
+msgid "Ready to update."
+msgstr "Listo para actualizar."
+
+#: plugins/updater/init.php:387
+msgid "Start update"
+msgstr "Empezar actualización"
+
 #: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr "Importar y exportar"
@@ -2619,10 +2655,39 @@ msgstr ""
 msgid "Prepare data"
 msgstr "Preparar datos"
 
-#: plugins/import_export/init.php:446
-#: plugins/googlereaderimport/init.php:92
-msgid "No file uploaded."
-msgstr "No se ha cargado ningún archivo."
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr "Plugin NSFW"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Configuración guardada."
+
+#: plugins/auth_internal/init.php:65
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Contraseña de un solo uso incorrecta"
+
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "La contraseña ha sido cambiada."
+
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "La contraseña antigua es incorrecta."
+
+#: plugins/close_button/init.php:22
+msgid "Close article"
+msgstr "Cerrar artículo"
 
 #: plugins/mail/init.php:28
 msgid "Mail addresses saved."
@@ -2649,45 +2714,6 @@ msgstr "Asunto:"
 msgid "Send e-mail"
 msgstr "Enviar correo electrónico"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Editar nota del artículo"
-
-#: plugins/googlereaderimport/init.php:179
-#, php-format
-msgid "All done. %d out of %d articles imported."
-msgstr ""
-
-#: plugins/googlereaderimport/init.php:183
-msgid "The document has incorrect format."
-msgstr ""
-
-#: plugins/googlereaderimport/init.php:354
-msgid "Import starred or shared items from Google Reader"
-msgstr ""
-
-#: plugins/googlereaderimport/init.php:358
-msgid "Paste your starred.json or shared.json into the form below."
-msgstr ""
-
-#: plugins/googlereaderimport/init.php:372
-msgid "Import my Starred items"
-msgstr "Importar mis ítems favoritos"
-
-#: plugins/af_comics/init.php:39
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:41
-msgid "The following comics are currently supported:"
-msgstr ""
-
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:54
-msgid "Shared articles"
-msgstr "Artículos compartidos"
-
 #: plugins/instances/init.php:141
 msgid "Linked"
 msgstr "Enlazado"
@@ -2748,6 +2774,33 @@ msgstr "Fuentes archivadas"
 msgid "Create link"
 msgstr "Crear enlace"
 
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:54
+msgid "Shared articles"
+msgstr "Artículos compartidos"
+
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
+
+#: plugins/bookmarklets/init.php:22
+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 ""
+
+#: plugins/bookmarklets/init.php:26
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Se ha suscrito a %s"
+
+#: plugins/bookmarklets/init.php:31
+#, fuzzy
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Actualizar Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
 #: plugins/share/init.php:39
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
@@ -2768,44 +2821,6 @@ msgstr ""
 msgid "Unshare article"
 msgstr "Dejar de compartir el artículo"
 
-#: plugins/updater/init.php:324
-#: plugins/updater/init.php:341
-#: plugins/updater/updater.js:10
-msgid "Update Tiny Tiny RSS"
-msgstr "Actualizar Tiny Tiny RSS"
-
-#: plugins/updater/init.php:344
-msgid "Your Tiny Tiny RSS installation is up to date."
-msgstr ""
-
-#: plugins/updater/init.php:347
-msgid "Force update"
-msgstr "Forzar actualización"
-
-#: plugins/updater/init.php:356
-msgid "Do not close this dialog until updating is finished."
-msgstr ""
-
-#: plugins/updater/init.php:365
-msgid "It is suggested to backup your tt-rss directory first."
-msgstr ""
-
-#: plugins/updater/init.php:366
-msgid "Your database will not be modified."
-msgstr ""
-
-#: plugins/updater/init.php:367
-msgid "Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes."
-msgstr ""
-
-#: plugins/updater/init.php:368
-msgid "Ready to update."
-msgstr "Listo para actualizar."
-
-#: plugins/updater/init.php:373
-msgid "Start update"
-msgstr "Empezar actualización"
-
 #: js/functions.js:62
 msgid "The error will be reported to the configured log destination."
 msgstr ""
@@ -2822,71 +2837,76 @@ msgstr ""
 msgid "Are you sure to report this exception to tt-rss.org? The report will include information about your web browser and tt-rss configuration. Your IP will be saved in the database."
 msgstr ""
 
-#: js/functions.js:236
+#: js/functions.js:224
 msgid "Click to close"
 msgstr "Haga clic para cerrar"
 
-#: js/functions.js:1048
+#: js/functions.js:1051
 msgid "Edit action"
 msgstr "Editar acción"
 
-#: js/functions.js:1085
+#: js/functions.js:1088
 msgid "Create Filter"
 msgstr "Crear filtro"
 
-#: js/functions.js:1215
+#: js/functions.js:1218
 msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1226
+#: js/functions.js:1229
 msgid "Subscription reset."
 msgstr "Suscripción reiniciada."
 
-#: js/functions.js:1236
-#: js/tt-rss.js:678
+#: js/functions.js:1239
+#: js/tt-rss.js:684
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
 
-#: js/functions.js:1239
+#: js/functions.js:1242
 msgid "Removing feed..."
 msgstr "Eliminando la fuente..."
 
-#: js/functions.js:1346
+#: js/functions.js:1349
 msgid "Please enter category title:"
 msgstr "Introduzca el nombre de la categoría:"
 
-#: js/functions.js:1377
+#: js/functions.js:1380
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1381
+#: js/functions.js:1384
+#: js/prefs.js:1218
 msgid "Trying to change address..."
 msgstr "Intentando cambiar la dirección..."
 
-#: js/functions.js:1682
-#: js/functions.js:1792
+#: js/functions.js:1685
+#: js/functions.js:1795
 #: js/prefs.js:414
 #: js/prefs.js:444
 #: js/prefs.js:476
 #: js/prefs.js:629
 #: js/prefs.js:649
+#: js/prefs.js:1194
+#: js/prefs.js:1339
 msgid "No feeds are selected."
 msgstr "No se han seleccionado fuentes."
 
-#: js/functions.js:1724
+#: js/functions.js:1727
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1763
+#: js/functions.js:1766
 msgid "Feeds with update errors"
 msgstr "Fuentes con errores de actualización"
 
-#: js/functions.js:1774
+#: js/functions.js:1777
+#: js/prefs.js:1176
 msgid "Remove selected feeds?"
 msgstr "¿Borrar fuentes seleccionadas?"
 
-#: js/functions.js:1777
+#: js/functions.js:1780
+#: js/prefs.js:1179
 msgid "Removing selected feeds..."
 msgstr "Borrando fuentes seleccionadas..."
 
@@ -2923,6 +2943,7 @@ msgstr "Editor de usuario"
 #: js/prefs.js:736
 #: plugins/instances/instances.js:26
 #: plugins/instances/instances.js:89
+#: js/functions.js:1592
 msgid "Saving data..."
 msgstr "Guardando datos..."
 
@@ -2947,6 +2968,7 @@ msgid "Removing selected labels..."
 msgstr "Eliminando los marcadores seleccionados..."
 
 #: js/prefs.js:312
+#: js/prefs.js:1380
 msgid "No labels are selected."
 msgstr "No se han seleccionado marcadores."
 
@@ -3059,8 +3081,8 @@ msgid "Please choose an OPML file first."
 msgstr ""
 
 #: js/prefs.js:802
-#: plugins/import_export/import_export.js:115
 #: plugins/googlereaderimport/init.js:45
+#: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando. Por favor, espere..."
 
@@ -3090,39 +3112,40 @@ msgstr "Marcar artículos anteriores como leídos"
 msgid "Marking all feeds as read..."
 msgstr "Marcar fuente como leída"
 
-#: js/tt-rss.js:385
+#: js/tt-rss.js:391
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:426
-#: js/tt-rss.js:659
+#: js/tt-rss.js:432
+#: js/tt-rss.js:665
+#: js/functions.js:1571
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:497
+#: js/tt-rss.js:503
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:667
+#: js/tt-rss.js:673
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/tt-rss.js:672
-#: js/tt-rss.js:825
+#: js/tt-rss.js:678
+#: js/tt-rss.js:831
 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Limpiando las fuentes seleccionadas..."
 
-#: js/tt-rss.js:820
+#: js/tt-rss.js:826
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:830
+#: js/tt-rss.js:836
 #, fuzzy, perl-format
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
-#: js/tt-rss.js:833
+#: js/tt-rss.js:839
 msgid "Rescoring articles..."
 msgstr "Reiniciando la puntuación de los artículos..."
 
@@ -3157,6 +3180,9 @@ msgstr[1] "No se ha seleccionado ningún artículo."
 #: js/viewfeed.js:2289
 #: plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
+#: js/viewfeed.js:817
+#: js/viewfeed.js:882
+#: js/viewfeed.js:916
 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
 
@@ -3208,6 +3234,8 @@ msgid "Saving article tags..."
 msgstr "Guardando las etiquetas del artículo..."
 
 #: js/viewfeed.js:1326
+#: js/viewfeed.js:113
+#: js/viewfeed.js:184
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Haga clic para editar fuente"
@@ -3254,11 +3282,27 @@ msgstr "URL del artículo:"
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr "Guardando nota del artículo..."
+
+#: plugins/googlereaderimport/init.js:18
+msgid "Google Reader Import"
+msgstr "Importación de Google Reader"
+
+#: plugins/googlereaderimport/init.js:42
+msgid "Please choose a file first."
+msgstr ""
+
 #: plugins/mailto/init.js:21
 #: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Enviar artículo por correo electrónico"
 
+#: plugins/updater/updater.js:58
+msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
+msgstr ""
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Exportar datos"
@@ -3278,6 +3322,10 @@ msgstr "Importación de datos"
 msgid "Please choose the file first."
 msgstr ""
 
+#: plugins/shorten_expanded/init.js:37
+msgid "Click to expand article"
+msgstr "Desplegar el artículo"
+
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
 msgstr ""
@@ -3286,22 +3334,6 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr ""
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Guardando nota del artículo..."
-
-#: plugins/shorten_expanded/init.js:37
-msgid "Click to expand article"
-msgstr "Desplegar el artículo"
-
-#: plugins/googlereaderimport/init.js:18
-msgid "Google Reader Import"
-msgstr "Importación de Google Reader"
-
-#: plugins/googlereaderimport/init.js:42
-msgid "Please choose a file first."
-msgstr ""
-
 #: plugins/instances/instances.js:10
 msgid "Link Instance"
 msgstr "Enlazar instancia"
@@ -3328,18 +3360,6 @@ msgstr "No se han seleccionado instancias."
 msgid "Please select only one instance."
 msgstr "¿Eliminar instancias seleccionadas?"
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr ""
-
-#: plugins/share/share_prefs.js:6
-msgid "Clearing URLs..."
-msgstr "Limpiando URL..."
-
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Las URL compartidas han sido borradas."
-
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Compartir artículo mediante URL"
@@ -3360,143 +3380,270 @@ msgstr ""
 msgid "Trying to unshare..."
 msgstr "Intentando dejar de compartir..."
 
-#: plugins/updater/updater.js:58
-msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
+#: plugins/share/share_prefs.js:3
+msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
+#: plugins/share/share_prefs.js:6
+#: js/prefs.js:1518
+msgid "Clearing URLs..."
+msgstr "Limpiando URL..."
+
+#: plugins/share/share_prefs.js:13
+msgid "Shared URLs cleared."
+msgstr "Las URL compartidas han sido borradas."
+
+#: js/feedlist.js:406
+#: js/feedlist.js:434
 #, fuzzy
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "¿Reiniciar la puntuación de los artículos en %?"
+msgid "Mark all articles in %s as read?"
+msgstr "¿Reiniciar la puntuación de los artículos en %?"
+
+#: js/feedlist.js:425
+#, fuzzy
+msgid "Mark all articles in %s older than 1 day as read?"
+msgstr "¿Reiniciar la puntuación de los artículos en %?"
+
+#: js/feedlist.js:428
+#, fuzzy
+msgid "Mark all articles in %s older than 1 week as read?"
+msgstr "¿Reiniciar la puntuación de los artículos en %?"
+
+#: js/feedlist.js:431
+#, fuzzy
+msgid "Mark all articles in %s older than 2 weeks as read?"
+msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
-#~ msgid "Error explained"
-#~ msgstr "Error explicado"
+#: js/functions.js:615
+msgid "Error explained"
+msgstr "Error explicado"
 
-#~ msgid "Upload complete."
-#~ msgstr "Carga completa."
+#: js/functions.js:697
+msgid "Upload complete."
+msgstr "Carga completa."
 
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "¿Borrar el icono de la fuente?"
+#: js/functions.js:721
+msgid "Remove stored feed icon?"
+msgstr "¿Borrar el icono de la fuente?"
 
-#~ msgid "Removing feed icon..."
-#~ msgstr "Borrando el icono de la fuente..."
+#: js/functions.js:726
+msgid "Removing feed icon..."
+msgstr "Borrando el icono de la fuente..."
 
-#~ msgid "Feed icon removed."
-#~ msgstr "Icono de la fuente borrado."
+#: js/functions.js:731
+msgid "Feed icon removed."
+msgstr "Icono de la fuente borrado."
 
-#~ msgid "Uploading, please wait..."
-#~ msgstr "Cargando. Por favor, espere..."
+#: js/functions.js:753
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "¿Eliminar los filtros seleccionados?"
+
+#: js/functions.js:755
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:756
+msgid "Uploading, please wait..."
+msgstr "Cargando. Por favor, espere..."
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "Por favor, introduzca el nombre del marcador:"
+#: js/functions.js:772
+msgid "Please enter label caption:"
+msgstr "Por favor, introduzca el nombre del marcador:"
 
+#: js/functions.js:777
 #, fuzzy
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "Por favor, introduzca el nombre del marcador:"
+msgid "Can't create label: missing caption."
+msgstr "Por favor, introduzca el nombre del marcador:"
+
+#: js/functions.js:820
+msgid "Subscribe to Feed"
+msgstr "Suscribirse a una fuente"
+
+#: js/functions.js:839
+msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
+msgstr ""
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "Suscribirse a una fuente"
+#: js/functions.js:854
+msgid "Subscribed to %s"
+msgstr "Se ha suscrito a %s"
+
+#: js/functions.js:859
+msgid "Specified URL seems to be invalid."
+msgstr ""
+
+#: js/functions.js:862
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr ""
 
-#~ msgid "Subscribed to %s"
-#~ msgstr "Se ha suscrito a %s"
+#: js/functions.js:874
+msgid "Expand to select feed"
+msgstr "Expandir para seleccionar fuente"
+
+#: js/functions.js:886
+msgid "Couldn't download the specified URL: %s"
+msgstr ""
+
+#: js/functions.js:890
+msgid "XML validation failed: %s"
+msgstr "Fallo de validación de XML: %s"
+
+#: js/functions.js:895
+#, fuzzy
+msgid "You are already subscribed to this feed."
+msgstr "Se ha suscrito a %s"
 
-#~ msgid "Expand to select feed"
-#~ msgstr "Expandir para seleccionar fuente"
+#: js/functions.js:1025
+msgid "Edit rule"
+msgstr "Editar regla"
 
-#~ msgid "XML validation failed: %s"
-#~ msgstr "Fallo de validación de XML: %s"
+#: js/functions.js:1586
+msgid "Edit Feed"
+msgstr "Editar fuente"
 
-#~ msgid "Edit rule"
-#~ msgstr "Editar regla"
+#: js/functions.js:1624
+msgid "More Feeds"
+msgstr "Más fuentes"
 
-#~ msgid "Edit Feed"
-#~ msgstr "Editar fuente"
+#: js/functions.js:1878
+msgid "Help"
+msgstr "Ayuda"
 
-#~ msgid "More Feeds"
-#~ msgstr "Más fuentes"
+#: js/prefs.js:1083
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""
 
-#~ msgid "Help"
-#~ msgstr "Ayuda"
+#: js/prefs.js:1089
+msgid "Removing category..."
+msgstr "Eliminando categoría..."
 
-#~ msgid "Removing category..."
-#~ msgstr "Eliminando categoría..."
+#: js/prefs.js:1110
+msgid "Remove selected categories?"
+msgstr "¿Eliminar las categorías seleccionadas?"
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "¿Eliminar las categorías seleccionadas?"
+#: js/prefs.js:1113
+msgid "Removing selected categories..."
+msgstr "Eliminando las categorías seleccionadas..."
 
-#~ msgid "Removing selected categories..."
-#~ msgstr "Eliminando las categorías seleccionadas..."
+#: js/prefs.js:1126
+msgid "No categories are selected."
+msgstr "No se han seleccionado categorías."
 
-#~ msgid "No categories are selected."
-#~ msgstr "No se han seleccionado categorías."
+#: js/prefs.js:1134
+msgid "Category title:"
+msgstr "Nombre de la categoría:"
 
-#~ msgid "Category title:"
-#~ msgstr "Nombre de la categoría:"
+#: js/prefs.js:1138
+msgid "Creating category..."
+msgstr "Creando categoría..."
 
-#~ msgid "Creating category..."
-#~ msgstr "Creando categoría..."
+#: js/prefs.js:1165
+msgid "Feeds without recent updates"
+msgstr "Fuentes sin actualizaciones recientes"
 
-#~ msgid "Feeds without recent updates"
-#~ msgstr "Fuentes sin actualizaciones recientes"
+#: js/prefs.js:1214
+msgid "Replace current OPML publishing address with a new one?"
+msgstr ""
 
-#~ msgid "Clearing feed..."
-#~ msgstr "Limpiando la fuente..."
+#: js/prefs.js:1303
+msgid "Clearing feed..."
+msgstr "Limpiando la fuente..."
 
+#: js/prefs.js:1323
 #, fuzzy
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr "¿Reiniciar la puntuación de los artículos en %?"
+msgid "Rescore articles in selected feeds?"
+msgstr "¿Reiniciar la puntuación de los artículos en %?"
+
+#: js/prefs.js:1326
+msgid "Rescoring selected feeds..."
+msgstr "Volviendo a puntuar las fuentes seleccionadas..."
 
-#~ msgid "Rescoring selected feeds..."
-#~ msgstr "Volviendo a puntuar las fuentes seleccionadas..."
+#: js/prefs.js:1346
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
 
-#~ msgid "Rescoring feeds..."
-#~ msgstr "Volviendo a puntuar las fuentes..."
+#: js/prefs.js:1349
+msgid "Rescoring feeds..."
+msgstr "Volviendo a puntuar las fuentes..."
 
+#: js/prefs.js:1366
 #, fuzzy
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr "¿Borrar los marcadores seleccionados?"
+msgid "Reset selected labels to default colors?"
+msgstr "¿Borrar los marcadores seleccionados?"
+
+#: js/prefs.js:1403
+msgid "Settings Profiles"
+msgstr "Perfiles de preferencias"
 
-#~ msgid "Settings Profiles"
-#~ msgstr "Perfiles de preferencias"
+#: js/prefs.js:1412
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: js/prefs.js:1415
+msgid "Removing selected profiles..."
+msgstr "Borrando los perfiles seleccionados..."
 
-#~ msgid "Removing selected profiles..."
-#~ msgstr "Borrando los perfiles seleccionados..."
+#: js/prefs.js:1430
+msgid "No profiles are selected."
+msgstr "No se ha seleccionado ningún perfil."
 
-#~ msgid "No profiles are selected."
-#~ msgstr "No se ha seleccionado ningún perfil."
+#: js/prefs.js:1438
+#: js/prefs.js:1491
+msgid "Activate selected profile?"
+msgstr "¿Activar el perfil seleccionado?"
 
-#~ msgid "Activate selected profile?"
-#~ msgstr "¿Activar el perfil seleccionado?"
+#: js/prefs.js:1454
+#: js/prefs.js:1507
+msgid "Please choose a profile to activate."
+msgstr ""
 
-#~ msgid "Creating profile..."
-#~ msgstr "Creando perfil..."
+#: js/prefs.js:1459
+msgid "Creating profile..."
+msgstr "Creando perfil..."
+
+#: js/prefs.js:1515
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
 
-#~ msgid "Generated URLs cleared."
-#~ msgstr "Las URL generadas han sido borradas."
+#: js/prefs.js:1525
+msgid "Generated URLs cleared."
+msgstr "Las URL generadas han sido borradas."
 
-#~ msgid "Label Editor"
-#~ msgstr "Editor de marcadores"
+#: js/prefs.js:1616
+msgid "Label Editor"
+msgstr "Editor de marcadores"
 
+#: js/tt-rss.js:652
 #, fuzzy
-#~ msgid "Select item(s) by tags"
-#~ msgstr "Seleccionar por etiquetas..."
+msgid "Select item(s) by tags"
+msgstr "Seleccionar por etiquetas..."
 
-#~ msgid "New version available!"
-#~ msgstr "¡Nueva versión disponible!"
+#: js/tt-rss.js:980
+msgid "New version available!"
+msgstr "¡Nueva versión disponible!"
 
-#~ msgid "Cancel search"
-#~ msgstr "Cancelar búsqueda"
+#: js/viewfeed.js:117
+msgid "Cancel search"
+msgstr "Cancelar búsqueda"
 
-#~ msgid "No article is selected."
-#~ msgstr "No se ha seleccionado ningún artículo."
+#: js/viewfeed.js:1438
+msgid "No article is selected."
+msgstr "No se ha seleccionado ningún artículo."
 
-#, fuzzy
-#~ msgid "Mark %d article as read?"
-#~ msgid_plural "Mark %d articles as read?"
-#~ msgstr[0] "Marcar artículos anteriores como leídos"
-#~ msgstr[1] "Marcar artículos anteriores como leídos"
+#: js/viewfeed.js:1473
+msgid "No articles found to mark"
+msgstr ""
 
-#~ msgid "Display article URL"
-#~ msgstr "Mostrar la URL del artículo"
+#: js/viewfeed.js:1475
+#, fuzzy
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "Marcar artículos anteriores como leídos"
+msgstr[1] "Marcar artículos anteriores como leídos"
+
+#: js/viewfeed.js:1990
+msgid "Display article URL"
+msgstr "Mostrar la URL del artículo"
 
 #~ msgid "From:"
 #~ msgstr "De:"