The branch, master has been updated via aefd12b57848c104b09863a600bf13ade9d0b4f7 (commit) via 7b751a6378da20b71bcf5fc353939faea68f1b9e (commit) via c6361c2eb0cacc2feda330f6175195814934d7bb (commit) from c30b83ebb36ca649f2bb331b4c93b9233beaeb8b (commit)

- Log ----------------------------------------------------------------- commit aefd12b57848c104b09863a600bf13ade9d0b4f7 Author: Michal Čihař mcihar@novell.com Date: Thu Feb 24 10:17:29 2011 +0100

Update generated docs

commit 7b751a6378da20b71bcf5fc353939faea68f1b9e Author: mjaning mjaning@gmail.com Date: Wed Feb 23 22:49:41 2011 +0200

Translation update done using Pootle.

commit c6361c2eb0cacc2feda330f6175195814934d7bb Author: mjaning mjaning@gmail.com Date: Wed Feb 23 22:41:06 2011 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: output/pt_BR/Documentation.html | 20 ++++++++++---------- po/pt_BR.po | 16 ++++++++++++++-- 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/output/pt_BR/Documentation.html b/output/pt_BR/Documentation.html index 092095a..53088d1 100644 --- a/output/pt_BR/Documentation.html +++ b/output/pt_BR/Documentation.html @@ -422,17 +422,17 @@ em um cookie temporário.</li> <li id="pmausr">Note: this section is only applicable if your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br />

- For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie' -modes, phpMyAdmin needs a controluser that has <b>only</b> the -<tt>SELECT</tt> privilege on the <i>`mysql`.`user` (all columns except -`Password`)</i>, <i>`mysql`.`db` (all columns)</i>, <i>`mysql`.`host` (all -columns)</i> and <i>`mysql`.`tables_priv` (all columns except `Grantor` and -`Timestamp`)</i> tables.<br /> You must specify the details for the <a href="#controluser">controluser</a> -in the <tt>config.inc.php</tt> file under the <tt><a -href="#cfg_Servers_controluser" class="configrule"> -$cfg['Servers'][$i]['controluser']</a></tt> and <tt><a + Para modo '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' e modo +'cookie', o phpMyAdmin precisa de um usuário master que tenha <b>somente</b> +o privilégio <tt>SELECT</tt> na tabela <i>`mysql`.`user` (todas as colunas +exceto `Password`)</i>, <i>`mysql`.`db` (todas as colunas)</i>, +<i>`mysql`.`host` (todas as colunas)</i> e <i>`mysql`.`tables_priv` (todas +as colunas exceto `Grantor` e `Timestamp`)</i> tables.<br /> Você deve configurar os detalhes para o usuário <a +href="#controluser">master</a> no arquivo <tt>config.inc.php</tt> sob a +sessão <tt><a href="#cfg_Servers_controluser" class="configrule"> +$cfg['Servers'][$i]['controluser']</a></tt> e <tt><a href="#cfg_Servers_controlpass" class="configrule"> -$cfg['Servers'][$i]['controlpass']</a></tt> settings.<br /> +$cfg['Servers'][$i]['controlpass']</a></tt>.<br /> The following example assumes you want to use <tt>pma</tt> as the controluser and <tt>pmapass</tt> as the controlpass, but <b>this is only an example: use something else in your file!</b> Input these statements from diff --git a/po/pt_BR.po b/po/pt_BR.po index 67ee6d1..2cb3dc8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-19 23:01+0100\n" -"PO-Revision-Date: 2011-02-02 20:17+0200\n" -"Last-Translator: Maurício Meneghini Fauth mauriciofauth@gmail.com\n" +"PO-Revision-Date: 2011-02-23 22:49+0200\n" +"Last-Translator: mjaning@gmail.com\n" "Language-Team: none\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -1088,6 +1088,12 @@ msgid "" "<i>`mysql`.`tables_priv` (all columns except `Grantor` and `Timestamp`)</i> " "tables." msgstr "" +"Para modo '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' e modo " +"'cookie', o phpMyAdmin precisa de um usuário master que tenha <b>somente</b> " +"o privilégio <tt>SELECT</tt> na tabela <i>`mysql`.`user` (todas as colunas " +"exceto `Password`)</i>, <i>`mysql`.`db` (todas as colunas)</i>, " +"<i>`mysql`.`host` (todas as colunas)</i> e <i>`mysql`.`tables_priv` (todas " +"as colunas exceto `Grantor` e `Timestamp`)</i> tables."

#. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:405 @@ -1098,6 +1104,12 @@ msgid "" "['controluser']</a></tt> and <tt><a href="#cfg_Servers_controlpass" class=" ""configrule"> $cfg['Servers'][$i]['controlpass']</a></tt> settings." msgstr "" +"Você deve configurar os detalhes para o usuário <a " +"href="#controluser">master</a> no arquivo <tt>config.inc.php</tt> sob a " +"sessão <tt><a href="#cfg_Servers_controluser" class="configrule"> " +"$cfg['Servers'][$i]['controluser']</a></tt> e <tt><a " +"href="#cfg_Servers_controlpass" class="configrule"> " +"$cfg['Servers'][$i]['controlpass']</a></tt>."

#. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:412

hooks/post-receive