- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 2cc74d228db1c42481b01df58ddbc4be61d84105
by Michal Čihař 03 May '11

03 May '11

The branch, master has been updated via 2cc74d228db1c42481b01df58ddbc4be61d84105 (commit) via f02643e3ca4c2a54941d2dc319e73f3d0ad8ef04 (commit) via 6b1bbbf70e791fe9e2c19eeac665694bcc84c109 (commit) via 8d1566399cee2514f3b46b18c9a023b6f8e0233a (commit) via 538e10dcf8ee460d1472dd0336ac0d1a65290207 (commit) via 519505bf83eb64a9839dad607a584c543b81aaa2 (commit) via a5b757228672c425f63264980d7f9718aad589f5 (commit) via 0e133c3e6108727199a24046a70092bb72e79a23 (commit) via 6d8fadd9d32ac4b59493b49d80fba11faab407ca (commit) via 58ed468ef119f380d4e748c3b6e59df650554c80 (commit) via a1ab13449d165974c86dc2298ce96d138947823e (commit) via bca7c7c2cc4b283ffc10d6c5809eac02cd02d12c (commit) via d819413715475564d49a2018ac8e52a335cd3729 (commit) via 530cc8b544df2eedb1b6b7f535ea9a106da541f9 (commit) via 2cdd4065648958fb7b8a76879233ac0651c02875 (commit) via 732a2e8b8db606af958a16e2986cdd3bafbca621 (commit) via 0f5ec00a109ad9d304776c50e42fabb6a1c52e01 (commit) via 0db72432a687598fa6ee1e176ad9416d0fedcc5b (commit) via 7a17b82c38691c52d4a7a6e9f8ad95c28a108474 (commit) via 271fbb175aef2f7e56521c264644ee3734bf5a66 (commit) via 40abef48c1e9ff82b588e59aebf0860efd2b7f5a (commit) via 0c7e21a42e8802b6615d498e20c570ece78b0f9f (commit) via f60a6c6a95d15696fed07d7833c5979e380128b9 (commit) via b110bb46b85ff799e2226fbe53d9b6dff2fbb363 (commit) via 06caa9017d78159794f34776e830562c379c6866 (commit) via 4cb04d7d0c3089a7d126d4802642dd98329cad3e (commit) via 14f1da66919f700dee6360d9df7131caa79b982e (commit) from 7f9860a07611d6f10bf9acd1e06bf9ff168419d9 (commit) - Log ----------------------------------------------------------------- commit 2cc74d228db1c42481b01df58ddbc4be61d84105 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue May 3 14:40:04 2011 +0200 Generate commit f02643e3ca4c2a54941d2dc319e73f3d0ad8ef04 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:09:13 2011 +0200 Translation update done using Pootle. commit 6b1bbbf70e791fe9e2c19eeac665694bcc84c109 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:08:44 2011 +0200 Translation update done using Pootle. commit 8d1566399cee2514f3b46b18c9a023b6f8e0233a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:08:29 2011 +0200 Translation update done using Pootle. commit 538e10dcf8ee460d1472dd0336ac0d1a65290207 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:08:22 2011 +0200 Translation update done using Pootle. commit 519505bf83eb64a9839dad607a584c543b81aaa2 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:08:16 2011 +0200 Translation update done using Pootle. commit a5b757228672c425f63264980d7f9718aad589f5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:08:11 2011 +0200 Translation update done using Pootle. commit 0e133c3e6108727199a24046a70092bb72e79a23 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:08:01 2011 +0200 Translation update done using Pootle. commit 6d8fadd9d32ac4b59493b49d80fba11faab407ca Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:07:54 2011 +0200 Translation update done using Pootle. commit 58ed468ef119f380d4e748c3b6e59df650554c80 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:07:47 2011 +0200 Translation update done using Pootle. commit a1ab13449d165974c86dc2298ce96d138947823e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:07:39 2011 +0200 Translation update done using Pootle. commit bca7c7c2cc4b283ffc10d6c5809eac02cd02d12c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:07:31 2011 +0200 Translation update done using Pootle. commit d819413715475564d49a2018ac8e52a335cd3729 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:07:23 2011 +0200 Translation update done using Pootle. commit 530cc8b544df2eedb1b6b7f535ea9a106da541f9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:07:13 2011 +0200 Translation update done using Pootle. commit 2cdd4065648958fb7b8a76879233ac0651c02875 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:07:01 2011 +0200 Translation update done using Pootle. commit 732a2e8b8db606af958a16e2986cdd3bafbca621 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:06:53 2011 +0200 Translation update done using Pootle. commit 0f5ec00a109ad9d304776c50e42fabb6a1c52e01 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:06:47 2011 +0200 Translation update done using Pootle. commit 0db72432a687598fa6ee1e176ad9416d0fedcc5b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:06:40 2011 +0200 Translation update done using Pootle. commit 7a17b82c38691c52d4a7a6e9f8ad95c28a108474 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:06:29 2011 +0200 Translation update done using Pootle. commit 271fbb175aef2f7e56521c264644ee3734bf5a66 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:06:22 2011 +0200 Translation update done using Pootle. commit 40abef48c1e9ff82b588e59aebf0860efd2b7f5a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:06:16 2011 +0200 Translation update done using Pootle. commit 0c7e21a42e8802b6615d498e20c570ece78b0f9f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:06:08 2011 +0200 Translation update done using Pootle. commit f60a6c6a95d15696fed07d7833c5979e380128b9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:06:02 2011 +0200 Translation update done using Pootle. commit b110bb46b85ff799e2226fbe53d9b6dff2fbb363 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:05:51 2011 +0200 Translation update done using Pootle. commit 06caa9017d78159794f34776e830562c379c6866 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:05:38 2011 +0200 Translation update done using Pootle. commit 4cb04d7d0c3089a7d126d4802642dd98329cad3e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:05:05 2011 +0200 Translation update done using Pootle. commit 14f1da66919f700dee6360d9df7131caa79b982e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue May 3 14:04:52 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/es/Documentation.html | 70 ++++++++++---------- po/es.po | 148 +++++++++++++++++++++--------------------- 2 files changed, 108 insertions(+), 110 deletions(-) diff --git a/output/es/Documentation.html b/output/es/Documentation.html index 5867d1a..e78d343 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -85,12 +85,11 @@ mbstring y ctype. </li> <li>Necesita el módulo GD2 de PHP para mostrar las miniaturas de JPEGs ("image/jpeg: inline") conservando su relación de aspecto.</li> - <li>Cuando se use el <a href="#authentication_modes">método de -autentificación</a> por "cookies", se sugiere encarecidamente la -extensión<a href="http://www.php.net/mcrypt"><tt>mcrypt</tt></a> para la -mayoría de los usuarios; es <b>obligatoria</b> para máquinas de -64–bit. No usar mcrypt hará que phpMyAdmin cargue las páginas -sensiblemente más lento. + <li>Cuando se use el <a href="#authentication_modes">método de autenticación</a> +por "cookies", se sugiere encarecidamente la extensión<a +href="http://www.php.net/mcrypt"><tt>mcrypt</tt></a> para la mayoría de los +usuarios; es <b>obligatoria</b> para máquinas de 64–bit. No usar +mcrypt hará que phpMyAdmin cargue las páginas sensiblemente más lento. </li> <li>Para obtener barras de progreso en las subidas, vea <a href="#faq2_9"> <abbr title="Frequently Asked Questions">FAQ</abbr> 2.9</a>.</li> @@ -316,15 +315,15 @@ configuración no provee.</li></ul></li> preferible que proteja el directorio de instalación de phpMyAdmin porque el uso de config no requiere que el usuario escriba su contraseña para acceder a la instalación de phpMyAdmin. Se recomienda el uso de métodos de -autentificación alternativos, como por ejemplo un HTTP–AUTH en un +autenticación alternativos, como por ejemplo un HTTP–AUTH en un fichero <a href="#glossary"><i>.htaccess</i></a> o bien usar una cookie -<tt>auth_type</tt> o http. Vea la <a href="#faqmultiuser"> subsección +<tt>auth_type</tt> o http. Vea la <a href="#faqmultiuser">subsección multiusuario</a> de este <abbr title="Frequently Asked Questions">FAQ</abbr> -para obtener información adicional, especialmente <a href="#faq4_4"> <abbr +para obtener información adicional, especialmente <a href="#faq4_4"><abbr title="Frequently Asked Questions">FAQ</abbr> 4.4</a>.</li> <li>Abra el <a href="index.php">directorio principal de phpMyAdmin</a> em su navegador. phpMyAdmin debería mostrar una pantall de bienvenida y sus bases -de datos o, si está usando un método de autentificación por <abbr +de datos o, si está usando un método de autenticación por <abbr title="HyperText Transfer Protocol">HTTP</abbr> o por cookies, un diálogo de registro de usuario.</li> <li>Debería rechazar el acceso a los subdirectorios <tt>./libraries</tt> y @@ -374,7 +373,7 @@ especificar los nombres de las tablas en su fichero <a href="#config">Sección de configuración</a>. También necesitará tener un usuario controlador con los permisos necesarios para acceder a dichas tablas (vea la sección <a href="#authentication_modes">Uso de los modos de -autentificación</a> más abajo).</p> +autenticación</a> más abajo).</p> <h3 id="upgrading">Actualizando desde una versión más antigua</h3> @@ -397,10 +396,10 @@ una versión anterior a la 4.1.2 y está utilizando almacenamiento de configuración phpMyAdmin, debería ejecutar el script SQL en <tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt>.</p> -<h3 id="authentication_modes">Uso de los métodos de autentificación</h3> +<h3 id="authentication_modes">Uso de los métodos de autenticación</h3> <ul><li>Se recomiendan los métodos <abbr title="HyperText Transfer -Protocol">HTTP</abbr> y autentificación por cookies en <b>entornos +Protocol">HTTP</abbr> y autenticación por cookies en <b>entornos multiusuario</b>, donde se desea dar a cada usuario acceso a su propia base de datos pero no a las de los demás.<br /> De todas maneras, tenga en cuenta que MS Internet Explorer tiene muchos @@ -410,7 +409,7 @@ title="HyperText Transfer Protocol">HTTP</abbr> o por cookies, para que su usuario y contraseña no estén expuestos en el fichero de configuración. </li> - <li>Los métodos de autentificación <abbr title="HyperText Transfer + <li>Los métodos de autenticación <abbr title="HyperText Transfer Protocol">HTTP</abbr> y por cookies so n más seguros, dado que la información de registro de MySQL no está expuesta en el fichero de configuración de phpMyAdmin (a excepción del <a href="#controluser">usuario @@ -423,7 +422,7 @@ cifrada con el algoritmo blowfish.</li> <li id="pmausr">Nota: esta sección sólo aplica si el servidor MySQL está ejecutando con la opción <tt>--skip-show-database</tt>.<br /><br /> - Para los modos de autentificación '<abbr title="HyperText Transfer + Para los modos de autenticación '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' y 'cookie', phpMyAdmin necesita un usuario controlador que tenga <b>únicamente</b> el privilegio <tt>SELECT</tt> en las tablas <i>`mysql`.`user` (todas las columnas salvo `Password`)</i>, @@ -481,16 +480,16 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real Las acciones permitidas en este momento para el usuario están completamente bajo el control del sistema de administración de MySQL.<br /> - Con los métodos de autentificación <abbr title="HyperText Transfer + Con los métodos de autenticación <abbr title="HyperText Transfer Protocol">HTTP</abbr> o por cookies, no es necesario rellenar los campos usuario/contraseña en el array <a href="#cfg_Servers" class="configrule">$cfg['Servers']</a>.</li> </ul> -<h4>Método de autentificación '<abbr title="HyperText Transfer +<h4>Método de autenticación '<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</h4> -<ul><li>Emplea el método básico de autentificación <abbr title="HyperText Transfer +<ul><li>Emplea el método básico de autenticación <abbr title="HyperText Transfer Protocol">HTTP</abbr> y le permite ingresar como cualquier usuario válido de MySQL.</li> <li>Admite la mayoría de las configuraciones PHP. Para el soporte de <abbr @@ -503,17 +502,17 @@ de Apache, vea <a href="#faq1_35"><abbr title="Frequently Asked Questions">FAQ</abbr> 1.35</a>.</li> <li>Vea también <a href="#faq4_4"> <abbr title="Frequently Asked Questions">FAQ</abbr> 4.4</a> acerca de cómo no usar el mecanismo -<i>.htaccess</i> conjuntamente con el modo de autentificación '<abbr +<i>.htaccess</i> conjuntamente con el modo de autenticación '<abbr title="HyperText Transfer Protocol">HTTP</abbr>'.</li> </ul> -<h4>método de autentificación por 'cookie'</h4> +<h4>Método de autenticación por 'cookie'</h4> -<ul><li>Se puede usar este método como reemplazo de la autentificación <abbr +<ul><li>Se puede usar este método como reemplazo de la autenticación <abbr title="HyperText Transfer Protocol">HTTP</abbr> (si por ejemplo, está ejecutando <abbr title="Internet Information Services">IIS</abbr>).</li> <li>Obviamente, el usuario debe de activar las cookies, aunque ya es un -requisito para todos los métodos de autentificación.</li> +requisito para todos los métodos de autenticación.</li> <li>Mediante este modo, el usuario puede salir completamente de phpMyAdmin y después volver a entrar con el mismo nombre de usuario.</li> <li>Si quiere entrar en cualquier servidor, vea la directiva <a @@ -524,7 +523,7 @@ emplear la extensión <tt>mcrypt</tt> acelerará el acceso considerablemente, aunque no es obligatoria.</li> </ul> -<h4>método de autentificación 'signon'</h4> +<h4>Método de autenticación 'signon'</h4> <ul><li>Este modo es una manera útil de usar las credenciales de otra aplicación para entrar en phpMyAdmin.</li> @@ -532,7 +531,7 @@ para entrar en phpMyAdmin.</li> datos de la sesión.</li> <li>Más detalles en la sección <a href="#cfg_Servers_auth_type">auth_type</a>.</li> </ul> -<h4>modo de autentificación 'config'</h4> +<h4>Modo de autenticación 'config'</h4> <ul><li>Este modo es el más inseguro dado que necesita que se rellenen los campos <a href="#servers_user" class="configrule"> $cfg['Servers'][$i]['user']</a> y @@ -548,13 +547,12 @@ provider">ISP</abbr> <abbr title="Frequently Asked Questions">FAQ</abbr></a>, hay una reseña que explica cómo proteger su fichero de configuración.</li> <li>Para incrementar la seguridad en este modo, debería considerar el uso de las -directivas de autentificación del servidor <a -href="#servers_allowdeny_order" class="configrule"> -$cfg['Servers'][$i]['AllowDeny']['order']</a> y <a +directivas de autenticación del servidor <a href="#servers_allowdeny_order" +class="configrule"> $cfg['Servers'][$i]['AllowDeny']['order']</a> y <a href="#servers_allowdeny_rules" class="configrule"> $cfg['Servers'][$i]['AllowDeny']['rules']</a>.</li> <li>Al contrario que los modos de cookie o http, no pide al usuario que se -autentifique al cargar la página phpMyAdmin por primera vez. Es así por +autentique al cargar la página phpMyAdmin por primera vez. Es así por diseño, pero podría permitir a cualquiera entrar en su instalación. Debería emplear un método de restricción, como un fichero <a href="#glossary">.htaccess</a> con la directiva HTTP-AUTH, o impedir las @@ -562,14 +560,14 @@ consultas HTTP entrantes a su router o firewall (ambos métodos están más allá de la temática de este manual, pero son fácilmente localizables con Google).</li> </ul> -<h4 id="swekey">autentificación Swekey</h4> +<h4 id="swekey">Autenticación Swekey</h4> <p> -Swekey es un sistema de autentificación barato mediante una llave USB que se +Swekey es un sistema de autenticación barato mediante una llave USB que se puede emplear en aplicaciones web.<br /><br /> -Cuando se activa la autentificación Swekey, phpMyAdmin pide insertar la -Swekey del usuario antes de entrar a la página de registro (actualmente sólo -habilitada para el modo de autentificación po cookies). La autentificación -Swekey está desactivada por defecto.<br /><br /> +Cuando se activa la autenticación Swekey, phpMyAdmin pide insertar la Swekey +del usuario antes de entrar a la página de registro (actualmente sólo +habilitada para el modo de autenticación por cookies). La autenticación +Swekey está desactivada de forma predeterminada.<br /><br /> Para habilitarla, añada la línea siguiente a <i>config.inc.php</i>: </p> <pre> @@ -647,7 +645,7 @@ este parámetro a <tt>TRUE</tt> para eliminar este mensaje.</dd> <dt id="cfg_McryptDisableWarning">$cfg['McryptDisableWarning'] boolean</dt> <dd>Desactica el aviso por defecto que se muestra si no se encuentra mcrypt para -la autentificación por cookies. Se puede poner este parámetro como +la autenticación por cookies. Se puede poner este parámetro como <tt>TRUE</tt> para desactivar el mensaje.</dd> <dt id="cfg_TranslationWarningThreshold">entero $cfg['TranslationWarningThreshold']</dt> @@ -3399,7 +3397,7 @@ una línea</p> <p> Reinicia Apache y funcionará.</p> -<p> Este es una corrección sugerida por Brad Ummer:</p> +<p> Esta es una corrección sugerida por Brad Ummer:</p> <ul><li>Primero necesitas determinar qué zócalo está siendo utilizado por MySQL.<br /> Para hacer esto, conéctate a tu servidor y ubícate en el directorio bin de diff --git a/po/es.po b/po/es.po index 67978f1..0298f18 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:31+0300\n" -"PO-Revision-Date: 2011-04-22 18:16+0200\n" +"PO-Revision-Date: 2011-05-03 14:09+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -193,12 +193,11 @@ msgid "" "<b>required</b> for 64–bit machines. Not using mcrypt will cause " "phpMyAdmin to load pages significantly slower." msgstr "" -"Cuando se use el <a href=\"#authentication_modes\">método de " -"autentificación</a> por "cookies", se sugiere encarecidamente la " -"extensión<a href=\"http://www.php.net/mcrypt\"><tt>mcrypt</tt></a> para la " -"mayoría de los usuarios; es <b>obligatoria</b> para máquinas de 64–" -"bit. No usar mcrypt hará que phpMyAdmin cargue las páginas sensiblemente más " -"lento." +"Cuando se use el <a href=\"#authentication_modes\">método de autenticación</a> " +"por "cookies", se sugiere encarecidamente la extensión<a " +"href=\"http://www.php.net/mcrypt\"><tt>mcrypt</tt></a> para la mayoría de los " +"usuarios; es <b>obligatoria</b> para máquinas de 64–bit. No usar " +"mcrypt hará que phpMyAdmin cargue las páginas sensiblemente más lento." #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:80 @@ -808,12 +807,12 @@ msgstr "" "preferible que proteja el directorio de instalación de phpMyAdmin porque el " "uso de config no requiere que el usuario escriba su contraseña para acceder " "a la instalación de phpMyAdmin. Se recomienda el uso de métodos de " -"autentificación alternativos, como por ejemplo un HTTP–AUTH en un " +"autenticación alternativos, como por ejemplo un HTTP–AUTH en un " "fichero <a href=\"#glossary\"><i>.htaccess</i></a> o bien usar una cookie " -"<tt>auth_type</tt> o http. Vea la <a href=\"#faqmultiuser\"> subsección " -"multiusuario</a> de este <abbr title=\"Frequently Asked Questions\">FAQ</" -"abbr> para obtener información adicional, especialmente <a href=\"#faq4_4\"> " -"<abbr title=\"Frequently Asked Questions\">FAQ</abbr> 4.4</a>." +"<tt>auth_type</tt> o http. Vea la <a href=\"#faqmultiuser\">subsección " +"multiusuario</a> de este <abbr title=\"Frequently Asked Questions\">FAQ</abbr> " +"para obtener información adicional, especialmente <a href=\"#faq4_4\"><abbr " +"title=\"Frequently Asked Questions\">FAQ</abbr> 4.4</a>." #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:303 @@ -825,8 +824,8 @@ msgid "" msgstr "" "Abra el <a href=\"index.php\">directorio principal de phpMyAdmin</a> em su " "navegador. phpMyAdmin debería mostrar una pantall de bienvenida y sus bases " -"de datos o, si está usando un método de autentificación por <abbr title=" -"\"HyperText Transfer Protocol\">HTTP</abbr> o por cookies, un diálogo de " +"de datos o, si está usando un método de autenticación por <abbr " +"title=\"HyperText Transfer Protocol\">HTTP</abbr> o por cookies, un diálogo de " "registro de usuario." #. type: Content of: <html><body><div><ol><li> @@ -937,11 +936,11 @@ msgid "" msgstr "" "Después de importar el fichero <i>./scripts/create_tables.sql</i>, debería " "especificar los nombres de las tablas en su fichero <i>./config.inc.php</i>. " -"Las directivas necesarias están disponibles en la <a href=\"#config" -"\">Sección de configuración</a>. También necesitará tener un usuario " -"controlador con los permisos necesarios para acceder a dichas tablas (vea la " -"sección <a href=\"#authentication_modes\">Uso de los modos de " -"autentificación</a> más abajo)." +"Las directivas necesarias están disponibles en la <a href=\"#config\">Sección " +"de configuración</a>. También necesitará tener un usuario controlador con " +"los permisos necesarios para acceder a dichas tablas (vea la sección <a " +"href=\"#authentication_modes\">Uso de los modos de autenticación</a> más " +"abajo)." #. type: Content of: <html><body><div><h3> #: orig-docs/Documentation.html:356 @@ -996,7 +995,7 @@ msgstr "" #. type: Content of: <html><body><div><h3> #: orig-docs/Documentation.html:375 msgid "Using authentication modes" -msgstr "Uso de los métodos de autentificación" +msgstr "Uso de los métodos de autenticación" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:377 @@ -1006,10 +1005,10 @@ msgid "" "where you want to give users access to their own database and don't want " "them to play around with others." msgstr "" -"Se recomiendan los métodos <abbr title=\"HyperText Transfer Protocol\">HTTP</" -"abbr> y autentificación por cookies en <b>entornos multiusuario</b>, donde " -"se desea dar a cada usuario acceso a su propia base de datos pero no a las " -"de los demás." +"Se recomiendan los métodos <abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr> y autenticación por cookies en <b>entornos " +"multiusuario</b>, donde se desea dar a cada usuario acceso a su propia base " +"de datos pero no a las de los demás." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:381 @@ -1039,11 +1038,11 @@ msgid "" "need to be set in the phpMyAdmin configuration file (except possibly for the " "<a href=\"#controluser\">controluser</a>)." msgstr "" -"Los métodos de autentificación <abbr title=\"HyperText Transfer Protocol" -"\">HTTP</abbr> y por cookies so n más seguros, dado que la información de " -"registro de MySQL no está expuesta en el fichero de configuración de " -"phpMyAdmin (a excepción del <a href=\"#controluser\">usuario controlador</" -"a>)." +"Los métodos de autenticación <abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr> y por cookies so n más seguros, dado que la " +"información de registro de MySQL no está expuesta en el fichero de " +"configuración de phpMyAdmin (a excepción del <a href=\"#controluser\">usuario " +"controlador</a>)." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:392 @@ -1082,13 +1081,13 @@ msgid "" "<i>`mysql`.`tables_priv` (all columns except `Grantor` and `Timestamp`)</i> " "tables." msgstr "" -"Para los modos de autentificación '<abbr title=\"HyperText Transfer Protocol" -"\">HTTP</abbr>' y 'cookie', phpMyAdmin necesita un usuario controlador que " -"tenga <b>únicamente</b> el privilegio <tt>SELECT</tt> en las tablas " -"<i>`mysql`.`user` (todas las columnas salvo `Password`)</i>, <i>`mysql`.`db` " -"(todas las columnas)</i>, <i>`mysql`.`host` (todas las columnas)</i> y " -"<i>`mysql`.`tables_priv` (todas las columnas salvo `Grantor` y `Timestamp`)</" -"i>." +"Para los modos de autenticación '<abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr>' y 'cookie', phpMyAdmin necesita un usuario " +"controlador que tenga <b>únicamente</b> el privilegio <tt>SELECT</tt> en las " +"tablas <i>`mysql`.`user` (todas las columnas salvo `Password`)</i>, " +"<i>`mysql`.`db` (todas las columnas)</i>, <i>`mysql`.`host` (todas las " +"columnas)</i> y <i>`mysql`.`tables_priv` (todas las columnas salvo `Grantor` " +"y `Timestamp`)</i>." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:405 @@ -1225,18 +1224,18 @@ msgid "" "authentication mode, you don't need to fill the user/password fields inside " "the <a href=\"#cfg_Servers\" class=\"configrule\">$cfg['Servers']</a> array." msgstr "" -"Con los métodos de autentificación <abbr title=\"HyperText Transfer Protocol" -"\">HTTP</abbr> o por cookies, no es necesario rellenar los campos usuario/" -"contraseña en el array <a href=\"#cfg_Servers\" class=\"configrule\">$cfg" -"['Servers']</a>." +"Con los métodos de autenticación <abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr> o por cookies, no es necesario rellenar los campos " +"usuario/contraseña en el array <a href=\"#cfg_Servers\" " +"class=\"configrule\">$cfg['Servers']</a>." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:463 msgid "" "'<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>' authentication mode" msgstr "" -"Método de autentificación '<abbr title=\"HyperText Transfer Protocol\">HTTP</" -"abbr>'" +"Método de autenticación '<abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr>'" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:465 @@ -1244,9 +1243,9 @@ msgid "" "Uses <abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> Basic " "authentication method and allows you to log in as any valid MySQL user." msgstr "" -"Emplea el método básico de autentificación <abbr title=\"HyperText Transfer " -"Protocol\">HTTP</abbr> y le permite ingresar como cualquier usuario válido " -"de MySQL." +"Emplea el método básico de autenticación <abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr> y le permite ingresar como cualquier usuario válido de " +"MySQL." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:467 @@ -1275,15 +1274,15 @@ msgid "" "with '<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>' " "authentication mode." msgstr "" -"Vea también <a href=\"#faq4_4\"> <abbr title=\"Frequently Asked Questions" -"\">FAQ</abbr> 4.4</a> acerca de cómo no usar el mecanismo <i>.htaccess</i> " -"conjuntamente con el modo de autentificación '<abbr title=\"HyperText " -"Transfer Protocol\">HTTP</abbr>'." +"Vea también <a href=\"#faq4_4\"> <abbr title=\"Frequently Asked " +"Questions\">FAQ</abbr> 4.4</a> acerca de cómo no usar el mecanismo " +"<i>.htaccess</i> conjuntamente con el modo de autenticación '<abbr " +"title=\"HyperText Transfer Protocol\">HTTP</abbr>'." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:483 msgid "'cookie' authentication mode" -msgstr "método de autentificación por 'cookie'" +msgstr "Método de autenticación por 'cookie'" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:485 @@ -1292,9 +1291,9 @@ msgid "" "Transfer Protocol\">HTTP</abbr> authentication (for example, if you're " "running <abbr title=\"Internet Information Services\">IIS</abbr>)." msgstr "" -"Se puede usar este método como reemplazo de la autentificación <abbr title=" -"\"HyperText Transfer Protocol\">HTTP</abbr> (si por ejemplo, está ejecutando " -"<abbr title=\"Internet Information Services\">IIS</abbr>)." +"Se puede usar este método como reemplazo de la autenticación <abbr " +"title=\"HyperText Transfer Protocol\">HTTP</abbr> (si por ejemplo, está " +"ejecutando <abbr title=\"Internet Information Services\">IIS</abbr>)." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:489 @@ -1303,7 +1302,7 @@ msgid "" "requirement for all authentication modes." msgstr "" "Obviamente, el usuario debe de activar las cookies, aunque ya es un " -"requisito para todos los métodos de autentificación." +"requisito para todos los métodos de autenticación." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:491 @@ -1338,7 +1337,7 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:501 msgid "'signon' authentication mode" -msgstr "método de autentificación 'signon'" +msgstr "Método de autenticación 'signon'" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:503 @@ -1366,7 +1365,7 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:510 msgid "'config' authentication mode" -msgstr "modo de autentificación 'config'" +msgstr "Modo de autenticación 'config'" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:512 @@ -1415,10 +1414,10 @@ msgid "" "['AllowDeny']['rules']</a> configuration directives." msgstr "" "Para incrementar la seguridad en este modo, debería considerar el uso de las " -"directivas de autentificación del servidor <a href=\"#servers_allowdeny_order" -"\" class=\"configrule\"> $cfg['Servers'][$i]['AllowDeny']['order']</a> y <a " -"href=\"#servers_allowdeny_rules\" class=\"configrule\"> $cfg['Servers'][$i]" -"['AllowDeny']['rules']</a>." +"directivas de autenticación del servidor <a href=\"#servers_allowdeny_order\" " +"class=\"configrule\"> $cfg['Servers'][$i]['AllowDeny']['order']</a> y <a " +"href=\"#servers_allowdeny_rules\" class=\"configrule\"> " +"$cfg['Servers'][$i]['AllowDeny']['rules']</a>." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:533 @@ -1432,17 +1431,18 @@ msgid "" "searchable with Google)." msgstr "" "Al contrario que los modos de cookie o http, no pide al usuario que se " -"autentifique al cargar la página phpMyAdmin por primera vez. Es así por " +"autentique al cargar la página phpMyAdmin por primera vez. Es así por " "diseño, pero podría permitir a cualquiera entrar en su instalación. Debería " -"emplear un método de restricción, como un fichero <a href=\"#glossary\">." -"htaccess</a> con la directiva HTTP-AUTH, o impedir las consultas HTTP " -"entrantes a su router o firewall (ambos métodos están más allá de la " -"temática de este manual, pero son fácilmente localizables con Google)." +"emplear un método de restricción, como un fichero <a " +"href=\"#glossary\">.htaccess</a> con la directiva HTTP-AUTH, o impedir las " +"consultas HTTP entrantes a su router o firewall (ambos métodos están más " +"allá de la temática de este manual, pero son fácilmente localizables con " +"Google)." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:541 msgid "Swekey authentication" -msgstr "autentificación Swekey" +msgstr "Autenticación Swekey" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:543 @@ -1450,7 +1450,7 @@ msgid "" "The Swekey is a low cost authentication USB key that can be used in web " "applications." msgstr "" -"Swekey es un sistema de autentificación barato mediante una llave USB que se " +"Swekey es un sistema de autenticación barato mediante una llave USB que se " "puede emplear en aplicaciones web." #. type: Content of: <html><body><div><p> @@ -1461,10 +1461,10 @@ msgid "" "cookie authentication mode only). Swekey Authentication is disabled by " "default." msgstr "" -"Cuando se activa la autentificación Swekey, phpMyAdmin pide insertar la " -"Swekey del usuario antes de entrar a la página de registro (actualmente sólo " -"habilitada para el modo de autentificación po cookies). La autentificación " -"Swekey está desactivada por defecto." +"Cuando se activa la autenticación Swekey, phpMyAdmin pide insertar la Swekey " +"del usuario antes de entrar a la página de registro (actualmente sólo " +"habilitada para el modo de autenticación por cookies). La autenticación " +"Swekey está desactivada de forma predeterminada." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:549 @@ -1668,8 +1668,8 @@ msgid "" "this message from appearing." msgstr "" "Desactica el aviso por defecto que se muestra si no se encuentra mcrypt para " -"la autentificación por cookies. Se puede poner este parámetro como <tt>TRUE</" -"tt> para desactivar el mensaje." +"la autenticación por cookies. Se puede poner este parámetro como " +"<tt>TRUE</tt> para desactivar el mensaje." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:627 @@ -8860,7 +8860,7 @@ msgstr "Reinicia Apache y funcionará." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3131 msgid "Here is a fix suggested by Brad Ummer:" -msgstr "Este es una corrección sugerida por Brad Ummer:" +msgstr "Esta es una corrección sugerida por Brad Ummer:" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3133 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-476-g56476bc
by Piotr Przybylski 03 May '11

03 May '11

The branch, master has been updated via 56476bc74df455405bd331ad82d0a88404c9b155 (commit) from 2c3fa8aa7cbc11d353b58922aa86e23f1ad06899 (commit) - Log ----------------------------------------------------------------- commit 56476bc74df455405bd331ad82d0a88404c9b155 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue May 3 14:26:55 2011 +0200 Make sure $limit is initialized ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 842b891..22d9671 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -282,7 +282,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`, - `TABLE_TYPE` ÀS `TABLE_TYPE`, + `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`, `ENGINE` AS `Type`, `VERSION` AS `Version`, @@ -479,7 +479,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals * returns array with databases containing extended infos about them * * @todo move into PMA_List_Database? - * @param string $databases database + * @param string $database database * @param boolean $force_stats retrieve stats also for MySQL < 5 * @param resource $link mysql link * @param string $sort_by column to order by @@ -508,9 +508,8 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false, * if $GLOBALS['cfg']['NaturalOrder'] is enabled, we cannot use LIMIT * cause MySQL does not support natural ordering, we have to do it afterward */ - if ($GLOBALS['cfg']['NaturalOrder']) { - $limit = ''; - } else { + $limit = ''; + if (!$GLOBALS['cfg']['NaturalOrder']) { if ($limit_count) { $limit = ' LIMIT ' . $limit_count . ' OFFSET ' . $limit_offset; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-475-g2c3fa8a
by Piotr Przybylski 03 May '11

03 May '11

The branch, master has been updated via 2c3fa8aa7cbc11d353b58922aa86e23f1ad06899 (commit) from 65d869023e2aa27f2289807550f7cbacacb5285c (commit) - Log ----------------------------------------------------------------- commit 2c3fa8aa7cbc11d353b58922aa86e23f1ad06899 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue May 3 14:14:57 2011 +0200 Don't display More for views and information_schema tables ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index 73374d7..fce4f39 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -466,8 +466,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php } // end if... else... echo "\n"; - } // end if (! $tbl_is_view && ! $db_is_information_schema) - ?> + ?> <td class="more_opts" id="more_opts<?php echo $rownum; ?>"> <?php echo __('More'); ?> <img src="<?php echo $pmaThemeImage . 'more.png'; ?>" alt="<?php echo __('Show more actions'); ?>" /> <div class="structure_actions_dropdown" id="row_<?php echo $rownum; ?>"> @@ -531,6 +530,9 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> </div> </td> + <?php + } // end if (! $tbl_is_view && ! $db_is_information_schema) + ?> </tr> <?php unset($field_charset); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-474-g65d8690
by Michal Čihař 03 May '11

03 May '11

The branch, master has been updated via 65d869023e2aa27f2289807550f7cbacacb5285c (commit) via 4b9aa973ea12b46810546f3350796b82ed79ec9c (commit) via 4d71a45de43c469b287c216121e330d51a995dc7 (commit) via 0b78b24e5f14a4c7c5396efc2b44a63e5d904c91 (commit) via 7f45ba6471d45984ee378748b8773be9514b0245 (commit) via da86a5baceb01d3de9f0c69dec45b2e14264248c (commit) via 186dac6555cada0cda1faa1f95d9fa265792af29 (commit) via d6eac7336f04265fc67b08dd9cb5997c51b1fb56 (commit) via eb2c82afe36002737dd5a32fc1998a6375c7f31f (commit) via 7881fdfc1ac7ba225ce74277e195c78196a6a258 (commit) via 629791d54a70483052ee3632920443044cc7f601 (commit) via 82aeb4a62a733a0003ef8ab0074ddc5f0e7043b6 (commit) via a9122ee67d1bc63d0e82c7d18ab10e6e99579409 (commit) via 87ac66be3c5baff0ec2a7abe83e3c2363cf5978d (commit) via 69da73ba9beac511a7351814b9170d04eb5a49c2 (commit) via 0b583d77dcf066e4df4bdaff2816d8f234f70d09 (commit) via 1f274e5ad7ebe5f86422a28ec4f0e9a02170faa1 (commit) via bf751a6c9315578658192bfc5a3652bac4eb0d66 (commit) from da84c8730986f60fafaf89729a4fe8b1e862ec64 (commit) - Log ----------------------------------------------------------------- commit 65d869023e2aa27f2289807550f7cbacacb5285c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 12:06:41 2011 +0200 Translation update done using Pootle. commit 4b9aa973ea12b46810546f3350796b82ed79ec9c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 12:06:13 2011 +0200 Translation update done using Pootle. commit 4d71a45de43c469b287c216121e330d51a995dc7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:54:18 2011 +0200 Translation update done using Pootle. commit 0b78b24e5f14a4c7c5396efc2b44a63e5d904c91 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:53:52 2011 +0200 Translation update done using Pootle. commit 7f45ba6471d45984ee378748b8773be9514b0245 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:46:24 2011 +0200 Translation update done using Pootle. commit da86a5baceb01d3de9f0c69dec45b2e14264248c Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 11:46:05 2011 +0200 Translation update done using Pootle. commit 186dac6555cada0cda1faa1f95d9fa265792af29 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:45:54 2011 +0200 Translation update done using Pootle. commit d6eac7336f04265fc67b08dd9cb5997c51b1fb56 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 11:45:52 2011 +0200 Translation update done using Pootle. commit eb2c82afe36002737dd5a32fc1998a6375c7f31f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:45:43 2011 +0200 Translation update done using Pootle. commit 7881fdfc1ac7ba225ce74277e195c78196a6a258 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:44:05 2011 +0200 Translation update done using Pootle. commit 629791d54a70483052ee3632920443044cc7f601 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:43:28 2011 +0200 Translation update done using Pootle. commit 82aeb4a62a733a0003ef8ab0074ddc5f0e7043b6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:40:05 2011 +0200 Translation update done using Pootle. commit a9122ee67d1bc63d0e82c7d18ab10e6e99579409 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:39:20 2011 +0200 Translation update done using Pootle. commit 87ac66be3c5baff0ec2a7abe83e3c2363cf5978d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:33:11 2011 +0200 Translation update done using Pootle. commit 69da73ba9beac511a7351814b9170d04eb5a49c2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:28:11 2011 +0200 Translation update done using Pootle. commit 0b583d77dcf066e4df4bdaff2816d8f234f70d09 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:23:18 2011 +0200 Translation update done using Pootle. commit 1f274e5ad7ebe5f86422a28ec4f0e9a02170faa1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:22:51 2011 +0200 Translation update done using Pootle. commit bf751a6c9315578658192bfc5a3652bac4eb0d66 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:16:10 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 33 ++++++++++++++++++--------------- po/si.po | 7 +++---- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/po/ja.po b/po/ja.po index e9bd88b..71aa796 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:27+0200\n" -"PO-Revision-Date: 2011-05-03 11:10+0200\n" +"PO-Revision-Date: 2011-05-03 12:06+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -96,7 +96,7 @@ msgstr "この値を利用する" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "BLOB ストリーミングサーバが設定されていません！" #: bs_disp_as_mime_type.php:35 #| msgid "Failed to write file to disk." @@ -3638,10 +3638,12 @@ msgid "" "More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug " "tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]" msgstr "" +"詳細は [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] と " +"[a@http://bugs.mysql.com/19588]MySQL Bugs[/a]。" #: libraries/config/messages.inc.php:381 msgid "Disable use of INFORMATION_SCHEMA" -msgstr "" +msgstr "INFORMATION_SCHEMA の使用を無効にする" #: libraries/config/messages.inc.php:382 msgid "What PHP extension to use; you should use mysqli if supported" @@ -5437,7 +5439,7 @@ msgstr "<code>CREATE TABLE</code> オプション：" msgid "" "Enclose table and field names with backquotes <i>(Protects field and table " "names formed with special characters or keywords)</i>" -msgstr "逆クオートでテーブルやフィールドの名前を囲む <i>(特殊な文字やキーワードを含むフィールド名やテーブル名を保護します)</i>" +msgstr "逆クォートでテーブルやフィールドの名前を囲む <i>(特殊な文字やキーワードを含むフィールド名やテーブル名を保護します)</i>" #: libraries/export/sql.php:136 msgid "Instead of <code>INSERT</code> statements, use:" @@ -6416,7 +6418,7 @@ msgstr "END RAW" #: libraries/sqlparser.lib.php:363 msgid "Automatically appended backtick to the end of query!" -msgstr "" +msgstr "クエリの最後に逆クォートが自動的に追加されました！" #: libraries/sqlparser.lib.php:366 msgid "Unclosed quote" @@ -7730,12 +7732,12 @@ msgstr "マスタのログの位置が読み込めません。マスター上の #: server_replication.php:69 msgid "Unable to change master" -msgstr "マスタを変更することはできません" +msgstr "マスタを切り替えることができません" #: server_replication.php:72 #, php-format msgid "Master server changed succesfully to %s" -msgstr "" +msgstr "マスタサーバを %s へ切り替えるのに成功しました。" #: server_replication.php:180 msgid "This server is configured as master in a replication process." @@ -7810,7 +7812,7 @@ msgstr "スレーブの IO スレッドが実行していません！" #: server_replication.php:303 msgid "" "Server is configured as slave in a replication process. Would you like to:" -msgstr "" +msgstr "サーバはレプリケーションプロセスではスレーブとして設定されています。どのようにしたいですか？" #: server_replication.php:306 msgid "See slave status table" @@ -7822,19 +7824,19 @@ msgstr "データベースをマスタと同期させる" #: server_replication.php:320 msgid "Control slave:" -msgstr "" +msgstr "スレーブの操作：" #: server_replication.php:323 msgid "Full start" -msgstr "" +msgstr "全開始" #: server_replication.php:323 msgid "Full stop" -msgstr "" +msgstr "全停止" #: server_replication.php:324 msgid "Reset slave" -msgstr "" +msgstr "スレーブのリセット" #: server_replication.php:326 #| msgid "Structure only" @@ -7860,19 +7862,20 @@ msgstr "管理エラー:" #: server_replication.php:340 msgid "Skipping errors might lead into unsynchronized master and slave!" -msgstr "" +msgstr "エラーのスキップは、マスタとスレーブの同期を切ることになるかもしれません！" #: server_replication.php:342 msgid "Skip current error" -msgstr "" +msgstr "現在のエラーをスキップする" +# I think better of "Skip next %s errors." #: server_replication.php:343 msgid "Skip next" msgstr "" #: server_replication.php:346 msgid "errors." -msgstr "" +msgstr "エラースキップする" #: server_replication.php:361 #, php-format diff --git a/po/si.po b/po/si.po index edf8338..26d4a41 100644 --- a/po/si.po +++ b/po/si.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:27+0200\n" -"PO-Revision-Date: 2011-05-01 09:50+0200\n" +"PO-Revision-Date: 2011-05-03 11:46+0200\n" "Last-Translator: Madhura Jayaratne <madhura.cj(a)gmail.com>\n" "Language-Team: sinhala <si(a)li.org>\n" "Language: si\n" @@ -626,7 +626,7 @@ msgstr "" #: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 msgid "View" -msgstr "දර්ශනය කරන්න" +msgstr "දසුන" #: db_structure.php:444 libraries/db_structure.lib.php:40 #: libraries/server_links.inc.php:90 server_replication.php:31 @@ -5554,10 +5554,9 @@ msgid "Object creation options (all are recommended)" msgstr "" #: libraries/export/xml.php:40 -#, fuzzy #| msgid "View" msgid "Views" -msgstr "දර්ශනය කරන්න" +msgstr "දසුන්" #: libraries/export/xml.php:47 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 7f9860a07611d6f10bf9acd1e06bf9ff168419d9
by Michal Čihař 03 May '11

03 May '11

The branch, master has been updated via 7f9860a07611d6f10bf9acd1e06bf9ff168419d9 (commit) from 281acd718e03961d8623b77ebefd76d9c85c7dc2 (commit) - Log ----------------------------------------------------------------- commit 7f9860a07611d6f10bf9acd1e06bf9ff168419d9 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue May 3 11:47:57 2011 +0200 Fix typo in HTML tag ----------------------------------------------------------------------- Summary of changes: output/es/Documentation.html | 2 +- po/es.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/output/es/Documentation.html b/output/es/Documentation.html index 64b3194..5867d1a 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -3388,7 +3388,7 @@ Connection Failed: Can't connect to local MySQL server through socket <p> Para usuarios de RedHat, Harald Legner sugiere esto en la lista de correo:</p> <p> En una máquina RedHat, el zócalo de MySQL es -<i>/var/lib/mysql/mysql.sock</i>. En el archivo <i>php.ini</a> encontrarás +<i>/var/lib/mysql/mysql.sock</i>. En el archivo <i>php.ini</i> encontrarás una línea</p> <pre>mysql.default_socket = /tmp/mysql.sock</pre> diff --git a/po/es.po b/po/es.po index 3a82793..67978f1 100644 --- a/po/es.po +++ b/po/es.po @@ -8833,7 +8833,7 @@ msgid "" "In your <i>php.ini</i> you will find a line" msgstr "" "En una máquina RedHat, el zócalo de MySQL es <i>/var/lib/mysql/mysql.sock</" -"i>. En el archivo <i>php.ini</a> encontrarás una línea" +"i>. En el archivo <i>php.ini</i> encontrarás una línea" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:3123 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 281acd718e03961d8623b77ebefd76d9c85c7dc2
by Michal Čihař 03 May '11

03 May '11

The branch, master has been updated via 281acd718e03961d8623b77ebefd76d9c85c7dc2 (commit) via 917529dc43dcc904d56ea6b690273eabc7dcea98 (commit) via 4a4d810b83a2e372d3f670d0dce1a26e22d892f6 (commit) via efe9325a98723180438351675b87c1f07daa68a6 (commit) via 5958845dfab0d9744f0b92ebf061fd2ec6b6a8c2 (commit) via da36b14354ee7c9b026bd96be742bf4009b77155 (commit) via 8f375d6bfb52cb5c9fa434ba70909e7e71570bc4 (commit) via 969447ecd9e00c92cc1e245fe8e2bad7e8979487 (commit) via 6d71dd7c1a42297c5aa67d9d0e0f79fe08af4be8 (commit) via 6dbabbed43163e5278aae843aa32f5cc884f0aec (commit) via 1c5a518c8f5202d016edbc604b55bf20e344bb97 (commit) via c9b3a55ad6238c0f99a50ec64f01971fbc7d5208 (commit) via 01b937507eda193addc5c45ab9d5326a72973105 (commit) via 94badc7e9cf0b1045fd76a9dd78be8f009fde9fa (commit) via fa603bc99cc034417710baa1de32fb3e5dbc409e (commit) via f69adad244d172f985654e2bbc3820fb6891783a (commit) via 83bdad7c4125ec40a6cf034d0cfae843119da192 (commit) via eb3e2635d914c5b217355ba15b085dd68fdbf00b (commit) via cedf8d67445ca88d574a8e19640b21c1055d4e2d (commit) via adfd8f3d5bb4ce2218d7ee375194bd41b21ce96e (commit) via 29116cbe94d728cf0f6f5742b15567716e643c0e (commit) via 777a69d9fd76071000733315b438b515f9d5e9e1 (commit) from 2e0271f36eda422aa2bf3d8d6ab4155053ccbaa2 (commit) - Log ----------------------------------------------------------------- commit 281acd718e03961d8623b77ebefd76d9c85c7dc2 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue May 3 11:26:15 2011 +0200 Generate commit 917529dc43dcc904d56ea6b690273eabc7dcea98 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 08:22:04 2011 +0200 Translation update done using Pootle. commit 4a4d810b83a2e372d3f670d0dce1a26e22d892f6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 06:36:10 2011 +0200 Translation update done using Pootle. commit efe9325a98723180438351675b87c1f07daa68a6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 06:01:42 2011 +0200 Translation update done using Pootle. commit 5958845dfab0d9744f0b92ebf061fd2ec6b6a8c2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 06:01:25 2011 +0200 Translation update done using Pootle. commit da36b14354ee7c9b026bd96be742bf4009b77155 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 05:59:20 2011 +0200 Translation update done using Pootle. commit 8f375d6bfb52cb5c9fa434ba70909e7e71570bc4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 05:55:59 2011 +0200 Translation update done using Pootle. commit 969447ecd9e00c92cc1e245fe8e2bad7e8979487 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 05:53:34 2011 +0200 Translation update done using Pootle. commit 6d71dd7c1a42297c5aa67d9d0e0f79fe08af4be8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 05:52:29 2011 +0200 Translation update done using Pootle. commit 6dbabbed43163e5278aae843aa32f5cc884f0aec Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 05:51:26 2011 +0200 Translation update done using Pootle. commit 1c5a518c8f5202d016edbc604b55bf20e344bb97 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 05:46:25 2011 +0200 Translation update done using Pootle. commit c9b3a55ad6238c0f99a50ec64f01971fbc7d5208 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 05:46:05 2011 +0200 Translation update done using Pootle. commit 01b937507eda193addc5c45ab9d5326a72973105 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 05:43:17 2011 +0200 Translation update done using Pootle. commit 94badc7e9cf0b1045fd76a9dd78be8f009fde9fa Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 04:27:01 2011 +0200 Translation update done using Pootle. commit fa603bc99cc034417710baa1de32fb3e5dbc409e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 04:15:16 2011 +0200 Translation update done using Pootle. commit f69adad244d172f985654e2bbc3820fb6891783a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 04:10:38 2011 +0200 Translation update done using Pootle. commit 83bdad7c4125ec40a6cf034d0cfae843119da192 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 04:08:49 2011 +0200 Translation update done using Pootle. commit eb3e2635d914c5b217355ba15b085dd68fdbf00b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 04:06:02 2011 +0200 Translation update done using Pootle. commit cedf8d67445ca88d574a8e19640b21c1055d4e2d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 04:02:55 2011 +0200 Translation update done using Pootle. commit adfd8f3d5bb4ce2218d7ee375194bd41b21ce96e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 03:58:18 2011 +0200 Translation update done using Pootle. commit 29116cbe94d728cf0f6f5742b15567716e643c0e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 03:57:17 2011 +0200 Translation update done using Pootle. commit 777a69d9fd76071000733315b438b515f9d5e9e1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue May 3 03:55:01 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/zh_CN/Documentation.html | 85 ++++++++++++++---------------------- po/zh_CN.po | 91 +++++++++++++++----------------------- 2 files changed, 68 insertions(+), 108 deletions(-) diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html index cd4c0f0..fd9552a 100644 --- a/output/zh_CN/Documentation.html +++ b/output/zh_CN/Documentation.html @@ -72,9 +72,9 @@ SourceForge.net 的项目页 (英语)</a></li> <h2 id="require">环境需求</h2> <ul><li><b>PHP</b> - <ul><li>You need PHP 5.2.0 or newer, with <tt>session</tt> support (<a -href="#faq1_31">see <abbr title="Frequently Asked Questions">FAQ</abbr> -1.31</a>) , the Standard PHP Library (SPL) extension and JSON support. + <ul><li>开启 <tt>会话 (session)</tt> (<a href="#faq1_31">参见 <abbr title="常见问题 +(Frequently Asked Questions)">FAQ</abbr> 1.31</a>) 、标准 PHP 库 (SPL) 和 JSON +扩展的 PHP 5.2.0 或更高版本。 </li> <li>要支持上传 zip 文件，需要 <tt>zip</tt> 扩展。</li> <li>为了更好的支持多字节字符串 (如 UTF-8 编码的文字, 当前默认编码)，你应该安装 mbstring 和 ctype 扩展。 @@ -491,8 +491,8 @@ class="configrule">$cfg['Servers'][$i]['pmadb']</a>)。 <dt id="cfg_McryptDisableWarning">$cfg['McryptDisableWarning'] 布尔</dt> <dd>设为 <tt>TRUE</tt> 可在使用 cookie 认证但没有 mcrypt 扩展时不显示警告。</dd> - <dt id="cfg_TranslationWarningThreshold">$cfg['TranslationWarningThreshold'] integer</dt> - <dd>Show warning about incomplete translations on certain threshold.</dd> + <dt id="cfg_TranslationWarningThreshold">$cfg['TranslationWarningThreshold'] 整数</dt> + <dd>对不到特定完成度的翻译显示警告。</dd> <dt id="cfg_AllowThirdPartyFraming">$cfg['AllowThirdPartyFraming'] 布尔</dt> <dd>设为 <tt>true</tt> 将允许 phpMyAdmin 被不同域名的框架所调用，这个潜在的安全漏洞可能导致跨框架脚本攻击。</dd> @@ -585,15 +585,12 @@ class="configrule">$cfg['AllowArbitraryServer']</a></tt> 则可登录到任意 (旧版本中曾被称为 'advanced' 认证，也可写作 'http') (<tt>$auth_type = '<abbr title="超文本转移协议 (HyperText Transfer Protocol)">HTTP</abbr>'</tt>) 自 1.3.0 起允许通过任意有效的 MySQL 用户登录。</li> - <li>'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as -introduced in 2.10.0 allows you to log in from prepared PHP session -data. This is useful for implementing single signon from another -application. Sample way how to seed session is in signon example: -<code>scripts/signon.php</code>. There is also alternative example using -OpenID - <code>scripts/openid.php</code>. You need to configure <a -href="#cfg_Servers_SignonSession" class="configrule">session name</a> and <a -href="#cfg_Servers_SignonURL" class="configrule">signon URL</a> to use this -authentication method.</li> + <li>'signon' 认证 (<tt>$auth_type = 'signon'</tt>) 自 2.10.0 起允许通过预定义的 +PHP 会话数据登录。这在通过单点登录整合第三方应用程序时很有用。这个文件演示了如何记录 signon 的会话: +<code>scripts/signon.php</code>。另外这个文件演示了通过 OpenID 登录 - +<code>scripts/openid.php</code>。你需要设置<a href="#cfg_Servers_SignonSession" +class="configrule">会话名</a>和<a href="#cfg_Servers_SignonURL" +class="configrule">登录 URL</a> 以使用该认证。</li> </ul> 详细信息请参见<a href="#setup">安装</a>一节中的"使用认证"。 @@ -725,9 +722,7 @@ Questions)">FAQ</abbr> 6.6</a>)</li> <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> <li>在 <tt>$cfg['Servers'][$i]['relation']</tt> 中设置要使用的数据表名</li> - <li>now as normal user open phpMyAdmin and for each one of your tables where you -want to use this feature, click "Structure/Relation view/" and -choose foreign columns. + <li>现在以普通用户登录到 phpMyAdmin 并打开每一张你想要使用这个功能的数据表，点击"结构/关系查看/"并设置外键字段。 </li> </ul> @@ -740,9 +735,7 @@ choose foreign columns. 字符串 </dt> <dd> - Since release 2.3.0 you can describe, in a special 'table_info' table, which -column is to be displayed as a tool-tip when moving the cursor over the -corresponding key.<br /> + 自 2.3.0 起你可以在 'table_info' 表的支持下设置当鼠标移到对应字段时用气泡提示显示出来的相应内容。<br /> 这张表的名字将被保存在此变量中。要启用此功能: <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> <li>在 <tt>$cfg['Servers'][$i]['table_info']</tt> 中设置要使用的数据表名 @@ -790,11 +783,9 @@ column name (properties page) or embedded within the header of table in browse view. They can also be shown in a table dump. Please see the relevant configuration directives later on.<br /><br /> - Also new in release 2.5.0 is a MIME-transformation system which is also -based on the following table structure. See <a href="#transformations"> -Transformations</a> for further information. To use the MIME-transformation -system, your column_info table has to have the three new columns 'mimetype', -'transformation', 'transformation_options'. + 自 2.5.0 起 MIME 类型转换系统同样基于下列数据表结构。详情请参见<a href="#transformations">转换</a>。要想使用 +MIME 类型转换系统，column_info 表必须有这三个新字段 'mimetype'、'transformation' 和 +'transformation_options' 。 <br /><br /> 要启用此功能: @@ -933,8 +924,7 @@ id="cfg_Servers_tracking_add_drop_database">$cfg['Servers'][$i]['tracking_add_dr 字符串 </dt> <dd> - Since release 3.4.x phpMyAdmin allows users to set most preferences by -themselves and store them in the database. + 自 3.4.x 起 phpMyAdmin 允许用户自己设置大部分偏好并将设置保存在数据库中。 <br /><br /> If you don't allow for storing preferences in <a href="#pmadb">pmadb</a>, @@ -971,11 +961,8 @@ id="cfg_Servers_designer_coords">$cfg['Servers'][$i]['designer_coords']</span> id="cfg_Servers_verbose_check">$cfg['Servers'][$i]['verbose_check']</span> 布尔 </dt> - <dd>Because release 2.5.0 introduced the new MIME-transformation support, the -column_info table got enhanced with three new columns. If the above variable -is set to <tt>TRUE</tt> (default) phpMyAdmin will check if you have the -latest table structure available. If not, it will emit a warning to the -superuser.<br /><br /> + <dd>因自 2.5.0 起采用了新的 MIME 类型转换功能，使 column_info 表增加了三个字段。若上述变量设为 <tt>TRUE</tt> +(默认值)，phpMyAdmin 将会检查你的表结构是否已更新。若没有，则会给超级用户显示警告。<br /><br /> 你可以通过将其设为 false 来禁止此检查，从而得到性能的提升。<br /><br /> @@ -1002,12 +989,9 @@ id="cfg_Servers_AllowDeny_order">$cfg['Servers'][$i]['AllowDeny']['order']</span 若将规则顺序设为 <tt>'allow,deny'</tt>，系统将首先应用所有的禁止 (deny) 规则，然后再应用允许 (allow) 规则。默认禁止访问。任何没有被 Allow (允许) 命令匹配的客户端或者被 Deny (禁止) 命令匹配的客户端将被禁止访问服务器。<br /><br /> - If your rule order is set to 'explicit', authorization is performed in a -similar fashion to rule order 'deny,allow', with the added restriction that -your host/username combination <b>must</b> be listed in the <i>allow</i> -rules, and not listed in the <i>deny</i> rules. This is the <b>most</b> -secure means of using Allow/Deny rules, and was available in Apache by -specifying allow and deny rules without setting any order.<br /><br /> + 若将规则顺序设为 'explicit'，认证行为与设为 'deny,allow' 相似，但同时额外要求主机/用户名组合<b>必须</b>在<i>允许 +(allow)</i> 规则中列出且不能在<i>禁止 (deny)</i> 规则中出现。这是<b>最</b>安全的方式，并且相当于在 Apache +中使用允许 (allow)、禁止 (deny) 规则但不指定顺序时的效果。<br /><br /> 同时请参见 <a href="#cfg_TrustedProxies">$cfg['TrustedProxies']</a> 探测使用代理的真实 IP 。 @@ -1081,13 +1065,11 @@ id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span> 0 则将在登录页面显示服务器列表。<br /> 如果只有一个服务器设置，<tt>$cfg['ServerDefault']</tt> 必须设为那台服务器。</dd> - <dt id="cfg_AjaxEnable">$cfg['AjaxEnable'] boolean</dt> - <dd>Defines whether to refresh only parts of certain pages using Ajax -techniques. Applies only where a non-Ajax behavior is possible; for example, -the Designer feature is Ajax-only so this directive does not apply to it.</dd> + <dt id="cfg_AjaxEnable">$cfg['AjaxEnable'] 布尔</dt> + <dd>设置是否使用 Ajax 技术只刷新某些页面的部分内容。仅用于支持非 Ajax 的页面，例如，设计器功能必须使用 Ajax 所以该指令对其无效。</dd> - <dt id="cfg_VersionCheck">$cfg['VersionCheck'] boolean</dt> - <dd>Enables check for latest versions using javascript on main phpMyAdmin page.</dd> + <dt id="cfg_VersionCheck">$cfg['VersionCheck'] 布尔</dt> + <dd>设置是否允许在 phpMyAdmin 主页面中使用 javascript 检查新版本。</dd> <dt id="cfg_MaxDbList">$cfg['MaxDbList'] 整数</dt> <dd>导航框架和数据库列表中所显示数据库的最大数量。</dd> @@ -1125,10 +1107,9 @@ session_save_path (外链，英语)</a>)。</dd> 同样可以设置为 php.ini 中可以识别的字符串，如 '16M' 。请确保没有丢掉后缀 (16 表示 16 字节！)</dd> <dt id="cfg_SkipLockedTables">$cfg['SkipLockedTables'] 布尔</dt> - <dd>Mark used tables and make it possible to show databases with locked tables -(since MySQL 3.23.30).</dd> + <dd>标记正在使用的表以使得可以显示含有已锁定表的数据库 (自 MySQL 3.23.30 起) 。</dd> - <dt id="cfg_ShowSQL">$cfg['ShowSQL'] boolean</dt> + <dt id="cfg_ShowSQL">$cfg['ShowSQL'] 布尔</dt> <dd>Defines whether <abbr title="structured query language">SQL</abbr> queries generated by phpMyAdmin should be displayed or not.</dd> @@ -1164,9 +1145,7 @@ invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> not lower than the value of $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> - <dd>Define how long login cookie should be stored in browser. Default 0 means -that it will be kept for existing session. This is recommended for not -trusted environments.</dd> + <dd>设置登录 cookie 应在浏览器中保存多长时间。默认值 0 表示当前会话。建议在公共环境下使用。</dd> <dt id="cfg_LoginCookieDeleteAll">$cfg['LoginCookieDeleteAll'] boolean</dt> <dd>If enabled (default), logout deletes cookies for all servers, otherwise only @@ -1196,10 +1175,10 @@ MySQL servers behind the firewall where your <abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed. </dd> - <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt> + <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] 布尔</dt> <dd>Whether to display errors from PHP or not.</dd> - <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt> + <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] 布尔</dt> <dd>Whether to gather errors from PHP or not.</dd> <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt> @@ -1266,7 +1245,7 @@ this is <tt>main.php</tt>.</dd> new one (<tt>new</tt>). Note: use <tt>new</tt> if you are linking to <tt>phpmyadmin.net</tt>.</dd> - <dt id="cfg_LeftDisplayTableFilterMinimum">$cfg['LeftDisplayTableFilterMinimum'] integer</dt> + <dt id="cfg_LeftDisplayTableFilterMinimum">$cfg['LeftDisplayTableFilterMinimum'] 整数</dt> <dd>Defines the minimum number of tables to display a JavaScript filter box above the list of tables in the left frame. Defaults to <tt>30</tt>. To disable the filter completely some high number can he used (e.g. 9999)</dd> diff --git a/po/zh_CN.po b/po/zh_CN.po index ea53c90..9f93d3e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:32+0300\n" -"PO-Revision-Date: 2011-03-30 14:21+0200\n" +"PO-Revision-Date: 2011-05-03 08:22+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -147,14 +147,13 @@ msgstr "<b>PHP</b>" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:60 -#, fuzzy msgid "" "You need PHP 5.2.0 or newer, with <tt>session</tt> support (<a href=" "\"#faq1_31\">see <abbr title=\"Frequently Asked Questions\">FAQ</abbr> 1.31</" "a>) , the Standard PHP Library (SPL) extension and JSON support." msgstr "" -"开启 <tt>会话 (session)</tt> (<a href=\"#faq1_31\">参见 <abbr title=\"常见问" -"题 (Frequently Asked Questions)\">FAQ</abbr> 1.31</a>) 和标准 PHP 库 (SPL) " +"开启 <tt>会话 (session)</tt> (<a href=\"#faq1_31\">参见 <abbr title=\"常见问题 " +"(Frequently Asked Questions)\">FAQ</abbr> 1.31</a>) 、标准 PHP 库 (SPL) 和 JSON " "扩展的 PHP 5.2.0 或更高版本。" #. type: Content of: <html><body><div><ul><li><ul><li> @@ -1553,12 +1552,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:627 msgid "$cfg['TranslationWarningThreshold'] integer" -msgstr "" +msgstr "$cfg['TranslationWarningThreshold'] 整数" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:628 msgid "Show warning about incomplete translations on certain threshold." -msgstr "" +msgstr "对不到特定完成度的翻译显示警告。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:630 @@ -1895,7 +1894,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:759 -#, fuzzy msgid "" "'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as " "introduced in 2.10.0 allows you to log in from prepared PHP session data. " @@ -1907,11 +1905,12 @@ msgid "" "href=\"#cfg_Servers_SignonURL\" class=\"configrule\">signon URL</a> to use " "this authentication method." msgstr "" -"'signon' 认证 (<tt>$auth_type = 'signon'</tt>) 自 2.10.0 起允许通过" -"预定义的 PHP 会话数据登录。这在通过单点登录整合第三方应用程序时很有用。这个文" -"件演示了如何记录 signon 的会话: <code>scripts/signon.php</code>，你还需要设置" -"<a href=\"#cfg_Servers_SignonSession\" class=\"configrule\">会话名</a>和<a " -"href=\"#cfg_Servers_SignonURL\" class=\"configrule\">登录 URL</a> 。" +"'signon' 认证 (<tt>$auth_type = 'signon'</tt>) 自 2.10.0 起允许通过预定义的 " +"PHP 会话数据登录。这在通过单点登录整合第三方应用程序时很有用。这个文件演示了如何记录 signon 的会话: " +"<code>scripts/signon.php</code>。另外这个文件演示了通过 OpenID 登录 - " +"<code>scripts/openid.php</code>。你需要设置<a href=\"#cfg_Servers_SignonSession\" " +"class=\"configrule\">会话名</a>和<a href=\"#cfg_Servers_SignonURL\" " +"class=\"configrule\">登录 URL</a> 以使用该认证。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:777 @@ -2328,14 +2327,12 @@ msgstr "在 <tt>$cfg['Servers'][$i]['relation']</tt> 中设置要使用的数据 #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:931 -#, fuzzy msgid "" "now as normal user open phpMyAdmin and for each one of your tables where you " "want to use this feature, click "Structure/Relation view/" and " "choose foreign columns." msgstr "" -"登录到 phpMyAdmin 并打开每一张你要使用这些功能的数据表，点击"结构/关系查" -"看/"设置好外键字段。" +"现在以普通用户登录到 phpMyAdmin 并打开每一张你想要使用这个功能的数据表，点击"结构/关系查看/"并设置外键字段。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:938 @@ -2358,14 +2355,11 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:947 -#, fuzzy msgid "" "Since release 2.3.0 you can describe, in a special 'table_info' table, which " "column is to be displayed as a tool-tip when moving the cursor over the " "corresponding key." -msgstr "" -"自 2.3.0 起你可以在 'table_info' 表的支持下定义当鼠标移到对应的键时用气泡提示" -"显示哪个字段的内容。" +msgstr "自 2.3.0 起你可以在 'table_info' 表的支持下设置当鼠标移到对应字段时用气泡提示显示出来的相应内容。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:950 @@ -2487,7 +2481,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1002 -#, fuzzy msgid "" "Also new in release 2.5.0 is a MIME-transformation system which is also " "based on the following table structure. See <a href=\"#transformations\"> " @@ -2495,9 +2488,9 @@ msgid "" "system, your column_info table has to have the three new columns 'mimetype', " "'transformation', 'transformation_options'." msgstr "" -"自 2.5.0 起 MIME 类型转换系统同样基于下列数据表结构。详情请参见<a href=" -"\"#transformations\">转换</a>。要想使用 MIME 类型转换系统，column_info 表必须" -"有这三个新字段 'mimetype', 'transformation', 'transformation_options' 。" +"自 2.5.0 起 MIME 类型转换系统同样基于下列数据表结构。详情请参见<a href=\"#transformations\">转换</a>。要想使用 " +"MIME 类型转换系统，column_info 表必须有这三个新字段 'mimetype'、'transformation' 和 " +"'transformation_options' 。" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1011 @@ -2790,21 +2783,22 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1147 -#, fuzzy msgid "" "Since release 3.4.x phpMyAdmin allows users to set most preferences by " "themselves and store them in the database." -msgstr "" -"自 2.2.0 起 phpMyAdmin 允许用户将查询加入书签。你可以将经常要执行的语句加入书" -"签。" +msgstr "自 3.4.x 起 phpMyAdmin 允许用户自己设置大部分偏好并将设置保存在数据库中。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1151 +#, fuzzy msgid "" "If you don't allow for storing preferences in <a href=\"#pmadb\">pmadb</a>, " "users can still personalize phpMyAdmin, but settings will be saved in " "browser's local storage, or, it is is unavailable, until the end of session." msgstr "" +"如果你不想让用户将偏好保存在 <a href=\"#pmadb\">pmadb</a> 中，用户仍然可以个性化 " +"phpMyAdmin，但设置将会保存在浏览器本地存储中，或者, it is is unavailable, until the end of " +"session." #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1161 @@ -2847,7 +2841,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1182 -#, fuzzy msgid "" "Because release 2.5.0 introduced the new MIME-transformation support, the " "column_info table got enhanced with three new columns. If the above variable " @@ -2855,9 +2848,8 @@ msgid "" "latest table structure available. If not, it will emit a warning to the " "superuser." msgstr "" -"因自 2.5.0 起采用了新的 MIME 类型转换功能，使 column_info 表增加了三个字段。" -"若上述变量设为 <tt>TRUE</tt> (默认值)，phpMyAdmin 将会检查你的表结构是否符合" -"要求。若不符合，则会给超级用户显示警告。" +"因自 2.5.0 起采用了新的 MIME 类型转换功能，使 column_info 表增加了三个字段。若上述变量设为 <tt>TRUE</tt> " +"(默认值)，phpMyAdmin 将会检查你的表结构是否已更新。若没有，则会给超级用户显示警告。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1188 @@ -2953,7 +2945,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1220 -#, fuzzy msgid "" "If your rule order is set to 'explicit', authorization is performed in a " "similar fashion to rule order 'deny,allow', with the added restriction that " @@ -2962,10 +2953,9 @@ msgid "" "secure means of using Allow/Deny rules, and was available in Apache by " "specifying allow and deny rules without setting any order." msgstr "" -"若将规则顺序设为 'explicit'，认证行为与设为 'deny,allow' 类似，但主机/用户名" -"<b>必须</b>在<i>允许 (allow)</i> 规则中列出且不能在<i>禁止 (deny)</i> 规则中" -"出现。这是<b>最</b>安全的方式，并且相当于在 Apache 中使用允许 (allow)、禁止 " -"(deny) 规则但不指定顺序时的效果。" +"若将规则顺序设为 'explicit'，认证行为与设为 'deny,allow' 相似，但同时额外要求主机/用户名组合<b>必须</b>在<i>允许 " +"(allow)</i> 规则中列出且不能在<i>禁止 (deny)</i> 规则中出现。这是<b>最</b>安全的方式，并且相当于在 Apache " +"中使用允许 (allow)、禁止 (deny) 规则但不指定顺序时的效果。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1228 @@ -3227,9 +3217,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1299 -#, fuzzy msgid "$cfg['AjaxEnable'] boolean" -msgstr "$cfg['SkipLockedTables'] 布尔" +msgstr "$cfg['AjaxEnable'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1300 @@ -3237,19 +3226,18 @@ msgid "" "Defines whether to refresh only parts of certain pages using Ajax " "techniques. Applies only where a non-Ajax behavior is possible; for example, " "the Designer feature is Ajax-only so this directive does not apply to it." -msgstr "" +msgstr "设置是否使用 Ajax 技术只刷新某些页面的部分内容。仅用于支持非 Ajax 的页面，例如，设计器功能必须使用 Ajax 所以该指令对其无效。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1305 -#, fuzzy msgid "$cfg['VersionCheck'] boolean" -msgstr "$cfg['PersistentConnections'] 布尔" +msgstr "$cfg['VersionCheck'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1306 msgid "" "Enables check for latest versions using javascript on main phpMyAdmin page." -msgstr "" +msgstr "设置是否允许在 phpMyAdmin 主页面中使用 javascript 检查新版本。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1309 @@ -3417,12 +3405,12 @@ msgstr "$cfg['SkipLockedTables'] 布尔" msgid "" "Mark used tables and make it possible to show databases with locked tables " "(since MySQL 3.23.30)." -msgstr "" +msgstr "标记正在使用的表以使得可以显示含有已锁定表的数据库 (自 MySQL 3.23.30 起) 。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1363 msgid "$cfg['ShowSQL'] boolean" -msgstr "" +msgstr "$cfg['ShowSQL'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1364 @@ -3509,15 +3497,11 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1400 -#, fuzzy msgid "" "Define how long login cookie should be stored in browser. Default 0 means " "that it will be kept for existing session. This is recommended for not " "trusted environments." -msgstr "" -"设置登录 Cookies 应该保存多长时间 (单位：秒)。若设置为 0，Cookies 的有效期将" -"为浏览器进程，在关闭浏览器之后 Cookies 就会被删除。默认值为0。在不安全的环境" -"下建议使用默认值。" +msgstr "设置登录 cookie 应在浏览器中保存多长时间。默认值 0 表示当前会话。建议在公共环境下使用。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1404 @@ -3591,9 +3575,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1432 -#, fuzzy msgid "$cfg['Error_Handler']['display'] boolean" -msgstr "$cfg['Servers'][$i]['ssl'] 布尔" +msgstr "$cfg['Error_Handler']['display'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1433 @@ -3602,9 +3585,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1435 -#, fuzzy msgid "$cfg['Error_Handler']['gather'] boolean" -msgstr "$cfg['Servers'][$i]['ssl'] 布尔" +msgstr "$cfg['Error_Handler']['gather'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1436 @@ -3763,9 +3745,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1503 -#, fuzzy msgid "$cfg['LeftDisplayTableFilterMinimum'] integer" -msgstr "$cfg['McryptDisableWarning'] 布尔" +msgstr "$cfg['LeftDisplayTableFilterMinimum'] 整数" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1505 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-456-gda84c87
by Michal Čihař 03 May '11

03 May '11

The branch, master has been updated via da84c8730986f60fafaf89729a4fe8b1e862ec64 (commit) via a3179bfb9e6133469c4a86e47cc411878ebda2c6 (commit) via 16e46f0c32f79e1274f80a6894a6cb40d87559ac (commit) via 7bae7a4e7f28977eef2e2f36be79624fd128612e (commit) via 1ec73fc8a8e94eae1915010531bd7512780187b7 (commit) via 23f9b74243c4943867c3b940a31aca6abca8478c (commit) via 4f2a6b8711e164cabc229a4cb9df88976749c051 (commit) via c8a42882fb5f6286cc0a17476ea91157d01cb4fc (commit) from 5c39c5511f20662878a75da8e1db07f354dcdfc8 (commit) - Log ----------------------------------------------------------------- commit da84c8730986f60fafaf89729a4fe8b1e862ec64 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:10:19 2011 +0200 Translation update done using Pootle. commit a3179bfb9e6133469c4a86e47cc411878ebda2c6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:10:05 2011 +0200 Translation update done using Pootle. commit 16e46f0c32f79e1274f80a6894a6cb40d87559ac Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:09:36 2011 +0200 Translation update done using Pootle. commit 7bae7a4e7f28977eef2e2f36be79624fd128612e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:09:05 2011 +0200 Translation update done using Pootle. commit 1ec73fc8a8e94eae1915010531bd7512780187b7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:07:59 2011 +0200 Translation update done using Pootle. commit 23f9b74243c4943867c3b940a31aca6abca8478c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:07:01 2011 +0200 Translation update done using Pootle. commit 4f2a6b8711e164cabc229a4cb9df88976749c051 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:06:39 2011 +0200 Translation update done using Pootle. commit c8a42882fb5f6286cc0a17476ea91157d01cb4fc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue May 3 11:06:03 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/ja.po b/po/ja.po index fa51c2b..e9bd88b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:27+0200\n" -"PO-Revision-Date: 2011-05-01 10:48+0200\n" +"PO-Revision-Date: 2011-05-03 11:10+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -799,15 +799,15 @@ msgstr "個々の入力欄にそれぞれ値を入力してください。" #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ 書き込みをやり直して、新しい値を追加する。" #: enum_editor.php:67 msgid "Output" -msgstr "出力する" +msgstr "成形結果" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "結合された値（成形結果）を「長さ/値」フィールドにコピー＆ペーストしてください。" #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -965,7 +965,7 @@ msgstr "BLOB 格納を無効にしようとしています!" #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" -msgstr "" +msgstr "データベース %s に対する全ての BLOB 参照を無効にしようとしていますが、よろしいですか？" #: js/messages.php:44 msgid "Missing value in the form!" @@ -2116,13 +2116,12 @@ msgstr "両方" #: libraries/config.values.php:74 msgid "Open" -msgstr "" +msgstr "開いておく" #: libraries/config.values.php:74 -#, fuzzy #| msgid "Unclosed quote" msgid "Closed" -msgstr "引用符が閉じていません" +msgstr "閉じておく" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -3111,7 +3110,7 @@ msgstr "値がゼロのものに対して AUTO_INCREMENT を使用しない" #: libraries/config/messages.inc.php:261 msgid "Initial state for sliders" -msgstr "" +msgstr "折り畳みに対しての初期値" #: libraries/config/messages.inc.php:262 msgid "How many rows can be inserted at one time" @@ -6723,7 +6722,8 @@ msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" msgstr "" -"お使いのブラウザは、このドメインに対しての phpMyAdmin の設定を保存しています。現在のセッションにその設定を読み込んでもよろしいですか？" +"お使いのブラウザは、このドメインに対しての phpMyAdmin の設定を (Web Storage に) " +"保存しています。現在のセッションにその設定を読み込んでもよろしいですか？" #: libraries/zip_extension.lib.php:25 msgid "No files found inside ZIP archive!" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-448-g5c39c55
by Piotr Przybylski 02 May '11

02 May '11

The branch, master has been updated via 5c39c5511f20662878a75da8e1db07f354dcdfc8 (commit) from f25945b8bee7b5025abe4e4e054cf6732dcca6ec (commit) - Log ----------------------------------------------------------------- commit 5c39c5511f20662878a75da8e1db07f354dcdfc8 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Mon May 2 20:50:16 2011 +0200 Comments formatting and PHPDoc fixes ----------------------------------------------------------------------- Summary of changes: libraries/Message.class.php | 11 +++++------ libraries/common.inc.php | 2 +- libraries/common.lib.php | 10 +++++----- libraries/database_interface.lib.php | 19 +++++++++---------- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/libraries/Message.class.php b/libraries/Message.class.php index 908a1d7..5c46e86 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -151,8 +151,8 @@ class PMA_Message * @uses PMA_Message::SANITIZE_PARAMS * @param string $string * @param integer $number - * @param array $$params - * @param boolean $sanitize + * @param array $params + * @param integer $sanitize */ public function __construct($string = '', $number = PMA_Message::NOTICE, $params = array(), $sanitize = PMA_Message::SANITIZE_NONE) @@ -624,9 +624,9 @@ class PMA_Message * @static * @uses is_array() * @uses htmlspecialchars() - * @uses PMA_Message::sanitize() recursiv - * @param mixed the message(s) - * @return mixed the sanitized message(s) + * @uses PMA_Message::sanitize() recursive + * @param mixed $message the message(s) + * @return mixed the sanitized message(s) * @access public */ static public function sanitize($message) @@ -686,7 +686,6 @@ class PMA_Message * @uses PMA_Message::$_string * @uses PMA_Message::$_message * @uses md5() - * @param string $file * @return string PMA_Message::$_hash */ public function getHash() diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 906b6f6..49937c8 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -838,7 +838,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.… // Look at: "static int check_dir_access(request_rec *r)" if (isset($cfg['Server']['AllowDeny']) - && isset($cfg['Server']['AllowDeny']['order'])) { + && isset($cfg['Server']['AllowDeny']['order'])) { /** * ip based access library diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 8be5c0e..3161132 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -706,11 +706,11 @@ function PMA_mysqlDie($error_message = '', $the_query = '', * @uses uksort() * @uses strstr() * @uses explode() - * @param string $db name of db - * @param string $tables name of tables - * @param integer $limit_offset list offset - * @param integer $limit_count max tables to return - * return array (recursive) grouped table list + * @param string $db name of db + * @param string $tables name of tables + * @param integer $limit_offset list offset + * @param int|bool $limit_count max tables to return + * @return array (recursive) grouped table list */ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = false) { diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index c1b34e0..842b891 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -254,7 +254,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals $tables = array(); if (! $GLOBALS['cfg']['Server']['DisableIS']) { - // get table information from information_schema + // get table information from information_schema if ($table) { if (true === $tbl_is_group) { $sql_where_table = 'AND `TABLE_NAME` LIKE \'' @@ -269,13 +269,13 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals $sql_where_table = ''; } - // for PMA bc: - // `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME` - // - // on non-Windows servers, - // added BINARY in the WHERE clause to force a case sensitive - // comparison (if we are looking for the db Aa we don't want - // to find the db aa) + // for PMA bc: + // `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME` + // + // on non-Windows servers, + // added BINARY in the WHERE clause to force a case sensitive + // comparison (if we are looking for the db Aa we don't want + // to find the db aa) $this_databases = array_map('PMA_sqlAddslashes', $databases); $sql = ' @@ -945,7 +945,6 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null * @uses $GLOBALS['mysql_charset_map'] * @uses $GLOBALS['charset'] * @uses $GLOBALS['lang'] - * @uses $GLOBALS['server'] * @uses $GLOBALS['cfg']['Lang'] * @uses defined() * @uses explode() @@ -989,7 +988,7 @@ function PMA_DBI_postConnect($link, $is_controluser = false) define('PMA_DRIZZLE', PMA_MYSQL_MAJOR_VERSION >= 2009); } - /* Skip charsets for Drizzle */ + // Skip charsets for Drizzle if (!PMA_DRIZZLE) { if (! empty($GLOBALS['collation_connection'])) { PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-447-gf25945b
by Madhura Jayaratne 02 May '11

02 May '11

The branch, master has been updated via f25945b8bee7b5025abe4e4e054cf6732dcca6ec (commit) from 3256a4407600b6d1cbba29b1cb05ffadb6a1ad67 (commit) - Log ----------------------------------------------------------------- commit f25945b8bee7b5025abe4e4e054cf6732dcca6ec Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon May 2 01:21:46 2011 +0530 DB Operations tab adjusted for low resolution browsers ----------------------------------------------------------------------- Summary of changes: db_operations.php | 10 +++++----- themes/original/css/theme_right.css.php | 2 +- themes/pmahomme/css/theme_right.css.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/db_operations.php b/db_operations.php index 5587664..f48ba27 100644 --- a/db_operations.php +++ b/db_operations.php @@ -349,11 +349,6 @@ if ($db == 'information_schema') { } if (!$is_information_schema) { - ?> - <div class="operations_half_width"> - <?php require './libraries/display_create_table.lib.php'; ?> - </div> - <?php if ($cfgRelation['commwork']) { /** * database comment @@ -377,6 +372,11 @@ if (!$is_information_schema) { </div> <?php } + ?> + <div class="operations_half_width"> + <?php require './libraries/display_create_table.lib.php'; ?> + </div> + <?php /** * rename database */ diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 27d931b..5b12292 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1252,7 +1252,7 @@ li#li_user_preferences { } .operations_half_width { - min-width: 48%; + width: 48%; float: <?php echo $left; ?>; } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 25692d2..9654cd9 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1547,7 +1547,7 @@ li#li_user_preferences { } .operations_half_width { - min-width: 48%; + width: 48%; float: <?php echo $left; ?>; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. f47a177dbcc82ad261b4ebf5ff6957dbb95b033c
by Michal Čihař 02 May '11

02 May '11

The branch, master has been updated via f47a177dbcc82ad261b4ebf5ff6957dbb95b033c (commit) from 5891b2779727e7c4d9b04ea6b6bbf0e8ed40b93a (commit) - Log ----------------------------------------------------------------- commit f47a177dbcc82ad261b4ebf5ff6957dbb95b033c Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 2 11:19:46 2011 +0200 Add Zarubin Stas ----------------------------------------------------------------------- Summary of changes: planet.ini | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/planet.ini b/planet.ini index d3036db..49357ef 100644 --- a/planet.ini +++ b/planet.ini @@ -48,3 +48,6 @@ name = Madhura Jayaratne [http://ammaryasirr.blogspot.com/feeds/posts/default] name = Ammar Yasir + +[http://zsv.org.ua/feed/] +name = Zarubin Stas hooks/post-receive -- Planet phpMyAdmin

1 0