The following commit has been merged in the master branch:
commit 3406069430cdb11f86288715585096ab49984c64
Author: Michal ÄŒihaÅ™ <michal(a)cihar.com>
Date: Wed Feb 17 15:50:37 2010 +0100
Move scripts for website to separate subdir.
diff --git a/README b/website/README
similarity index 100%
rename from README
rename to website/README
diff --git a/pma-copy-docs b/website/pma-copy-docs
similarity index 100%
rename from pma-copy-docs
rename to website/pma-copy-docs
diff --git a/pma-docs b/website/pma-docs
similarity index 100%
rename from pma-docs
rename to website/pma-docs
diff --git a/pma-planet b/website/pma-planet
similarity index 100%
rename from pma-planet
rename to website/pma-planet
diff --git a/pma-stats b/website/pma-stats
similarity index 100%
rename from pma-stats
rename to website/pma-stats
diff --git a/pma-web b/website/pma-web
similarity index 100%
rename from pma-web
rename to website/pma-web
--
phpMyAdmin scripts
The following commit has been merged in the master branch:
commit 9926e273b9e86f1eda2df4830a5c54cbb0117c02
Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com>
Date: Thu Feb 18 01:44:34 2010 +0200
Translation update done using Pootle.
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cf11463..fee732c 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: 2010-01-25 13:26+0100\n"
-"PO-Revision-Date: 2010-02-18 01:37+0200\n"
+"PO-Revision-Date: 2010-02-18 01:44+0200\n"
"Last-Translator: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com>\n"
"Language-Team: none\n"
"Language: pt_BR\n"
@@ -984,6 +984,10 @@ msgid ""
"you should run the SQL script found in <tt>scripts/upgrade_tables_mysql_4_1_2"
"+.sql</tt>."
msgstr ""
+"Se tiver atualizado o seu servidor MySQL a partir de uma versão anterior a "
+"4.1.2 para a versão 4.1.2 ou mais recente e se você usa o "
+"pmadb/infraestrutura de tabela relacionada, você deve executar o script SQL "
+"encontrado em <tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt>."
#. type: Content of: <html><body><div><h3>
#: ../phpMyAdmin/Documentation.html:376
--
phpMyAdmin localized documentation
The following commit has been merged in the master branch:
commit 8bccf1ab00dc458e21c0fd5fecfd332f4dbc2c2e
Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com>
Date: Thu Feb 18 01:31:45 2010 +0200
Translation update done using Pootle.
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 382a7c9..c443f70 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: 2010-01-25 13:26+0100\n"
-"PO-Revision-Date: 2010-02-18 01:21+0200\n"
+"PO-Revision-Date: 2010-02-18 01:31+0200\n"
"Last-Translator: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com>\n"
"Language-Team: none\n"
"Language: pt_BR\n"
@@ -525,6 +525,10 @@ msgid ""
"title=\"Apple Macintosh\">Mac</acronym>-style end of lines character (""
"<tt>\\r</tt>")."
msgstr ""
+"Desse modo você terá que salvar novamente, como por exemplo no BBEdit, ao "
+"estilo Unix, TODOS os scripts do phpMyAdmin antes de enviá-los ao servidor, "
+"visto que o PHP parece não gostar dos caracteres de final de linha do "
+"<acronym title=\"Apple Macintosh\">Mac</acronym> ("<tt>\r</tt>")."
#. type: Content of: <html><body><div><h3>
#: ../phpMyAdmin/Documentation.html:193
--
phpMyAdmin localized documentation
The following commit has been merged in the QA_3_3 branch:
commit a2b111b7ef9e756e2f1d28e763142c5b826ffbe3
Author: Herman van Rink <rink(a)initfour.nl>
Date: Wed Feb 17 15:57:56 2010 +0100
Signed-off-by: Herman van Rink <rink(a)initfour.nl>
diff --git a/ChangeLog b/ChangeLog
index b2edefe..ea0acff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
3.3.1.0 (not yet released)
- bug #2941037 [core] Database structure not sorted by table correctly
- bug #2948492 [interface] Slide effect masks some fields on search page
+- Test
3.3.0.0 (not yet released)
+ rfe #2308632 [edit] Use hex for (var)binary fields,
--
phpMyAdmin
The branch, qa33 has been deleted
was e5d083a19ae19aedbcabeb555f33573531bdf73f
-----------------------------------------------------------------------
e5d083a19ae19aedbcabeb555f33573531bdf73f Test commit to QA_3_3 branch
-----------------------------------------------------------------------
--
phpMyAdmin
The branch, qa33 has been created
at e5d083a19ae19aedbcabeb555f33573531bdf73f (commit)
- Shortlog ------------------------------------------------------------
commit e5d083a19ae19aedbcabeb555f33573531bdf73f
Author: Herman van Rink <rink(a)initfour.nl>
Date: Wed Feb 17 14:50:43 2010 +0100
Test commit to QA_3_3 branch
-----------------------------------------------------------------------
--
phpMyAdmin