- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1795-g8119fa3
by Michal Čihař 07 Apr '11

07 Apr '11

The branch, master has been updated via 8119fa376954e8fc7811c67cd68401b474f8d4f0 (commit) from df6bed32948928fb33ef90d20dc091a69b6bb4a7 (commit) - Log ----------------------------------------------------------------- commit 8119fa376954e8fc7811c67cd68401b474f8d4f0 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Apr 5 23:16:47 2011 +0100 Bug #3271928 - Fix alignment of form fields when creating a new table ----------------------------------------------------------------------- Summary of changes: themes/original/css/theme_right.css.php | 9 +++++++++ themes/pmahomme/css/theme_right.css.php | 13 +++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 1c9d5f5..5eb1a35 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1808,3 +1808,12 @@ fieldset .disabled-field td { #prefs_autoload { margin-bottom: 0.5em; } + +#table_columns input, select { + width: 14em; + box-sizing: border-box; + -ms-box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 652b441..3b57fea 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2110,3 +2110,16 @@ fieldset .disabled-field td { #prefs_autoload { margin-bottom: 0.5em; } + +#table_columns input, select { + width: 14em; + box-sizing: border-box; + -ms-box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + +#table_columns select { + margin: 0 6px; +} + hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1793-g91b28bb
by Michal Čihař 07 Apr '11

07 Apr '11

The branch, master has been updated via 91b28bbfa2794409ad3f46e139e34a9951ceab5e (commit) from 288329402cf5f2f0d5e3645495b25174caa7b099 (commit) - Log ----------------------------------------------------------------- commit 91b28bbfa2794409ad3f46e139e34a9951ceab5e Author: Azhari Harahap <blackarazi(a)gmail.com> Date: Thu Apr 7 00:52:14 2011 +0700 Fix db structure align (patch #3277725, bug #3276024). ----------------------------------------------------------------------- Summary of changes: libraries/db_structure.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 6f91d44..c288559 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -31,7 +31,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false $action_colspan = 6; } - echo '<table class="data" style="float: left;">' . "\n" + echo '<table class="data">' . "\n" .'<thead>' . "\n" .'<tr><th></th>' . "\n" .' <th>' . PMA_SortableTableHeader(__('Table'), 'table') . '</th>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1792-g2883294
by Michal Čihař 07 Apr '11

07 Apr '11

The branch, master has been updated via 288329402cf5f2f0d5e3645495b25174caa7b099 (commit) from 32b9a47a556c45e30c2974e60cb7155408ad698f (commit) - Log ----------------------------------------------------------------- commit 288329402cf5f2f0d5e3645495b25174caa7b099 Author: Sílvio Soares Ribeiro Júnior <silviojr(a)dcc.ufmg.br> Date: Thu Apr 7 11:29:10 2011 +0200 Show error when adding new user which already exists ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 51127ce..e436143 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -890,6 +890,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { $message = PMA_Message::error(__('The user %s already exists!')); $message->addParam('[i]\'' . $username . '\'@\'' . $hostname . '\'[/i]'); $_REQUEST['adduser'] = true; + $_add_user_error = true; } else { $create_user_real = 'CREATE USER \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\''; @@ -1385,7 +1386,7 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s * If we are in an Ajax request for Create User/Edit User/Revoke User/Flush Privileges, * show $message and exit. */ -if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && !isset($_REQUEST['adduser']) && !isset($_REQUEST['initial']) && !isset($_REQUEST['showall']) && !isset($_REQUEST['edit_user_dialog'])) { +if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && (!isset($_REQUEST['adduser']) || $_add_user_error) && !isset($_REQUEST['initial']) && !isset($_REQUEST['showall']) && !isset($_REQUEST['edit_user_dialog'])) { if(isset($sql_query)) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 445eacf6ebb9aa6631097143272af52170770b0a
by Michal Čihař 07 Apr '11

07 Apr '11

The branch, master has been updated via 445eacf6ebb9aa6631097143272af52170770b0a (commit) via 403dfdc86ed166ef25afa9292da2c2fcf2f78385 (commit) via 52e61717056a73f02a75c6043c39510f122e5143 (commit) via ae9f6d8b549bfcff9270403b6aa052008dfd032d (commit) via 25dc5d2c5bc98dfbe3c4f7811572b63dd46cdcde (commit) via 908eb89284ba2bfa2f01382ec440687ec4725e16 (commit) via 7ec452d65765441c0f1cd38e26d04aac2bba6c14 (commit) via 561415550394beaf63eb101feb6e62edca39f0c9 (commit) via c4f2ad12d4589cb040c7dac4aa5ad2d2958065cb (commit) via 2d25355360c65c6f4c4d8fe0a18e2e0af0845fae (commit) via 3465c04ea5f0f8292658a9f26610a2b6cb4a9774 (commit) via 4f96096e5b0a68ac0dbdcb54af1389c0f0dd2ea3 (commit) via ffb4a4a01388079417f23087a89d1df45ba9d3fe (commit) via aa81cf844eb53363c5c2643e046cc8298b5a51fb (commit) from cc5a80bd1b4fdbc14096e2c19463a07331507757 (commit) - Log ----------------------------------------------------------------- commit 445eacf6ebb9aa6631097143272af52170770b0a Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 7 11:07:59 2011 +0200 Update commit 403dfdc86ed166ef25afa9292da2c2fcf2f78385 Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 19:00:58 2011 +0200 Translation update done using Pootle. commit 52e61717056a73f02a75c6043c39510f122e5143 Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 18:55:31 2011 +0200 Translation update done using Pootle. commit ae9f6d8b549bfcff9270403b6aa052008dfd032d Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 18:54:54 2011 +0200 Translation update done using Pootle. commit 25dc5d2c5bc98dfbe3c4f7811572b63dd46cdcde Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 18:47:54 2011 +0200 Translation update done using Pootle. commit 908eb89284ba2bfa2f01382ec440687ec4725e16 Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 18:45:30 2011 +0200 Translation update done using Pootle. commit 7ec452d65765441c0f1cd38e26d04aac2bba6c14 Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 18:40:39 2011 +0200 Translation update done using Pootle. commit 561415550394beaf63eb101feb6e62edca39f0c9 Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 15:23:15 2011 +0200 Translation update done using Pootle. commit c4f2ad12d4589cb040c7dac4aa5ad2d2958065cb Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 15:20:16 2011 +0200 Translation update done using Pootle. commit 2d25355360c65c6f4c4d8fe0a18e2e0af0845fae Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 15:18:38 2011 +0200 Translation update done using Pootle. commit 3465c04ea5f0f8292658a9f26610a2b6cb4a9774 Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 15:16:59 2011 +0200 Translation update done using Pootle. commit 4f96096e5b0a68ac0dbdcb54af1389c0f0dd2ea3 Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 15:04:25 2011 +0200 Translation update done using Pootle. commit ffb4a4a01388079417f23087a89d1df45ba9d3fe Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 15:00:55 2011 +0200 Translation update done using Pootle. commit aa81cf844eb53363c5c2643e046cc8298b5a51fb Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 14:57:57 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/pt_BR/Documentation.html | 54 +++++++++++++++++++------------------- po/pt_BR.po | 39 +++++++++++++++++++++------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/output/pt_BR/Documentation.html b/output/pt_BR/Documentation.html index 8cfe3fb..caec58a 100644 --- a/output/pt_BR/Documentation.html +++ b/output/pt_BR/Documentation.html @@ -93,9 +93,9 @@ as páginas muito mais devagar. </li> <li>Para ter suporte à barras de progresso de upload, veja a <a href="#faq2_9"><abbr title="Perguntas Frequentes">FAQ</abbr> 2.9</a>.</li> - <li>To support BLOB streaming, see PHP and MySQL requirements in <a -href="#faq6_25"> <abbr title="Frequently Asked Questions">FAQ</abbr> -6.25</a>.</li> + <li>Para ter suporte a streaming de canpos BLOB, veja os requisitos do PHP e +MySQL na <a href="#faq6_25"> <abbr title="Frequently Asked +Questions">FAQ</abbr> 6.25</a>.</li> </ul> </li> <li><b>MySQL</b> 5.0 ou mais recente (<a href="#faq1_17">detalhes</a>);</li> @@ -115,7 +115,7 @@ MySQL na parte apropriada. <h3>Atualmente o phpMyAdmin pode:</h3> -<ul><li>browse and drop databases, tables, views, columns and indexes</li> +<ul><li>procurar e eliminar bancos de dados, tabelas, views, colunas e índices</li> <li>criar, copiar, eliminar, renomear e alterar bancos de dados, tabelas, colunas e índices;</li> <li>subsistência de servidor, bancos de dados e tabelas, com propostas sobre a @@ -702,37 +702,37 @@ href="#cfg_Servers_host" class="configrule">$cfg['Servers'][$i]['host']</a>. <dt id="cfg_Servers_socket">$cfg['Servers'][$i]['socket'] string</dt> <dd>Caminho para usar o socket. Deixe em branco para usar o padrão.<br /> Para determinar o socket correto, verifique a sua configuração MySQL ou, use -o comando de linha do <tt>mysql</tt> client, passando a opção +o comando de linha do <tt>mysql</tt> <tt>client</tt>, passando a opção <tt>status</tt>. Dentre os resultados obtidos estará também o socket em uso.</dd> <dt id="cfg_Servers_ssl">$cfg['Servers'][$i]['ssl'] booleano</dt> - <dd>Whether to enable SSL for connection to MySQL server. + <dd>Caso queira ativar o SSL para conexões com o servidor MySQL. </dd> <dt id="cfg_Servers_connect_type">$cfg['Servers'][$i]['connect_type'] string</dt> - <dd>What type connection to use with the MySQL server. Your options are -<tt>'socket'</tt> and <tt>'tcp'</tt>. It defaults to 'tcp' as that is nearly -guaranteed to be available on all MySQL servers, while sockets are not -supported on some platforms.<br /><br /> + <dd>Que tipo de conexão utilizar com o servidor MySQL. Suas opções são +<tt>'socket'</tt> e <tt>'tcp'</tt>. O padrão é o 'tcp' pois é mais +grarantido que esteja disponível em todos os servidores MySQL, enquanto que +sockets não são suportados em algumas plataformas.<br /><br /> - To use the socket mode, your MySQL server must be on the same machine as the -Web server.</dd> + Para conexões via socket, o seu servidor MySQL deve estar na mesma máquina +que o servidor Web.</dd> <dt id="cfg_Servers_extension">$cfg['Servers'][$i]['extension'] string</dt> - <dd>What php MySQL extension to use for the connection. Valid options are: + <dd>Qual extensão do php MySQL utilizar para a conexão. As opções válidas são: <br /><br /> - <tt><i>mysql</i></tt> : The classic MySQL extension. This is the recommended -and default method at this time.<br /><br /> + <tt><i>mysql</i></tt> : A extensão clássica do MySQL. Este é o método +recomendado e também é o padrão neste momento.<br /><br /> - <tt><i>mysqli</i></tt> : The improved MySQL extension. This extension became -available with php 5.0.0 and is the recommended way to connect to a server -running MySQL 4.1.x or newer.</dd> + <tt><i>mysqli</i></tt> : A extensão modernizada do MySQL. Esta extensão foi +disponibilizada com o php 5.0.0 e é método recomendado para se conectar a +servidores rodando MySQL 4.1.x ou mais recentes.</dd> <dt id="cfg_Servers_compress">$cfg['Servers'][$i]['compress'] booleano</dt> - <dd>Whether to use a compressed protocol for the MySQL server connection or not -(experimental).<br /> - This feature requires PHP >= 4.3.0.</dd> + <dd>Caso queira usar ou não o protocólo de compressão para a conexão com o +servidor MySQL (em fase experimental).<br /> + Este recurso requer o PHP >= 4.3.0.</dd> <dt id="controluser"> <span id="cfg_Servers_controluser">$cfg['Servers'][$i]['controluser']</span> @@ -740,12 +740,12 @@ string<br /> <span id="cfg_Servers_controlpass">$cfg['Servers'][$i]['controlpass']</span> string </dt> - <dd>This special account is used for 2 distinct purposes: to make possible all -relational features (see <a href="#pmadb" -class="configrule">$cfg['Servers'][$i]['pmadb']</a>) and, for a MySQL -server running with <tt>--skip-show-database</tt>, to enable a multi-user -installation (<abbr title="HyperText Transfer Protocol">HTTP</abbr> or -cookie authentication mode).<br /><br /> + <dd>Esta conta especial é usada para 2 finalidades específicas: para habilitar +todos os recursos de relacionamento (veja <a href="#pmadb" +class="configrule">$cfg['Servers'][$i]['pmadb']</a>) e para um servidor +MySQL que estiver rodando com <tt>--skip-show-database</tt>, para habilitar +uma instalação mult-usuário (autenticação por modo <abbr title="HyperText +Transfer Protocol">HTTP</abbr> ou COOKIE).<br /><br /> When using <abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie authentication modes (or 'config' authentication mode since phpMyAdmin diff --git a/po/pt_BR.po b/po/pt_BR.po index a38b756..e722808 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.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-06 10:05+0300\n" -"PO-Revision-Date: 2011-04-06 00:25+0200\n" +"PO-Revision-Date: 2011-04-06 19:00+0200\n" "Last-Translator: <mjaning(a)gmail.com>\n" "Language-Team: none\n" "Language: pt_BR\n" @@ -209,13 +209,13 @@ msgstr "" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:82 -#, fuzzy msgid "" "To support BLOB streaming, see PHP and MySQL requirements in <a href=" "\"#faq6_25\"> <abbr title=\"Frequently Asked Questions\">FAQ</abbr> 6.25</a>." msgstr "" -"suportar mysqli, a extensão melhorada do MySQL (<a href=\"#faq1_17\">veja a " -"<abbr title=\"Perguntas Frequentes\">FAQ</abbr> 1.17</a>);" +"Para ter suporte a streaming de canpos BLOB, veja os requisitos do PHP e " +"MySQL na <a href=\"#faq6_25\"> <abbr title=\"Frequently Asked " +"Questions\">FAQ</abbr> 6.25</a>." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:87 @@ -253,9 +253,8 @@ msgstr "Atualmente o phpMyAdmin pode:" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:102 -#, fuzzy msgid "browse and drop databases, tables, views, columns and indexes" -msgstr "procurar e eliminar bancos de dados, tabelas, campos e índices;" +msgstr "procurar e eliminar bancos de dados, tabelas, views, colunas e índices" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:103 @@ -1831,8 +1830,8 @@ msgid "" "command. Among the resulting information displayed will be the socket used." msgstr "" "Para determinar o socket correto, verifique a sua configuração MySQL ou, use " -"o comando de linha do <tt>mysql</tt> client, passando a opção <tt>status</" -"tt>. Dentre os resultados obtidos estará também o socket em uso." +"o comando de linha do <tt>mysql</tt> <tt>client</tt>, passando a opção " +"<tt>status</tt>. Dentre os resultados obtidos estará também o socket em uso." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:682 @@ -1842,7 +1841,7 @@ msgstr "$cfg['Servers'][$i]['ssl'] booleano" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:683 msgid "Whether to enable SSL for connection to MySQL server." -msgstr "" +msgstr "Caso queira ativar o SSL para conexões com o servidor MySQL." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:686 @@ -1857,6 +1856,10 @@ msgid "" "guaranteed to be available on all MySQL servers, while sockets are not " "supported on some platforms." msgstr "" +"Que tipo de conexão utilizar com o servidor MySQL. Suas opções são " +"<tt>'socket'</tt> e <tt>'tcp'</tt>. O padrão é o 'tcp' pois é mais " +"grarantido que esteja disponível em todos os servidores MySQL, enquanto que " +"sockets não são suportados em algumas plataformas." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:692 @@ -1864,6 +1867,8 @@ msgid "" "To use the socket mode, your MySQL server must be on the same machine as the " "Web server." msgstr "" +"Para conexões via socket, o seu servidor MySQL deve estar na mesma máquina " +"que o servidor Web." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:695 @@ -1874,6 +1879,7 @@ msgstr "$cfg['Servers'][$i]['extension'] string" #: orig-docs/Documentation.html:696 msgid "What php MySQL extension to use for the connection. Valid options are:" msgstr "" +"Qual extensão do php MySQL utilizar para a conexão. As opções válidas são:" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:699 @@ -1881,6 +1887,8 @@ msgid "" "<tt><i>mysql</i></tt> : The classic MySQL extension. This is the recommended " "and default method at this time." msgstr "" +"<tt><i>mysql</i></tt> : A extensão clássica do MySQL. Este é o método " +"recomendado e também é o padrão neste momento." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:703 @@ -1889,6 +1897,9 @@ msgid "" "available with php 5.0.0 and is the recommended way to connect to a server " "running MySQL 4.1.x or newer." msgstr "" +"<tt><i>mysqli</i></tt> : A extensão modernizada do MySQL. Esta extensão foi " +"disponibilizada com o php 5.0.0 e é método recomendado para se conectar a " +"servidores rodando MySQL 4.1.x ou mais recentes." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:708 @@ -1901,11 +1912,13 @@ msgid "" "Whether to use a compressed protocol for the MySQL server connection or not " "(experimental)." msgstr "" +"Caso queira usar ou não o protocólo de compressão para a conexão com o " +"servidor MySQL (em fase experimental)." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:711 msgid "This feature requires PHP >= 4.3.0." -msgstr "" +msgstr "Este recurso requer o PHP >= 4.3.0." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:714 @@ -1934,6 +1947,12 @@ msgid "" "skip-show-database</tt>, to enable a multi-user installation (<abbr title=" "\"HyperText Transfer Protocol\">HTTP</abbr> or cookie authentication mode)." msgstr "" +"Esta conta especial é usada para 2 finalidades específicas: para habilitar " +"todos os recursos de relacionamento (veja <a href=\"#pmadb\" " +"class=\"configrule\">$cfg['Servers'][$i]['pmadb']</a>) e para um servidor " +"MySQL que estiver rodando com <tt>--skip-show-database</tt>, para habilitar " +"uma instalação mult-usuário (autenticação por modo <abbr title=\"HyperText " +"Transfer Protocol\">HTTP</abbr> ou COOKIE)." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:725 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1791-g32b9a47
by Michal Čihař 07 Apr '11

07 Apr '11

The branch, master has been updated via 32b9a47a556c45e30c2974e60cb7155408ad698f (commit) from 52299e0658c4f21fbcfdae60c5f26b587d2af4d3 (commit) - Log ----------------------------------------------------------------- commit 32b9a47a556c45e30c2974e60cb7155408ad698f Author: theranchcowboy <theranchcowboy(a)googlemail.com> Date: Wed Apr 6 18:43:02 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sr.po | 392 +------------------------------------------------------------- 1 files changed, 5 insertions(+), 387 deletions(-) diff --git a/po/sr.po b/po/sr.po index 2886941..5ed737f 100644 --- a/po/sr.po +++ b/po/sr.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-03-23 12:53-0400\n" -"PO-Revision-Date: 2010-03-30 23:47+0200\n" -"Last-Translator: Michal <michal(a)cihar.com>\n" +"PO-Revision-Date: 2011-04-06 18:43+0200\n" +"Last-Translator: <theranchcowboy(a)googlemail.com>\n" "Language-Team: serbian_cyrillic <sr(a)li.org>\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 #: libraries/display_tbl.lib.php:341 server_privileges.php:1600 @@ -27,7 +27,7 @@ msgstr "Прикажи све" #: libraries/schema/Pdf_Relation_Schema.class.php:1114 #: libraries/schema/User_Schema.class.php:360 msgid "Page number:" -msgstr "Број стране:" +msgstr "Број странице:" #: browse_foreigners.php:133 msgid "" @@ -10174,385 +10174,3 @@ msgstr "назив за VIEW" #, fuzzy msgid "Rename view to" msgstr "Промени име табеле у " - -#, fuzzy -#~| msgid "Dumping data for table" -#~ msgid "Delete the matches for the " -#~ msgstr "Приказ података табеле" - -#~ msgid "Show left delete link" -#~ msgstr "Прикажи/сакриј мени с леве стране" - -#~ msgid "yes" -#~ msgstr "Да" - -#~ msgid "to/from page" -#~ msgstr "од/до странице" - -#~ msgid "Disable Statistics" -#~ msgstr "Искључи статистике" - -#~ msgid "Start" -#~ msgstr "Суб" - -#~ msgid "Display table filter" -#~ msgstr "Приказујем коментаре колоне" - -#~ msgid "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." -#~ msgstr "" -#~ "Додатне могућности за рад са повезаним табелама су искључене. Да бисте " -#~ "сазнали зашто, кликните %sовде%s." - -#~ msgid "Ignore duplicate rows" -#~ msgstr "Игнориши дуплициране редове" - -#~ msgid "Execute bookmarked query" -#~ msgstr "Изврши упамћен упит" - -#~ msgid "No tables" -#~ msgstr "Нема табела" - -#~ msgid "SVG" -#~ msgstr "CSV" - -#~ msgid "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." -#~ msgstr "" -#~ "Молимо унесите вредности за опције трансформације користећи овај облик: " -#~ "'a', 100, b,'c'...<br />Ако треба да унесете обрнуту косу црту (\"\\\") " -#~ "или апостроф (\"'\") у те вредности, ставите обрнуту косу црту испред њих " -#~ "(на пример '\\\\xyz' или 'a\\'b')." - -#~ msgid "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." -#~ msgstr "" -#~ "Молимо унесите вредности за опције трансформације користећи овај облик: " -#~ "'a', 100, b,'c'...<br />Ако треба да унесете обрнуту косу црту (\"\\\") " -#~ "или апостроф (\"'\") у те вредности, ставите обрнуту косу црту испред њих " -#~ "(на пример '\\\\xyz' или 'a\\'b')." - -#~ msgid "New table" -#~ msgstr "Нема табела" - -#~ msgid "server name" -#~ msgstr "назив сервера" - -#~ msgid "database name" -#~ msgstr "назив базе" - -#~ msgid "Edit PDF Pages" -#~ msgstr "Уређивање PDF страна" - -#~ msgid "Data Dictionary Format" -#~ msgstr "Формат речника података" - -#~ msgid "PMA database" -#~ msgstr "База не постоји" - -#~ msgid "<code>AUTO_INCREMENT</code>" -#~ msgstr "Додај AUTO_INCREMENT вредност" - -#~ msgid "Dump %s row(s) starting at row # %s" -#~ msgstr "Прикажи %s редова почевши од реда %s." - -#~ msgid "remember template" -#~ msgstr "запамти шаблон" - -#~ msgid "\"zipped\"" -#~ msgstr "\"зиповано\"" - -#~ msgid "\"gzipped\"" -#~ msgstr "\"гзип-овано\"" - -#~ msgid "\"bzipped\"" -#~ msgstr "\"бзип-овано\"" - -#~ msgid "Imported file compression will be automatically detected from: %s" -#~ msgstr "Врста компресије увезених датотека ће бити аутоматски одабрана: %s" - -#~ msgid "Add into comments" -#~ msgstr "Додај у коментаре" - -#~ msgid "Export triggers" -#~ msgstr "Тип извоза" - -#~ msgid "Export views" -#~ msgstr "Тип извоза" - -#~ msgid "Invalid column (%s) specified!" -#~ msgstr "Задата је неисправна колона (%s)!" - -#~ msgid "Actions" -#~ msgstr "Акција" - -#~ msgid "Table removal" -#~ msgstr "Назив табеле" - -#~ msgctxt "BLOB repository" -#~ msgid "Enabled" -#~ msgstr "Омогућено" - -#~ msgid "Disable" -#~ msgstr "Онемогућено" - -#~ msgctxt "BLOB repository" -#~ msgid "Repair" -#~ msgstr "Поправи табелу" - -#~ msgctxt "BLOB repository" -#~ msgid "Disabled" -#~ msgstr "Онемогућено" - -#~ msgid "" -#~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " -#~ "extension. Please check your PHP configuration." -#~ msgstr "" -#~ "не могу да учитам екстензију %s,<br />молим проверите PHP конфигурацију" - -#~ msgid "" -#~ "Couldn't load the iconv or recode extension needed for charset " -#~ "conversion. Either configure PHP to enable these extensions or disable " -#~ "charset conversion in phpMyAdmin." -#~ msgstr "" -#~ "Не могу да учитам iconv или recode екстензије потребне за конверзију " -#~ "скупова знакова, подесите PHP да дозволи коришћење ових екстензија или " -#~ "онемогућите конверзију скупова знакова у phpMyAdmin-у." - -#~ msgid "" -#~ "Couldn't use the iconv, libiconv, or recode_string functions, although " -#~ "the necessary extensions appear to be loaded. Check your PHP " -#~ "configuration." -#~ msgstr "" -#~ "Не могу да користим iconv или libiconv или recode_string функције иако " -#~ "екстензија пријављује да је учитана. Проверите вашу PHP конфигурацију." - -#~ msgid "Field" -#~ msgstr "Поље" - -#~ msgid "Records" -#~ msgstr "Записи" - -#~ msgid "Fields terminated by" -#~ msgstr "Поља раздвојена са" - -#~ msgid "Fields" -#~ msgstr "Поља" - -#~ msgid "Field %s has been dropped" -#~ msgstr "Поље %s је обрисано" - -#~ msgid "See image/jpeg: inline" -#~ msgstr "Прикажи JPEG слике на страни" - -#~ msgid "" -#~ "Add custom comment into header (\n" -#~ " splits lines)" -#~ msgstr "Додај коментар у заглавље (\\n раздваја линије)" - -#~ msgid "and" -#~ msgstr "и" - -#~ msgctxt "$strBLOBRepositoryDisabled" -#~ msgid "Disabled" -#~ msgstr "Онемогућено" - -#~ msgctxt "$strBLOBRepositoryEnabled" -#~ msgid "Enabled" -#~ msgstr "Омогућено" - -#~ msgctxt "$strBLOBRepositoryRepair" -#~ msgid "Repair" -#~ msgstr "Поправи табелу" - -#~ msgid "Calendar" -#~ msgstr "Календар" - -#~ msgid "MySQL 4.0 compatible" -#~ msgstr "MySQL 4.0 компатибилно" - -#~ msgid "Could not load default configuration from: \"%1$s\"" -#~ msgstr "Не могу да учитам подразумевану конфигурацију из: \"%1$s\"" - -#~ msgid "Create an index on %s columns" -#~ msgstr "Направи кључ на %s колона" - -#~ msgctxt "$strCreateTableShort" -#~ msgid "Create table" -#~ msgstr "Направи табелу" - -#~ msgctxt "$strCreateUserDatabaseNone" -#~ msgid "None" -#~ msgstr "нема" - -#~ msgid "Flush the table (\"FLUSH\")" -#~ msgstr "Освежи табелу (\"FLUSH\")" - -#~ msgid "Invalid server index: \"%s\"" -#~ msgstr "Неисправан индекс сервера: \"%s\"" - -#~ msgctxt "$strMIME_description" -#~ msgid "Description" -#~ msgstr "Опис" - -#~ msgctxt "$strNoneDefault" -#~ msgid "None" -#~ msgstr "нема" - -#~ msgid "Schema of the \"%s\" database - Page %s" -#~ msgstr "Схема базе \"%s\" - Страна %s" - -#~ msgid "The \"%s\" table doesn't exist!" -#~ msgstr "Табела \"%s\" не постоји!" - -#~ msgid "running on %s" -#~ msgstr "на серверу %s" - -#~ msgid "The scale factor is too small to fit the schema on one page" -#~ msgstr "Фактор умањења је премали да би схема стала на једну страну" - -#~ msgid "" -#~ "Cannot start session without errors, please check errors given in your " -#~ "PHP and/or webserver log file and configure your PHP installation " -#~ "properly." -#~ msgstr "" -#~ "Не могу да покренем сесију без грешака, молим проверите грешке у PHP и/" -#~ "или дневнику веб сервера и прописно подесите вашу PHP инсталацију." - -#~ msgid "" -#~ "However on last run no data has been parsed, this usually means " -#~ "phpMyAdmin won" -#~ msgstr "" -#~ "Међутим, при последњем покретању подаци нису били обрађени, што обично " -#~ "значи да phpMyAdmin неће бити у могућности да заврши овај увоз осим ако " -#~ "не повећате временска ограничења у PHP-у" - -#~ msgctxt "None action" -#~ msgid "None" -#~ msgstr "нема" - -#~ msgctxt "" -#~ msgid "None" -#~ msgstr "нема" - -#~ msgid "Grant all privileges on wildcard name (username_%)" -#~ msgstr "Дај све привилегије на имену са џокерима (корисничко_име\\_%)" - -#~ msgid "The %s table doesn" -#~ msgstr "Табела \"%s\" не постоји!" - -#~ msgid "Invalid hostname for server %1. Please review your configuration." -#~ msgstr "" -#~ "Неисправан назив сервера %1$s. Молимо проверите своју конфигурацију." - -#~ msgid "Error renaming table %1 to %2" -#~ msgstr "Грешка при преименовању табеле %1$s у %2$s" - -#~ msgid "" -#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. " -#~ "Please check your PHP configuration." -#~ msgstr "" -#~ "не могу да учитам екстензију %s,<br />молим проверите PHP конфигурацију" - -#~ msgid "(or the local MySQL server" -#~ msgstr "Не могу да се пријавим на MySQL сервер" - -#~ msgid "" -#~ "There is a chance that you may have found a bug in the SQL parser. Please " -#~ "examine your query closely, and check that the quotes are correct and not " -#~ "mis-matched. Other possible failure causes may be that you are uploading " -#~ "a file with binary outside of a quoted text area. You can also try your " -#~ "query on the MySQL command line interface. The MySQL server error output " -#~ "be . " -#~ msgstr "" -#~ "Постоји могућност да сте пронашли баг у SQL парсеру. Молимо испитајте " -#~ "свој упит пажљиво, и проверите да су наводници исправни и да не " -#~ "недостају. Остали могући разлози грешке могу бити да сте послали бинарну " -#~ "датотеку ван области за обичан текст. Можете пробати свој упит у MySQL " -#~ "сучељу командне линије. Доња порука о грешци MySQL сервера, ако је има, " -#~ "може вам помоћи у откривању проблема. Ако и даље имате проблеме или ако " -#~ "парсер не успева тамо где успева сучеље командне линије, сведите свој SQL " -#~ "упит на један једини упит који ствара проблеме и пошаљите нам извештај о " -#~ "грешци са делом кода у доњој РЕЗ секцији:" - -#~ msgctxt "$strStrucCSV" -#~ msgid "CSV" -#~ msgstr "CSV формат" - -#~ msgid "Delete the users and reload the privileges afterwards." -#~ msgstr "Обриши кориснике и поново учитај привилегије." - -#~ msgid "" -#~ "This is the cleanest way, but reloading the privileges may take a while." -#~ msgstr "" -#~ "Ово је најчистији начин, али поновно учитавање привилегина може да " -#~ "потраје." - -#~ msgid "has been altered." -#~ msgstr "је промењен(а)." - -#~ msgid "Internet Explorer does not support this function." -#~ msgstr "Internet Explorer не подржава ову функцију." - -#~ msgid "" -#~ "The "deleted" users will still be able to access the server as " -#~ "usual until the privileges are reloaded." -#~ msgstr "" -#~ ""Обрисани" корисници ће и даље имати приступ серверу док " -#~ "привилегије не буду поново учитане." - -#~ msgid "Just delete the users from the privilege tables." -#~ msgstr "Само обриши кориснике из табеле привилегија." - -#~ msgid "" -#~ "Allows running stored procedures; has no effect in this MySQL version." -#~ msgstr "" -#~ "Дозвољава покретање сачуваних процедура. Нема ефекта у овој верзији MySQL-" -#~ "a." - -#~ msgid "Process list" -#~ msgstr "Листа процеса" - -#~ msgid "" -#~ "The users will still have the USAGE privilege until the privileges are " -#~ "reloaded." -#~ msgstr "" -#~ "Корисници ће и даље имати USAGE привилегије док се привилегије поново не " -#~ "учитају." - -#~ msgid "Native MS Excel format" -#~ msgstr "Изворни MS Excel подаци" - -#~ msgctxt "Create SELECT ... query" -#~ msgid "Select" -#~ msgstr "Изабери све" - -#~ msgctxt "Create INSERT query" -#~ msgid "Insert" -#~ msgstr "Нови запис" - -#~ msgctxt "Create UPDATE query" -#~ msgid "Update" -#~ msgstr "Ажурирај упит" - -#~ msgctxt "Create DELETE query" -#~ msgid "Delete" -#~ msgstr "Обриши" - -#~ msgid "utf-8" -#~ msgstr "utf-8" - -#~ msgid "Jan0" -#~ msgstr "јан0" - -#~ msgid "Jan1" -#~ msgstr "јан1" - -#~ msgid "Jan2" -#~ msgstr "јан2" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1790-g52299e0
by Michal Čihař 06 Apr '11

06 Apr '11

The branch, master has been updated via 52299e0658c4f21fbcfdae60c5f26b587d2af4d3 (commit) via 2d540f73b33740b3ecfbc24d6bdb4b204c998c47 (commit) via e264e9f112d917c4170ad432f9f61660c9eddbb4 (commit) via d421c85a5c9912fdc0e728a811940870c5f7dc9f (commit) via 4c957837eb6c90259ca6afb80257a31ce33685e0 (commit) from 864bf00d97d70001d6446ed87389a8b3942360d7 (commit) - Log ----------------------------------------------------------------- commit 52299e0658c4f21fbcfdae60c5f26b587d2af4d3 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Apr 5 16:02:46 2011 +0200 Drizzle-compatible Status tab commit 2d540f73b33740b3ecfbc24d6bdb4b204c998c47 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Apr 5 16:02:16 2011 +0200 Drizzle-compatible Processes tab commit e264e9f112d917c4170ad432f9f61660c9eddbb4 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Apr 5 16:01:35 2011 +0200 Hide password change for Drizzle commit d421c85a5c9912fdc0e728a811940870c5f7dc9f Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Apr 5 16:00:44 2011 +0200 Make Charsets tab read charset and collation info from information_schema (MySQL) / data_dictionary (Drizzle) instead of SHOW statements commit 4c957837eb6c90259ca6afb80257a31ce33685e0 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Apr 5 15:58:11 2011 +0200 Introduce PMA_DRIZZLE constant ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 4 ++- libraries/mysql_charsets.lib.php | 52 +++++++++++++++++----------------- main.php | 25 ++++++++-------- server_processlist.php | 16 ++++++++++- server_status.php | 9 ++++- 5 files changed, 64 insertions(+), 42 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 192cf0e..c1b34e0 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -985,10 +985,12 @@ function PMA_DBI_postConnect($link, $is_controluser = false) PMA_cacheSet('PMA_MYSQL_MAJOR_VERSION', PMA_MYSQL_MAJOR_VERSION, true); PMA_cacheSet('PMA_MYSQL_STR_VERSION', PMA_MYSQL_STR_VERSION, true); } + // detect Drizzle by version number (year.month.day.?patch-version) + define('PMA_DRIZZLE', PMA_MYSQL_MAJOR_VERSION >= 2009); } /* Skip charsets for Drizzle */ - if (PMA_MYSQL_MAJOR_VERSION < 2009) { + if (!PMA_DRIZZLE) { if (! empty($GLOBALS['collation_connection'])) { PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE); PMA_DBI_query("SET collation_connection = '" . PMA_sqlAddslashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE); diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 5663dd9..45fd55a 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -11,26 +11,18 @@ if (! defined('PHPMYADMIN')) { /** * */ -if (PMA_MYSQL_MAJOR_VERSION >= 2009) { - /* There are no charsets in Drizzle */ - $GLOBALS['mysql_charsets'] = array(); - $GLOBALS['mysql_charsets_descriptions'] = array('utf8' => 'UTF-8 Unicode'); - $GLOBALS['mysql_charsets_count'] = 0; - $GLOBALS['mysql_charsets_available'] = array(); - $GLOBALS['mysql_collations'] = array(); - $GLOBALS['mysql_default_collations'] = array(); - $GLOBALS['mysql_collations_flat'] = array(); - $GLOBALS['mysql_collations_count'] = 0; - $GLOBALS['mysql_collations_available'] = array(); -} elseif (! PMA_cacheExists('mysql_charsets_count', true)) { - $res = PMA_DBI_query('SHOW CHARACTER SET;'); +if (! PMA_cacheExists('mysql_charsets_count', true)) { + $sql = PMA_DRIZZLE + ? 'SELECT * FROM data_dictionary.CHARACTER_SETS' + : 'SELECT * FROM information_schema.CHARACTER_SETS'; + $res = PMA_DBI_query($sql); $mysql_charsets = array(); while ($row = PMA_DBI_fetch_assoc($res)) { - $mysql_charsets[] = $row['Charset']; + $mysql_charsets[] = $row['CHARACTER_SET_NAME']; // never used //$mysql_charsets_maxlen[$row['Charset']] = $row['Maxlen']; - $mysql_charsets_descriptions[$row['Charset']] = $row['Description']; + $mysql_charsets_descriptions[$row['CHARACTER_SET_NAME']] = $row['DESCRIPTION']; } PMA_DBI_free_result($res); @@ -40,26 +32,34 @@ if (PMA_MYSQL_MAJOR_VERSION >= 2009) { $mysql_collations = array_flip($mysql_charsets); $mysql_default_collations = $mysql_collations_flat = $mysql_charsets_available = $mysql_collations_available = array(); - $res = PMA_DBI_query('SHOW COLLATION;'); + $sql = PMA_DRIZZLE + ? 'SELECT * FROM data_dictionary.COLLATIONS' + : 'SELECT * FROM information_schema.COLLATIONS'; + $res = PMA_DBI_query($sql); while ($row = PMA_DBI_fetch_assoc($res)) { - if (!is_array($mysql_collations[$row['Charset']])) { - $mysql_collations[$row['Charset']] = array($row['Collation']); + if (!is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) { + $mysql_collations[$row['CHARACTER_SET_NAME']] = array($row['COLLATION_NAME']); } else { - $mysql_collations[$row['Charset']][] = $row['Collation']; + $mysql_collations[$row['CHARACTER_SET_NAME']][] = $row['COLLATION_NAME']; } - $mysql_collations_flat[] = $row['Collation']; - if ((isset($row['D']) && $row['D'] == 'Y') || (isset($row['Default']) && $row['Default'] == 'Yes')) { - $mysql_default_collations[$row['Charset']] = $row['Collation']; + $mysql_collations_flat[] = $row['COLLATION_NAME']; + if ($row['IS_DEFAULT'] == 'Yes') { + $mysql_default_collations[$row['CHARACTER_SET_NAME']] = $row['COLLATION_NAME']; } //$mysql_collations_available[$row['Collation']] = !isset($row['Compiled']) || $row['Compiled'] == 'Yes'; - $mysql_collations_available[$row['Collation']] = TRUE; - $mysql_charsets_available[$row['Charset']] = - !empty($mysql_charsets_available[$row['Charset']]) - || !empty($mysql_collations_available[$row['Collation']]); + $mysql_collations_available[$row['COLLATION_NAME']] = true; + $mysql_charsets_available[$row['CHARACTER_SET_NAME']] = + !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']]) + || !empty($mysql_collations_available[$row['COLLATION_NAME']]); } PMA_DBI_free_result($res); unset($res, $row); + if (PMA_DRIZZLE && isset($mysql_collations['utf8_general_ci']) && isset($mysql_collations['utf8'])) { + $mysql_collations['utf8'] = $mysql_collations['utf8_general_ci']; + unset($mysql_collations['utf8_general_ci']); + } + $mysql_collations_count = count($mysql_collations_flat); sort($mysql_collations_flat, SORT_STRING); foreach ($mysql_collations AS $key => $value) { diff --git a/main.php b/main.php index c29a508..e678d88 100644 --- a/main.php +++ b/main.php @@ -85,19 +85,20 @@ if ($server > 0 if ($server > 0) { require_once './libraries/check_user_privileges.lib.php'; - // Logout for advanced authentication - if ($cfg['Server']['auth_type'] != 'config') { - if ($cfg['ShowChgPassword']) { - if ($GLOBALS['cfg']['AjaxEnable']) { - $conditional_class = 'ajax'; - } else { - $conditional_class = null; + if (!PMA_DRIZZLE) { + // Logout for advanced authentication + if ($cfg['Server']['auth_type'] != 'config') { + if ($cfg['ShowChgPassword']) { + if ($GLOBALS['cfg']['AjaxEnable']) { + $conditional_class = 'ajax'; + } else { + $conditional_class = null; + } + PMA_printListItem(__('Change password'), 'li_change_password', + './user_password.php?' . $common_url_query, null, null, 'change_password_anchor', null, $conditional_class); } - PMA_printListItem(__('Change password'), 'li_change_password', - './user_password.php?' . $common_url_query, null, null, 'change_password_anchor', null, $conditional_class); - } - } // end if - if (PMA_MYSQL_MAJOR_VERSION < 2009) { + } // end if + echo ' <li id="li_select_mysql_collation">'; echo ' <form method="post" action="index.php" target="_parent">' . "\n" . PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection') diff --git a/server_processlist.php b/server_processlist.php index ea31a76..12959d1 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -52,11 +52,16 @@ $result = PMA_DBI_query($sql_query); ?> <table id="tableprocesslist" class="data"> <thead> -<tr><td><a href="<?php echo $full_text_link; ?>" +<tr> + <?php if (!PMA_DRIZZLE): ?> + <td><a href="<?php echo $full_text_link; ?>" title="<?php echo empty($full) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>"> <img src="<?php echo $pmaThemeImage . 's_' . (empty($_REQUEST['full']) ? 'full' : 'partial'); ?>text.png" alt="<?php echo empty($_REQUEST['full']) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>" /> </a></td> + <?php else: ?> + <th></th> + <?php endif; ?> <th><?php echo __('ID'); ?></th> <th><?php echo __('User'); ?></th> <th><?php echo __('Host'); ?></th> @@ -71,6 +76,15 @@ $result = PMA_DBI_query($sql_query); <?php $odd_row = true; while($process = PMA_DBI_fetch_assoc($result)) { + if (PMA_DRIZZLE) { + // Drizzle uses uppercase keys + foreach ($process as $k => $v) { + $k = $k !== 'DB' + ? $k = ucfirst(strtolower($k)) + : 'db'; + $process[$k] = $v; + } + } $url_params['kill'] = $process['Id']; $kill_process = 'server_processlist.php' . PMA_generate_common_url($url_params); ?> diff --git a/server_status.php b/server_status.php index c67c63a..3b44a4a 100644 --- a/server_status.php +++ b/server_status.php @@ -653,8 +653,11 @@ $used_queries = $sections['com']['vars']; // reverse sort by value to show most used statements first arsort($used_queries); // remove all zero values from the end -while (end($used_queries) == 0) { - array_pop($used_queries); +// variable empty for Drizzle +if ($used_queries) { + while (end($used_queries) == 0) { + array_pop($used_queries); + } } // number of tables to split values into @@ -713,6 +716,7 @@ foreach ($used_queries as $name => $value) { <div class="clearfloat"></div> </div> +<?php if ($used_queries): ?> <div id="serverstatusquerieschart"> <?php if (empty($_REQUEST["query_chart"])) { @@ -726,6 +730,7 @@ foreach ($used_queries as $name => $value) { } ?> </div> +<?php endif; ?> <div id="serverstatussection"> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1785-g864bf00
by Michal Čihař 06 Apr '11

06 Apr '11

The branch, master has been updated via 864bf00d97d70001d6446ed87389a8b3942360d7 (commit) from 6c85df23d4c0eb5db33b2ae366fd539d3df32793 (commit) - Log ----------------------------------------------------------------- commit 864bf00d97d70001d6446ed87389a8b3942360d7 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Apr 6 15:13:29 2011 +0200 Fix typo ----------------------------------------------------------------------- Summary of changes: scripts/remove-incomplete-mo | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo index a9ff4eb..b59d6e7 100755 --- a/scripts/remove-incomplete-mo +++ b/scripts/remove-incomplete-mo @@ -16,7 +16,7 @@ fi echo '<?php' > libraries/language_stats.inc.php echo '/* Automatically generated file, do not edit! */' >> libraries/language_stats.inc.php -echo '/* Generated bt scripts/remove-incomplete-mo */' >> libraries/language_stats.inc.php +echo '/* Generated by scripts/remove-incomplete-mo */' >> libraries/language_stats.inc.php echo '' >> libraries/language_stats.inc.php echo '$GLOBALS["language_stats"] = array (' >> libraries/language_stats.inc.php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. cc5a80bd1b4fdbc14096e2c19463a07331507757
by Michal Čihař 06 Apr '11

06 Apr '11

The branch, master has been updated via cc5a80bd1b4fdbc14096e2c19463a07331507757 (commit) via c1a431aaedfe31a9bf2e48d2e03f3f961200aeb3 (commit) via 945b8950f6fb6930aa903235927805b8edd16831 (commit) from a5948e66e8f789d9b1c2dd8d7a6c52849db01a66 (commit) - Log ----------------------------------------------------------------- commit cc5a80bd1b4fdbc14096e2c19463a07331507757 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Apr 6 13:44:52 2011 +0200 Update doc commit c1a431aaedfe31a9bf2e48d2e03f3f961200aeb3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Apr 6 12:03:16 2011 +0200 Translation update done using Pootle. commit 945b8950f6fb6930aa903235927805b8edd16831 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Apr 6 11:57:11 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/tr/Documentation.html | 4 ++-- po/tr.po | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index 597fe71..30b03d3 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -647,8 +647,8 @@ ayarlayabilirsiniz.</dd> varsayılan uyarı etkisiz. Bu mesajın görünmesini durdurmak için bu parametreyi <tt>TRUE</tt> olarak ayarlayabilirsiniz.</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'] tam sayı</dt> + <dd>Belli uç noktalarda tamamlanmamış çevirilerle ilgili uyarı gösterir.</dd> <dt id="cfg_AllowThirdPartyFraming">$cfg['AllowThirdPartyFraming'] boolean</dt> <dd>Bunu <tt>true</tt> olarak ayarlamak phpMyAdmin'i çerçeve içinde çağırmak diff --git a/po/tr.po b/po/tr.po index d66409e..392e3b0 100644 --- a/po/tr.po +++ b/po/tr.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-06 10:04+0300\n" -"PO-Revision-Date: 2011-04-04 16:54+0200\n" +"PO-Revision-Date: 2011-04-06 12:03+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -1671,12 +1671,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:627 msgid "$cfg['TranslationWarningThreshold'] integer" -msgstr "" +msgstr "$cfg['TranslationWarningThreshold'] tam sayı" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:628 msgid "Show warning about incomplete translations on certain threshold." -msgstr "" +msgstr "Belli uç noktalarda tamamlanmamış çevirilerle ilgili uyarı gösterir." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:630 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1784-g6c85df2
by Michal Čihař 06 Apr '11

06 Apr '11

The branch, master has been updated via 6c85df23d4c0eb5db33b2ae366fd539d3df32793 (commit) from 6b48dccefe8822c7e4c317aa38e7357c3c155fbd (commit) - Log ----------------------------------------------------------------- commit 6c85df23d4c0eb5db33b2ae366fd539d3df32793 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Apr 6 10:04:42 2011 +0200 Fix markup ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index baa3d1e..3063f3c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -624,7 +624,7 @@ since this link provides funding for phpMyAdmin. You can set this parameter to <tt>TRUE</tt> to stop this message from appearing.</dd> - <dd id="cfg_TranslationWarningThreshold">$cfg['TranslationWarningThreshold'] integer</dt> + <dt id="cfg_TranslationWarningThreshold">$cfg['TranslationWarningThreshold'] integer</dt> <dd>Show warning about incomplete translations on certain threshold.</dd> <dt id="cfg_AllowThirdPartyFraming">$cfg['AllowThirdPartyFraming'] boolean</dt> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. c8dfe06ba3952a4cf32791af2869cf19cc3c674d
by Michal Čihař 06 Apr '11

06 Apr '11

The branch, master has been updated via c8dfe06ba3952a4cf32791af2869cf19cc3c674d (commit) via d6fd32f9b50d5860117e163c2f1c2629418588b1 (commit) via 157456c9953482e42371161e11839ba0f71a2b3e (commit) via 2b4a57ee662d6779b1ef31c52584749cab6ad711 (commit) via a42b9f7119eb50b2202df4139ee29c5dfb3aa819 (commit) via 7d15089249e62cdea4593da58cafa0ae4a193afc (commit) via 5c4db372c961c4c725bc7afaabadeec6022d3c1b (commit) via 491d6e9821206c7d8370c92e64a1b034074635e3 (commit) via ecfdbf2304b0fe8e31c926e6e89c9f65465c7e84 (commit) from c73912315c5ca83093725e1267ac0122dc6a2da5 (commit) - Log ----------------------------------------------------------------- commit c8dfe06ba3952a4cf32791af2869cf19cc3c674d Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 00:25:58 2011 +0200 Translation update done using Pootle. commit d6fd32f9b50d5860117e163c2f1c2629418588b1 Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 00:22:04 2011 +0200 Translation update done using Pootle. commit 157456c9953482e42371161e11839ba0f71a2b3e Author: mjaning <mjaning(a)gmail.com> Date: Wed Apr 6 00:20:45 2011 +0200 Translation update done using Pootle. commit 2b4a57ee662d6779b1ef31c52584749cab6ad711 Author: mjaning <mjaning(a)gmail.com> Date: Tue Apr 5 19:36:00 2011 +0200 Translation update done using Pootle. commit a42b9f7119eb50b2202df4139ee29c5dfb3aa819 Author: mjaning <mjaning(a)gmail.com> Date: Tue Apr 5 19:32:07 2011 +0200 Translation update done using Pootle. commit 7d15089249e62cdea4593da58cafa0ae4a193afc Author: mjaning <mjaning(a)gmail.com> Date: Tue Apr 5 19:20:30 2011 +0200 Translation update done using Pootle. commit 5c4db372c961c4c725bc7afaabadeec6022d3c1b Author: mjaning <mjaning(a)gmail.com> Date: Tue Apr 5 19:01:42 2011 +0200 Translation update done using Pootle. commit 491d6e9821206c7d8370c92e64a1b034074635e3 Author: mjaning <mjaning(a)gmail.com> Date: Tue Apr 5 18:53:46 2011 +0200 Translation update done using Pootle. commit ecfdbf2304b0fe8e31c926e6e89c9f65465c7e84 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Tue Apr 5 16:14:28 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 9 ++++----- po/pt_BR.po | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index c4bcaaa..91863a7 100644 --- a/po/en_GB.po +++ b/po/en_GB.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-03-23 19:26+0100\n" -"PO-Revision-Date: 2011-03-03 18:47+0200\n" +"PO-Revision-Date: 2011-04-05 16:14+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: none\n" "Language: en_GB\n" @@ -146,15 +146,14 @@ 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 "" -"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>) and the Standard PHP Library (SPL) extension." +"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." #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:65 diff --git a/po/pt_BR.po b/po/pt_BR.po index 93c5edc..de11cfb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.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-03-23 19:26+0100\n" -"PO-Revision-Date: 2011-04-05 15:16+0200\n" +"PO-Revision-Date: 2011-04-06 00:25+0200\n" "Last-Translator: <mjaning(a)gmail.com>\n" "Language-Team: none\n" "Language: pt_BR\n" @@ -1707,6 +1707,8 @@ msgid "" "The "cookie" auth_type uses blowfish algorithm to encrypt the " "password." msgstr "" +"A autenticação por "cookie" usa o algorítimo "blowfish" " +"para criptografar a senha." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:635 @@ -1716,6 +1718,11 @@ msgid "" "algorithm: you won’t be prompted for this passphrase. There is no " "maximum length for this secret." msgstr "" +"Se você estiver usando o modo de autenticação por "cookie", " +"informe aqui uma frase secreta qualquer para randomização. Ela será " +"utilizada internamente pelo algorítimo blowfish: esta frase secreta não será " +"requisitada em nenhum momento. Não existe um tamanho máximo para esta " +"frase." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:640 @@ -1724,6 +1731,9 @@ msgid "" "bit weaker security as this generated secret is stored in session and " "furthermore it makes impossible to recall user name from cookie." msgstr "" +"A partir da versão 3.1.0 o phpMyAdmin pode gerá-la automaticamente, mas ela " +"torna-se um pouco fraca já que esta frase gerada é armazenada em sessão e " +"além disto torna-se impossível resgatar o nome de usuário do cookie." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:645 @@ -1745,6 +1755,19 @@ msgid "" "<tt>./config.inc.php</tt>, copy that block or needed parts (you don't have " "to define all settings, just those you need to change)." msgstr "" +"A partir da versão 1.4.2, o phpMyAdmin suporta a administração de múltiplos " +"servidores MySQL. Então, uma <a href=\"#cfg_Servers\" " +"class=\"configrule\">$cfg['Servers']</a>-matriz foi adicionada a qual contém " +"as informações do login para os diferentes servidores. O primeiro <a " +"href=\"#cfg_Servers_host\" class=\"configrule\">$cfg['Servers'][$i]['host']</a> " +"contém o hostname do primeiro servidor, o segundo <a " +"href=\"#cfg_Servers_host\" class=\"configrule\">$cfg['Servers'][$i]['host']</a> " +"o hostname do segundo servidor, e assim por diante. Em " +"<tt>./libraries/config.default.php</tt>, existe somente uma seção para as " +"definições do servidor, entretanto você pode definir quantas vezes você " +"precisar em <tt>./config.inc.php</tt>, apenas copie o bloco ou informações " +"que quiser (você não deve definir todas as opções, apenas aquelas que " +"precisam ser alteradas)." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:660 @@ -1757,6 +1780,8 @@ msgid "" "The hostname or <abbr title=\"Internet Protocol\">IP</abbr> address of your " "$i-th MySQL-server. E.g. localhost." msgstr "" +"O hostname ou o endereço <abbr title=\"Internet Protocol\">IP</abbr> do seu " +"$i° servidor MySQL. E.g. localhost." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:664 @@ -1773,6 +1798,12 @@ msgid "" "hostname in <a href=\"#cfg_Servers_host\" class=\"configrule\">$cfg" "['Servers'][$i]['host']</a>." msgstr "" +"O número da porta do seu $i° servidor MySQL. A porta padrão é 3306 " +"(deixe em branco). Se você usa "localhost" como o hostname, o " +"MySQL ignora este número de porta e conecta via socket, então caso queira " +"conectar com uma porta diferente da porta padrão, defina o IP " +""127.0.0.1" ou um hostname verdadeiro em <a " +"href=\"#cfg_Servers_host\" class=\"configrule\">$cfg['Servers'][$i]['host']</a>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:673 @@ -1782,7 +1813,7 @@ msgstr "$cfg['Servers'][$i]['socket'] string" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:674 msgid "The path to the socket to use. Leave blank for default." -msgstr "" +msgstr "Caminho para usar o socket. Deixe em branco para usar o padrão." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:675 @@ -1791,6 +1822,9 @@ msgid "" "the <tt>mysql</tt> command–line client, issue the <tt>status</tt> " "command. Among the resulting information displayed will be the socket used." msgstr "" +"Para determinar o socket correto, verifique a sua configuração MySQL ou, use " +"o comando de linha do <tt>mysql</tt> client, passando a opção " +"<tt>status</tt>. Dentre os resultados obtidos estará também o socket em uso." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:679 hooks/post-receive -- phpMyAdmin localized documentation

1 0