diff options
author | Richard Beales <[email protected]> | 2013-03-20 16:59:19 +0000 |
---|---|---|
committer | Richard Beales <[email protected]> | 2013-03-20 16:59:19 +0000 |
commit | 77accf45df3072bf0e3fe1e919bb75fc14313119 (patch) | |
tree | 84be283769a6849f4916880739044a163e6f4761 /locale/es_ES | |
parent | 04ed8b423abd9046ac4ee6813cf5e98b37aad2a3 (diff) | |
parent | 2d2d08fc41dec694ac0895368eff3eb80a173a5b (diff) |
fix merge conflict with stylesheet tags
Diffstat (limited to 'locale/es_ES')
-rw-r--r-- | locale/es_ES/LC_MESSAGES/messages.mo | bin | 44623 -> 44623 bytes | |||
-rw-r--r-- | locale/es_ES/LC_MESSAGES/messages.po | 96 |
2 files changed, 48 insertions, 48 deletions
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo Binary files differindex b31384c42..4b9b0d753 100644 --- a/locale/es_ES/LC_MESSAGES/messages.mo +++ b/locale/es_ES/LC_MESSAGES/messages.mo diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po index 1f91eb1f5..cc7de552b 100644 --- a/locale/es_ES/LC_MESSAGES/messages.po +++ b/locale/es_ES/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-20 10:24+0400\n" +"POT-Creation-Date: 2013-03-20 15:53+0400\n" "PO-Revision-Date: 2012-10-25 00:12+0100\n" "Last-Translator: DavidM <[email protected]>\n" "Language-Team: Español <[email protected]>\n" @@ -266,7 +266,7 @@ msgstr "" #: index.php:117 index.php:147 index.php:252 prefs.php:79 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 -#: plugins/digest/digest_body.php:45 js/viewfeed.js:1174 +#: plugins/digest/digest_body.php:45 js/viewfeed.js:1181 msgid "Loading, please wait..." msgstr "Cargando. Por favor, espere..." @@ -340,7 +340,7 @@ msgstr "Actualizar" #: index.php:191 index.php:221 include/functions.php:1906 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 -#: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156 +#: classes/feeds.php:410 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Marcar como leído" @@ -707,11 +707,11 @@ msgstr "Publicar artículo" msgid "Open in new window" msgstr "Abrir el artículo en una nueva pestaña o ventana" -#: include/functions.php:1886 js/viewfeed.js:1798 +#: include/functions.php:1886 js/viewfeed.js:1818 msgid "Mark below as read" msgstr "Marcar artículos posteriores como leídos" -#: include/functions.php:1887 js/viewfeed.js:1792 +#: include/functions.php:1887 js/viewfeed.js:1812 msgid "Mark above as read" msgstr "Marcar artículos anteriores como leídos" @@ -861,39 +861,39 @@ msgstr "Mostrar el diálogo de búsqueda" msgid "Search results: %s" msgstr "Resultados de búsqueda: %s" -#: include/functions.php:2892 js/viewfeed.js:1885 +#: include/functions.php:2893 js/viewfeed.js:1905 msgid "Click to play" msgstr "Clic para reproducir" -#: include/functions.php:2893 js/viewfeed.js:1884 +#: include/functions.php:2894 js/viewfeed.js:1904 msgid "Play" msgstr "Reproducir" -#: include/functions.php:3014 +#: include/functions.php:3015 msgid " - " msgstr " - " -#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360 +#: include/functions.php:3037 include/functions.php:3354 classes/rpc.php:360 msgid "no tags" msgstr "sin etiquetas" -#: include/functions.php:3046 classes/feeds.php:653 +#: include/functions.php:3047 classes/feeds.php:656 msgid "Edit tags for this article" msgstr "Editar las etiquetas de este artículo" -#: include/functions.php:3075 classes/feeds.php:608 +#: include/functions.php:3076 classes/feeds.php:610 msgid "Originally from:" msgstr "Original de:" -#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507 +#: include/functions.php:3089 classes/feeds.php:623 classes/pref/feeds.php:507 msgid "Feed URL" msgstr "URL de la fuente" -#: include/functions.php:3117 +#: include/functions.php:3118 msgid "Related" msgstr "Relacionado" -#: include/functions.php:3144 classes/dlg.php:43 classes/dlg.php:162 +#: include/functions.php:3145 classes/dlg.php:43 classes/dlg.php:162 #: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508 #: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608 #: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106 @@ -904,15 +904,15 @@ msgstr "Relacionado" msgid "Close this window" msgstr "Cerrar esta ventana" -#: include/functions.php:3378 +#: include/functions.php:3379 msgid "(edit note)" msgstr "(editar nota)" -#: include/functions.php:3611 +#: include/functions.php:3612 msgid "unknown type" msgstr "tipo desconocido" -#: include/functions.php:3661 +#: include/functions.php:3662 msgid "Attachments" msgstr "Adjuntos" @@ -949,7 +949,7 @@ msgstr "Publicar artículo" msgid "Assign tags" msgstr "Asignar etiquetas" -#: include/localized_schema.php:14 js/viewfeed.js:1849 +#: include/localized_schema.php:14 js/viewfeed.js:1869 msgid "Assign label" msgstr "Asignar marcador" @@ -1648,32 +1648,32 @@ msgstr "Enviar por correo electrónico" msgid "Feed:" msgstr "Fuente:" -#: classes/feeds.php:201 classes/feeds.php:798 +#: classes/feeds.php:201 classes/feeds.php:801 msgid "Feed not found." msgstr "Fuente no encontrada." -#: classes/feeds.php:498 +#: classes/feeds.php:500 msgid "mark as read" msgstr "marcar como leído" -#: classes/feeds.php:553 +#: classes/feeds.php:555 #, fuzzy msgid "Collapse article" msgstr "Cerrar artículo" -#: classes/feeds.php:699 +#: classes/feeds.php:702 msgid "No unread articles found to display." msgstr "No se han encontrado artículos sin leer." -#: classes/feeds.php:702 +#: classes/feeds.php:705 msgid "No updated articles found to display." msgstr "No se han encontrado artículos actualizados." -#: classes/feeds.php:705 +#: classes/feeds.php:708 msgid "No starred articles found to display." msgstr "No se han encontrado artículos favoritos." -#: classes/feeds.php:709 +#: classes/feeds.php:712 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1682,21 +1682,21 @@ msgstr "" "artículos a los marcadores manualmente (ver arriba el menú Acciones) o usar " "un filtro." -#: classes/feeds.php:711 +#: classes/feeds.php:714 msgid "No articles found to display." msgstr "No se han encontrado artículos que mostrar." -#: classes/feeds.php:726 classes/feeds.php:907 +#: classes/feeds.php:729 classes/feeds.php:910 #, php-format msgid "Feeds last updated at %s" msgstr "Última actualización de las fuentes: %s" -#: classes/feeds.php:736 classes/feeds.php:917 +#: classes/feeds.php:739 classes/feeds.php:920 msgid "Some feeds have update errors (click for details)" msgstr "" "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)" -#: classes/feeds.php:897 +#: classes/feeds.php:900 msgid "No feed selected." msgstr "No se ha seleccionado ninguna fuente." @@ -3182,75 +3182,75 @@ msgstr "Marcar el artículo como favorito" msgid "Unpublish article" msgstr "Despublicar artículo" -#: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791 -#: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003 -#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7 +#: js/viewfeed.js:681 js/viewfeed.js:709 js/viewfeed.js:736 js/viewfeed.js:798 +#: js/viewfeed.js:830 js/viewfeed.js:967 js/viewfeed.js:1010 +#: js/viewfeed.js:1060 js/viewfeed.js:1987 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "No se han seleccionado artículos." -#: js/viewfeed.js:940 +#: js/viewfeed.js:947 msgid "Mark all visible articles in %s as read?" msgstr "¿Marcar todos los artículos visibles de %s como leídos?" -#: js/viewfeed.js:968 +#: js/viewfeed.js:975 msgid "Delete %d selected articles in %s?" msgstr "¿Borrar %d artículos seleccionados en %s?" -#: js/viewfeed.js:970 +#: js/viewfeed.js:977 msgid "Delete %d selected articles?" msgstr "¿Borrar %d artículos seleccionados?" -#: js/viewfeed.js:1012 +#: js/viewfeed.js:1019 msgid "Archive %d selected articles in %s?" msgstr "¿Archivar %d artículos seleccionados en %s?" -#: js/viewfeed.js:1015 +#: js/viewfeed.js:1022 msgid "Move %d archived articles back?" msgstr "¿Mover %d artículos archivados a su fuente original?" -#: js/viewfeed.js:1059 +#: js/viewfeed.js:1066 msgid "Mark %d selected articles in %s as read?" msgstr "¿Marcar %d artículos seleccionados de %s como leídos?" -#: js/viewfeed.js:1083 +#: js/viewfeed.js:1090 msgid "Edit article Tags" msgstr "Editar las etiquetas del artículo" -#: js/viewfeed.js:1252 +#: js/viewfeed.js:1259 msgid "No article is selected." msgstr "No se ha seleccionado ningún artículo." -#: js/viewfeed.js:1287 +#: js/viewfeed.js:1294 msgid "No articles found to mark" msgstr "No se han encontrado artículos que marcar" -#: js/viewfeed.js:1289 +#: js/viewfeed.js:1296 msgid "Mark %d article(s) as read?" msgstr "¿Marcar %d artículo(s) como leído(s)?" -#: js/viewfeed.js:1784 +#: js/viewfeed.js:1804 msgid "Open original article" msgstr "Abrir artículo original" -#: js/viewfeed.js:1854 +#: js/viewfeed.js:1874 msgid "Remove label" msgstr "Borrar marcador" -#: js/viewfeed.js:1878 +#: js/viewfeed.js:1898 msgid "Playing..." msgstr "Reproduciendo..." -#: js/viewfeed.js:1879 +#: js/viewfeed.js:1899 msgid "Click to pause" msgstr "Clic para pausar" -#: js/viewfeed.js:1936 +#: js/viewfeed.js:1956 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "Por favor, introduzca una nota para este artículo:" -#: js/viewfeed.js:1978 +#: js/viewfeed.js:1998 #, fuzzy msgid "Please enter new score for this article:" msgstr "Por favor, introduzca una nota para este artículo:" |