The branch, master has been updated via 15fb569d34a9576dc424e09c23fda58a0c9111bd (commit) via f8d77019cbb5847bbb61a1e905c681b58ceeb18a (commit) via ce2b930832a9b228b78fc22b26e2517c2000f83d (commit) via b43b8d30643dcf0ba8e75fddc7f591c006f44581 (commit) via 09ed45002994611a024e969ccaf377bb880cc026 (commit) via 87b8cfdee395a3bd219354905fb9b7663ee7ac25 (commit) via c40df38501d822abc480f5942350412e74f63977 (commit) via 61591e18056e563a2553cd42cc867407d36704ba (commit) via b68f235607255a1059e4c4689c046785365f10d4 (commit) via b48ea00bcfb57d937ab3dee9604c0e32f2cc8f91 (commit) via b2233b4833ee7d946c728f4f2b3ba6ecf6123c54 (commit) via da16f5c3224a740d58e4f74ce107145180107d6c (commit) via 9c9287f21d30144a74bfc3603d17263d5b385cca (commit) via 81bccb73928c85f5f368b5e22a9dcfe50f1cc5c5 (commit) via c4665ab0ecfd6844b9d84c0c2a673c7ef598316a (commit) via 785ba417038576c81dc7c4545082ae40c269c9b0 (commit) via 3422dbdf5cb01f691fea42ef170b40e348353b54 (commit) via 20ba6369d2cdeadd828bc3a52065d477fe193649 (commit) via da505529036aa5bc411d0270999a5354cdb79a05 (commit) via c03e0916e70207d6b6ea69578bf833d3434c8a2e (commit) via 528ca33787e24578130c314566aca2f7767f7026 (commit) via 003762be8e110b1bcbae757753b4c1926153639a (commit) via 0af70b23f3fc79dc178370620bac65fe13244737 (commit) via a009fac1a8f73e1c24bd514390db23705d681527 (commit) via 3fb342128e44bab6148bd98b0cf1cecd58101905 (commit) from 433f2c76ee60f683390bd65d14d6996da601c3f3 (commit)
- Log ----------------------------------------------------------------- commit 15fb569d34a9576dc424e09c23fda58a0c9111bd Merge: 433f2c7 f8d7701 Author: Michal Čihař michal@cihar.com Date: Fri Aug 26 07:45:12 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts: po/es.po
commit f8d77019cbb5847bbb61a1e905c681b58ceeb18a Merge: ce2b930 fd118e0 Author: Pootle server pootle@cihar.com Date: Thu Aug 25 22:40:15 2011 +0200
Merge remote-tracking branch 'origin/master'
commit ce2b930832a9b228b78fc22b26e2517c2000f83d Merge: b43b8d3 04772d6 Author: Pootle server pootle@cihar.com Date: Thu Aug 25 20:40:12 2011 +0200
Merge remote-tracking branch 'origin/master'
commit b43b8d30643dcf0ba8e75fddc7f591c006f44581 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:57:21 2011 +0200
Translation update done using Pootle.
commit 09ed45002994611a024e969ccaf377bb880cc026 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:56:52 2011 +0200
Translation update done using Pootle.
commit 87b8cfdee395a3bd219354905fb9b7663ee7ac25 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:56:39 2011 +0200
Translation update done using Pootle.
commit c40df38501d822abc480f5942350412e74f63977 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:56:36 2011 +0200
Translation update done using Pootle.
commit 61591e18056e563a2553cd42cc867407d36704ba Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:56:27 2011 +0200
Translation update done using Pootle.
commit b68f235607255a1059e4c4689c046785365f10d4 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:56:23 2011 +0200
Translation update done using Pootle.
commit b48ea00bcfb57d937ab3dee9604c0e32f2cc8f91 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:56:18 2011 +0200
Translation update done using Pootle.
commit b2233b4833ee7d946c728f4f2b3ba6ecf6123c54 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:56:13 2011 +0200
Translation update done using Pootle.
commit da16f5c3224a740d58e4f74ce107145180107d6c Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:56:06 2011 +0200
Translation update done using Pootle.
commit 9c9287f21d30144a74bfc3603d17263d5b385cca Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:56:02 2011 +0200
Translation update done using Pootle.
commit 81bccb73928c85f5f368b5e22a9dcfe50f1cc5c5 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:55:49 2011 +0200
Translation update done using Pootle.
commit c4665ab0ecfd6844b9d84c0c2a673c7ef598316a Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:55:39 2011 +0200
Translation update done using Pootle.
commit 785ba417038576c81dc7c4545082ae40c269c9b0 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:55:35 2011 +0200
Translation update done using Pootle.
commit 3422dbdf5cb01f691fea42ef170b40e348353b54 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:55:26 2011 +0200
Translation update done using Pootle.
commit 20ba6369d2cdeadd828bc3a52065d477fe193649 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:55:10 2011 +0200
Translation update done using Pootle.
commit da505529036aa5bc411d0270999a5354cdb79a05 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:55:02 2011 +0200
Translation update done using Pootle.
commit c03e0916e70207d6b6ea69578bf833d3434c8a2e Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:54:47 2011 +0200
Translation update done using Pootle.
commit 528ca33787e24578130c314566aca2f7767f7026 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:54:30 2011 +0200
Translation update done using Pootle.
commit 003762be8e110b1bcbae757753b4c1926153639a Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:54:16 2011 +0200
Translation update done using Pootle.
commit 0af70b23f3fc79dc178370620bac65fe13244737 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:53:50 2011 +0200
Translation update done using Pootle.
commit a009fac1a8f73e1c24bd514390db23705d681527 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:53:44 2011 +0200
Translation update done using Pootle.
commit 3fb342128e44bab6148bd98b0cf1cecd58101905 Author: Matías Bellone matiasbellone@gmail.com Date: Thu Aug 25 18:53:38 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/es.po | 53 +++++++++++++++++++++++------------------------------ 1 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/po/es.po b/po/es.po index b83d586..f435519 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 23:09+0200\n" -"PO-Revision-Date: 2011-08-22 22:01+0200\n" +"PO-Revision-Date: 2011-08-25 18:57+0200\n" "Last-Translator: Matías Bellone matiasbellone@gmail.com\n" "Language-Team: spanish es@li.org\n" "Language: es\n" @@ -909,10 +909,10 @@ msgstr "Y"
#: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:289 -#, fuzzy, php-format +#, php-format #| msgid "Point" msgid "Point %d" -msgstr "Punto" +msgstr "Punto %d"
#: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:295 @@ -1000,6 +1000,8 @@ msgstr "" msgid "" "Cannot convert file's character set without character set conversion library" msgstr "" +"No se pudo convertir el conjunto de caracteres del archivo sin la biblioteca " +"correspondiente"
#: import.php:376 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" @@ -5370,13 +5372,12 @@ msgstr "Texto Open Document"
#: libraries/config/validate.lib.php:198 msgid "Could not initialize Drizzle connection library" -msgstr "" +msgstr "No se pudo inicializar la biblioteca de conexión Drizzle"
#: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" -msgstr "No pudo conectarse con un servidor MySQL" +msgstr "No se pudo conectar con un servidor Drizzle"
#: libraries/config/validate.lib.php:223 libraries/config/validate.lib.php:230 msgid "Could not connect to MySQL server" @@ -5489,11 +5490,10 @@ msgid "The server is not responding" msgstr "El servidor no está respondiendo"
#: libraries/dbi/drizzle.dbi.lib.php:344 -#, fuzzy #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" msgstr "" -"(o el socket del servidor MySQL local no está configurado correctamente)" +"(o el zócalo del servidor Drizzle local no está configurado correctamente)"
#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:384 msgid "(or the local MySQL server's socket is not correctly configured)" @@ -7944,7 +7944,7 @@ msgstr "Juegos de caracteres" #: libraries/server_links.inc.php:104 server_plugins.php:47 #: server_plugins.php:80 msgid "Plugins" -msgstr "" +msgstr "Complementos"
#: libraries/server_links.inc.php:108 msgid "Engines" @@ -8421,10 +8421,9 @@ msgid "General Settings" msgstr "Configuraciones generales"
#: main.php:101 -#, fuzzy #| msgid "MySQL connection collation" msgid "Server connection collation" -msgstr "Cotejamiento de las conexiones MySQL" +msgstr "Cotejamiento de la conexión al servidor"
#: main.php:116 msgid "Appearance Settings" @@ -8435,20 +8434,18 @@ msgid "More settings" msgstr "Más configuraciones"
#: main.php:156 -#, fuzzy #| msgid "Database for user" msgid "Database server" -msgstr "Base de datos para el usuario" +msgstr "Servidor de base de datos"
#: main.php:159 msgid "Software" -msgstr "" +msgstr "Programa"
#: main.php:160 -#, fuzzy #| msgid "Show versions" msgid "Software version" -msgstr "Mostrar versiones" +msgstr "Versiones de programa"
#: main.php:161 msgid "Protocol version" @@ -8461,20 +8458,18 @@ msgid "User" msgstr "Usuario"
#: main.php:167 -#, fuzzy #| msgid "Server socket" msgid "Server charset" -msgstr "Puerto del servidor" +msgstr "Conjunto de caracteres del servidor"
#: main.php:179 msgid "Web server" msgstr "Servidor web"
#: main.php:190 -#, fuzzy #| msgid "Use light version" msgid "Database client version" -msgstr "Use la versión clara" +msgstr "Versión del cliente de base de datos"
#: main.php:192 msgid "PHP extension" @@ -8973,7 +8968,7 @@ msgstr "Ver el volcado (schema) de la base de datos"
#: server_plugins.php:81 msgid "Modules" -msgstr "" +msgstr "Módulos"
#: server_plugins.php:102 msgid "Begin" @@ -8981,15 +8976,15 @@ msgstr "Empezar"
#: server_plugins.php:111 msgid "Plugin" -msgstr "" +msgstr "Complemento"
#: server_plugins.php:112 server_plugins.php:146 msgid "Module" -msgstr "" +msgstr "Módulo"
#: server_plugins.php:113 server_plugins.php:148 msgid "Library" -msgstr "" +msgstr "Biblioteca"
#: server_plugins.php:114 server_plugins.php:149 tbl_tracking.php:635 msgid "Version" @@ -8997,17 +8992,16 @@ msgstr "Versión"
#: server_plugins.php:115 server_plugins.php:150 msgid "Author" -msgstr "" +msgstr "Autor"
#: server_plugins.php:116 server_plugins.php:151 msgid "License" msgstr "Licencia"
#: server_plugins.php:182 -#, fuzzy #| msgid "Disabled" msgid "disabled" -msgstr "Deshabilitado" +msgstr "desactivado"
#: server_privileges.php:32 server_privileges.php:364 msgid "Includes all privileges except GRANT." @@ -12237,16 +12231,15 @@ msgstr "" "se encontró 'percona' en el comentario de la versión («version_comment»)"
#: po/advisory_rules.php:62 -#, fuzzy #| msgid "Percona documentation is at http://www.percona.com/docs/wiki/" msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "" -"La documentación de Percona se encuentra en http://www.percona.com/docs/wiki/" +msgstr "La documentación de Drizzle se encuentra en http://docs.drizzle.org/"
#: po/advisory_rules.php:63 #, php-format msgid "Version string (%s) matches Drizzle versioning scheme" msgstr "" +"La cadena de versión (%s) coincide con el esquema de versionado de Drizzle"
#: po/advisory_rules.php:65 msgid "MySQL Architecture"
hooks/post-receive
-
Michal Čihař