June 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3181-gca78ac3
by Marc Delisle 07 Jun '11

07 Jun '11

The branch, master has been updated via ca78ac3dc5fe7fe6c35f650430af2c192d666e10 (commit) from b6190ddb0992460255f4dd53cc00b8a5f99f9a3c (commit) - Log ----------------------------------------------------------------- commit ca78ac3dc5fe7fe6c35f650430af2c192d666e10 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 06:45:37 2011 -0400 Refresh .po files ----------------------------------------------------------------------- Summary of changes: po/af.po | 4 ++-- po/ar.po | 4 ++-- po/az.po | 4 ++-- po/be.po | 4 ++-- po/be(a)latin.po | 4 ++-- po/bg.po | 6 ++++-- po/bn.po | 4 ++-- po/bs.po | 4 ++-- po/ca.po | 4 ++-- po/cs.po | 4 ++-- po/cy.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/el.po | 4 ++-- po/en_GB.po | 4 ++-- po/es.po | 4 ++-- po/et.po | 4 ++-- po/eu.po | 4 ++-- po/fa.po | 4 ++-- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/gl.po | 4 ++-- po/he.po | 4 ++-- po/hi.po | 4 ++-- po/hr.po | 4 ++-- po/hu.po | 4 ++-- po/id.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 4 ++-- po/ka.po | 4 ++-- po/ko.po | 4 ++-- po/lt.po | 4 ++-- po/lv.po | 4 ++-- po/mk.po | 4 ++-- po/ml.po | 4 ++-- po/mn.po | 4 ++-- po/ms.po | 4 ++-- po/nb.po | 4 ++-- po/nl.po | 4 ++-- po/phpmyadmin.pot | 4 ++-- po/pl.po | 4 ++-- po/pt.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ro.po | 4 ++-- po/ru.po | 4 ++-- po/si.po | 4 ++-- po/sk.po | 4 ++-- po/sl.po | 4 ++-- po/sq.po | 4 ++-- po/sr.po | 4 ++-- po/sr(a)latin.po | 4 ++-- po/sv.po | 4 ++-- po/ta.po | 4 ++-- po/te.po | 4 ++-- po/th.po | 4 ++-- po/tr.po | 6 ++++-- po/tt.po | 4 ++-- po/ug.po | 4 ++-- po/uk.po | 4 ++-- po/ur.po | 4 ++-- po/uz.po | 4 ++-- po/uz(a)latin.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- 64 files changed, 132 insertions(+), 128 deletions(-) diff --git a/po/af.po b/po/af.po index 7a52868..6c104f1 100644 --- a/po/af.po +++ b/po/af.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: afrikaans <af(a)li.org>\n" @@ -7910,7 +7910,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "Veld %s is verwyder" #: server_processlist.php:29 diff --git a/po/ar.po b/po/ar.po index ed90632..43f0e55 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" "Last-Translator: <u4504712(a)anu.edu.au>\n" "Language-Team: arabic <ar(a)li.org>\n" @@ -8008,7 +8008,7 @@ msgstr "حرف شامل" #: server_privileges.php:2295 #, fuzzy #| msgid "The row has been deleted" -msgid "New user has been added." +msgid "User has been added." msgstr "لقد تم حذف الصف" #: server_processlist.php:29 diff --git a/po/az.po b/po/az.po index d57a713..ca74620 100644 --- a/po/az.po +++ b/po/az.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani <az(a)li.org>\n" @@ -8075,7 +8075,7 @@ msgstr "xüsusi işare" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "%s sahesi leğv edildi" #: server_processlist.php:29 diff --git a/po/be.po b/po/be.po index fc49ea9..02f3545 100644 --- a/po/be.po +++ b/po/be.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: belarusian_cyrillic <be(a)li.org>\n" @@ -8318,7 +8318,7 @@ msgstr "шаблён" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Выгляд %s быў выдалены" #: server_processlist.php:29 diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 5c4c49e..c505085 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: belarusian_latin <be@latin@li.org>\n" @@ -8293,7 +8293,7 @@ msgstr "šablon" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Vyhlad %s byŭ vydaleny" #: server_processlist.php:29 diff --git a/po/bg.po b/po/bg.po index e9ed0aa..e1ca5ce 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-07 08:14+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" @@ -7645,7 +7645,9 @@ msgid "wildcard" msgstr "знак за заместване" #: server_privileges.php:2295 -msgid "New user has been added." +#, fuzzy +#| msgid "New user has been added." +msgid "User has been added." msgstr "Нов потребител беше създаден." #: server_processlist.php:29 diff --git a/po/bn.po b/po/bn.po index d6d7f69..4ae5611 100644 --- a/po/bn.po +++ b/po/bn.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" "Last-Translator: Nobin নবীন <nobin(a)cyberbogra.com>\n" "Language-Team: bangla <bn(a)li.org>\n" @@ -8226,7 +8226,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "View %s has been dropped" #: server_processlist.php:29 diff --git a/po/bs.po b/po/bs.po index d843fc3..cbf1a35 100644 --- a/po/bs.po +++ b/po/bs.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bosnian <bs(a)li.org>\n" @@ -8056,7 +8056,7 @@ msgstr "Džoker" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "Polje %s je obrisano" #: server_processlist.php:29 diff --git a/po/ca.po b/po/ca.po index 760aa85..e4500b1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" "Last-Translator: Xavier Navarro <xvnavarro(a)gmail.com>\n" "Language-Team: catalan <ca(a)li.org>\n" @@ -8093,7 +8093,7 @@ msgstr "comodins" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Vista %s esborrada" #: server_processlist.php:29 diff --git a/po/cs.po b/po/cs.po index a9ab29d..694f5b8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-03 11:59+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" @@ -7976,7 +7976,7 @@ msgstr "maska" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Pohled %s byl odstraněn" #: server_processlist.php:29 diff --git a/po/cy.po b/po/cy.po index 3f24ad3..872baca 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-19 21:21+0200\n" "Last-Translator: <ardavies(a)tiscali.co.uk>\n" "Language-Team: Welsh <cy(a)li.org>\n" @@ -7866,7 +7866,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Cafodd golwg %s ei ollwng" #: server_processlist.php:29 diff --git a/po/da.po b/po/da.po index 920fd33..ea1f650 100644 --- a/po/da.po +++ b/po/da.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" "Last-Translator: <hjortholm(a)gmail.com>\n" "Language-Team: danish <da(a)li.org>\n" @@ -8169,7 +8169,7 @@ msgstr "jokertegn" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Visning %s er blevet droppet" #: server_processlist.php:29 diff --git a/po/de.po b/po/de.po index 1f776d5..b45fd3e 100644 --- a/po/de.po +++ b/po/de.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" "Last-Translator: Dominik Geyer <dominik.geyer(a)gmx.de>\n" "Language-Team: german <de(a)li.org>\n" @@ -8118,7 +8118,7 @@ msgstr "Platzhalter" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Die Ansicht %s wurde gelöscht" #: server_processlist.php:29 diff --git a/po/el.po b/po/el.po index dbf8119..17bc05c 100644 --- a/po/el.po +++ b/po/el.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-06 09:50+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" @@ -8096,7 +8096,7 @@ msgstr "μπαλαντέρ" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Η προβολή %s διαγράφτηκε" #: server_processlist.php:29 diff --git a/po/en_GB.po b/po/en_GB.po index 1d9b10a..e2f49e2 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-04 12:04+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" @@ -7967,7 +7967,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "View %s has been dropped" #: server_processlist.php:29 diff --git a/po/es.po b/po/es.po index 5df48fd..fb8f5de 100644 --- a/po/es.po +++ b/po/es.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-03 21:27+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" @@ -8150,7 +8150,7 @@ msgstr "comodín" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Se descartó el modo de visualización %s" #: server_processlist.php:29 diff --git a/po/et.po b/po/et.po index 7319941..c64c5a3 100644 --- a/po/et.po +++ b/po/et.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: estonian <et(a)li.org>\n" @@ -8217,7 +8217,7 @@ msgstr "metamärk" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Vaade %s on kustutatud" #: server_processlist.php:29 diff --git a/po/eu.po b/po/eu.po index 49c0923..ad5491f 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: basque <eu(a)li.org>\n" @@ -8085,7 +8085,7 @@ msgstr "komodina" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "%s eremua ezabatu da" #: server_processlist.php:29 diff --git a/po/fa.po b/po/fa.po index a8cfe37..06fca3c 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" "Last-Translator: <ahmad_usa2007(a)yahoo.com>\n" "Language-Team: persian <fa(a)li.org>\n" @@ -7876,7 +7876,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "نمای %s حذف گرديد." #: server_processlist.php:29 diff --git a/po/fi.po b/po/fi.po index 89600e3..0c7647a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" "Last-Translator: <asdfsdf(a)asdfasdfasdf.com>\n" "Language-Team: finnish <fi(a)li.org>\n" @@ -8387,7 +8387,7 @@ msgstr "korvausmerkki" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Näkymä %s on poistettu" #: server_processlist.php:29 diff --git a/po/fr.po b/po/fr.po index 52675ef..fd8e5fd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-04 12:20+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" @@ -8080,7 +8080,7 @@ msgstr "passepartout" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "La vue %s a été supprimée" #: server_processlist.php:29 diff --git a/po/gl.po b/po/gl.po index 56acf77..01c5104 100644 --- a/po/gl.po +++ b/po/gl.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: galician <gl(a)li.org>\n" @@ -8579,7 +8579,7 @@ msgstr "comodín" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Deixouse a vista %s" #: server_processlist.php:29 diff --git a/po/he.po b/po/he.po index a4fdc35..56efd42 100644 --- a/po/he.po +++ b/po/he.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" "Last-Translator: <zippoxer(a)gmail.com>\n" "Language-Team: hebrew <he(a)li.org>\n" @@ -7994,7 +7994,7 @@ msgstr "תו כללי" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "שדה %s נמחק" #: server_processlist.php:29 diff --git a/po/hi.po b/po/hi.po index 3f9e41d..942d495 100644 --- a/po/hi.po +++ b/po/hi.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-06 09:13+0200\n" "Last-Translator: <manojonemail(a)gmail.com>\n" "Language-Team: hindi <hi(a)li.org>\n" @@ -7754,7 +7754,7 @@ msgstr "वाइल्डकार्ड" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "द्रश्य %s रद्द दिया गया है." #: server_processlist.php:29 diff --git a/po/hr.po b/po/hr.po index 107dbb9..3bc9360 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: croatian <hr(a)li.org>\n" @@ -8284,7 +8284,7 @@ msgstr "džoker" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Index %s je ispušten" #: server_processlist.php:29 diff --git a/po/hu.po b/po/hu.po index a8c234d..788823a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-27 18:52+0200\n" "Last-Translator: <slygyor(a)gmail.com>\n" "Language-Team: hungarian <hu(a)li.org>\n" @@ -8240,7 +8240,7 @@ msgstr "karakterhelyettesítő" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "A(z) %s nézet eldobása kész" #: server_processlist.php:29 diff --git a/po/id.po b/po/id.po index 6ad458b..1e8fffa 100644 --- a/po/id.po +++ b/po/id.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" "Last-Translator: <aris_feryanto(a)yahoo.com>\n" "Language-Team: indonesian <id(a)li.org>\n" @@ -8069,7 +8069,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Pandangan %s telah dibubarkan" #: server_processlist.php:29 diff --git a/po/it.po b/po/it.po index b531fa6..ab648e5 100644 --- a/po/it.po +++ b/po/it.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-25 22:43+0200\n" "Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n" "Language-Team: italian <it(a)li.org>\n" @@ -8117,7 +8117,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "La vista %s è stata eliminata" #: server_processlist.php:29 diff --git a/po/ja.po b/po/ja.po index bbfd0ad..fd257be 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-31 12:04+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" @@ -7986,7 +7986,7 @@ msgstr "ワイルドカード" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "ビュー %s を破棄しました" #: server_processlist.php:29 diff --git a/po/ka.po b/po/ka.po index 277d67c..5146795 100644 --- a/po/ka.po +++ b/po/ka.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: georgian <ka(a)li.org>\n" @@ -8495,7 +8495,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "View %s has been dropped" #: server_processlist.php:29 diff --git a/po/ko.po b/po/ko.po index 6cd8321..1150ed5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" "Last-Translator: <cihar(a)nvyu.net>\n" "Language-Team: korean <ko(a)li.org>\n" @@ -7905,7 +7905,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "뷰 %s가 제거되었습니다." #: server_processlist.php:29 diff --git a/po/lt.po b/po/lt.po index b904ec2..a1b3ad2 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" @@ -7997,7 +7997,7 @@ msgstr "pakaitos simbolis" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Rodinys %s buvo panaikintas" #: server_processlist.php:29 diff --git a/po/lv.po b/po/lv.po index d876ebb..55f2f0d 100644 --- a/po/lv.po +++ b/po/lv.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: latvian <lv(a)li.org>\n" @@ -8093,7 +8093,7 @@ msgstr "aizstājējzīme" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "Lauks %s tika izdzēsts" #: server_processlist.php:29 diff --git a/po/mk.po b/po/mk.po index 8f69e55..9627b02 100644 --- a/po/mk.po +++ b/po/mk.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-19 17:04+0200\n" "Last-Translator: <sjanevski(a)gmail.com>\n" "Language-Team: macedonian_cyrillic <mk(a)li.org>\n" @@ -8160,7 +8160,7 @@ msgstr "џокер" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Прегледот %s е избришан" #: server_processlist.php:29 diff --git a/po/ml.po b/po/ml.po index 7fcc608..e9194d0 100644 --- a/po/ml.po +++ b/po/ml.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: Malayalam <ml(a)li.org>\n" @@ -7496,7 +7496,7 @@ msgid "wildcard" msgstr "" #: server_privileges.php:2295 -msgid "New user has been added." +msgid "User has been added." msgstr "" #: server_processlist.php:29 diff --git a/po/mn.po b/po/mn.po index a37c8e0..8465033 100644 --- a/po/mn.po +++ b/po/mn.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: mongolian <mn(a)li.org>\n" @@ -8111,7 +8111,7 @@ msgstr "загвар" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Харц %s нь устгагдсан" #: server_processlist.php:29 diff --git a/po/ms.po b/po/ms.po index 10a2084..bd4393f 100644 --- a/po/ms.po +++ b/po/ms.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: malay <ms(a)li.org>\n" @@ -7938,7 +7938,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "Medan %s telah digugurkan" #: server_processlist.php:29 diff --git a/po/nb.po b/po/nb.po index 33f33f7..64aaa45 100644 --- a/po/nb.po +++ b/po/nb.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: norwegian <no(a)li.org>\n" @@ -8111,7 +8111,7 @@ msgstr "jokertegn" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Visningen %s har blitt slettet" #: server_processlist.php:29 diff --git a/po/nl.po b/po/nl.po index fd7bd40..dcad582 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-04 15:19+0200\n" "Last-Translator: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>\n" "Language-Team: dutch <nl(a)li.org>\n" @@ -8089,7 +8089,7 @@ msgstr "jokerteken" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "View %s is verwijderd" #: server_processlist.php:29 diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot index 7713c66..8046590 100644 --- a/po/phpmyadmin.pot +++ b/po/phpmyadmin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -7498,7 +7498,7 @@ msgid "wildcard" msgstr "" #: server_privileges.php:2295 -msgid "New user has been added." +msgid "User has been added." msgstr "" #: server_processlist.php:29 diff --git a/po/pl.po b/po/pl.po index f829929..0de02aa 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: polish <pl(a)li.org>\n" @@ -8378,7 +8378,7 @@ msgstr "znak wieloznaczny" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Widok %s został usunięty" #: server_processlist.php:29 diff --git a/po/pt.po b/po/pt.po index aa8cffa..8b5bb57 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" "Last-Translator: <efgpinto(a)gmail.com>\n" "Language-Team: portuguese <pt(a)li.org>\n" @@ -8017,7 +8017,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "A Vista %s foi eliminada" #: server_processlist.php:29 diff --git a/po/pt_BR.po b/po/pt_BR.po index 2b1009d..a4f9c91 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" "Last-Translator: <vitorpc.18(a)gmail.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" @@ -8138,7 +8138,7 @@ msgstr "coringa" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Visão %s foi apagada" #: server_processlist.php:29 diff --git a/po/ro.po b/po/ro.po index e66f056..323fb5f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: romanian <ro(a)li.org>\n" @@ -8293,7 +8293,7 @@ msgstr "Metacaracter" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Vizualizarea %s a fost eliminată" #: server_processlist.php:29 diff --git a/po/ru.po b/po/ru.po index e65e5ba..42830b7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-01 22:34+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" @@ -8077,7 +8077,7 @@ msgstr "Групповой символ" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Представление %s было удалено" #: server_processlist.php:29 diff --git a/po/si.po b/po/si.po index e417b33..f641ca6 100644 --- a/po/si.po +++ b/po/si.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-04 15:35+0200\n" "Last-Translator: Madhura Jayaratne <madhura.cj(a)gmail.com>\n" "Language-Team: sinhala <si(a)li.org>\n" @@ -7847,7 +7847,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "%s දසුන හලන ලදි" #: server_processlist.php:29 diff --git a/po/sk.po b/po/sk.po index 6c15b8a..ef4db5b 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-03 14:53+0200\n" "Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" "Language-Team: slovak <sk(a)li.org>\n" @@ -7892,7 +7892,7 @@ msgstr "nahradzujúci znak" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Pohľad %s bol odstránený" #: server_processlist.php:29 diff --git a/po/sl.po b/po/sl.po index 3c96873..852b6f9 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-05 21:27+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" @@ -8014,7 +8014,7 @@ msgstr "nadomestni znak" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Pogled %s je zavržen" #: server_processlist.php:29 diff --git a/po/sq.po b/po/sq.po index 22885e8..4877f2b 100644 --- a/po/sq.po +++ b/po/sq.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: albanian <sq(a)li.org>\n" @@ -8101,7 +8101,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Paraqitja %s u eleminua" #: server_processlist.php:29 diff --git a/po/sr.po b/po/sr.po index 33e8d56..b9b8f01 100644 --- a/po/sr.po +++ b/po/sr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\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" @@ -8224,7 +8224,7 @@ msgstr "џокер" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Поглед %s је одбачен" #: server_processlist.php:29 diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 088944e..4dcdcc8 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" "Last-Translator: Sasa Kostic <sasha.kostic(a)gmail.com>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" @@ -8213,7 +8213,7 @@ msgstr "džoker" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Pogled %s je odbačen" #: server_processlist.php:29 diff --git a/po/sv.po b/po/sv.po index bc4b445..1d5635c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-30 20:24+0200\n" "Last-Translator: <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" @@ -8004,7 +8004,7 @@ msgstr "jokertecken" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Vyn %s har tagits bort" #: server_processlist.php:29 diff --git a/po/ta.po b/po/ta.po index 40880c4..ec2c9f7 100644 --- a/po/ta.po +++ b/po/ta.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" "Last-Translator: Sutharshan <sutharshan02(a)gmail.com>\n" "Language-Team: Tamil <ta(a)li.org>\n" @@ -7588,7 +7588,7 @@ msgid "wildcard" msgstr "" #: server_privileges.php:2295 -msgid "New user has been added." +msgid "User has been added." msgstr "" #: server_processlist.php:29 diff --git a/po/te.po b/po/te.po index c537d30..326b4a3 100644 --- a/po/te.po +++ b/po/te.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" "Last-Translator: <veeven(a)gmail.com>\n" "Language-Team: Telugu <te(a)li.org>\n" @@ -7678,7 +7678,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "Database %s has been dropped." -msgid "New user has been added." +msgid "User has been added." msgstr "%s డేటాబేస్ తుడిచివేయడమైనది" #: server_processlist.php:29 diff --git a/po/th.po b/po/th.po index ed5f494..5319300 100644 --- a/po/th.po +++ b/po/th.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: thai <th(a)li.org>\n" @@ -7976,7 +7976,7 @@ msgstr "ไวล์การ์ด" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "โยนวิว %s ทิ้งไปเรียบร้อยแล้ว" #: server_processlist.php:29 diff --git a/po/tr.po b/po/tr.po index eacb95f..87b6ef2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-06 18:49+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" @@ -8023,7 +8023,9 @@ msgid "wildcard" msgstr "joker" #: server_privileges.php:2295 -msgid "New user has been added." +#, fuzzy +#| msgid "New user has been added." +msgid "User has been added." msgstr "Yeni kullanıcı eklendi." #: server_processlist.php:29 diff --git a/po/tt.po b/po/tt.po index b1e3e5b..0fa70f2 100644 --- a/po/tt.po +++ b/po/tt.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: tatarish <tt(a)li.org>\n" @@ -8152,7 +8152,7 @@ msgstr "almaşbilge" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "\"%s\" atlı Qaraş beterelgän buldı" #: server_processlist.php:29 diff --git a/po/ug.po b/po/ug.po index d980ab8..2d69bab 100644 --- a/po/ug.po +++ b/po/ug.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" @@ -7773,7 +7773,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "%s كۆرۈنمە ئۆچۈرۈلدى" #: server_processlist.php:29 diff --git a/po/uk.po b/po/uk.po index 465cdc9..f6ae5ff 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" "Last-Translator: Olexiy Zagorskyi <zalex_ua(a)i.ua>\n" "Language-Team: ukrainian <uk(a)li.org>\n" @@ -7785,7 +7785,7 @@ msgstr "шаблон" #: server_privileges.php:2295 #, fuzzy #| msgid "The row has been deleted" -msgid "New user has been added." +msgid "User has been added." msgstr "Рядок видалено" #: server_processlist.php:29 diff --git a/po/ur.po b/po/ur.po index 542eb1d..283c71e 100644 --- a/po/ur.po +++ b/po/ur.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" "Last-Translator: Mehbooob Khan <mehboobbugti(a)gmail.com>\n" "Language-Team: Urdu <ur(a)li.org>\n" @@ -7761,7 +7761,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "جدول نقل %s چھوڑا جاچکا ہے۔" #: server_processlist.php:29 diff --git a/po/uz.po b/po/uz.po index 695846a..38c05d1 100644 --- a/po/uz.po +++ b/po/uz.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_cyrillic <uz(a)li.org>\n" @@ -8602,7 +8602,7 @@ msgstr "Гуруҳлаш белгиси" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr " \"%s\" намойиши ўчирилди" #: server_processlist.php:29 diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 293eb1e..89cfff4 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_latin <uz@latin@li.org>\n" @@ -8647,7 +8647,7 @@ msgstr "Guruhlash belgisi" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr " \"%s\" namoyishi o‘chirildi" #: server_processlist.php:29 diff --git a/po/zh_CN.po b/po/zh_CN.po index d7fd2f6..c419710 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-30 05:47+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" @@ -7738,7 +7738,7 @@ msgstr "通配符" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "已删除视图 %s" #: server_processlist.php:29 diff --git a/po/zh_TW.po b/po/zh_TW.po index 9dc25b5..75fe710 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-03 09:09+0200\n" "Last-Translator: <kiange(a)gmail.com>\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" @@ -7804,7 +7804,7 @@ msgstr "萬用字元" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "已刪除 view %s" #: server_processlist.php:29 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3180-gb6190dd
by Marc Delisle 07 Jun '11

07 Jun '11

The branch, master has been updated via b6190ddb0992460255f4dd53cc00b8a5f99f9a3c (commit) from dbf52be46e0f670542f017632c87a7593f89ffa0 (commit) - Log ----------------------------------------------------------------- commit b6190ddb0992460255f4dd53cc00b8a5f99f9a3c Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 06:38:05 2011 -0400 Reword redundant message ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 29ef94e..b5f7031 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2292,7 +2292,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs if($GLOBALS['is_ajax_request'] == true){ $extra_data['user_form'] = $user_form; - $message = PMA_Message::success(__('New user has been added.')); + $message = PMA_Message::success(__('User has been added.')); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); }else{ // Offer to create a new user for the current database hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3177-g3d3739a
by Michal Čihař 07 Jun '11

07 Jun '11

The branch, master has been updated via 3d3739a24be4b22896239dcc3ae67e5f52477d0b (commit) via 1b3a134d17f27fb69724c78f983adca1222587c2 (commit) via 16d377fa9b53e48000c4d2c2251aa3fc2f37726e (commit) via 246be4620da5c70e9a201e3c11dbe17f191255e8 (commit) via 720ea23813ff7d6088ab2e925ab17a3fad6cc3c6 (commit) via f749098cb4328dab4a3b9184aa2ce499f1058cc1 (commit) via b0d5360006d67ca32c9db54b942335f9e5b1c360 (commit) via 5a0f28a3c3248a45034e0a85e7f3b39ae1ba8396 (commit) via a07cf749f82248f306fc9dc7d83986858bcc77be (commit) from cf6312f5278f922ab420d501200b175eba987c5e (commit) - Log ----------------------------------------------------------------- commit 3d3739a24be4b22896239dcc3ae67e5f52477d0b Author: stoyanster <stoyanster(a)gmail.com> Date: Tue Jun 7 08:14:40 2011 +0200 Translation update done using Pootle. commit 1b3a134d17f27fb69724c78f983adca1222587c2 Author: stoyanster <stoyanster(a)gmail.com> Date: Tue Jun 7 08:13:47 2011 +0200 Translation update done using Pootle. commit 16d377fa9b53e48000c4d2c2251aa3fc2f37726e Author: stoyanster <stoyanster(a)gmail.com> Date: Tue Jun 7 08:13:19 2011 +0200 Translation update done using Pootle. commit 246be4620da5c70e9a201e3c11dbe17f191255e8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jun 6 18:49:58 2011 +0200 Translation update done using Pootle. commit 720ea23813ff7d6088ab2e925ab17a3fad6cc3c6 Merge: f749098cb4328dab4a3b9184aa2ce499f1058cc1 cf6312f5278f922ab420d501200b175eba987c5e Author: Pootle server <pootle(a)cihar.com> Date: Mon Jun 6 18:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit f749098cb4328dab4a3b9184aa2ce499f1058cc1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jun 6 18:33:34 2011 +0200 Translation update done using Pootle. commit b0d5360006d67ca32c9db54b942335f9e5b1c360 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jun 6 18:07:19 2011 +0200 Translation update done using Pootle. commit 5a0f28a3c3248a45034e0a85e7f3b39ae1ba8396 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jun 6 18:06:56 2011 +0200 Translation update done using Pootle. commit a07cf749f82248f306fc9dc7d83986858bcc77be Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jun 6 18:06:33 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/bg.po | 10 ++++------ po/tr.po | 13 ++++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/po/bg.po b/po/bg.po index 8afde8a..794aab7 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-06 11:35+0200\n" -"PO-Revision-Date: 2011-06-06 10:24+0200\n" +"PO-Revision-Date: 2011-06-07 08:14+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" "Language: bg\n" @@ -1101,10 +1101,9 @@ msgid "Create Table" msgstr "Създаване таблица" #: js/messages.php:83 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Използване таблиците" +msgstr "Вмъкване на таблица" #: js/messages.php:86 msgid "Searching" @@ -6711,7 +6710,7 @@ msgstr "Визуални настройки" #: main.php:146 prefs_manage.php:274 msgid "More settings" -msgstr "Още настройки" +msgstr "Още" #: main.php:163 msgid "Protocol version" @@ -7649,10 +7648,9 @@ msgid "wildcard" msgstr "знак за заместване" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "New user has been added." -msgstr "Изглед %s беше изтрит" +msgstr "Нов потребител беше създаден." #: server_processlist.php:29 #, php-format diff --git a/po/tr.po b/po/tr.po index 3801ea7..34b954f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-06 11:35+0200\n" -"PO-Revision-Date: 2011-06-02 21:51+0200\n" +"PO-Revision-Date: 2011-06-06 18:49+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -1100,10 +1100,9 @@ msgid "Create Table" msgstr "Tablo Oluştur" #: js/messages.php:83 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Tabloları kullan" +msgstr "Tablo Ekle" #: js/messages.php:86 msgid "Searching" @@ -2582,12 +2581,13 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Bir veritabanının seçili tablolarını uyarlama ya da onarma gibi toplu tablo " +"bakımı işlemlerini etkisizleştirir." #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Tablo bakımı" +msgstr "Çoklu tablo bakımı etkisiz" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -8025,10 +8025,9 @@ msgid "wildcard" msgstr "joker" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "New user has been added." -msgstr "%s görünümü kaldırıldı" +msgstr "Yeni kullanıcı eklendi." #: server_processlist.php:29 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3168-gcf6312f
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via cf6312f5278f922ab420d501200b175eba987c5e (commit) via 72886c3c8a6cf2a01ea40f01c7d7c4c981a3a4e7 (commit) from db07b65c657162ce04c50ec1164390f0fb68b905 (commit) - Log ----------------------------------------------------------------- commit cf6312f5278f922ab420d501200b175eba987c5e Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 17:08:35 2011 +0200 Clarify documentation commit 72886c3c8a6cf2a01ea40f01c7d7c4c981a3a4e7 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 17:08:02 2011 +0200 Add option to call extenal script from signon method ----------------------------------------------------------------------- Summary of changes: Documentation.html | 28 +++++++++++++++++++++------- libraries/auth/signon.auth.lib.php | 14 +++++++++++++- libraries/config.default.php | 7 +++++++ scripts/signon.php | 6 +++--- 4 files changed, 44 insertions(+), 11 deletions(-) diff --git a/Documentation.html b/Documentation.html index 6e98747..6f66b64 100644 --- a/Documentation.html +++ b/Documentation.html @@ -759,13 +759,17 @@ since this link provides funding for phpMyAdmin. <li>'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as introduced in 2.10.0 allows you to log in from prepared PHP - session data. This is useful for implementing single signon - from another application. Sample way how to seed session is in - signon example: <code>scripts/signon.php</code>. There is also - alternative example using OpenID - - <code>scripts/openid.php</code>. You need to + session data or using supplied PHP script. This is useful for implementing single signon + from another application. + + Sample way how to seed session is in signon example: <code>scripts/signon.php</code>. + There is also alternative example using OpenID - <code>scripts/openid.php</code> and + example for scripts based solution - <code>scripts/signon-script.php</code>. + + You need to configure <a href="#cfg_Servers_SignonSession" - class="configrule">session name</a> and <a + class="configrule">session name</a> or <a href="#cfg_Servers_SignonScript" + class="configrule">script to be executed</a> and <a href="#cfg_Servers_SignonURL" class="configrule">signon URL</a> to use this authentication method.</li> </ul> @@ -1320,10 +1324,20 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dt>$cfg['Servers'][$i]['CountTables'] boolean</dt> <dd>Whether to count the number of tables for each database when preparing the list of databases for the navigation frame. </dd> + <dt>$cfg['Servers'][$i]['SignonScript'] string</dt> + <dd>Name of PHP script to be sourced and executed to obtain + login credentials. This is alternative approach to session based single + signon. The script needs to provide function + <code>get_login_credentials</code> which returns list of username and + pasword, accepting single parameter of existing username (can be empty). + See <code>scripts/signon-script.php</code> for an example. + </dd> <dt>$cfg['Servers'][$i]['SignonSession'] string</dt> <dd>Name of session which will be used for signon authentication method. You should use something different than <code>phpMyAdmin</code>, because - this is session which phpMyAdmin uses internally. + this is session which phpMyAdmin uses internally. Takes effect only if + <a href="#cfg_Servers_SignonScript" class="configrule">SignonScript</a> + is not configured. </dd> <dt>$cfg['Servers'][$i]['SignonURL'] string</dt> <dd>URL where user will be redirected to log in for signon authentication method. Should be absolute including protocol. diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index 0735020..e095829 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -60,6 +60,9 @@ function PMA_auth_check() return false; } + /* Script name */ + $script_name = $GLOBALS['cfg']['Server']['SignonScript']; + /* Session name */ $session_name = $GLOBALS['cfg']['Server']['SignonSession']; @@ -78,8 +81,17 @@ function PMA_auth_check() /* Are we requested to do logout? */ $do_logout = !empty($_REQUEST['old_usr']); + /* Handle script based auth */ + if (!empty($script_name)) { + if (! file_exists($script_name)) { + PMA_fatalError(__('Can not find signon authentication script:') . ' ' . $script_name); + } + require $script_name; + + list ($PHP_AUTH_USER, $PHP_AUTH_PW) = get_login_credentials($cfg['Server']['user']); + /* Does session exist? */ - if (isset($_COOKIE[$session_name])) { + } elseif (isset($_COOKIE[$session_name])) { /* End current session */ $old_session = session_name(); $old_id = session_id(); diff --git a/libraries/config.default.php b/libraries/config.default.php index d6e47c2..1a478b7 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -213,6 +213,13 @@ $cfg['Servers'][$i]['password'] = ''; $cfg['Servers'][$i]['SignonSession'] = ''; /** + * PHP script to use for 'signon' authentication method + * + * @global string $cfg['Servers'][$i]['SignonScript'] + */ +$cfg['Servers'][$i]['SignonScript'] = ''; + +/** * URL where to redirect user to login for 'signon' authentication method * * @global string $cfg['Servers'][$i]['SignonURL'] diff --git a/scripts/signon.php b/scripts/signon.php index e585625..d80c1cf 100644 --- a/scripts/signon.php +++ b/scripts/signon.php @@ -3,9 +3,9 @@ /** * Single signon for phpMyAdmin * - * This is just example how to use single signon with phpMyAdmin, it is - * not intended to be perfect code and look, only shows how you can - * integrate this functionality in your application. + * This is just example how to use session based single signon with + * phpMyAdmin, it is not intended to be perfect code and look, only + * shows how you can integrate this functionality in your application. * * @package phpMyAdmin * @subpackage Example hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3166-gdb07b65
by Piotr Przybylski 06 Jun '11

06 Jun '11

The branch, master has been updated via db07b65c657162ce04c50ec1164390f0fb68b905 (commit) from 41376df2b088a83778067d1f4f6e7c7669ab3561 (commit) - Log ----------------------------------------------------------------- commit db07b65c657162ce04c50ec1164390f0fb68b905 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Mon Jun 6 16:40:43 2011 +0200 Add missing 'server' argument to PMA_reloadRecentTable Was causing token regeneration on non-default servers, if the next action required valid token it would fail ----------------------------------------------------------------------- Summary of changes: js/navigation.js | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 7f9a013..20aea18 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -171,13 +171,16 @@ function clear_fast_filter() { * Reloads the recent tables list. */ function PMA_reloadRecentTable() { - $.get('navigation.php', - { 'token' : window.parent.token, 'ajax_request' : true, 'recent_table' : true }, - function (data) { - if (data.success == true) { - $('#recentTable').html(data.options); - } - }); + $.get('navigation.php', { + 'token': window.parent.token, + 'server': window.parent.server, + 'ajax_request': true, + 'recent_table': true}, + function (data) { + if (data.success == true) { + $('#recentTable').html(data.options); + } + }); } /* Performed on load */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3165-g41376df
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via 41376df2b088a83778067d1f4f6e7c7669ab3561 (commit) via 91c16608f8afa5d51975bd5e7aa54a828662da83 (commit) via 55d8b1efa04851fc1572154dead2d77820cb596d (commit) via 9b0b9b0b59311aa3274e5ed2060d47240504bfd0 (commit) via 0c964ca10ba0f7b2181332517bd8c62149626500 (commit) via c13e64468b9afed3f5963debbf01533f07bce444 (commit) via 4b3b0c616cc34f9f68da24553741a5e4096e1370 (commit) via cbd0b7d8f7a4887365170251fdd26fb6d44e9af5 (commit) via 6c6ae1c1cc8fec669749f9fbcbdb862b81d206d5 (commit) from d147fd26db0cf8a5965c640c3047494acc2b9d44 (commit) - Log ----------------------------------------------------------------- commit 41376df2b088a83778067d1f4f6e7c7669ab3561 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:36:57 2011 +0200 Properly end multi word links commit 91c16608f8afa5d51975bd5e7aa54a828662da83 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:33:22 2011 +0200 Documentation for other reserved words commit 55d8b1efa04851fc1572154dead2d77820cb596d Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:21:23 2011 +0200 Add documentation links to function names commit 9b0b9b0b59311aa3274e5ed2060d47240504bfd0 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:13:33 2011 +0200 Move doc back to correct place commit 0c964ca10ba0f7b2181332517bd8c62149626500 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:12:33 2011 +0200 Provide doc links for operators commit c13e64468b9afed3f5963debbf01533f07bce444 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 15:58:06 2011 +0200 Coding style commit 4b3b0c616cc34f9f68da24553741a5e4096e1370 Author: Mateusz Lewandowski <gandalfml(a)users.sourceforge.net> Date: Mon Jun 6 15:56:58 2011 +0200 Add data for documentation links. commit cbd0b7d8f7a4887365170251fdd26fb6d44e9af5 Merge: d147fd26db0cf8a5965c640c3047494acc2b9d44 6c6ae1c1cc8fec669749f9fbcbdb862b81d206d5 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 15:54:29 2011 +0200 Merge branch 'integration' Conflicts: libraries/sqlparser.lib.php commit 6c6ae1c1cc8fec669749f9fbcbdb862b81d206d5 Author: Mateusz Lewandowski <gandalfml(a)users.sourceforge.net> Date: Tue Apr 5 21:30:20 2011 +0200 Better names for some variables ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.data.php | 266 ++++++++++++++++++++++++++++++++++++++++++ libraries/sqlparser.lib.php | 55 +++++++-- 2 files changed, 312 insertions(+), 9 deletions(-) diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 5011ca7..d1c4b16 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -1222,4 +1222,270 @@ $PMA_SQPdata_column_type = array ( 'YEAR' ); +/** + * Documentation links for operators. + */ +$PMA_SQPdata_operators_docs = array( + '!=' => array('link' => 'comparison-operators','anchor' => 'operator_not-equal'), + '<>' => array('link' => 'comparison-operators','anchor' => 'operator_not-equal'), + '!' => array('link' => 'logical-operators','anchor' => 'operator_not'), + '||' => array('link' => 'logical-operators','anchor' => 'operator_or'), + '+' => array('link' => 'arithmetic-functions','anchor' => 'operator_plus'), + '>>' => array('link' => 'bit-functions','anchor' => 'operator_right-shift'), + '-' => array('link' => 'arithmetic-functions','anchor' => 'operator_minus'), + '*' => array('link' => 'arithmetic-functions','anchor' => 'operator_times'), + '&&' => array('link' => 'logical-operators','anchor' => 'operator_and'), + '&' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-and'), + '~' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-invert'), + '|' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-or'), + '^' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-xor'), + '=' => array('link' => 'assignment-operators','anchor' => 'operator_assign-equal'), + ':=' => array('link' => 'assignment-operators','anchor' => 'operator_assign-value'), + '/' => array('link' => 'arithmetic-functions','anchor' => 'operator_divide'), + '<=>' => array('link' => 'comparison-operators','anchor' => 'operator_equal-to'), + '=' => array('link' => 'comparison-operators','anchor' => 'operator_equal'), + '>=' => array('link' => 'comparison-operators','anchor' => 'operator_greater-than-or-equal'), + '>' => array('link' => 'comparison-operators','anchor' => 'operator_greater-than'), + '<<' => array('link' => 'bit-functions','anchor' => 'operator_left-shift'), + '<=' => array('link' => 'comparison-operators','anchor' => 'operator_less-than-or-equal'), + '<' => array('link' => 'comparison-operators','anchor' => 'operator_less-than'), + '%' => array('link' => 'arithmetic-functions','anchor' => 'operator_mod') +); + +/** + * Documentation links for functions. + */ +$PMA_SQPdata_functions_docs = array( + 'ABS' => array('link' => 'mathematical-functions','anchor' => 'function_abs'), + 'ACOS' => array('link' => 'mathematical-functions','anchor' => 'function_acos'), + 'ADDDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_adddate'), + 'ADDTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_addtime'), + 'AES_DECRYPT' => array('link' => 'encryption-functions','anchor' => 'function_aes_decrypt'), + 'AES_ENCRYPT' => array('link' => 'encryption-functions','anchor' => 'function_aes_encrypt'), + 'AND' => array('link' => 'logical-operators','anchor' => 'operator_and'), + 'ASCII' => array('link' => 'string-functions','anchor' => 'function_ascii'), + 'ASIN' => array('link' => 'mathematical-functions','anchor' => 'function_asin'), + 'ATAN2' => array('link' => 'mathematical-functions','anchor' => 'function_atan2'), + 'ATAN' => array('link' => 'mathematical-functions','anchor' => 'function_atan2'), + 'ATAN' => array('link' => 'mathematical-functions','anchor' => 'function_atan'), + 'AVG' => array('link' => 'group-by-functions','anchor' => 'function_avg'), + 'BENCHMARK' => array('link' => 'information-functions','anchor' => 'function_benchmark'), + 'BIN' => array('link' => 'string-functions','anchor' => 'function_bin'), + 'BINARY' => array('link' => 'cast-functions','anchor' => 'operator_binary'), + 'BIT_AND' => array('link' => 'group-by-functions','anchor' => 'function_bit_and'), + 'BIT_COUNT' => array('link' => 'bit-functions','anchor' => 'function_bit_count'), + 'BIT_LENGTH' => array('link' => 'string-functions','anchor' => 'function_bit_length'), + 'BIT_OR' => array('link' => 'group-by-functions','anchor' => 'function_bit_or'), + 'BIT_XOR' => array('link' => 'group-by-functions','anchor' => 'function_bit_xor'), + 'CASE' => array('link' => 'control-flow-functions','anchor' => 'operator_case'), + 'CAST' => array('link' => 'cast-functions','anchor' => 'function_cast'), + 'CEIL' => array('link' => 'mathematical-functions','anchor' => 'function_ceil'), + 'CEILING' => array('link' => 'mathematical-functions','anchor' => 'function_ceiling'), + 'CHAR_LENGTH' => array('link' => 'string-functions','anchor' => 'function_char_length'), + 'CHAR' => array('link' => 'string-functions','anchor' => 'function_char'), + 'CHARACTER_LENGTH' => array('link' => 'string-functions','anchor' => 'function_character_length'), + 'CHARSET' => array('link' => 'information-functions','anchor' => 'function_charset'), + 'COALESCE' => array('link' => 'comparison-operators','anchor' => 'function_coalesce'), + 'COERCIBILITY' => array('link' => 'information-functions','anchor' => 'function_coercibility'), + 'COLLATION' => array('link' => 'information-functions','anchor' => 'function_collation'), + 'COMPRESS' => array('link' => 'encryption-functions','anchor' => 'function_compress'), + 'CONCAT_WS' => array('link' => 'string-functions','anchor' => 'function_concat_ws'), + 'CONCAT' => array('link' => 'string-functions','anchor' => 'function_concat'), + 'CONNECTION_ID' => array('link' => 'information-functions','anchor' => 'function_connection_id'), + 'CONV' => array('link' => 'mathematical-functions','anchor' => 'function_conv'), + 'CONVERT_TZ' => array('link' => 'date-and-time-functions','anchor' => 'function_convert_tz'), + 'Convert' => array('link' => 'cast-functions','anchor' => 'function_convert'), + 'COS' => array('link' => 'mathematical-functions','anchor' => 'function_cos'), + 'COT' => array('link' => 'mathematical-functions','anchor' => 'function_cot'), + 'COUNT' => array('link' => 'group-by-functions','anchor' => 'function_count'), + 'CRC32' => array('link' => 'mathematical-functions','anchor' => 'function_crc32'), + 'CURDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_curdate'), + 'CURRENT_DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_current_date'), + 'CURRENT_TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_current_time'), + 'CURRENT_TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_current_timestamp'), + 'CURRENT_USER' => array('link' => 'information-functions','anchor' => 'function_current_user'), + 'CURTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_curtime'), + 'DATABASE' => array('link' => 'information-functions','anchor' => 'function_database'), + 'DATE_ADD' => array('link' => 'date-and-time-functions','anchor' => 'function_date_add'), + 'DATE_FORMAT' => array('link' => 'date-and-time-functions','anchor' => 'function_date_format'), + 'DATE_SUB' => array('link' => 'date-and-time-functions','anchor' => 'function_date_sub'), + 'DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_date'), + 'DATEDIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_datediff'), + 'DAY' => array('link' => 'date-and-time-functions','anchor' => 'function_day'), + 'DAYNAME' => array('link' => 'date-and-time-functions','anchor' => 'function_dayname'), + 'DAYOFMONTH' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofmonth'), + 'DAYOFWEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofweek'), + 'DAYOFYEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofyear'), + 'DECODE' => array('link' => 'encryption-functions','anchor' => 'function_decode'), + 'DEFAULT' => array('link' => 'miscellaneous-functions','anchor' => 'function_default'), + 'DEGREES' => array('link' => 'mathematical-functions','anchor' => 'function_degrees'), + 'DES_DECRYPT' => array('link' => 'encryption-functions','anchor' => 'function_des_decrypt'), + 'DES_ENCRYPT' => array('link' => 'encryption-functions','anchor' => 'function_des_encrypt'), + 'DIV' => array('link' => 'arithmetic-functions','anchor' => 'operator_div'), + 'ELT' => array('link' => 'string-functions','anchor' => 'function_elt'), + 'ENCODE' => array('link' => 'encryption-functions','anchor' => 'function_encode'), + 'ENCRYPT' => array('link' => 'encryption-functions','anchor' => 'function_encrypt'), + 'EXP' => array('link' => 'mathematical-functions','anchor' => 'function_exp'), + 'EXPORT_SET' => array('link' => 'string-functions','anchor' => 'function_export_set'), + 'EXTRACT' => array('link' => 'date-and-time-functions','anchor' => 'function_extract'), + 'ExtractValue' => array('link' => 'xml-functions','anchor' => 'function_extractvalue'), + 'FIELD' => array('link' => 'string-functions','anchor' => 'function_field'), + 'FIND_IN_SET' => array('link' => 'string-functions','anchor' => 'function_find_in_set'), + 'FLOOR' => array('link' => 'mathematical-functions','anchor' => 'function_floor'), + 'FORMAT' => array('link' => 'string-functions','anchor' => 'function_format'), + 'FOUND_ROWS' => array('link' => 'information-functions','anchor' => 'function_found_rows'), + 'FROM_DAYS' => array('link' => 'date-and-time-functions','anchor' => 'function_from_days'), + 'FROM_UNIXTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_from_unixtime'), + 'GET_FORMAT' => array('link' => 'date-and-time-functions','anchor' => 'function_get_format'), + 'GET_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_get_lock'), + 'GREATEST' => array('link' => 'comparison-operators','anchor' => 'function_greatest'), + 'GROUP_CONCAT' => array('link' => 'group-by-functions','anchor' => 'function_group_concat'), + 'HEX' => array('link' => 'string-functions','anchor' => 'function_hex'), + 'HOUR' => array('link' => 'date-and-time-functions','anchor' => 'function_hour'), + 'IF' => array('link' => 'control-flow-functions','anchor' => 'function_if'), + 'IFNULL' => array('link' => 'control-flow-functions','anchor' => 'function_ifnull'), + 'IN' => array('link' => 'comparison-operators','anchor' => 'function_in'), + 'INET_ATON' => array('link' => 'miscellaneous-functions','anchor' => 'function_inet_aton'), + 'INET_NTOA' => array('link' => 'miscellaneous-functions','anchor' => 'function_inet_ntoa'), + 'INSERT' => array('link' => 'string-functions','anchor' => 'function_insert'), + 'INSTR' => array('link' => 'string-functions','anchor' => 'function_instr'), + 'INTERVAL' => array('link' => 'comparison-operators','anchor' => 'function_interval'), + 'IS_FREE_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_is_free_lock'), + 'IS_USED_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_is_used_lock'), + 'IS' => array('link' => 'comparison-operators','anchor' => 'operator_is'), + 'ISNULL' => array('link' => 'comparison-operators','anchor' => 'function_isnull'), + 'LAST_DAY' => array('link' => 'date-and-time-functions','anchor' => 'function_last_day'), + 'LAST_INSERT_ID' => array('link' => 'information-functions','anchor' => 'function_last_insert_id'), + 'LCASE' => array('link' => 'string-functions','anchor' => 'function_lcase'), + 'LEAST' => array('link' => 'comparison-operators','anchor' => 'function_least'), + 'LEFT' => array('link' => 'string-functions','anchor' => 'function_left'), + 'LENGTH' => array('link' => 'string-functions','anchor' => 'function_length'), + 'LIKE' => array('link' => 'string-comparison-functions','anchor' => 'operator_like'), + 'LN' => array('link' => 'mathematical-functions','anchor' => 'function_ln'), + 'LOAD_FILE' => array('link' => 'string-functions','anchor' => 'function_load_file'), + 'LOCALTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_localtime'), + 'LOCALTIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_localtimestamp'), + 'LOCATE' => array('link' => 'string-functions','anchor' => 'function_locate'), + 'LOG10' => array('link' => 'mathematical-functions','anchor' => 'function_log10'), + 'LOG2' => array('link' => 'mathematical-functions','anchor' => 'function_log2'), + 'LOG' => array('link' => 'mathematical-functions','anchor' => 'function_log'), + 'LOWER' => array('link' => 'string-functions','anchor' => 'function_lower'), + 'LPAD' => array('link' => 'string-functions','anchor' => 'function_lpad'), + 'LTRIM' => array('link' => 'string-functions','anchor' => 'function_ltrim'), + 'MAKE_SET' => array('link' => 'string-functions','anchor' => 'function_make_set'), + 'MAKEDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_makedate'), + 'MAKETIME' => array('link' => 'date-and-time-functions','anchor' => 'function_maketime'), + 'MASTER_POS_WAIT' => array('link' => 'miscellaneous-functions','anchor' => 'function_master_pos_wait'), + 'MATCH' => array('link' => 'fulltext-search','anchor' => 'function_match'), + 'MAX' => array('link' => 'group-by-functions','anchor' => 'function_max'), + 'MD5' => array('link' => 'encryption-functions','anchor' => 'function_md5'), + 'MICROSECOND' => array('link' => 'date-and-time-functions','anchor' => 'function_microsecond'), + 'MID' => array('link' => 'string-functions','anchor' => 'function_mid'), + 'MIN' => array('link' => 'group-by-functions','anchor' => 'function_min'), + 'MINUTE' => array('link' => 'date-and-time-functions','anchor' => 'function_minute'), + 'MOD' => array('link' => 'mathematical-functions','anchor' => 'function_mod'), + 'MONTH' => array('link' => 'date-and-time-functions','anchor' => 'function_month'), + 'MONTHNAME' => array('link' => 'date-and-time-functions','anchor' => 'function_monthname'), + 'NAME_CONST' => array('link' => 'miscellaneous-functions','anchor' => 'function_name_const'), + 'NOT' => array('link' => 'logical-operators','anchor' => 'operator_not'), + 'NOW' => array('link' => 'date-and-time-functions','anchor' => 'function_now'), + 'NULLIF' => array('link' => 'control-flow-functions','anchor' => 'function_nullif'), + 'OCT' => array('link' => 'mathematical-functions','anchor' => 'function_oct'), + 'OCTET_LENGTH' => array('link' => 'string-functions','anchor' => 'function_octet_length'), + 'OLD_PASSWORD' => array('link' => 'encryption-functions','anchor' => 'function_old_password'), + 'OR' => array('link' => 'logical-operators','anchor' => 'operator_or'), + 'ORD' => array('link' => 'string-functions','anchor' => 'function_ord'), + 'PASSWORD' => array('link' => 'encryption-functions','anchor' => 'function_password'), + 'PERIOD_ADD' => array('link' => 'date-and-time-functions','anchor' => 'function_period_add'), + 'PERIOD_DIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_period_diff'), + 'PI' => array('link' => 'mathematical-functions','anchor' => 'function_pi'), + 'POSITION' => array('link' => 'string-functions','anchor' => 'function_position'), + 'POW' => array('link' => 'mathematical-functions','anchor' => 'function_pow'), + 'POWER' => array('link' => 'mathematical-functions','anchor' => 'function_power'), + 'QUARTER' => array('link' => 'date-and-time-functions','anchor' => 'function_quarter'), + 'QUOTE' => array('link' => 'string-functions','anchor' => 'function_quote'), + 'RADIANS' => array('link' => 'mathematical-functions','anchor' => 'function_radians'), + 'RAND' => array('link' => 'mathematical-functions','anchor' => 'function_rand'), + 'REGEXP' => array('link' => 'regexp','anchor' => 'operator_regexp'), + 'RELEASE_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_release_lock'), + 'REPEAT' => array('link' => 'string-functions','anchor' => 'function_repeat'), + 'REPLACE' => array('link' => 'string-functions','anchor' => 'function_replace'), + 'REVERSE' => array('link' => 'string-functions','anchor' => 'function_reverse'), + 'RIGHT' => array('link' => 'string-functions','anchor' => 'function_right'), + 'RLIKE' => array('link' => 'regexp','anchor' => 'operator_rlike'), + 'ROUND' => array('link' => 'mathematical-functions','anchor' => 'function_round'), + 'ROW_COUNT' => array('link' => 'information-functions','anchor' => 'function_row_count'), + 'RPAD' => array('link' => 'string-functions','anchor' => 'function_rpad'), + 'RTRIM' => array('link' => 'string-functions','anchor' => 'function_rtrim'), + 'SCHEMA' => array('link' => 'information-functions','anchor' => 'function_schema'), + 'SEC_TO_TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_sec_to_time'), + 'SECOND' => array('link' => 'date-and-time-functions','anchor' => 'function_second'), + 'SESSION_USER' => array('link' => 'information-functions','anchor' => 'function_session_user'), + 'SHA' => array('link' => 'encryption-functions','anchor' => 'function_sha1'), + 'SHA1' => array('link' => 'encryption-functions','anchor' => 'function_sha1'), + 'SIGN' => array('link' => 'mathematical-functions','anchor' => 'function_sign'), + 'SIN' => array('link' => 'mathematical-functions','anchor' => 'function_sin'), + 'SLEEP' => array('link' => 'miscellaneous-functions','anchor' => 'function_sleep'), + 'SOUNDEX' => array('link' => 'string-functions','anchor' => 'function_soundex'), + 'SPACE' => array('link' => 'string-functions','anchor' => 'function_space'), + 'SQRT' => array('link' => 'mathematical-functions','anchor' => 'function_sqrt'), + 'STD' => array('link' => 'group-by-functions','anchor' => 'function_std'), + 'STDDEV_POP' => array('link' => 'group-by-functions','anchor' => 'function_stddev_pop'), + 'STDDEV_SAMP' => array('link' => 'group-by-functions','anchor' => 'function_stddev_samp'), + 'STDDEV' => array('link' => 'group-by-functions','anchor' => 'function_stddev'), + 'STR_TO_DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_str_to_date'), + 'STRCMP' => array('link' => 'string-comparison-functions','anchor' => 'function_strcmp'), + 'SUBDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_subdate'), + 'SUBSTR' => array('link' => 'string-functions','anchor' => 'function_substr'), + 'SUBSTRING_INDEX' => array('link' => 'string-functions','anchor' => 'function_substring_index'), + 'SUBSTRING' => array('link' => 'string-functions','anchor' => 'function_substring'), + 'SUBTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_subtime'), + 'SUM' => array('link' => 'group-by-functions','anchor' => 'function_sum'), + 'SYSDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_sysdate'), + 'SYSTEM_USER' => array('link' => 'information-functions','anchor' => 'function_system_user'), + 'TAN' => array('link' => 'mathematical-functions','anchor' => 'function_tan'), + 'TIME_FORMAT' => array('link' => 'date-and-time-functions','anchor' => 'function_time_format'), + 'TIME_TO_SEC' => array('link' => 'date-and-time-functions','anchor' => 'function_time_to_sec'), + 'TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_time'), + 'TIMEDIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_timediff'), + 'TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_timestamp'), + 'TIMESTAMPADD' => array('link' => 'date-and-time-functions','anchor' => 'function_timestampadd'), + 'TIMESTAMPDIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_timestampdiff'), + 'TO_DAYS' => array('link' => 'date-and-time-functions','anchor' => 'function_to_days'), + 'TRIM' => array('link' => 'string-functions','anchor' => 'function_trim'), + 'TRUNCATE' => array('link' => 'mathematical-functions','anchor' => 'function_truncate'), + 'UCASE' => array('link' => 'string-functions','anchor' => 'function_ucase'), + 'UNCOMPRESS' => array('link' => 'encryption-functions','anchor' => 'function_uncompress'), + 'UNCOMPRESSED_LENGTH' => array('link' => 'encryption-functions','anchor' => 'function_uncompressed_length'), + 'UNHEX' => array('link' => 'string-functions','anchor' => 'function_unhex'), + 'UNIX_TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_unix_timestamp'), + 'UpdateXML' => array('link' => 'xml-functions','anchor' => 'function_updatexml'), + 'UPPER' => array('link' => 'string-functions','anchor' => 'function_upper'), + 'USER' => array('link' => 'information-functions','anchor' => 'function_user'), + 'UTC_DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_utc_date'), + 'UTC_TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_utc_time'), + 'UTC_TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_utc_timestamp'), + 'UUID_SHORT' => array('link' => 'miscellaneous-functions','anchor' => 'function_uuid_short'), + 'UUID' => array('link' => 'miscellaneous-functions','anchor' => 'function_uuid'), + 'VALUES' => array('link' => 'miscellaneous-functions','anchor' => 'function_values'), + 'VAR_POP' => array('link' => 'group-by-functions','anchor' => 'function_var_pop'), + 'VAR_SAMP' => array('link' => 'group-by-functions','anchor' => 'function_var_samp'), + 'VARIANCE' => array('link' => 'group-by-functions','anchor' => 'function_variance'), + 'VERSION' => array('link' => 'information-functions','anchor' => 'function_version'), + 'WEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_week'), + 'WEEKDAY' => array('link' => 'date-and-time-functions','anchor' => 'function_weekday'), + 'WEEKOFYEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_weekofyear'), + 'XOR' => array('link' => 'logical-operators','anchor' => 'operator_xor'), + 'YEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_year'), + 'YEARWEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_yearweek'), + 'SOUNDS_LIKE' => array('link' => 'string-functions','anchor' => 'operator_sounds-like'), + 'IS_NOT_NULL' => array('link' => 'comparison-operators','anchor' => 'operator_is-not-null'), + 'IS_NOT' => array('link' => 'comparison-operators','anchor' => 'operator_is-not'), + 'IS_NULL' => array('link' => 'comparison-operators','anchor' => 'operator_is-null'), + 'NOT_LIKE' => array('link' => 'string-comparison-functions','anchor' => 'operator_not-like'), + 'NOT_REGEXP' => array('link' => 'regexp','anchor' => 'operator_not-regexp'), + 'COUNT_DISTINCT' => array('link' => 'group-by-functions','anchor' => 'function_count-distinct'), + 'NOT_IN' => array('link' => 'comparison-operators','anchor' => 'function_not-in') +); + ?> diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index e05d011..46ae2b2 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2089,6 +2089,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatHtml($arr, $mode='color', $start_token=0, $number_of_tokens=-1) { + global $PMA_SQPdata_operators_docs, $PMA_SQPdata_functions_docs; //DEBUG echo 'in Format<pre>'; print_r($arr); echo '</pre>'; // then check for an array if (! is_array($arr)) { @@ -2180,21 +2181,18 @@ if (! defined('PMA_MINIMUM_COMMON')) { $keywords_priv_list_cnt = 2; if ($number_of_tokens == -1) { - $arraysize = $arr['len']; - } else { - $arraysize = $number_of_tokens; + $number_of_tokens = $arr['len']; } $typearr = array(); - if ($arraysize >= 0) { + if ($number_of_tokens >= 0) { $typearr[0] = ''; $typearr[1] = ''; $typearr[2] = ''; - //$typearr[3] = $arr[0]['type']; $typearr[3] = $arr[$start_token]['type']; } $in_priv_list = false; - for ($i = $start_token; $i < $arraysize; $i++) { + for ($i = $start_token; $i < $number_of_tokens; $i++) { // DEBUG echo "Loop format " . $arr[$i]['data'] . " " . $arr[$i]['type'] . " "; $before = ''; $after = ''; @@ -2205,11 +2203,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { 2 current 3 next */ - if (($i + 1) < $arraysize) { - // array_push($typearr, $arr[$i + 1]['type']); + if (($i + 1) < $number_of_tokens) { $typearr[4] = $arr[$i + 1]['type']; } else { - //array_push($typearr, null); $typearr[4] = ''; } @@ -2285,6 +2281,17 @@ if (! defined('PMA_MINIMUM_COMMON')) { break; case 'punct': $before .= ' '; + if ($docu && isset($PMA_SQPdata_operators_docs[$arr[$i]['data']]) && + ($arr[$i]['data'] != '*' || in_array($arr[$i]['type'], array('digit_integer','digit_float','digit_hex')))) { + $before .= PMA_showMySQLDocu( + 'functions', + $PMA_SQPdata_operators_docs[$arr[$i]['data']]['link'], + false, + $PMA_SQPdata_operators_docs[$arr[$i]['data']]['anchor'], + true); + $after .= '</a>'; + } + // workaround for // select * from mytable limit 0,-1 // (a side effect of this workaround is that @@ -2388,6 +2395,18 @@ if (! defined('PMA_MINIMUM_COMMON')) { $after .= ' '; } break; + case 'alpha_functionName': + $funcname = strtoupper($arr[$i]['data']); + if ($docu && isset($PMA_SQPdata_functions_docs[$funcname])) { + $before .= PMA_showMySQLDocu( + 'functions', + $PMA_SQPdata_functions_docs[$funcname]['link'], + false, + $PMA_SQPdata_functions_docs[$funcname]['anchor'], + true); + $after .= '</a>'; + } + break; case 'alpha_reservedWord': // do not uppercase the reserved word if we are calling // this function in query_only mode, because we need @@ -2544,6 +2563,24 @@ if (! defined('PMA_MINIMUM_COMMON')) { } break; default: + if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))){ + $after .= '</a>'; + $close_docu_link = false; + } else if ($docu && isset($PMA_SQPdata_functions_docs[$arr[$i]['data']])) { + /* Handle multi word statements first */ + if (isset($typearr[4]) && $typearr[4] == 'alpha_reservedWord' && $typearr[3] == 'alpha_reservedWord' && isset($PMA_SQPdata_functions_docs[strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'] . '_' . $arr[$i + 2]['data'])])) { + $tempname = strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'] . '_' . $arr[$i + 2]['data']); + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$tempname]['link'], false, $PMA_SQPdata_functions_docs[$tempname]['anchor'], true); + $close_docu_link = true; + } else if (isset($typearr[3]) && $typearr[3] == 'alpha_reservedWord' && isset($PMA_SQPdata_functions_docs[strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'])])) { + $tempname = strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data']); + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$tempname]['link'], false, $PMA_SQPdata_functions_docs[$tempname]['anchor'], true); + $close_docu_link = true; + } else { + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$arr[$i]['data']]['link'], false, $PMA_SQPdata_functions_docs[$arr[$i]['data']]['anchor'], true); + $after .= '</a>'; + } + } break; } // end switch ($arr[$i]['data']) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3156-gd147fd2
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via d147fd26db0cf8a5965c640c3047494acc2b9d44 (commit) from f2fe4db5f1d100f29152445e4367789707007800 (commit) - Log ----------------------------------------------------------------- commit d147fd26db0cf8a5965c640c3047494acc2b9d44 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 15:01:50 2011 +0200 Update keywords to list from http://dev.mysql.com/doc/refman/5.5/en/reserved-words.html ----------------------------------------------------------------------- Summary of changes: js/codemirror/mode/mysql/mysql.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/codemirror/mode/mysql/mysql.js b/js/codemirror/mode/mysql/mysql.js index 704825e..fd53d6c 100644 --- a/js/codemirror/mode/mysql/mysql.js +++ b/js/codemirror/mode/mysql/mysql.js @@ -127,7 +127,7 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { for (var i = 0; i < words.length; ++i) obj[words[i]] = true; return obj; } - var cKeywords = "accessible action add after against aggregate algorithm all alter analyse analyze and as asc autocommit auto_increment avg_row_length backup begin between binlog both by cascade case change changed charset check checksum collate collation column columns comment commit committed compressed concurrent constraint contains convert create cross current_timestamp database databases day day_hour day_minute day_second definer delayed delay_key_write delete desc describe deterministic distinct distinctrow div do drop dumpfile duplicate dynamic else enclosed end engine engines escape escaped events execute exists explain extended fast fields file first fixed flush for force foreign from full fulltext function gemini gemini_spin_retries global grant grants group having heap high_priority hosts hour hour_minute hour_second identified if ignore in index indexes infile inner insert insert_id insert_method interval into invoker is isolation join key keys kill last_insert_id leading left like limit linear lines load local lock locks logs low_priority maria master master_connect_retry master_host master_log_file master_log_pos master_password master_port master_user match max_connections_per_hour max_queries_per_hour max_rows max_updates_per_hour max_user_connections medium merge minute minute_second min_rows mode modify month mrg_myisam myisam names natural no not null offset on open optimize option optionally or order outer outfile pack_keys page page_checksum partial partition partitions password primary privileges procedure process processlist purge quick raid0 raid_chunks raid_chunksize raid_type range read read_only read_write references regexp reload rename repair repeatable replace replication reset restore restrict return returns revoke right rlike rollback row rows row_format second security select separator serializable session share show shutdown slave soname sounds sql sql_auto_is_null sql_big_result sql_big_selects sql_big_tables sql_buffer_result sql_cache sql_calc_found_rows sql_log_bin sql_log_off sql_log_update sql_low_priority_updates sql_max_join_size sql_no_cache sql_quote_show_create sql_safe_updates sql_select_limit sql_slave_skip_counter sql_small_result sql_warnings start starting status stop storage straight_join string striped super table tables temporary terminated then to trailing transactional truncate type types uncommitted union unique unlock update usage use using values variables view when where with work write xor year_month"; + var cKeywords = "accessible add all alter analyze and as asc asensitive before between bigint binary blob both by call cascade case change char character check collate column condition constraint continue convert create cross current_date current_time current_timestamp current_user cursor database databases day_hour day_microsecond day_minute day_second dec decimal declare default delayed delete desc describe deterministic distinct distinctrow div double drop dual each else elseif enclosed escaped exists exit explain false fetch float float4 float8 for force foreign from fulltext grant group having high_priority hour_microsecond hour_minute hour_second if ignore in index infile inner inout insensitive insert int int1 int2 int3 int4 int8 integer interval into is iterate join key keys kill leading leave left like limit linear lines load localtime localtimestamp lock long longblob longtext loop low_priority master_ssl_verify_server_cert match maxvalue mediumblob mediumint mediumtext middleint minute_microsecond minute_second mod modifies natural not no_write_to_binlog null numeric on optimize option optionally or order out outer outfile precision primary procedure purge range read reads read_write real references regexp release rename repeat replace require resignal restrict return revoke right rlike schema schemas second_microsecond select sensitive separator set show signal smallint spatial specific sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl starting straight_join table terminated then tinyblob tinyint tinytext to trailing trigger true undo union unique unlock unsigned update usage use using utc_date utc_time utc_timestamp values varbinary varchar varcharacter varying when where while with write xor year_month zerofill"; var cFunctions = "abs acos adddate addtime aes_decrypt aes_encrypt area asbinary ascii asin astext atan atan2 avg bdmpolyfromtext bdmpolyfromwkb bdpolyfromtext bdpolyfromwkb benchmark bin bit_and bit_count bit_length bit_or bit_xor boundary buffer cast ceil ceiling centroid char character_length charset char_length coalesce coercibility collation compress concat concat_ws connection_id contains conv convert convert_tz convexhull cos cot count crc32 crosses curdate current_date current_time current_timestamp current_user curtime database date datediff date_add date_diff date_format date_sub day dayname dayofmonth dayofweek dayofyear decode default degrees des_decrypt des_encrypt difference dimension disjoint distance elt encode encrypt endpoint envelope equals exp export_set exteriorring extract extractvalue field find_in_set floor format found_rows from_days from_unixtime geomcollfromtext geomcollfromwkb geometrycollection geometrycollectionfromtext geometrycollectionfromwkb geometryfromtext geometryfromwkb geometryn geometrytype geomfromtext geomfromwkb get_format get_lock glength greatest group_concat group_unique_users hex hour if ifnull inet_aton inet_ntoa insert instr interiorringn intersection intersects interval isclosed isempty isnull isring issimple is_free_lock is_used_lock last_day last_insert_id lcase least left length linefromtext linefromwkb linestring linestringfromtext linestringfromwkb ln load_file localtime localtimestamp locate log log10 log2 lower lpad ltrim makedate maketime make_set master_pos_wait max mbrcontains mbrdisjoint mbrequal mbrintersects mbroverlaps mbrtouches mbrwithin md5 microsecond mid min minute mlinefromtext mlinefromwkb mod month monthname mpointfromtext mpointfromwkb mpolyfromtext mpolyfromwkb multilinestring multilinestringfromtext multilinestringfromwkb multipoint multipointfromtext multipointfromwkb multipolygon multipolygonfromtext multipolygonfromwkb name_const now nullif numgeometries numinteriorrings numpoints oct octet_length old_password ord overlaps password period_add period_diff pi point pointfromtext pointfromwkb pointn pointonsurface polyfromtext polyfromwkb polygon polygonfromtext polygonfromwkb position pow power quarter quote radians rand related release_lock repeat replace reverse right round row_count rpad rtrim schema second sec_to_time session_user sha sha1 sign sin sleep soundex space sqrt srid startpoint std stddev stddev_pop stddev_samp strcmp str_to_date subdate substr substring substring_index subtime sum symdifference sysdate system_user tan time timediff timestamp timestampadd timestampdiff time_format time_to_sec touches to_days trim truncate ucase uncompress uncompressed_length unhex unique_users unix_timestamp updatexml upper user utc_date utc_time utc_timestamp uuid variance var_pop var_samp version week weekday weekofyear within x y year yearweek"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3155-gf2fe4db
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via f2fe4db5f1d100f29152445e4367789707007800 (commit) from 4603ca7001b1d39389f622671e53ee957b2adf66 (commit) - Log ----------------------------------------------------------------- commit f2fe4db5f1d100f29152445e4367789707007800 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 14:11:11 2011 +0200 Remove not used code ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 432aa78..b1bd457 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -681,8 +681,6 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a { global $sql_drop_table; global $sql_backquotes; - global $cfgRelation; - global $sql_constraints; global $sql_constraints_query; // just the text of the query global $sql_drop_foreign_keys; @@ -1044,7 +1042,6 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { global $sql_backquotes; - global $rows_cnt; global $current_row; $formatted_table_name = (isset($GLOBALS['sql_backquotes'])) @@ -1067,9 +1064,6 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) return true; } - // it's not a VIEW - $buffer = ''; - // analyze the query to get the true column names, not the aliases // (this fixes an undefined index, also if Complete inserts // are used, we did not get the true column name in case of aliases) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3154-g4603ca7
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via 4603ca7001b1d39389f622671e53ee957b2adf66 (commit) from d14e49f8271c25b11cdc98962e6b24338aaef90e (commit) - Log ----------------------------------------------------------------- commit 4603ca7001b1d39389f622671e53ee957b2adf66 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 14:03:13 2011 +0200 Factor out common code for PMA_DBI_try_query. PMA_DBI_try_query is now shared for mysql and mysqli as the only difference there was real call to the database, the rest was same (timing, tracking, debugging,..). ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 64 +++++++++++++++++++++++++++++++ libraries/dbi/mysql.dbi.lib.php | 60 ++-------------------------- libraries/dbi/mysqli.dbi.lib.php | 70 ++------------------------------- 3 files changed, 74 insertions(+), 120 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 57c8568..ec82416 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -76,6 +76,70 @@ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows } /** + * runs a query and returns the result + * + * @param string $query query to run + * @param resource $link mysql link resource + * @param integer $options + * @return mixed + */ +function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) +{ + if (empty($link)) { + if (isset($GLOBALS['userlink'])) { + $link = $GLOBALS['userlink']; + } else { + return false; + } + } + + if ($GLOBALS['cfg']['DBG']['sql']) { + $time = microtime(true); + } + + $r = PMA_DBI_real_query($query, $link, $options); + + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + } + + if ($GLOBALS['cfg']['DBG']['sql']) { + $time = microtime(true) - $time; + + $hash = md5($query); + + if (isset($_SESSION['debug']['queries'][$hash])) { + $_SESSION['debug']['queries'][$hash]['count']++; + } else { + $_SESSION['debug']['queries'][$hash] = array(); + $_SESSION['debug']['queries'][$hash]['count'] = 1; + $_SESSION['debug']['queries'][$hash]['query'] = $query; + $_SESSION['debug']['queries'][$hash]['time'] = $time; + } + + $trace = array(); + foreach (debug_backtrace() as $trace_step) { + $trace[] = PMA_Error::relPath($trace_step['file']) . '#' + . $trace_step['line'] . ': ' + . (isset($trace_step['class']) ? $trace_step['class'] : '') + //. (isset($trace_step['object']) ? get_class($trace_step['object']) : '') + . (isset($trace_step['type']) ? $trace_step['type'] : '') + . (isset($trace_step['function']) ? $trace_step['function'] : '') + . '(' + . (isset($trace_step['params']) ? implode(', ', $trace_step['params']) : '') + . ')' + ; + } + $_SESSION['debug']['queries'][$hash]['trace'][] = $trace; + } + if ($r != false && PMA_Tracker::isActive() == true ) { + PMA_Tracker::handleQuery($query); + } + + return $r; +} + +/** * converts charset of a mysql message, usually coming from mysql_error(), * into PMA charset, usally UTF-8 * uses language to charset mapping from mysql/share/errmsg.txt diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index e96e167..e84e6b0 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -154,65 +154,15 @@ function PMA_DBI_select_db($dbname, $link = null) * @param integer $options * @return mixed */ -function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) +function PMA_DBI_real_query($query, $link, $options) { - if (empty($link)) { - if (isset($GLOBALS['userlink'])) { - $link = $GLOBALS['userlink']; - } else { - return false; - } - } - - if ($GLOBALS['cfg']['DBG']['sql']) { - $time = microtime(true); - } if ($options == ($options | PMA_DBI_QUERY_STORE)) { - $r = mysql_query($query, $link); + return mysql_query($query, $link); } elseif ($options == ($options | PMA_DBI_QUERY_UNBUFFERED)) { - $r = mysql_unbuffered_query($query, $link); + return mysql_unbuffered_query($query, $link); } else { - $r = mysql_query($query, $link); - } - - if ($cache_affected_rows) { - $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + return mysql_query($query, $link); } - - if ($GLOBALS['cfg']['DBG']['sql']) { - $time = microtime(true) - $time; - - $hash = md5($query); - - if (isset($_SESSION['debug']['queries'][$hash])) { - $_SESSION['debug']['queries'][$hash]['count']++; - } else { - $_SESSION['debug']['queries'][$hash] = array(); - $_SESSION['debug']['queries'][$hash]['count'] = 1; - $_SESSION['debug']['queries'][$hash]['query'] = $query; - $_SESSION['debug']['queries'][$hash]['time'] = $time; - } - - $trace = array(); - foreach (debug_backtrace() as $trace_step) { - $trace[] = PMA_Error::relPath($trace_step['file']) . '#' - . $trace_step['line'] . ': ' - . (isset($trace_step['class']) ? $trace_step['class'] : '') - //. (isset($trace_step['object']) ? get_class($trace_step['object']) : '') - . (isset($trace_step['type']) ? $trace_step['type'] : '') - . (isset($trace_step['function']) ? $trace_step['function'] : '') - . '(' - . (isset($trace_step['params']) ? implode(', ', $trace_step['params']) : '') - . ')' - ; - } - $_SESSION['debug']['queries'][$hash]['trace'][] = $trace; - } - if ($r != false && PMA_Tracker::isActive() == true ) { - PMA_Tracker::handleQuery($query); - } - - return $r; } function PMA_DBI_fetch_array($result) @@ -406,7 +356,7 @@ function PMA_DBI_insert_id($link = null) * @uses $GLOBALS['userlink'] * @uses mysql_affected_rows() * @param object mysql $link the mysql object - * @param boolean $get_from_cache + * @param boolean $get_from_cache * @return string integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index a40e32d..2418fd2 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -164,18 +164,15 @@ function PMA_DBI_select_db($dbname, $link = null) * * @uses PMA_DBI_QUERY_STORE * @uses PMA_DBI_QUERY_UNBUFFERED - * @uses $GLOBALS['userlink'] * @uses MYSQLI_STORE_RESULT * @uses MYSQLI_USE_RESULT * @uses mysqli_query() - * @uses defined() * @param string $query query to execute * @param object mysqli $link mysqli object * @param integer $options - * @param boolean $cache_affected_rows * @return mixed true, false or result object */ -function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) +function PMA_DBI_real_query($query, $link, $options) { if ($options == ($options | PMA_DBI_QUERY_STORE)) { $method = MYSQLI_STORE_RESULT; @@ -185,64 +182,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r $method = 0; } - if (empty($link)) { - if (isset($GLOBALS['userlink'])) { - $link = $GLOBALS['userlink']; - } else { - return false; - } - } - - if ($GLOBALS['cfg']['DBG']['sql']) { - $time = microtime(true); - } - $r = mysqli_query($link, $query, $method); - - if ($cache_affected_rows) { - $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); - } - - if ($GLOBALS['cfg']['DBG']['sql']) { - $time = microtime(true) - $time; - - $hash = md5($query); - - if (isset($_SESSION['debug']['queries'][$hash])) { - $_SESSION['debug']['queries'][$hash]['count']++; - } else { - $_SESSION['debug']['queries'][$hash] = array(); - $_SESSION['debug']['queries'][$hash]['count'] = 1; - $_SESSION['debug']['queries'][$hash]['query'] = $query; - $_SESSION['debug']['queries'][$hash]['time'] = $time; - } - - $trace = array(); - foreach (debug_backtrace() as $trace_step) { - $trace[] = PMA_Error::relPath($trace_step['file']) . '#' - . $trace_step['line'] . ': ' - . (isset($trace_step['class']) ? $trace_step['class'] : '') - //. (isset($trace_step['object']) ? get_class($trace_step['object']) : '') - . (isset($trace_step['type']) ? $trace_step['type'] : '') - . (isset($trace_step['function']) ? $trace_step['function'] : '') - . '(' - . (isset($trace_step['params']) ? implode(', ', $trace_step['params']) : '') - . ')' - ; - } - $_SESSION['debug']['queries'][$hash]['trace'][] = $trace; - } - - if ($r != false && PMA_Tracker::isActive() == true ) { - PMA_Tracker::handleQuery($query); - } - - return $r; - - // From the PHP manual: - // "note: returns true on success or false on failure. For SELECT, - // SHOW, DESCRIBE or EXPLAIN, mysqli_query() will return a result object" - // so, do not use the return value to feed mysqli_num_rows() if it's - // a boolean + return mysqli_query($link, $query, $method); } /** @@ -452,9 +392,9 @@ function PMA_DBI_insert_id($link = '') return false; } } - // When no controluser is defined, using mysqli_insert_id($link) + // When no controluser is defined, using mysqli_insert_id($link) // does not always return the last insert id due to a mixup with - // the tracking mechanism, but this works: + // the tracking mechanism, but this works: return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link); // Curiously, this problem does not happen with the mysql extension but // there is another problem with BIGINT primary keys so PMA_DBI_insert_id() @@ -467,7 +407,7 @@ function PMA_DBI_insert_id($link = '') * @uses $GLOBALS['userlink'] * @uses mysqli_affected_rows() * @param object mysqli $link the mysqli object - * @param boolean $get_from_cache + * @param boolean $get_from_cache * @return string integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3153-gd14e49f
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via d14e49f8271c25b11cdc98962e6b24338aaef90e (commit) from 3cf4830bbb94ce8fe7078f4a3f4fbac1c6253a8c (commit) - Log ----------------------------------------------------------------- commit d14e49f8271c25b11cdc98962e6b24338aaef90e Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 13:47:00 2011 +0200 Simplify code ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 55d330e..432aa78 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -449,7 +449,11 @@ function PMA_exportHeader() . PMA_exportComment('version ' . PMA_VERSION) . PMA_exportComment('http://www.phpmyadmin.net') . PMA_exportComment(); - $head .= empty($cfg['Server']['port']) ? PMA_exportComment(__('Host') . ': ' . $cfg['Server']['host']) : PMA_exportComment(__('Host') . ': ' . $cfg['Server']['host'] . ':' . $cfg['Server']['port']); + $host_string = __('Host') . ': ' . $cfg['Server']['host']; + if (!empty($cfg['Server']['port'])) { + $host_string .= ':' . $cfg['Server']['port']; + } + $head .= PMA_exportComment($host_string); $head .= PMA_exportComment(__('Generation Time') . ': ' . PMA_localisedDate()) . PMA_exportComment(__('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3)) hooks/post-receive -- phpMyAdmin

1 0