Git

git@phpmyadmin.net

18 participants
38269 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-35-g548b62e
by Michal Čihař 23 May '11

23 May '11

The branch, QA_3_4 has been updated via 548b62e93f2281805aff12f286e4df011c8791c4 (commit) from adc6de06850e57cdb0118f9ca6f3d90f4bba47a8 (commit) - Log ----------------------------------------------------------------- commit 548b62e93f2281805aff12f286e4df011c8791c4 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 23 10:40:26 2011 +0200 Update po files ----------------------------------------------------------------------- Summary of changes: po/af.po | 2 +- po/ar.po | 2 +- po/az.po | 2 +- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 105 +++++++++++++++++++++++++++++++------------------------ po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz(a)latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 63 files changed, 121 insertions(+), 108 deletions(-) diff --git a/po/af.po b/po/af.po index 4bcb300..b4ec79f 100644 --- a/po/af.po +++ b/po/af.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" diff --git a/po/ar.po b/po/ar.po index b716a17..93ff613 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" diff --git a/po/az.po b/po/az.po index a22e342..f31bff5 100644 --- a/po/az.po +++ b/po/az.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" diff --git a/po/be.po b/po/be.po index 0557710..9cb4502 100644 --- a/po/be.po +++ b/po/be.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index c096453..481987d 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" diff --git a/po/bg.po b/po/bg.po index 778ce57..23eb015 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-22 12:51+0200\n" diff --git a/po/bn.po b/po/bn.po index c6d2efd..3510ea6 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" diff --git a/po/bs.po b/po/bs.po index aab0ca6..6b62306 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/ca.po b/po/ca.po index 9e52bee..b7bfacb 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" diff --git a/po/cs.po b/po/cs.po index 743d5b0..db57130 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/cy.po b/po/cy.po index b81a06e..f88d081 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" diff --git a/po/da.po b/po/da.po index fcf770b..50db740 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" diff --git a/po/de.po b/po/de.po index 7e13d59..1c37fb6 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" diff --git a/po/el.po b/po/el.po index 27e1be0..b9aca15 100644 --- a/po/el.po +++ b/po/el.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-05 11:15+0200\n" diff --git a/po/en_GB.po b/po/en_GB.po index 5a206eb..c2ab85d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-10 16:24+0200\n" diff --git a/po/es.po b/po/es.po index 551dc8a..eec3207 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-02 11:10+0200\n" diff --git a/po/et.po b/po/et.po index 6fcd3e4..6cff2d4 100644 --- a/po/et.po +++ b/po/et.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/eu.po b/po/eu.po index c0f76b0..5b03610 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" diff --git a/po/fa.po b/po/fa.po index 97d7832..04e72de 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" diff --git a/po/fi.po b/po/fi.po index 5a3c340..a502ff3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" diff --git a/po/fr.po b/po/fr.po index 13eff66..b9867fa 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-10 19:23+0200\n" diff --git a/po/gl.po b/po/gl.po index 29f2fc4..052e874 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" diff --git a/po/he.po b/po/he.po index e066b52..cac00da 100644 --- a/po/he.po +++ b/po/he.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" diff --git a/po/hi.po b/po/hi.po index 411212a..962682c 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-24 00:23+0200\n" diff --git a/po/hr.po b/po/hr.po index 06bf7d6..1ac83fd 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" diff --git a/po/hu.po b/po/hu.po index 37e66b8..87c3062 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-05-05 12:49+0200\n" diff --git a/po/id.po b/po/id.po index 18ddb7e..aa339d0 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Repoct-Id-Version: phpMyAdmin 3.4.2-dev\n"sourceforge.net\n"-----------m [172.29.30.125]6��p��+ T�6�"aP�+��P�+�^�6�_�6��hP�+��Q�+�tq�+�Xm�+_�6��p��+ T�6��R�6��}P�+6 ��!�!�^�6�_�6�xm�+ U�6�"aP�+~P�+�^�6��`P�+�^�6��+�hP�+��+��+� ��+��Q�+xm�+ U�6��S�6��}P�+�!�!�^�6�_�6��L�+V�6�"aP�+~P�+�^�6��`P�+�^�6��^�6��^�6�{q�+�p�_�6��hP�+��Q�+V�6��T�6��}P�+GHIJKMNOP�^�6�_�6�H�#�+�W�6�"aP�+~P�+�^�6�0��+�hP�+ m�+��+��+��+� ��+��Q�+H�#�+�W�6��U�6��}P�+8�#�+�W�6�V�6��}P�+(�#�+�W�6�@V�6��}P�+�#�+�W�6�pV�6��}P�+ ��+�hP�+� ��+�P�6��+�gP�+��+W�6�y�+�gP�+��+@W�6�Z�+�gP�+��+ m�+��+��+�$m�+��+� ��+��Q�+� ��+�X�6��W�6��}P�+#%')*-.035678:<=�^�6�_�6�pK��+�Y�6�"aP�+8/m�+�hP�+�$m�+�)m�+��Q�+cf��+_�6�pK��+�Y�6��X�6��}P�+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�"��+P`�6�F04�+F04�+?u��+`�6�pW�6�0[�6��+�gP�+�tq�+�a�6�B04�+``�6��^�6��r�+_�6��B04�+_�6��}P�rt-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" diff --git a/po/it.po b/po/it.po index 2d60785..add88e8 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-05 14:27+0200\n" diff --git a/po/ja.po b/po/ja.po index bcfe71c..29a38b6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-05-05 11:38+0200\n" diff --git a/po/ka.po b/po/ka.po index 9941a82..afa9aae 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/ko.po b/po/ko.po index fc019e1..687b3fb 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" diff --git a/po/lt.po b/po/lt.po index 78d59d0..43efc2d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" diff --git a/po/lv.po b/po/lv.po index e74f550..5239951 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/mk.po b/po/mk.po index 993a9b9..4311a5d 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/ml.po b/po/ml.po index e14f263..e1a2fbe 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the phpMyAdmin package. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/mn.po b/po/mn.po index c028ea1..cf9d7d3 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/ms.po b/po/ms.po index 02b9ad0..8707dc2 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/nb.po b/po/nb.po index a9414f1..f823b52 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" diff --git a/po/nl.po b/po/nl.po index 1c0ffa7..b7e1b7e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-16 20:18+0200\n" diff --git a/po/pl.po b/po/pl.po index 5b51d66..e271d2a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" diff --git a/po/pt.po b/po/pt.po index 28e2aca..535452f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 14ddc75..e93ba1d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" diff --git a/po/ro.po b/po/ro.po index f3e0f02..dade929 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" diff --git a/po/ru.po b/po/ru.po index 5385fdb..3ccba4b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-13 21:17+0200\n" diff --git a/po/si.po b/po/si.po index b784534..c95b51e 100644 --- a/po/si.po +++ b/po/si.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-05-04 14:56+0200\n" diff --git a/po/sk.po b/po/sk.po index 2b0fce3..abb5b01 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" @@ -4016,6 +4016,8 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links" "[/a] support, suggested: [kbd]pma_relation[/kbd]" msgstr "" +"Nechajte prázdne pre vypnutie [a@http://wiki.phpmyadmin.net/pma/relation]" +"relation-links[/a] podpory, navrhované: [kbd]pma_relation[/kbd]" #: libraries/config/messages.inc.php:404 #, fuzzy @@ -4140,6 +4142,8 @@ msgid "" "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/" "kbd]" msgstr "" +"Nechajte prázdne pre vypnutie podpory pre sledovanie SQL dopytov, " +"navrhované: [kbd]pma_tracking[/kbd]" #: libraries/config/messages.inc.php:427 msgid "SQL query tracking table" @@ -4180,25 +4184,29 @@ msgstr "" #: libraries/config/messages.inc.php:435 msgid "Verbose check" -msgstr "" +msgstr "Podrobná kontrola" #: libraries/config/messages.inc.php:436 msgid "" "A user-friendly description of this server. Leave blank to display the " "hostname instead." msgstr "" +"Užívateľsky prívetivý popis tohto servera. Ak necháte prízdne, zobrazí sa " +"namiesto popisu meno servera." #: libraries/config/messages.inc.php:437 msgid "Verbose name of this server" -msgstr "" +msgstr "Dlhé meno tohto servera" #: libraries/config/messages.inc.php:438 msgid "Whether a user should be displayed a "show all (rows)" button" msgstr "" +"Či sa bude užívateľovi zobrazovať tlačidlo "zobraziť všetky (riadky)" +""" #: libraries/config/messages.inc.php:439 msgid "Allow to display all the rows" -msgstr "" +msgstr "Povoliť zobraziť všetky riadky" #: libraries/config/messages.inc.php:440 msgid "" @@ -4209,11 +4217,11 @@ msgstr "" #: libraries/config/messages.inc.php:441 msgid "Show password change form" -msgstr "" +msgstr "Zobraziť formulár na zmenu hesla" #: libraries/config/messages.inc.php:442 msgid "Show create database form" -msgstr "" +msgstr "Zobraziť formulár na vytvorenie databázy" #: libraries/config/messages.inc.php:443 msgid "" @@ -4229,25 +4237,27 @@ msgstr "Zobraziť otvorené tabuľky" #: libraries/config/messages.inc.php:445 msgid "Display the function fields in edit/insert mode" -msgstr "" +msgstr "Zobraziť zoznam funkcií v móde úprav" #: libraries/config/messages.inc.php:446 msgid "Show function fields" -msgstr "" +msgstr "Zobraziť zoznam funkcií" #: libraries/config/messages.inc.php:447 msgid "" "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] " "output" msgstr "" +"Zobraziť odkaz na výstup [a@http://php.net/manual/function.phpinfo.php]" +"phpinfo()[/a] funkcie" #: libraries/config/messages.inc.php:448 msgid "Show phpinfo() link" -msgstr "" +msgstr "Zobraziť odkaz na phpinfo()" #: libraries/config/messages.inc.php:449 msgid "Show detailed MySQL server information" -msgstr "" +msgstr "Zobraziť podrobné informácie o MySQL serveri" #: libraries/config/messages.inc.php:450 msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed" @@ -4261,6 +4271,7 @@ msgstr "Zobraziť kompletné dopyty" #: libraries/config/messages.inc.php:452 msgid "Allow to display database and table statistics (eg. space usage)" msgstr "" +"Povoliť zobrazenie štatistík o databázach a tabuľkách (napr. využité miesto)" #: libraries/config/messages.inc.php:453 #, fuzzy @@ -4275,7 +4286,7 @@ msgstr "" #: libraries/config/messages.inc.php:455 msgid "Display database comment instead of its name" -msgstr "" +msgstr "Zobraziť komentár k databáze namiesto mena" #: libraries/config/messages.inc.php:456 msgid "" @@ -4287,7 +4298,7 @@ msgstr "" #: libraries/config/messages.inc.php:457 msgid "Display table comment instead of its name" -msgstr "" +msgstr "Zobraziť komentár k tabuľke namiesto mena" #: libraries/config/messages.inc.php:458 msgid "Display table comments in tooltips" @@ -4322,10 +4333,12 @@ msgid "" "[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be " "installed" msgstr "" +"[strong]Varovanie:[/strong] vyžaduje nainštalované rozšírenia PHP SOAP alebo " +"PEAR SOAP" #: libraries/config/messages.inc.php:469 msgid "Enable SQL Validator" -msgstr "" +msgstr "Povoliť kontrolovanie SQL" #: libraries/config/messages.inc.php:470 msgid "" @@ -4347,7 +4360,7 @@ msgstr "" #: libraries/config/messages.inc.php:473 msgid "Suggest new database name" -msgstr "" +msgstr "Navrhnúť meno novej databázy" #: libraries/config/messages.inc.php:474 msgid "A warning is displayed on the main page if Suhosin is detected" @@ -4355,7 +4368,7 @@ msgstr "" #: libraries/config/messages.inc.php:475 msgid "Suhosin warning" -msgstr "" +msgstr "Varovanie Suhosin rozšírenia" #: libraries/config/messages.inc.php:476 msgid "" @@ -4377,15 +4390,15 @@ msgstr "" #: libraries/config/messages.inc.php:479 msgid "Textarea rows" -msgstr "" +msgstr "Riadkov v textovej oblasti" #: libraries/config/messages.inc.php:480 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "Popis okna prehliadača pri výbere databázy" #: libraries/config/messages.inc.php:482 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "Popis okna prehliadača keď nie je nič vybrané" #: libraries/config/messages.inc.php:483 #, fuzzy @@ -4395,11 +4408,11 @@ msgstr "Predvolené" #: libraries/config/messages.inc.php:484 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "Popis okna prehliadača keď je vybraný server" #: libraries/config/messages.inc.php:486 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "Popis okna prehliadača keď je vybraná tabuľka" #: libraries/config/messages.inc.php:488 msgid "" @@ -4415,19 +4428,19 @@ msgstr "" #: libraries/config/messages.inc.php:490 msgid "Directory on server where you can upload files for import" -msgstr "" +msgstr "Adresár na serveri, kde môžete nahrať súbor pre import" #: libraries/config/messages.inc.php:491 msgid "Upload directory" -msgstr "" +msgstr "Adresár pre nahrávanie" #: libraries/config/messages.inc.php:492 msgid "Allow for searching inside the entire database" -msgstr "" +msgstr "Povoliť prehľadávať celú databázu" #: libraries/config/messages.inc.php:493 msgid "Use database search" -msgstr "" +msgstr "Použiť databázové vyhľadávanie" #: libraries/config/messages.inc.php:494 msgid "" @@ -4437,7 +4450,7 @@ msgstr "" #: libraries/config/messages.inc.php:495 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Povoliť záložku Pre vývojára v nastaveniach" #: libraries/config/messages.inc.php:496 msgid "" @@ -4452,11 +4465,11 @@ msgstr "" #: libraries/config/messages.inc.php:498 setup/frames/index.inc.php:229 msgid "Check for latest version" -msgstr "" +msgstr "Skontrolovať najnovšiu verziu" #: libraries/config/messages.inc.php:499 msgid "Enables check for latest version on main phpMyAdmin page" -msgstr "" +msgstr "Povoliť kontrolu poslednej verzie na hlavnej stránke phpMyAdmina" #: libraries/config/messages.inc.php:500 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 @@ -4464,7 +4477,7 @@ msgstr "" #: setup/lib/index.lib.php:161 setup/lib/index.lib.php:164 #: setup/lib/index.lib.php:200 msgid "Version check" -msgstr "" +msgstr "Kontrola verzie" #: libraries/config/messages.inc.php:501 msgid "" @@ -4504,14 +4517,14 @@ msgstr "CSV pomocou LOAD DATA" #: libraries/config/user_preferences.forms.php:245 libraries/export/xls.php:17 #: libraries/import/xls.php:20 msgid "Excel 97-2003 XLS Workbook" -msgstr "" +msgstr "Excel 97-2003 XLS pracovný zošit" #: libraries/config/setup.forms.php:252 libraries/config/setup.forms.php:347 #: libraries/config/user_preferences.forms.php:155 #: libraries/config/user_preferences.forms.php:249 #: libraries/export/xlsx.php:17 libraries/import/xlsx.php:20 msgid "Excel 2007 XLSX Workbook" -msgstr "" +msgstr "Excel 2007 XLSX pracovný zošit" #: libraries/config/setup.forms.php:255 libraries/config/setup.forms.php:356 #: libraries/config/user_preferences.forms.php:158 @@ -4582,7 +4595,7 @@ msgstr "" #: libraries/config/validate.lib.php:367 #, php-format msgid "Incorrect IP address: %s" -msgstr "" +msgstr "Nesprávna IP adresa: %s" #. l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. #: libraries/core.lib.php:264 @@ -4614,7 +4627,7 @@ msgstr "Databáza vyzerá prázdna!" #: libraries/db_links.inc.php:66 libraries/relation.lib.php:143 #: libraries/tbl_links.inc.php:90 msgid "Tracking" -msgstr "" +msgstr "Sledovanie" #: libraries/db_links.inc.php:71 msgid "Query" @@ -4636,7 +4649,7 @@ msgstr "" #: libraries/db_routines.inc.php:37 msgid "Return type" -msgstr "" +msgstr "Návratový typ" #: libraries/db_structure.lib.php:48 libraries/display_tbl.lib.php:1923 msgid "" @@ -4659,7 +4672,7 @@ msgstr "(alebo soket lokálneho MySQL servra nie je správne nastavený)" #: libraries/dbi/mysql.dbi.lib.php:370 tbl_structure.php:703 msgid "Details..." -msgstr "" +msgstr "Podrobnosti..." #: libraries/display_change_password.lib.php:29 main.php:94 #: user_password.php:119 user_password.php:137 @@ -4781,7 +4794,7 @@ msgstr "Počet polí" #: libraries/display_export.lib.php:162 msgid "Row to begin at:" -msgstr "" +msgstr "Začať od riadku:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" @@ -4789,7 +4802,7 @@ msgstr "" #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202 msgid "Output:" -msgstr "" +msgstr "Výstup:" #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 #, fuzzy, php-format @@ -4838,7 +4851,7 @@ msgstr "" #: libraries/display_export.lib.php:275 msgid "use this for future exports" -msgstr "" +msgstr "použiť aj pre budúce exporty" #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:517 @@ -4917,7 +4930,7 @@ msgstr "" #: libraries/display_import.lib.php:76 msgid "The file is being processed, please be patient." -msgstr "" +msgstr "Súbor sa spracováva, buďte prosím trpezliví." #: libraries/display_import.lib.php:98 msgid "" @@ -4952,7 +4965,7 @@ msgstr "Súbor na importovanie" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "Súbor môže byť komprimovaný (%s) alebo nekomprimovaný." #: libraries/display_import.lib.php:158 msgid "" @@ -6857,7 +6870,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:373 msgid "Get more editing space" -msgstr "" +msgstr "Získať viac miesta pre úpravy" #: libraries/tbl_properties.inc.php:396 #, fuzzy @@ -7118,7 +7131,7 @@ msgstr "Overenie MySQL spojenia" #: main.php:119 msgid "Appearance Settings" -msgstr "" +msgstr "Nastavenia vzhľadu" #: main.php:146 prefs_manage.php:274 #, fuzzy @@ -7517,7 +7530,7 @@ msgstr "Zmeny boli uložené" #: prefs_forms.php:78 msgid "Cannot save settings, submitted form contains errors" -msgstr "" +msgstr "Nepodarilo sa uložiť nastavenia, odoslaný formulár obsahuje chyby" #: prefs_manage.php:80 #, fuzzy @@ -7531,7 +7544,7 @@ msgstr "" #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Prajete si načítať zostávajúce nastavenia?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" @@ -7553,7 +7566,7 @@ msgstr "" #: prefs_manage.php:254 msgid "You have no saved settings!" -msgstr "" +msgstr "Nemáte žiadne uložené nastavenia!" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" @@ -7581,7 +7594,7 @@ msgstr "" #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Súčasné nastavenia budú prepísané!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." @@ -9145,7 +9158,7 @@ msgstr "SQL dopyt" #: server_status.php:727 msgid "Note: Generating the query chart can take a long time." -msgstr "" +msgstr "Poznámka: Generovanie grafu dopytov môže trvať dlhý čas." #: server_status.php:872 msgid "Replication status" diff --git a/po/sl.po b/po/sl.po index 513738c..8851a53 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-24 22:38+0200\n" diff --git a/po/sq.po b/po/sq.po index 3129383..2ab948d 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" diff --git a/po/sr.po b/po/sr.po index fce4777..c9c1f1a 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 3b97248..6fbde20 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" diff --git a/po/sv.po b/po/sv.po index 05ff9e5..6b3f5c6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-16 21:42+0200\n" diff --git a/po/ta.po b/po/ta.po index e4b385c..2d83950 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" diff --git a/po/te.po b/po/te.po index 5a84918..3295f2f 100644 --- a/po/te.po +++ b/po/te.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" diff --git a/po/th.po b/po/th.po index 066021a..6315dc7 100644 --- a/po/th.po +++ b/po/th.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" diff --git a/po/tr.po b/po/tr.po index 5a44d68..414be82 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-17 19:11+0200\n" diff --git a/po/tt.po b/po/tt.po index 312572f..5b19dc5 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" diff --git a/po/ug.po b/po/ug.po index 90eaa22..0680a03 100644 --- a/po/ug.po +++ b/po/ug.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" diff --git a/po/uk.po b/po/uk.po index 9acd5b8..7a03d20 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" diff --git a/po/ur.po b/po/ur.po index 2ded270..7031624 100644 --- a/po/ur.po +++ b/po/ur.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" diff --git a/po/uz.po b/po/uz.po index 991d146..842b84f 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 3bafea2..a9c48e7 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 874000e..4b8a168 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-04 09:47+0200\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5d5e7b2..17a1037 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-11-05 14:13+0200\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-34-gadc6de0
by Michal Čihař 23 May '11

23 May '11

The branch, QA_3_4 has been updated via adc6de06850e57cdb0118f9ca6f3d90f4bba47a8 (commit) from e936257d44ba2103c03986dd7253519480e46fac (commit) - Log ----------------------------------------------------------------- commit adc6de06850e57cdb0118f9ca6f3d90f4bba47a8 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 23 10:33:14 2011 +0200 [auth] Fixed error handling for signon auth method. The message is now stored in caller session data and properly displayed in example script. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/auth/signon.auth.lib.php | 41 +++++++++++++++++++++++++---------- scripts/signon.php | 15 +++++++------ 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02db359..0bed539 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ - bug #3305606 [interface] Show all button wraps on privileges page - bug #3305517 [config] Config for export compression not used - bug #3305883 [interface] Table is dropped regardless of confirmation +- [auth] Fixed error handling for signon auth method. 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index 3e0d64b..0735020 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -202,18 +202,35 @@ function PMA_auth_set_user() */ function PMA_auth_fails() { - if (! empty($GLOBALS['login_without_password_is_forbidden'])) { - $_SESSION['PMA_single_signon_error_message'] = __('Login without a password is forbidden by configuration (see AllowNoPassword)'); - } elseif (! empty($GLOBALS['allowDeny_forbidden'])) { - $_SESSION['PMA_single_signon_error_message'] = __('Access denied'); - } elseif (! empty($GLOBALS['no_activity'])) { - $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']); - } elseif (PMA_DBI_getError()) { - $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError()); - } elseif (isset($php_errormsg)) { - $_SESSION['PMA_single_signon_error_message'] = $php_errormsg; - } else { - $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server'); + /* Session name */ + $session_name = $GLOBALS['cfg']['Server']['SignonSession']; + + /* Does session exist? */ + if (isset($_COOKIE[$session_name])) { + /* End current session */ + $old_session = session_name(); + $old_id = session_id(); + session_write_close(); + + /* Load single signon session */ + session_name($session_name); + session_id($_COOKIE[$session_name]); + session_start(); + + /* Set error message */ + if (! empty($GLOBALS['login_without_password_is_forbidden'])) { + $_SESSION['PMA_single_signon_error_message'] = __('Login without a password is forbidden by configuration (see AllowNoPassword)'); + } elseif (! empty($GLOBALS['allowDeny_forbidden'])) { + $_SESSION['PMA_single_signon_error_message'] = __('Access denied'); + } elseif (! empty($GLOBALS['no_activity'])) { + $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']); + } elseif (PMA_DBI_getError()) { + $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError()); + } elseif (isset($php_errormsg)) { + $_SESSION['PMA_single_signon_error_message'] = $php_errormsg; + } else { + $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server'); + } } PMA_auth(); } // end of the 'PMA_auth_fails()' function diff --git a/scripts/signon.php b/scripts/signon.php index acb5f7d..e585625 100644 --- a/scripts/signon.php +++ b/scripts/signon.php @@ -11,14 +11,15 @@ * @subpackage Example */ +/* Need to have cookie visible from parent directory */ +session_set_cookie_params(0, '/', '', 0); +/* Create signon session */ +$session_name = 'SignonSession'; +session_name($session_name); +session_start(); + /* Was data posted? */ if (isset($_POST['user'])) { - /* Need to have cookie visible from parent directory */ - session_set_cookie_params(0, '/', '', 0); - /* Create signon session */ - $session_name = 'SignonSession'; - session_name($session_name); - session_start(); /* Store there credentials */ $_SESSION['PMA_single_signon_user'] = $_POST['user']; $_SESSION['PMA_single_signon_password'] = $_POST['password']; @@ -47,7 +48,7 @@ if (isset($_POST['user'])) { <body> <?php if (isset($_SESSION['PMA_single_signon_error_message'])) { - echo '<p class="error">' . $_SESSION['PMA_single_signon_message'] . '</p>'; + echo '<p class="error">' . $_SESSION['PMA_single_signon_error_message'] . '</p>'; } ?> <form action="signon.php" method="post"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1810-g21c3493
by Madhura Jayaratne 22 May '11

22 May '11

The branch, master has been updated via 21c3493d3c5564c3dfd5ba9e39596b25e2f6569a (commit) via e936257d44ba2103c03986dd7253519480e46fac (commit) from 6619e39d639bd994f5efe05e2766836cc1945145 (commit) - Log ----------------------------------------------------------------- commit 21c3493d3c5564c3dfd5ba9e39596b25e2f6569a Merge: 6619e39d639bd994f5efe05e2766836cc1945145 e936257d44ba2103c03986dd7253519480e46fac Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 22 22:41:55 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 7 ++++++- libraries/sql_query_form.lib.php | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dcd985..99bc2dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ - patch #3303813 [setup] Define a label that was missing - bug #3305606 [interface] Show all button wraps on privileges page - bug #3305517 [config] Config for export compression not used +- bug #3305883 [interface] Table is dropped regardless of confirmation 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/js/sql.js b/js/sql.js index 13fade0..32a5bba 100644 --- a/js/sql.js +++ b/js/sql.js @@ -263,10 +263,15 @@ $(document).ready(function() { */ $("#sqlqueryform.ajax").live('submit', function(event) { event.preventDefault(); + + $form = $(this); + if (! checkSqlQuery($form[0])) { + return false; + } + // remove any div containing a previous error message $('.error').remove(); - $form = $(this); var $msgbox = PMA_ajaxShowMessage(); PMA_prepareForAjaxRequest($form); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 9852e0a..25f67cd 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -119,8 +119,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') if ($GLOBALS['cfg']['AjaxEnable']) { echo ' class="ajax"'; } - echo ' id="sqlqueryform"' - .' onsubmit="return checkSqlQuery(this)" name="sqlform">' . "\n"; + echo ' id="sqlqueryform" name="sqlform">' . "\n"; } if ($is_querywindow) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-33-ge936257
by Madhura Jayaratne 22 May '11

22 May '11

The branch, QA_3_4 has been updated via e936257d44ba2103c03986dd7253519480e46fac (commit) from 16305005c58e57b4f89150fe01b93f9071131601 (commit) - Log ----------------------------------------------------------------- commit e936257d44ba2103c03986dd7253519480e46fac Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 22 22:01:47 2011 +0530 bug #3305883 [interface] Table is dropped regardless of confirmation ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 7 ++++++- libraries/sql_query_form.lib.php | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3942083..02db359 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ - patch #3303813 [setup] Define a label that was missing - bug #3305606 [interface] Show all button wraps on privileges page - bug #3305517 [config] Config for export compression not used +- bug #3305883 [interface] Table is dropped regardless of confirmation 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/js/sql.js b/js/sql.js index 13fade0..32a5bba 100644 --- a/js/sql.js +++ b/js/sql.js @@ -263,10 +263,15 @@ $(document).ready(function() { */ $("#sqlqueryform.ajax").live('submit', function(event) { event.preventDefault(); + + $form = $(this); + if (! checkSqlQuery($form[0])) { + return false; + } + // remove any div containing a previous error message $('.error').remove(); - $form = $(this); var $msgbox = PMA_ajaxShowMessage(); PMA_prepareForAjaxRequest($form); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 9852e0a..25f67cd 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -119,8 +119,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') if ($GLOBALS['cfg']['AjaxEnable']) { echo ' class="ajax"'; } - echo ' id="sqlqueryform"' - .' onsubmit="return checkSqlQuery(this)" name="sqlform">' . "\n"; + echo ' id="sqlqueryform" name="sqlform">' . "\n"; } if ($is_querywindow) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. e44eb2866f5210b701416b82c29af918841ec666
by Marc Delisle 22 May '11

22 May '11

The branch, master has been updated via e44eb2866f5210b701416b82c29af918841ec666 (commit) from a1be72d541e6f3d1283065bb91f8f3c3e4fc0359 (commit) - Log ----------------------------------------------------------------- commit e44eb2866f5210b701416b82c29af918841ec666 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun May 22 06:28:04 2011 -0400 PMASA-2011-3 and -4 ----------------------------------------------------------------------- Summary of changes: templates/security/{PMASA-2011-2 => PMASA-2011-3} | 34 +++++++------- templates/security/PMASA-2011-4 | 50 +++++++++++++++++++++ 2 files changed, 68 insertions(+), 16 deletions(-) copy templates/security/{PMASA-2011-2 => PMASA-2011-3} (50%) create mode 100644 templates/security/PMASA-2011-4 diff --git a/templates/security/PMASA-2011-2 b/templates/security/PMASA-2011-3 similarity index 50% copy from templates/security/PMASA-2011-2 copy to templates/security/PMASA-2011-3 index 8dfca27..cb973dd 100644 --- a/templates/security/PMASA-2011-2 +++ b/templates/security/PMASA-2011-3 @@ -3,55 +3,57 @@ <py:def function="announcement_id"> -PMASA-2011-2 +PMASA-2011-3 </py:def> <py:def function="announcement_date"> -2011-02-11 +2011-05-22 </py:def> <py:def function="announcement_summary"> -SQL query could be executed under another user. +XSS vulnerability on Tracking page </py:def> <py:def function="announcement_description"> -It was possible to create a bookmark which would be executed unintentionally by other users. +It was possible to create a crafted table name that leads to XSS. </py:def> <py:def function="announcement_severity"> -We consider this vulnerability to be critical. +We consider this vulnerability to be serious. </py:def> <py:def function="announcement_mitigation"> -To use this vulnerability, phpMyAdmin configuration storage needs to be -set up and enabled and bookmarks function needs to be enabled. +This vulnerability works in the context of a shared phpMyAdmin installation. +The attacker needs to convince a victim to go to the Tracking page that +relates to the crafted table. </py:def> <py:def function="announcement_affected"> -The 2.11.x and 3.3.x versions are affected. +The 3.3.x and 3.4.0 versions are affected. </py:def> <py:def function="announcement_solution"> -Upgrade to phpMyAdmin 3.3.9.2 or newer (2.11.11.3 or newer for the older -family) or apply the related patch listed below. +Upgrade to phpMyAdmin 3.3.10.1 or 3.4.1 or apply the related patch listed below. </py:def>  <py:def function="announcement_references"> -This issue was found by <a href="http://cihar.com/">Michal Čihař</a>. +This issue was found by a person who wishes to be known as "dave b". </py:def>  -<py:def function="announcement_cve">CVE-2011-0987</py:def> +<py:def function="announcement_cve">CVE-2011-XXXX</py:def> -<py:def function="announcement_cwe">661 89</py:def> +<py:def function="announcement_cwe">661 79</py:def> <py:def function="announcement_commits"> -a5464b4daff0059cdf8c9e5f4d54a80e2dd2a5b0 +7e10c132a3887c8ebfd7a8eee356b28375f1e287 +d3ccf798fdbd4f8a89d4088130637d8dee918492 </py:def> -<py:def function="announcement_commits_2_11"> -2fa4c8d97a92ae0d4e2051d5d18a18688c31f84f +<py:def function="announcement_commits_3_3_10"> +1300510d3686b40adefafb7f1778a6f06d0a553a +452669a1746898a08129d3a555ac4b1ec084b423 </py:def> <xi:include href="_page.tpl" /> diff --git a/templates/security/PMASA-2011-4 b/templates/security/PMASA-2011-4 new file mode 100644 index 0000000..1ebbfda --- /dev/null +++ b/templates/security/PMASA-2011-4 @@ -0,0 +1,50 @@ + +<html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> + + +<py:def function="announcement_id"> +PMASA-2011-4 +</py:def> + +<py:def function="announcement_date"> +2011-05-22 +</py:def> + +<py:def function="announcement_summary"> +URL redirection to untrusted site +</py:def> + +<py:def function="announcement_description"> +It was possible to redirect to an arbitrary, untrusted site, leading to +a possible phishing attack. +</py:def> + +<py:def function="announcement_severity"> +We consider this vulnerability to be serious. +</py:def> + +<py:def function="announcement_affected"> +The 3.4.0 version is affected. +</py:def> + +<py:def function="announcement_solution"> +Upgrade to phpMyAdmin 3.4.1 or apply the related patch listed below. +</py:def> + + +<py:def function="announcement_references"> +This issue was found by Kian Mohageri. +</py:def> + + +<py:def function="announcement_cve">CVE-2011-XXXX</py:def> + +<py:def function="announcement_cwe">661 601</py:def> + +<py:def function="announcement_commits"> +b7a8179eb6bf0f1643970ac57a70b5b513a1cd4f +ecfc8ba4f7b4ea612c58ab5726054ed0f28e200d +</py:def> + +<xi:include href="_page.tpl" /> +</html> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1808-g6619e39
by Madhura Jayaratne 22 May '11

22 May '11

The branch, master has been updated via 6619e39d639bd994f5efe05e2766836cc1945145 (commit) via 16305005c58e57b4f89150fe01b93f9071131601 (commit) from 633f63004bfd3fd587dd8c164486dc302accafb2 (commit) - Log ----------------------------------------------------------------- commit 6619e39d639bd994f5efe05e2766836cc1945145 Merge: 633f63004bfd3fd587dd8c164486dc302accafb2 16305005c58e57b4f89150fe01b93f9071131601 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 22 13:06:05 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_export.lib.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9650f0..6dcd985 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ - bug #3303869 [interface] Unnecessary scrolling on Databases page - patch #3303813 [setup] Define a label that was missing - bug #3305606 [interface] Show all button wraps on privileges page +- bug #3305517 [config] Config for export compression not used 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 88c80af..2460042 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -296,7 +296,9 @@ if(isset($_GET['sql_query'])) { ?> <?php if(isset($_GET['compression'])) { - $selected_compression = $_GET['compression']; + $selected_compression = $_GET['compression']; + } elseif (isset($cfg['Export']['compression'])) { + $selected_compression = $cfg['Export']['compression']; } else { $selected_compression = "none"; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-32-g1630500
by Madhura Jayaratne 22 May '11

22 May '11

The branch, QA_3_4 has been updated via 16305005c58e57b4f89150fe01b93f9071131601 (commit) from f5eaf8c7d87e2c793f26127da20d25becf959ad8 (commit) - Log ----------------------------------------------------------------- commit 16305005c58e57b4f89150fe01b93f9071131601 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 22 13:00:39 2011 +0530 bug #3305517 [config] Config for export compression not used ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_export.lib.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5aede20..3942083 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ - bug #3303869 [interface] Unnecessary scrolling on Databases page - patch #3303813 [setup] Define a label that was missing - bug #3305606 [interface] Show all button wraps on privileges page +- bug #3305517 [config] Config for export compression not used 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 10e8178..87c3a8e 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -296,7 +296,9 @@ if(isset($_GET['sql_query'])) { ?> <?php if(isset($_GET['compression'])) { - $selected_compression = $_GET['compression']; + $selected_compression = $_GET['compression']; + } elseif (isset($cfg['Export']['compression'])) { + $selected_compression = $cfg['Export']['compression']; } else { $selected_compression = "none"; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1806-g633f630
by Madhura Jayaratne 22 May '11

22 May '11

The branch, master has been updated via 633f63004bfd3fd587dd8c164486dc302accafb2 (commit) via f5eaf8c7d87e2c793f26127da20d25becf959ad8 (commit) via 16a28bbeaa9bc70a82891b5aac9a88d45987659b (commit) from f64de0a3ead27c07b99231097bc226f8de4f9048 (commit) - Log ----------------------------------------------------------------- commit 633f63004bfd3fd587dd8c164486dc302accafb2 Merge: f64de0a3ead27c07b99231097bc226f8de4f9048 f5eaf8c7d87e2c793f26127da20d25becf959ad8 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 22 09:33:48 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2da49e..b9650f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ - bug #3301249 [interface] Iconic table operations does not remove inline edit label - bug #3303869 [interface] Unnecessary scrolling on Databases page - patch #3303813 [setup] Define a label that was missing +- bug #3305606 [interface] Show all button wraps on privileges page 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/server_privileges.php b/server_privileges.php index 1407fdf..ec2f0a7 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1159,7 +1159,7 @@ if (!empty($update_privs)) { $sql_query2 .= ';'; } if (! PMA_DBI_try_query($sql_query0)) { - // This might fail when the executing user does not have ALL PRIVILEGES himself. + // This might fail when the executing user does not have ALL PRIVILEGES himself. // See https://sourceforge.net/tracker/index.php?func=detail&aid=3285929&group_id=… $sql_query0 = ''; } @@ -1580,7 +1580,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs echo '<td>' . $tmp_initial . '</td>'; } } - echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&showall=1">[' . __('Show all') . ']</a></td>' . "\n"; + echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&showall=1" class="nowrap">[' . __('Show all') . ']</a></td>' . "\n"; echo '</tr></table>'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-31-gf5eaf8c
by Madhura Jayaratne 22 May '11

22 May '11

The branch, QA_3_4 has been updated via f5eaf8c7d87e2c793f26127da20d25becf959ad8 (commit) from 16a28bbeaa9bc70a82891b5aac9a88d45987659b (commit) - Log ----------------------------------------------------------------- commit f5eaf8c7d87e2c793f26127da20d25becf959ad8 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 22 09:30:44 2011 +0530 bug #3305606 [interface] Show all button wraps on privileges page ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f945db..5aede20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ - bug #3301249 [interface] Iconic table operations does not remove inline edit label - bug #3303869 [interface] Unnecessary scrolling on Databases page - patch #3303813 [setup] Define a label that was missing +- bug #3305606 [interface] Show all button wraps on privileges page 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/server_privileges.php b/server_privileges.php index 11714c4..7e60f09 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1159,7 +1159,7 @@ if (!empty($update_privs)) { $sql_query2 .= ';'; } if (! PMA_DBI_try_query($sql_query0)) { - // This might fail when the executing user does not have ALL PRIVILEGES himself. + // This might fail when the executing user does not have ALL PRIVILEGES himself. // See https://sourceforge.net/tracker/index.php?func=detail&aid=3285929&group_id=… $sql_query0 = ''; } @@ -1580,7 +1580,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs echo '<td>' . $tmp_initial . '</td>'; } } - echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&showall=1">[' . __('Show all') . ']</a></td>' . "\n"; + echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&showall=1" class="nowrap">[' . __('Show all') . ']</a></td>' . "\n"; echo '</tr></table>'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1803-gf64de0a
by Dieter Adriaenssens 20 May '11

20 May '11

The branch, master has been updated via f64de0a3ead27c07b99231097bc226f8de4f9048 (commit) via fe53e42d1dfff53967ef5c3d6930b1bd9ac4b428 (commit) from da8521c9b181199b21555488e20f237b0eae3ad3 (commit) - Log ----------------------------------------------------------------- commit f64de0a3ead27c07b99231097bc226f8de4f9048 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Fri May 20 23:21:11 2011 +0200 Remove deprecated function PMA_DBI_get_fields commit fe53e42d1dfff53967ef5c3d6930b1bd9ac4b428 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed May 18 20:49:04 2011 +0200 Remove deprecated function PMA_DBI_get_fields ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_qbe.php | 2 +- libraries/database_interface.lib.php | 23 ----------------------- libraries/import/csv.php | 2 +- libraries/relation.lib.php | 6 +++--- libraries/replication_gui.lib.php | 2 +- libraries/server_synchronize.lib.php | 10 +++++----- server_privileges.php | 2 +- tbl_indexes.php | 2 +- 9 files changed, 14 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2219ea4..d2da49e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ + Update to jQuery 1.6.1 + Patch #3256122 [search] Show/hide db search results + Patch #3302354 Add gettext wrappers around a message ++ Remove deprecated function PMA_DBI_get_fields 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/db_qbe.php b/db_qbe.php index 34c85ee..a076798 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -105,7 +105,7 @@ if (0 == $tbl_result_cnt) { // The tables list gets from MySQL while (list($tbl) = PMA_DBI_fetch_row($tbl_result)) { - $fld_results = PMA_DBI_get_fields($db, $tbl); + $fld_results = PMA_DBI_get_columns($db, $tbl, true); if (empty($tbl_names[$tbl]) && !empty($_REQUEST['TableList'])) { $tbl_names[$tbl] = ''; diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index be8d9f5..9735a82 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -775,29 +775,6 @@ function PMA_DBI_get_columns_full($database = null, $table = null, } /** - * @todo should only return columns names, for more info use PMA_DBI_get_columns_full() - * - * @deprecated by PMA_DBI_get_columns() or PMA_DBI_get_columns_full() - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param mixed $link mysql link resource - * @return array column info - */ -function PMA_DBI_get_fields($database, $table, $link = null) -{ - // here we use a try_query because when coming from - // tbl_create + tbl_properties.inc.php, the table does not exist - $fields = PMA_DBI_fetch_result( - 'SHOW FULL COLUMNS - FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table), - null, null, $link); - if (! is_array($fields) || count($fields) < 1) { - return false; - } - return $fields; -} - -/** * array PMA_DBI_get_columns(string $database, string $table, bool $full = false, mysql db link $link = null) * * @param string $database name of database diff --git a/libraries/import/csv.php b/libraries/import/csv.php index aaff1b1..757e3b4 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -106,7 +106,7 @@ if (!$analyze) { } $sql_template .= ' INTO ' . PMA_backquote($table); - $tmp_fields = PMA_DBI_get_fields($db, $table); + $tmp_fields = PMA_DBI_get_columns($db, $table); if (empty($csv_columns)) { $fields = $tmp_fields; diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 9588853..338f833 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -517,7 +517,7 @@ function PMA_getDisplayField($db, $table) * Gets the comments for all rows of a table or the db itself * * @access public - * @uses PMA_DBI_get_fields() + * @uses PMA_DBI_get_columns() * @uses PMA_getDbComment() * @param string the name of the db to check for * @param string the name of the table to check for @@ -529,9 +529,9 @@ function PMA_getComments($db, $table = '') if ($table != '') { // MySQL native column comments - $fields = PMA_DBI_get_fields($db, $table); + $fields = PMA_DBI_get_columns($db, $table); if ($fields) { - foreach ($fields as $key => $field) { + foreach ($fields as $field) { if (! empty($field['Comment'])) { $comments[$field['Field']] = $field['Comment']; } diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index d64e5f4..1d99166 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -204,7 +204,7 @@ function PMA_replication_print_slaves_table($hidden = false) { */ function PMA_replication_get_username_hostname_length() { - $fields_info = PMA_DBI_get_fields('mysql', 'user'); + $fields_info = PMA_DBI_get_columns('mysql', 'user'); $username_length = 16; $hostname_length = 41; foreach ($fields_info as $key => $val) { diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index ba6f813..aca007f 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -68,7 +68,7 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * If update is required, it is placed in $update_array * Otherwise that entry is placed in the $insert_array. * - * @uses PMA_DBI_get_fields() + * @uses PMA_DBI_get_columns() * @uses PMA_DBI_get_column_values() * @uses PMA_DBI_fetch_result() * @@ -95,7 +95,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching { if (isset($matching_table[$matching_table_index])) { $fld = array(); - $fld_results = PMA_DBI_get_fields($src_db, $matching_table[$matching_table_index], $src_link); + $fld_results = PMA_DBI_get_columns($src_db, $matching_table[$matching_table_index], true, $src_link); $is_key = array(); if (isset($fld_results)) { foreach ($fld_results as $each_field) { @@ -113,7 +113,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching $source_result_set = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $is_key, $src_link); $source_size = sizeof($source_result_set); - $trg_fld_results = PMA_DBI_get_fields($trg_db, $matching_table[$matching_table_index], $trg_link); + $trg_fld_results = PMA_DBI_get_columns($trg_db, $matching_table[$matching_table_index], true, $trg_link); $all_keys_match = true; $trg_keys = array(); @@ -597,7 +597,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, /** * PMA_createTargetTables() Create the missing table $uncommon_table in target database * -* @uses PMA_DBI_get_fields() +* @uses PMA_DBI_get_columns() * @uses PMA_backquote() * @uses PMA_DBI_fetch_result() * @@ -613,7 +613,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display) { if (isset($uncommon_tables[$table_index])) { - $fields_result = PMA_DBI_get_fields($src_db, $uncommon_tables[$table_index], $src_link); + $fields_result = PMA_DBI_get_columns($src_db, $uncommon_tables[$table_index], true, $src_link); $fields = array(); foreach ($fields_result as $each_field) { $field_name = $each_field['Field']; diff --git a/server_privileges.php b/server_privileges.php index e2a930e..1407fdf 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -663,7 +663,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE) function PMA_displayLoginInformationFields($mode = 'new') { // Get user/host name lengths - $fields_info = PMA_DBI_get_fields('mysql', 'user'); + $fields_info = PMA_DBI_get_columns('mysql', 'user', true); $username_length = 16; $hostname_length = 41; foreach ($fields_info as $key => $val) { diff --git a/tbl_indexes.php b/tbl_indexes.php index 46e5e1c..5fcfee9 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -15,7 +15,7 @@ require_once './libraries/tbl_common.php'; // Get fields and stores their name/type $fields = array(); -foreach (PMA_DBI_get_fields($db, $table) as $row) { +foreach (PMA_DBI_get_columns($db, $table) as $row) { if (preg_match('@^(set|enum)$(.+)$$@i', $row['Type'], $tmp)) { $tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1); hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git