Git

git@phpmyadmin.net

12 participants
38218 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10928-g60890fe
by Marc Delisle 18 Nov '10

18 Nov '10

The branch, master has been updated via 60890fe0421ef29df6fda0569b3d54d872bc7ee2 (commit) from 42ed6447498db6dc4552262ae2c976a85230efd0 (commit) - Log ----------------------------------------------------------------- commit 60890fe0421ef29df6fda0569b3d54d872bc7ee2 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 06:20:38 2010 -0500 use standard term for this ----------------------------------------------------------------------- Summary of changes: libraries/config/messages.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 437ca71..6f6a8ed 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -199,7 +199,7 @@ $strConfigForm_Server_desc = __('Enter server connection parameters'); $strConfigForm_Server_pmadb = __('Configuration storage'); $strConfigForm_Server_pmadb_desc = __('Configure phpMyAdmin configuration storage to gain access to additional features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration storage[/a] in documentation'); $strConfigForm_Server_tracking = __('Changes tracking'); -$strConfigForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.'); +$strConfigForm_Server_tracking_desc = __('Tracking of changes made in database. Requires the phpMyAdmin configuration storage.'); $strConfigFormset_Export = __('Customize export options'); $strConfigFormset_Features = __('Features'); $strConfigFormset_Import = __('Customize import defaults'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10927-g42ed644
by Michal Čihař 18 Nov '10

18 Nov '10

The branch, master has been updated via 42ed6447498db6dc4552262ae2c976a85230efd0 (commit) via 390c0df0f78f074f7f8120be962c948bffb3155d (commit) via 7609bd92163caa29c6fb0352bf173c317c1e8c11 (commit) via 3f7e1a88ed56b4cad3570ffa2d5bb06a609deaef (commit) via 14fe585021b4f3e63e198dcd4f1d35efc387de39 (commit) via 52d3f2a940ad1bc19c2a712f8fef093b8cf97f1d (commit) via b47d45b3609057a9c6a391dcdee863000fba054d (commit) via c2e2a62c54c4dce4ca29ebb76f6c16884921ee0d (commit) via 3fbb1d6ad79ec04f252095d741af0d8671be021a (commit) via 4c60168a3e0e11f95c598e580047aeab2f813322 (commit) via a57c162b3a802da77d338fc1c3c287a47fc4072e (commit) via d5798b146c142dfc716f49f00b954e783a095711 (commit) via 4593b9e7c8d9f81b9e2d5e8fb7b31dc75307767c (commit) via 2150f3f80fb8548d9e9bd1c0ac3673c0fc692c14 (commit) via 83d78edcddddf834ca3e67920fc11e2914c17d43 (commit) via 1acc2445cbd9657df0d574ae654514506cbd0524 (commit) via 6a0e7366f6ab9fa8202d40831b5a7bc5c3d38475 (commit) via 00a7555f27e7d90d1eca9e1be83fd44a8f2999cf (commit) via d9afea5b8e96f861da0899aef2125c0b91779b9f (commit) via 827151b4cda0c0312bf7ea8a489aa3917fa23e90 (commit) via 68fe0006eebcc039dc0ba50ee5a720f12ab62791 (commit) via 27abef2fec6533cfd05f3a0b65b505882a37cd93 (commit) via 2c194fd30c869135f956f9c927ad707ef1ab1784 (commit) via 4e6c2d9af10d31fc117b61aa4096e2951da17ca7 (commit) via b374ff847d65149d1ba038e7d8c5672c3f659e90 (commit) via 958ee26ae5ff751fc2e78f5a5fea8cb49b5586d8 (commit) via 31654c8037f0ae1c70f3f19741b56907de3b7c46 (commit) via 61a51c5798114a36c5341e6edbd91c0de2a06658 (commit) via 32d548337bb9ba434eb31059f8e93b396f1cd080 (commit) via 6e157e6aa674788230508a8b6ce9d2e460d38727 (commit) via c84d07d6e4f9b54fb61ee490f8f0e95208c34a26 (commit) via bf95ca0f9becf71d57bf35d080f5760de85003de (commit) via 6ddfce3ff23605a882a8d54cbf48827604c3adac (commit) via ec6ecb96220f0d0d11cc89f674622f832eced3ac (commit) via 632484c08cec76a0ba537f56b3a4d4694b2a4a2c (commit) via d8480b46cc23b617be48d7a4a9dfd658ac7d3c5a (commit) via 75e84c3d9072a512d9f8751a25707350218a977a (commit) via 59a971d776f834a5079ae5e2035cae4d21a87203 (commit) via e0c8090f32dae48374fed98518200b123c941646 (commit) via 6805bb5ed62241833eaeccff525587d7853a06ad (commit) via 8ad8e0daed8ec113d8fe8533242ebd2303c7bb7c (commit) via bbd9d5f7a440dd9cf920de70ae6c57cefe10b662 (commit) via d17a5ed1cb37caf51b8703f2394917b05d35f2cf (commit) via 23f028c5efe58d4a39c3b65fb41849c95235f83a (commit) via 1787fd4799ec289e320186766218100caa18683c (commit) via 66012c87eebfc5b8391ab9443c2013b1ecca7da7 (commit) via fd6fafe0bc927a64bbf028c48e3f229621afcc2a (commit) via 6d7cd35323d5561c799c3afd64a5a9524a32880b (commit) via 41513b569b2b33850d2fb7884cc229dd5efd747e (commit) via 56fba9b1ac56758a5739e3618ede84b20eff61ca (commit) via 0c8155c9486245c6613b3c42cb4b862d04add66a (commit) via bed4de33d07cf724d3b3240f4cee1bd6771ae640 (commit) via 090be872cb2bae9d0a34dd9f58bd78fe73b55956 (commit) via 5f6fd0d743d12cf70e86b46484bc4460c55da636 (commit) via 1d3d0bd526a906642ced1ea589127740fef8e84d (commit) via 237d650c6830a560da8be6b2cafeac57de3f818d (commit) via ef33c541e51ce7c0390de0d4728180ad58a73247 (commit) via ad98c17d8712104aba92abe8ba0b23e733c2fe31 (commit) via e9047318249e934082fe55f2643997dde5bf52f4 (commit) via babb034ead052ec1a895176721a68cce906d9b2b (commit) via 7f2c18ebfc825ab0771869370720b506a014b277 (commit) via b620023c82c919bc9d8e060e7511284e9f1dcad0 (commit) via a697246d5ec95e66c032d1913fb45b78c7493213 (commit) from 0132e3317701e017360ef135001048863a3c6452 (commit) - Log ----------------------------------------------------------------- commit 42ed6447498db6dc4552262ae2c976a85230efd0 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:15:50 2010 +0200 Translation update done using Pootle. commit 390c0df0f78f074f7f8120be962c948bffb3155d Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:15:32 2010 +0200 Translation update done using Pootle. commit 7609bd92163caa29c6fb0352bf173c317c1e8c11 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:14:46 2010 +0200 Translation update done using Pootle. commit 3f7e1a88ed56b4cad3570ffa2d5bb06a609deaef Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:14:39 2010 +0200 Translation update done using Pootle. commit 14fe585021b4f3e63e198dcd4f1d35efc387de39 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:14:17 2010 +0200 Translation update done using Pootle. commit 52d3f2a940ad1bc19c2a712f8fef093b8cf97f1d Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:13:24 2010 +0200 Translation update done using Pootle. commit b47d45b3609057a9c6a391dcdee863000fba054d Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:13:00 2010 +0200 Translation update done using Pootle. commit c2e2a62c54c4dce4ca29ebb76f6c16884921ee0d Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:11:39 2010 +0200 Translation update done using Pootle. commit 3fbb1d6ad79ec04f252095d741af0d8671be021a Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:11:19 2010 +0200 Translation update done using Pootle. commit 4c60168a3e0e11f95c598e580047aeab2f813322 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:08:32 2010 +0200 Translation update done using Pootle. commit a57c162b3a802da77d338fc1c3c287a47fc4072e Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:08:22 2010 +0200 Translation update done using Pootle. commit d5798b146c142dfc716f49f00b954e783a095711 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:08:14 2010 +0200 Translation update done using Pootle. commit 4593b9e7c8d9f81b9e2d5e8fb7b31dc75307767c Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:08:03 2010 +0200 Translation update done using Pootle. commit 2150f3f80fb8548d9e9bd1c0ac3673c0fc692c14 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:07:54 2010 +0200 Translation update done using Pootle. commit 83d78edcddddf834ca3e67920fc11e2914c17d43 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 18 01:06:12 2010 +0200 Translation update done using Pootle. commit 1acc2445cbd9657df0d574ae654514506cbd0524 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 21:02:58 2010 +0200 Translation update done using Pootle. commit 6a0e7366f6ab9fa8202d40831b5a7bc5c3d38475 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 21:02:51 2010 +0200 Translation update done using Pootle. commit 00a7555f27e7d90d1eca9e1be83fd44a8f2999cf Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 21:02:26 2010 +0200 Translation update done using Pootle. commit d9afea5b8e96f861da0899aef2125c0b91779b9f Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 21:01:34 2010 +0200 Translation update done using Pootle. commit 827151b4cda0c0312bf7ea8a489aa3917fa23e90 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 21:00:58 2010 +0200 Translation update done using Pootle. commit 68fe0006eebcc039dc0ba50ee5a720f12ab62791 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 21:00:47 2010 +0200 Translation update done using Pootle. commit 27abef2fec6533cfd05f3a0b65b505882a37cd93 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 21:00:34 2010 +0200 Translation update done using Pootle. commit 2c194fd30c869135f956f9c927ad707ef1ab1784 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 21:00:10 2010 +0200 Translation update done using Pootle. commit 4e6c2d9af10d31fc117b61aa4096e2951da17ca7 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:59:40 2010 +0200 Translation update done using Pootle. commit b374ff847d65149d1ba038e7d8c5672c3f659e90 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:58:18 2010 +0200 Translation update done using Pootle. commit 958ee26ae5ff751fc2e78f5a5fea8cb49b5586d8 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:57:33 2010 +0200 Translation update done using Pootle. commit 31654c8037f0ae1c70f3f19741b56907de3b7c46 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:57:01 2010 +0200 Translation update done using Pootle. commit 61a51c5798114a36c5341e6edbd91c0de2a06658 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:56:59 2010 +0200 Translation update done using Pootle. commit 32d548337bb9ba434eb31059f8e93b396f1cd080 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:56:24 2010 +0200 Translation update done using Pootle. commit 6e157e6aa674788230508a8b6ce9d2e460d38727 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:55:29 2010 +0200 Translation update done using Pootle. commit c84d07d6e4f9b54fb61ee490f8f0e95208c34a26 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:55:23 2010 +0200 Translation update done using Pootle. commit bf95ca0f9becf71d57bf35d080f5760de85003de Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:55:05 2010 +0200 Translation update done using Pootle. commit 6ddfce3ff23605a882a8d54cbf48827604c3adac Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:55:00 2010 +0200 Translation update done using Pootle. commit ec6ecb96220f0d0d11cc89f674622f832eced3ac Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:54:12 2010 +0200 Translation update done using Pootle. commit 632484c08cec76a0ba537f56b3a4d4694b2a4a2c Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:53:07 2010 +0200 Translation update done using Pootle. commit d8480b46cc23b617be48d7a4a9dfd658ac7d3c5a Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:51:45 2010 +0200 Translation update done using Pootle. commit 75e84c3d9072a512d9f8751a25707350218a977a Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:51:01 2010 +0200 Translation update done using Pootle. commit 59a971d776f834a5079ae5e2035cae4d21a87203 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:50:10 2010 +0200 Translation update done using Pootle. commit e0c8090f32dae48374fed98518200b123c941646 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:49:03 2010 +0200 Translation update done using Pootle. commit 6805bb5ed62241833eaeccff525587d7853a06ad Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:48:17 2010 +0200 Translation update done using Pootle. commit 8ad8e0daed8ec113d8fe8533242ebd2303c7bb7c Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:47:06 2010 +0200 Translation update done using Pootle. commit bbd9d5f7a440dd9cf920de70ae6c57cefe10b662 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:46:50 2010 +0200 Translation update done using Pootle. commit d17a5ed1cb37caf51b8703f2394917b05d35f2cf Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:46:01 2010 +0200 Translation update done using Pootle. commit 23f028c5efe58d4a39c3b65fb41849c95235f83a Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:45:24 2010 +0200 Translation update done using Pootle. commit 1787fd4799ec289e320186766218100caa18683c Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:45:09 2010 +0200 Translation update done using Pootle. commit 66012c87eebfc5b8391ab9443c2013b1ecca7da7 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:43:03 2010 +0200 Translation update done using Pootle. commit fd6fafe0bc927a64bbf028c48e3f229621afcc2a Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:42:43 2010 +0200 Translation update done using Pootle. commit 6d7cd35323d5561c799c3afd64a5a9524a32880b Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:42:35 2010 +0200 Translation update done using Pootle. commit 41513b569b2b33850d2fb7884cc229dd5efd747e Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:42:26 2010 +0200 Translation update done using Pootle. commit 56fba9b1ac56758a5739e3618ede84b20eff61ca Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:42:15 2010 +0200 Translation update done using Pootle. commit 0c8155c9486245c6613b3c42cb4b862d04add66a Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:41:58 2010 +0200 Translation update done using Pootle. commit bed4de33d07cf724d3b3240f4cee1bd6771ae640 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:41:39 2010 +0200 Translation update done using Pootle. commit 090be872cb2bae9d0a34dd9f58bd78fe73b55956 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:41:29 2010 +0200 Translation update done using Pootle. commit 5f6fd0d743d12cf70e86b46484bc4460c55da636 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:41:18 2010 +0200 Translation update done using Pootle. commit 1d3d0bd526a906642ced1ea589127740fef8e84d Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:40:36 2010 +0200 Translation update done using Pootle. commit 237d650c6830a560da8be6b2cafeac57de3f818d Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:40:30 2010 +0200 Translation update done using Pootle. commit ef33c541e51ce7c0390de0d4728180ad58a73247 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:40:12 2010 +0200 Translation update done using Pootle. commit ad98c17d8712104aba92abe8ba0b23e733c2fe31 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:39:09 2010 +0200 Translation update done using Pootle. commit e9047318249e934082fe55f2643997dde5bf52f4 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:38:51 2010 +0200 Translation update done using Pootle. commit babb034ead052ec1a895176721a68cce906d9b2b Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:38:37 2010 +0200 Translation update done using Pootle. commit 7f2c18ebfc825ab0771869370720b506a014b277 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:38:28 2010 +0200 Translation update done using Pootle. commit b620023c82c919bc9d8e060e7511284e9f1dcad0 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:35:29 2010 +0200 Translation update done using Pootle. commit a697246d5ec95e66c032d1913fb45b78c7493213 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Wed Nov 17 20:34:58 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 51 ++++++++++++++++------------ po/lt.po | 111 +++++++++++++++++++++++++++---------------------------------- 2 files changed, 78 insertions(+), 84 deletions(-) diff --git a/po/fr.po b/po/fr.po index cac0635..e223c5d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-12 14:06+0100\n" -"PO-Revision-Date: 2010-11-12 12:43+0200\n" +"PO-Revision-Date: 2010-11-18 01:15+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -2300,7 +2300,7 @@ msgstr "Nombre de colonnes pour les textareas CHAR/VARCHAR)" #: libraries/config/messages.inc.php:33 msgid "CHAR textarea columns" -msgstr "Taille horizontale pour un textarea" +msgstr "Taille horizontale pour un textarea contenant un CHAR" #: libraries/config/messages.inc.php:34 msgid "Number of rows for CHAR/VARCHAR textareas" @@ -2308,7 +2308,7 @@ msgstr "Nombre de lignes pour les textareas CHAR/VARCHAR)" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea rows" -msgstr "Taille verticale pour un textarea" +msgstr "Taille verticale pour un textarea contenant un CHAR" #: libraries/config/messages.inc.php:36 msgid "Check config file permissions" @@ -2389,11 +2389,11 @@ msgstr "Onglet par défaut pour tables" #: libraries/config/messages.inc.php:52 msgid "Show binary contents as HEX by default" -msgstr "Montrer par défaut le contenu binaire en hexadécimal" +msgstr "Montrer par défaut le contenu binaire en hexadécimal (HEX)" #: libraries/config/messages.inc.php:53 libraries/display_tbl.lib.php:597 msgid "Show binary contents as HEX" -msgstr "Montrer le contenu binaire en hexadécimal" +msgstr "Montrer le contenu binaire en hexadécimal (HEX)" #: libraries/config/messages.inc.php:54 msgid "Show database listing as a list instead of a drop down" @@ -2499,7 +2499,7 @@ msgstr "Remplacer NULL par" #: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:80 msgid "Remove CRLF characters within columns" -msgstr "Enlève les caractères de fin de ligne à l'intérieur des colonnes" +msgstr "Enlève les caractères de fin de ligne (CRLF) à l'intérieur des colonnes" #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:240 #: libraries/config/messages.inc.php:248 libraries/import/csv.php:61 @@ -3644,7 +3644,9 @@ msgstr "Masquer les bases de données" msgid "" "Leave blank for no SQL query history support, suggested: [kbd]pma_history[/" "kbd]" -msgstr "Laisser vider pour désactiver, suggéré : [kbd]pma_history[/kbd]" +msgstr "" +"Laisser vider pour désactiver l'historique des requêtes SQL, suggéré : " +"[kbd]pma_history[/kbd]" #: libraries/config/messages.inc.php:384 msgid "SQL query history table" @@ -3700,7 +3702,9 @@ msgstr "Mot de passe pour méthode config" #: libraries/config/messages.inc.php:394 msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]" -msgstr "Laisser vider pour désactiver, suggéré : [kbd]pma_pdf_pages[/kbd]" +msgstr "" +"Laisser vider pour désactiver le support des schémas en PDF, suggéré : " +"[kbd]pma_pdf_pages[/kbd]" #: libraries/config/messages.inc.php:395 msgid "PDF schema: pages table" @@ -3980,7 +3984,8 @@ msgstr "Afficher les informations détaillées sur le serveur MySQL" #: libraries/config/messages.inc.php:447 msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed" msgstr "" -"Détermine si les requêtes générées par phpMyAdmin devraient être affichées" +"Détermine si les requêtes SQL générées par phpMyAdmin devraient être " +"affichées" #: libraries/config/messages.inc.php:448 msgid "Show SQL queries" @@ -4654,9 +4659,9 @@ msgid "" "to the PHP timeout limit. <i>(This might be good way to import large files, " "however it can break transactions.)</i>" msgstr "" -"Permettre l'interruption de l'importation si la limite de temps est sur le " -"point d'être atteinte. Ceci pourrait aider à importer des fichiers " -"volumineux, au détriment du respect des transactions." +"Permettre l'interruption de l'importation si la limite de temps configurée " +"dans PHP est sur le point d'être atteinte. Ceci pourrait aider à importer " +"des fichiers volumineux, au détriment du respect des transactions." #: libraries/display_import.lib.php:228 msgid "Number of rows to skip, starting from the first row:" @@ -5953,7 +5958,7 @@ msgstr "" #: libraries/relation.lib.php:125 libraries/sql_query_form.lib.php:406 msgid "Bookmarked SQL query" -msgstr "Requêtes en signets" +msgstr "Requêtes SQL en signets" #: libraries/relation.lib.php:129 querywindow.php:98 querywindow.php:205 msgid "SQL history" @@ -6315,7 +6320,7 @@ msgstr "Exécuter une ou des requêtes SQL sur le serveur %s" #: libraries/sql_query_form.lib.php:237 libraries/sql_query_form.lib.php:261 #, php-format msgid "Run SQL query/queries on database %s" -msgstr "Exécuter une ou des <b>requêtes</b> sur la base %s" +msgstr "Exécuter une ou des requêtes SQL sur la base %s" #: libraries/sql_query_form.lib.php:297 msgid "Columns" @@ -6323,7 +6328,7 @@ msgstr "Colonnes" #: libraries/sql_query_form.lib.php:332 sql.php:846 sql.php:847 sql.php:864 msgid "Bookmark this SQL query" -msgstr "Conserver cette requête dans les signets" +msgstr "Conserver cette requête SQL dans les signets" #: libraries/sql_query_form.lib.php:339 sql.php:858 msgid "Let every user access this bookmark" @@ -6643,8 +6648,8 @@ msgid "" "the link." msgstr "" "Affiche un lien, la colonne contient le nom du fichier; en première option, " -"un préfixe comme «http://www.example.com/», en seconde option, un titre pour " -"le lien." +"un préfixe URL comme «http://www.example.com/», en seconde option, un titre " +"pour le lien." #: libraries/transformations/text_plain__longToIpv4.inc.php:9 msgid "" @@ -6848,7 +6853,7 @@ msgstr "" "vous aurez terminé la configuration de phpMyAdmin." #: main.php:304 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage has been deactivated. To find out " #| "why click %shere%s." @@ -6856,8 +6861,9 @@ msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. To find out why click %shere%s." msgstr "" -"Le stockage des configurations phpMyAdmin a été désactivé. Pour une analyse " -"du problème, cliquez %sici%s." +"Le stockage des configurations phpMyAdmin n'est pas complètement configuré, " +"certaines fonctionnalités ont été désactivée. Pour en connaître la raison, " +"cliquez %sici%s." #: main.php:319 msgid "" @@ -6875,8 +6881,9 @@ msgid "" "Your PHP MySQL library version %s differs from your MySQL server version %s. " "This may cause unpredictable behavior." msgstr "" -"La version de votre bibliothèque MySQL (%s) diffère de la version de votre " -"serveur MySQL (%s). Ceci peut occasionner un comportement imprévisible." +"La version de votre bibliothèque MySQL (%s) de PHP diffère de la version de " +"votre serveur MySQL (%s). Ceci peut occasionner un comportement " +"imprévisible." #: main.php:346 #, php-format diff --git a/po/lt.po b/po/lt.po index 7bc065f..bf242bb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-12 14:06+0100\n" -"PO-Revision-Date: 2010-10-26 13:51+0200\n" +"PO-Revision-Date: 2010-11-17 21:02+0200\n" "Last-Translator: <edgaras.janusauskas(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -229,7 +229,7 @@ msgstr "Spausdinti" #: db_export.php:30 msgid "View dump (schema) of database" -msgstr "Sukurti, peržiūrėti duombazės atvaizdį" +msgstr "Peržiūrėti duomenų bazės atvaizdį" #: db_export.php:34 db_printview.php:94 db_qbe.php:98 db_tracking.php:47 #: export.php:371 navigation.php:320 @@ -571,10 +571,9 @@ msgid "Inside column:" msgstr "Stulpelio viduje:" #: db_structure.php:59 -#, fuzzy #| msgid "No tables found in database." msgid "No tables found in database" -msgstr "Duombazėje nerasta lentelių." +msgstr "Duomenų bazėje nerasta jokių lentelių." #: db_structure.php:270 tbl_operations.php:658 #, php-format @@ -605,8 +604,8 @@ msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." msgstr "" -"Šis rodinys turi mažiausiai tiek eilučių. Daugiau informacijos " -"%sdokumentacijoje%s." +"Šis rodinys turi mažiausiai tiek eilučių. Daugiau informacijos %" +"sdokumentacijoje%s." #: db_structure.php:386 db_structure.php:400 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -932,23 +931,21 @@ msgstr "Jūs ruošiatės SUNAIKINTI visą duombazę!" #: js/messages.php:32 msgid "Dropping Event" -msgstr "" +msgstr "Šalinamas įvykis" #: js/messages.php:33 -#, fuzzy #| msgid "Procedures" msgid "Dropping Procedure" -msgstr "Procedūros" +msgstr "Šalinama procedūra" #: js/messages.php:35 -#, fuzzy #| msgid "Allows inserting and replacing data." msgid "Deleting tracking data" -msgstr "Leisti įterpti ir modifikuoti duomenis." +msgstr "Trinami sekimo duomenys" #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Šalinamas pirminis raktas/indeksas" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" @@ -1002,10 +999,9 @@ msgid "Reloading Privileges" msgstr "Perkraunamos privilegijos" #: js/messages.php:55 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Pašalinti pažymėtus vartotojus" +msgstr "Šalinami pažymėti vartotojai" #: js/messages.php:56 tbl_tracking.php:245 tbl_tracking.php:373 msgid "Close" @@ -1016,74 +1012,65 @@ msgid "Cancel" msgstr "Atšaukti" #: js/messages.php:63 -#, fuzzy #| msgid "Load" msgid "Loading" -msgstr "Įkelti" +msgstr "Įkeliama" #: js/messages.php:64 -#, fuzzy #| msgid "Processes" msgid "Processing Request" -msgstr "Procesai" +msgstr "Vykdoma užklausa" #: js/messages.php:65 msgid "Error in Processing Request" -msgstr "" +msgstr "Klaida vykdant užklausą" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "Šalinamas stulpelis" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "Pridedamas pirminis raktas" #: js/messages.php:68 libraries/relation.lib.php:81 pmd_general.php:340 msgid "OK" msgstr "Gerai" #: js/messages.php:71 -#, fuzzy #| msgid "Rename database to" msgid "Renaming Databases" -msgstr "Pervadinti duombazę į" +msgstr "Keičiamas duomenų bazės pavadinimas" #: js/messages.php:72 -#, fuzzy #| msgid "Remove database" msgid "Reload Database" -msgstr "Pašalinti duombazę" +msgstr "Perkrauti duomenų bazę" #: js/messages.php:73 -#, fuzzy #| msgid "Copy database to" msgid "Copying Database" -msgstr "Kopijuoti duombazę į" +msgstr "Kopijuojama duomenų bazė" #: js/messages.php:74 -#, fuzzy #| msgid "Charset" msgid "Changing Charset" -msgstr "Koduotė" +msgstr "Keičiama koduotė" #: js/messages.php:75 -#, fuzzy #| msgid "Table must have at least one column." msgid "Table must have at least one column" -msgstr "Lentelė turi turėti bent vieną stulpelį." +msgstr "Lentelė turi turėti bent vieną stulpelį" #: js/messages.php:76 -#, fuzzy #| msgid "Create table" msgid "Create Table" -msgstr "Sukurti lentelę" +msgstr "Lentelės kūrimas" #: js/messages.php:81 -#, fuzzy #| msgid "Search" msgid "Searching" -msgstr "Paieška" +msgstr "Ieškoma" #: js/messages.php:84 #, fuzzy @@ -1098,10 +1085,9 @@ msgid "Show query box" msgstr "SQL užklausos langelis" #: js/messages.php:86 -#, fuzzy #| msgid "Inline" msgid "Inline Edit" -msgstr "Vidinis" +msgstr "Redaguoti čia" #: js/messages.php:89 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -1629,7 +1615,7 @@ msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." msgstr "" -"Jūs tikriausiai nesukūrėte nustatymų failo. Galite pasinaudoti %1$snustatymų " +"Jūs dar turbūt nesukūrėte nustatymų failo. Galite pasinaudoti %1$snustatymų " "skriptu%2$s, kad sukurtumėte failą." #: libraries/auth/config.auth.lib.php:115 @@ -1848,8 +1834,8 @@ msgid "" msgstr "" "phpMyAdmin negalėjo perskaityti nustatymų failo!<br />Tai galėjo nutikti " "jeigu PHP rado faile klaidą arba failo nerado visai.<br />Prašome atverti " -"nustatymų failą tiesiogiai naudojantis žemiau esančia nuoroda ir perskaityti " -"gautus PHP klaidų pranešimą(us). Daugeliu atveju trūksta kabučių ir/arba " +"nustatymų failą tiesiogiai naudojantis žemiau esančia nuoroda ir peržiūrėti " +"gautus PHP klaidų pranešimus. Daugeliu atveju trūksta kabučių ar " "kabliataškio.<br />Jeigu išvedamas tuščias naršyklės langas - viskas " "tvarkoje." @@ -4331,7 +4317,7 @@ msgstr "SQL užklausa" #: libraries/db_links.inc.php:76 libraries/relation.lib.php:133 msgid "Designer" -msgstr "" +msgstr "Projektavimas" #: libraries/db_links.inc.php:93 libraries/server_links.inc.php:64 #: server_privileges.php:112 server_privileges.php:1813 @@ -4351,7 +4337,9 @@ msgstr "Gražinimo tipas" msgid "" "May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ " "3.11[/a]" -msgstr "Gali būti apytikslis. Žiūrėkite DUK 3.11" +msgstr "" +"Gali būti apytikslis. Žiūrėkite " +"[a@./Documentation.html#faq3_11@Documentation]DUK 3.11[/a]" #: libraries/dbi/mysql.dbi.lib.php:111 libraries/dbi/mysqli.dbi.lib.php:122 msgid "Connection for controluser as defined in your configuration failed." @@ -5359,8 +5347,8 @@ msgid "" "(1,2,3)</code>" msgstr "" "įtraukti stulpelių vardus kiekviename <code>INSERT</code> sakinyje <br /> " -"      Pavyzdžiui: <code>INSERT INTO lenteles_vardas (col_A," -"col_B,col_C) VALUES (1,2,3)</code>" +"Pavyzdžiui: <code>INSERT INTO lentelės_pavadinimas (stul_A,stul_B,stul_C) " +"VALUES (1,2,3)</code>" #: libraries/export/sql.php:155 msgid "" @@ -5368,25 +5356,25 @@ msgid "" "    Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " "(7,8,9)</code>" msgstr "" -"įdėti įvairius įrašus į <code>INSERT</code> sakinį<br />     " -"  Pavyzdžiui: <code>INSERT INTO lenteles_vardas VALUES (1,2,3), " -"(4,5,6), (7,8,9)</code>" +"įdėti įvairius įrašus į <code>INSERT</code> sakinį<br /> Pavyzdžiui: " +"<code>INSERT INTO lentelės_pavadinimas VALUES (1,2,3), (4,5,6), " +"(7,8,9)</code>" #: libraries/export/sql.php:156 msgid "" "both of the above<br />       Example: <code>INSERT INTO " "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" msgstr "" -"abu iš paminėtų<br />       Pavyzdys: <code>INSERT INTO " -"lenteles_vardas (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" +"abu iš paminėtų<br /> Pavyzdys: <code>INSERT INTO lentelės_pavadinimas " +"(stul_A,stul_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" #: libraries/export/sql.php:157 msgid "" "neither of the above<br />       Example: <code>INSERT INTO " "tbl_name VALUES (1,2,3)</code>" msgstr "" -"nė vienas iš paminėtų<br />       Pavyzdys: <code>INSERT INTO " -"lenteles_vardas VALUES (1,2,3)</code>" +"nė vienas iš paminėtų<br /> Pavyzdys: <code>INSERT INTO lentelės_pavadinimas " +"VALUES (1,2,3)</code>" #: libraries/export/sql.php:167 msgid "" @@ -5656,11 +5644,11 @@ msgstr "Tradicinė kinų" #: libraries/mysql_charsets.lib.php:234 libraries/mysql_charsets.lib.php:420 msgid "case-insensitive" -msgstr "nesvarbu didžiosios ar mažosios" +msgstr "simbolių dydis nesvarbus" #: libraries/mysql_charsets.lib.php:237 libraries/mysql_charsets.lib.php:422 msgid "case-sensitive" -msgstr "svarbu didžiosios ar mažosios" +msgstr "simbolių dydis svarbus" #: libraries/mysql_charsets.lib.php:240 msgid "Croatian" @@ -6244,7 +6232,7 @@ msgstr "Stulpelių vardai" #: libraries/sql_query_form.lib.php:332 sql.php:846 sql.php:847 sql.php:864 msgid "Bookmark this SQL query" -msgstr "Sukurti nuorodą į šią SQL užklausą" +msgstr "Sukurti šios SQL užklausos žymę" #: libraries/sql_query_form.lib.php:339 sql.php:858 msgid "Let every user access this bookmark" @@ -7504,7 +7492,7 @@ msgstr "Sukurti privilegijas šiai duombazei" #: server_privileges.php:2034 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" -msgstr "Norint naudoti _ ir % simblius, prieš juos prirašykite \\" +msgstr "Norėdami naudoti _ ir % kaip simbolius, prieš juos prirašykite \\" #: server_privileges.php:2037 msgid "Add privileges on the following table" @@ -8633,7 +8621,6 @@ msgid "Cannot load or save configuration" msgstr "Nepavyko įkelti arba išsaugoti konfigūracijos" #: setup/frames/index.inc.php:50 -#, fuzzy #| msgid "" #| "Please create web server writable folder [em]config[/em] in phpMyAdmin " #| "top level directory as described in [a@../Documentation.html#setup_script]" @@ -8645,9 +8632,9 @@ msgid "" "documentation[/a]. Otherwise you will be only able to download or display it." msgstr "" "Prašome interneto serveryje phpMyAdmin pagrindiniame kataloge sukurti " -"įrašomą [em]config[/em] katalogą kaip parašyta [a@../Documentation." -"html#setup_script]dokumentacijoje[/a]. Kitaip Jūs galėsite tik parsisiųsti " -"ir peržiūrėti." +"įrašomą [em]config[/em] katalogą kaip parašyta " +"[a@../Documentation.html#setup_script]dokumentacijoje[/a]. Kitaip Jūs " +"galėsite jį tik parsisiųsti ir peržiūrėti." #: setup/frames/index.inc.php:57 msgid "" @@ -9678,7 +9665,7 @@ msgstr "Profilis papildytas." #: view_create.php:141 msgid "VIEW name" -msgstr "VIEW vardas" +msgstr "VIEW pavadinimas" #: view_operations.php:91 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10864-g0132e33
by Marc Delisle 16 Nov '10

16 Nov '10

The branch, master has been updated via 0132e3317701e017360ef135001048863a3c6452 (commit) from 18b0fa1482b2056855917367f64374492801f1fb (commit) - Log ----------------------------------------------------------------- commit 0132e3317701e017360ef135001048863a3c6452 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Nov 16 08:22:55 2010 -0500 prefix for jQuery objects; unneeded wrapping of objects ----------------------------------------------------------------------- Summary of changes: js/sql.js | 60 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/js/sql.js b/js/sql.js index 0c39fbe..8e04323 100644 --- a/js/sql.js +++ b/js/sql.js @@ -21,22 +21,22 @@ function PMA_urldecode(str) { * Get the field name for the current field. Required to construct the query * for inline editing * - * @param this_field_obj jQuery object that points to the current field's tr - * @param disp_mode string + * @param $this_field jQuery object that points to the current field's tr + * @param disp_mode string */ -function getFieldName(this_field_obj, disp_mode) { +function getFieldName($this_field, disp_mode) { if(disp_mode == 'vertical') { - var field_name = $(this_field_obj).siblings('th').find('a').text(); + var field_name = $this_field.siblings('th').find('a').text(); } else { - var this_field_index = $(this_field_obj).index(); + var this_field_index = $this_field.index(); if(window.parent.text_dir == 'ltr') { // 4 columns to account for the checkbox, edit, delete and appended inline edit anchors but index is zero-based so substract 3 - var field_name = $(this_field_obj).parents('table').find('thead').find('th:nth('+ (this_field_index-3 )+') a').text(); + var field_name = $this_field.parents('table').find('thead').find('th:nth('+ (this_field_index-3 )+') a').text(); } else { - var field_name = $(this_field_obj).parents('table').find('thead').find('th:nth('+ this_field_index+') a').text(); + var field_name = $this_field.parents('table').find('thead').find('th:nth('+ this_field_index+') a').text(); } } @@ -345,20 +345,20 @@ $(document).ready(function() { */ var this_row_index = $(this).index(); /** - * @var input_siblings Object referring to all inline editable events from same row + * @var $input_siblings Object referring to all inline editable events from same row */ - var input_siblings = $(this).parents('tbody').find('tr').find('.data_inline_edit:nth('+this_row_index+')'); + var $input_siblings = $(this).parents('tbody').find('tr').find('.data_inline_edit:nth('+this_row_index+')'); /** * @var where_clause String containing the WHERE clause to select this row */ var where_clause = $(this).parents('tbody').find('tr').find('.where_clause:nth('+this_row_index+')').val(); } else { - var input_siblings = $(this).parent('tr').find('.data_inline_edit'); + var $input_siblings = $(this).parent('tr').find('.data_inline_edit'); var where_clause = $(this).parent('tr').find('.where_clause').val(); } - $(input_siblings).each(function() { + $input_siblings.each(function() { /** @lends jQuery */ /** * @var data_value Current value of this field @@ -371,23 +371,23 @@ $(document).ready(function() { /** * @var this_field Object referring to this field (<td>) */ - var this_field = $(this); + var $this_field = $(this); /** * @var field_name String containing the name of this field. * @see getFieldName() */ - var field_name = getFieldName($(this), disp_mode); + var field_name = getFieldName($this_field, disp_mode); // In each input sibling, wrap the current value in a textarea // and store the current value in a hidden span - if($(this).is(':not(.truncated, .transformed, .relation, .enum, .null)')) { + if($this_field.is(':not(.truncated, .transformed, .relation, .enum, .null)')) { // handle non-truncated, non-transformed, non-relation values // We don't need to get any more data, just wrap the value - $(this).html('<textarea>'+data_value+'</textarea>') + $this_field.html('<textarea>'+data_value+'</textarea>') .append('<span class="original_data">'+data_value+'</span>'); $(".original_data").hide(); } - else if($(this).is('.truncated, .transformed')) { + else if($this_field.is('.truncated, .transformed')) { /** @lends jQuery */ //handle truncated/transformed values values @@ -405,7 +405,7 @@ $(document).ready(function() { 'inline_edit' : true }, function(data) { if(data.success == true) { - $(this_field).html('<textarea>'+data.value+'</textarea>') + $this_field.html('<textarea>'+data.value+'</textarea>') .append('<span class="original_data">'+data_value+'</span>'); $(".original_data").hide(); } @@ -414,14 +414,14 @@ $(document).ready(function() { } }) // end $.post() } - else if($(this).is('.relation')) { + else if($this_field.is('.relation')) { /** @lends jQuery */ //handle relations /** * @var curr_value String containing the current value of this relational field */ - var curr_value = $(this).find('a').text(); + var curr_value = $this_field.find('a').text(); /** * @var post_params Object containing parameters for the POST request @@ -437,18 +437,18 @@ $(document).ready(function() { } $.post('sql.php', post_params, function(data) { - $(this_field).html(data.dropdown) + $this_field.html(data.dropdown) .append('<span class="original_data">'+data_value+'</span>'); $(".original_data").hide(); }) // end $.post() } - else if($(this).is('.enum')) { + else if($this_field.is('.enum')) { /** @lends jQuery */ //handle enum fields /** * @var curr_value String containing the current value of this relational field */ - var curr_value = $(this).text(); + var curr_value = $this_field.text(); /** * @var post_params Object containing parameters for the POST request @@ -464,14 +464,14 @@ $(document).ready(function() { } $.post('sql.php', post_params, function(data) { - $(this_field).html(data.dropdown) + $this_field.html(data.dropdown) .append('<span class="original_data">'+data_value+'</span>'); $(".original_data").hide(); }) // end $.post() } - else if($(this).is('.null')) { + else if($this_field.is('.null')) { //handle null fields - $(this_field).html('<textarea></textarea>') + $this_field.html('<textarea></textarea>') .append('<span class="original_data">NULL</span>'); $(".original_data").hide(); } @@ -506,16 +506,16 @@ $(document).ready(function() { */ var this_td_index = $this_td.index(); /** - * @var input_siblings Object referring to all inline editable events from same row + * @var $input_siblings Object referring to all inline editable events from same row */ - var input_siblings = $this_td.parents('tbody').find('tr').find('.data_inline_edit:nth('+this_td_index+')'); + var $input_siblings = $this_td.parents('tbody').find('tr').find('.data_inline_edit:nth('+this_td_index+')'); /** * @var where_clause String containing the WHERE clause to select this row */ var where_clause = $this_td.parents('tbody').find('tr').find('.where_clause:nth('+this_td_index+')').val(); } else { - var input_siblings = $this_td.parent('tr').find('.data_inline_edit'); + var $input_siblings = $this_td.parent('tr').find('.data_inline_edit'); var where_clause = $this_td.parent('tr').find('.where_clause').val(); } @@ -547,7 +547,7 @@ $(document).ready(function() { */ var transformation_fields = false; - $(input_siblings).each(function() { + $input_siblings.each(function() { /** @lends jQuery */ /** * @var this_field Object referring to this field (<td>) @@ -634,7 +634,7 @@ $(document).ready(function() { PMA_ajaxShowMessage(data.message); $this_td.removeClass('inline_edit_active').addClass('inline_edit_anchor'); - $(input_siblings).each(function() { + $input_siblings.each(function() { // Inline edit post has been successful. if($(this).is(':not(.relation, .enum)')) { /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10863-g18b0fa1
by Marc Delisle 16 Nov '10

16 Nov '10

The branch, master has been updated via 18b0fa1482b2056855917367f64374492801f1fb (commit) from 7d465dcebbbeb7dd4c8defce065f539d8c21cbc4 (commit) - Log ----------------------------------------------------------------- commit 18b0fa1482b2056855917367f64374492801f1fb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Nov 16 08:06:02 2010 -0500 inline editable fields were not highlighted or marked in horizontal mode ----------------------------------------------------------------------- Summary of changes: js/functions.js | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index 8bd9449..01db2e6 100644 --- a/js/functions.js +++ b/js/functions.js @@ -847,23 +847,27 @@ function checkTransmitDump(theForm, theAction) } // end of the 'checkTransmitDump()' function /** - * For row marking in horizontal mode (use "live" so that it works also for + * Row marking in horizontal mode (use "live" so that it works also for * next pages reached via AJAX); a tr may have the class noclick to remove * this behavior. */ $(document).ready(function() { $('tr.odd:not(.noclick), tr.even:not(.noclick)').live('click',function() { - $(this).toggleClass('marked'); + var $tr = $(this); + $tr.toggleClass('marked'); + $tr.children().toggleClass('marked'); }); }) /** - * For row highlighting in horizontal mode (necessary for IE 6; use "live" + * Row highlighting in horizontal mode (use "live" * so that it works also for pages reached via AJAX) */ $(document).ready(function() { $('tr.odd, tr.even').live('hover',function() { - $(this).toggleClass('hover'); + var $tr = $(this); + $tr.toggleClass('hover'); + $tr.children().toggleClass('hover'); }); }) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10862-g7d465dc
by Michal Čihař 16 Nov '10

16 Nov '10

The branch, master has been updated via 7d465dcebbbeb7dd4c8defce065f539d8c21cbc4 (commit) via f495fa82ddafb730bf183ecbe0e4db2ab4437797 (commit) via 62e84e624c0195429fedde7bf384aade0fee33d8 (commit) via 6884541fa843baf977b0056c436bc929527735a3 (commit) from 65fcab4122a8feafc07427d2567b919c48b2fa77 (commit) - Log ----------------------------------------------------------------- commit 7d465dcebbbeb7dd4c8defce065f539d8c21cbc4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Nov 15 19:47:28 2010 +0200 Translation update done using Pootle. commit f495fa82ddafb730bf183ecbe0e4db2ab4437797 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Nov 15 19:47:21 2010 +0200 Translation update done using Pootle. commit 62e84e624c0195429fedde7bf384aade0fee33d8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Nov 15 19:47:07 2010 +0200 Translation update done using Pootle. commit 6884541fa843baf977b0056c436bc929527735a3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Nov 15 19:46:42 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index 6a8016e..3dcc0d9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-12 14:06+0100\n" -"PO-Revision-Date: 2010-11-13 06:45+0200\n" +"PO-Revision-Date: 2010-11-15 19:47+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -80,7 +80,7 @@ msgstr "Git" #: browse_foreigners.php:166 browse_foreigners.php:170 #: libraries/Index.class.php:441 tbl_tracking.php:314 msgid "Keyname" -msgstr "Anahtar ismi" +msgstr "Anahtar adı" #: browse_foreigners.php:167 browse_foreigners.php:169 #: server_collations.php:54 server_collations.php:66 server_engines.php:57 @@ -3988,11 +3988,11 @@ msgid "" "comment and the real name" msgstr "" "Eğer araç ipuçları etkinse ve veritabanı yorumu ayarlıysa bu, yorumu ve " -"gerçek ismi çevirecek" +"gerçek adı çevirecek" #: libraries/config/messages.inc.php:452 msgid "Display database comment instead of its name" -msgstr "Veritabanının ismi yerine yorumunu görüntüle" +msgstr "Veritabanının adı yerine yorumunu görüntüle" #: libraries/config/messages.inc.php:453 msgid "" @@ -4008,7 +4008,7 @@ msgstr "" #: libraries/config/messages.inc.php:454 msgid "Display table comment instead of its name" -msgstr "Tablonun ismi yerine yorumunu görüntüle" +msgstr "Tablonun adı yerine yorumunu görüntüle" #: libraries/config/messages.inc.php:455 msgid "Display table comments in tooltips" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10858-g65fcab4
by Dieter Adriaenssens 14 Nov '10

14 Nov '10

The branch, master has been updated via 65fcab4122a8feafc07427d2567b919c48b2fa77 (commit) via 63aec5b3280c39277c54d0789a1b511fd2f3b7ae (commit) from 57c5abf579d7ee37eeea5c44c2c62360bd5fe529 (commit) - Log ----------------------------------------------------------------- commit 65fcab4122a8feafc07427d2567b919c48b2fa77 Merge: 57c5abf579d7ee37eeea5c44c2c62360bd5fe529 63aec5b3280c39277c54d0789a1b511fd2f3b7ae Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sun Nov 14 21:08:28 2010 +0100 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_operations.php | 33 ++++++++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3bd70e..92a3a50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand - bug #3103853 [js] Double quotes were not escaped in generated js - bug #3077463 [core] Events were not copied when copying/renaming database +- bug #1762306 [core] Copy database with view of a view 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis diff --git a/db_operations.php b/db_operations.php index b5d7f5a..c9aa565 100644 --- a/db_operations.php +++ b/db_operations.php @@ -128,14 +128,15 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { foreach ($tables_full as $each_table => $tmp) { - // to be able to rename a db containing views, we - // first collect in $views all the views we find and we - // will handle them after the tables - /** - * @todo support a view of a view - */ + // to be able to rename a db containing views, + // first all the views are collected and a stand-in is created + // the real views are created after the tables if (PMA_Table::isView($db, $each_table)) { $views[] = $each_table; + // Create stand-in definition to resolve view dependencies + $sql_view_standin = PMA_getTableDefStandIn($db, $each_table, "\n"); + PMA_DBI_query($sql_view_standin); + $GLOBALS['sql_query'] .= "\n" . $sql_view_standin . ';'; continue; } @@ -193,13 +194,19 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // handle the views if (! $_error) { - foreach ($views as $view) { - if (! PMA_Table::moveCopy($db, $view, $newname, $view, - 'structure', $move, 'db_copy')) { - $_error = true; - break; - } - } + // temporarily force to add DROP IF EXIST to CREATE VIEW query, + // to remove stand-in VIEW that was created earlier + $temp_drop_if_exists = $GLOBALS['drop_if_exists']; + $GLOBALS['drop_if_exists'] = 'true'; + + foreach ($views as $view) { + if (! PMA_Table::moveCopy($db, $view, $newname, $view, 'structure', $move, 'db_copy')) { + $_error = true; + break; + } + } + // restore previous value + $GLOBALS['drop_if_exists'] = $temp_drop_if_exists; } unset($view, $views); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-16-g63aec5b
by Dieter Adriaenssens 14 Nov '10

14 Nov '10

The branch, QA_3_3 has been updated via 63aec5b3280c39277c54d0789a1b511fd2f3b7ae (commit) from 8277c92e25ce1001c6b0479e91698bcf5c02c618 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_operations.php | 33 ++++++++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9c8bef..0ed94ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand - bug #3103853 [js] Double quotes were not escaped in generated js - bug #3077463 [core] Events were not copied when copying/renaming database +- bug #1762306 [core] Copy database with view of a view 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis diff --git a/db_operations.php b/db_operations.php index 4004a3d..d3e62c2 100644 --- a/db_operations.php +++ b/db_operations.php @@ -125,14 +125,15 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { foreach ($tables_full as $each_table => $tmp) { - // to be able to rename a db containing views, we - // first collect in $views all the views we find and we - // will handle them after the tables - /** - * @todo support a view of a view - */ + // to be able to rename a db containing views, + // first all the views are collected and a stand-in is created + // the real views are created after the tables if (PMA_Table::isView($db, $each_table)) { $views[] = $each_table; + // Create stand-in definition to resolve view dependencies + $sql_view_standin = PMA_getTableDefStandIn($db, $each_table, "\n"); + PMA_DBI_query($sql_view_standin); + $GLOBALS['sql_query'] .= "\n" . $sql_view_standin . ';'; continue; } @@ -190,13 +191,19 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // handle the views if (! $_error) { - foreach ($views as $view) { - if (! PMA_Table::moveCopy($db, $view, $newname, $view, - 'structure', $move, 'db_copy')) { - $_error = true; - break; - } - } + // temporarily force to add DROP IF EXIST to CREATE VIEW query, + // to remove stand-in VIEW that was created earlier + $temp_drop_if_exists = $GLOBALS['drop_if_exists']; + $GLOBALS['drop_if_exists'] = 'true'; + + foreach ($views as $view) { + if (! PMA_Table::moveCopy($db, $view, $newname, $view, 'structure', $move, 'db_copy')) { + $_error = true; + break; + } + } + // restore previous value + $GLOBALS['drop_if_exists'] = $temp_drop_if_exists; } unset($view, $views); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10856-g57c5abf
by Dieter Adriaenssens 14 Nov '10

14 Nov '10

The branch, master has been updated via 57c5abf579d7ee37eeea5c44c2c62360bd5fe529 (commit) via 8277c92e25ce1001c6b0479e91698bcf5c02c618 (commit) via 5f4604c9bb4de2cdc2bf6b61f0ac55c898dd964e (commit) from d9d5abee089ee2570220a04a0aa8e664ab4334dd (commit) - Log ----------------------------------------------------------------- commit 57c5abf579d7ee37eeea5c44c2c62360bd5fe529 Merge: d9d5abee089ee2570220a04a0aa8e664ab4334dd 8277c92e25ce1001c6b0479e91698bcf5c02c618 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sun Nov 14 18:28:10 2010 +0100 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ db_operations.php | 22 ++++++++++++++++++++++ libraries/js_escape.lib.php | 1 + 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5e8414..d3bd70e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,8 @@ 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand +- bug #3103853 [js] Double quotes were not escaped in generated js +- bug #3077463 [core] Events were not copied when copying/renaming database 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis diff --git a/db_operations.php b/db_operations.php index 288de7b..b5d7f5a 100644 --- a/db_operations.php +++ b/db_operations.php @@ -215,6 +215,28 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { unset($GLOBALS['sql_constraints_query_full_db'], $one_query); } + if (PMA_MYSQL_INT_VERSION >= 50100) { + // here DELIMITER is not used because it's not part of the + // language; each statement is sent one by one + + // to avoid selecting alternatively the current and new db + // we would need to modify the CREATE definitions to qualify + // the db name + $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); + if ($event_names) { + foreach($event_names as $event_name) { + PMA_DBI_select_db($db); + $tmp_query = PMA_DBI_get_definition($db, 'EVENT', $event_name); + // collect for later display + $GLOBALS['sql_query'] .= "\n" . $tmp_query; + PMA_DBI_select_db($newname); + PMA_DBI_query($tmp_query); + } + } + } + // go back to current db, just in case + PMA_DBI_select_db($db); + // Duplicate the bookmarks for this db (done once for each db) if (! $_error && $db != $newname) { $get_fields = array('user', 'label', 'query'); diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 5ddb604..0773eec 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -59,6 +59,7 @@ function PMA_escapeJsString($string) "\000" => '', '\\' => '\\\\', '\'' => '\\\'', + '"' => '\"', "\n" => '\n', "\r" => '\r'))); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-15-g8277c92
by Dieter Adriaenssens 14 Nov '10

14 Nov '10

The branch, QA_3_3 has been updated via 8277c92e25ce1001c6b0479e91698bcf5c02c618 (commit) from 5f4604c9bb4de2cdc2bf6b61f0ac55c898dd964e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_operations.php | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e45143a..e9c8bef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand - bug #3103853 [js] Double quotes were not escaped in generated js +- bug #3077463 [core] Events were not copied when copying/renaming database 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis diff --git a/db_operations.php b/db_operations.php index 29d2635..4004a3d 100644 --- a/db_operations.php +++ b/db_operations.php @@ -212,6 +212,28 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { unset($GLOBALS['sql_constraints_query_full_db'], $one_query); } + if (PMA_MYSQL_INT_VERSION >= 50100) { + // here DELIMITER is not used because it's not part of the + // language; each statement is sent one by one + + // to avoid selecting alternatively the current and new db + // we would need to modify the CREATE definitions to qualify + // the db name + $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); + if ($event_names) { + foreach($event_names as $event_name) { + PMA_DBI_select_db($db); + $tmp_query = PMA_DBI_get_definition($db, 'EVENT', $event_name); + // collect for later display + $GLOBALS['sql_query'] .= "\n" . $tmp_query; + PMA_DBI_select_db($newname); + PMA_DBI_query($tmp_query); + } + } + } + // go back to current db, just in case + PMA_DBI_select_db($db); + // Duplicate the bookmarks for this db (done once for each db) if (! $_error && $db != $newname) { $get_fields = array('user', 'label', 'query'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10853-gd9d5abe
by Marc Delisle 14 Nov '10

14 Nov '10

The branch, master has been updated via d9d5abee089ee2570220a04a0aa8e664ab4334dd (commit) from 5a72c4ea7dd375d38cd01c4cf02b31f57b29f15c (commit) - Log ----------------------------------------------------------------- commit d9d5abee089ee2570220a04a0aa8e664ab4334dd Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 14 08:08:14 2010 -0500 adjust totals when dropping a table ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 58 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 23 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index f74cc26..03aa8e1 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -17,6 +17,39 @@ * Drop Table * */ + +/** + * Adjust number of rows and total size in the summary + * when emptying or dropping a table + * + * @param jQuery object $this_anchor + */ +function PMA_adjustTotals($this_anchor) { + var $parent_tr = $this_anchor.closest('tr'); + var $rows_td = $parent_tr.find('.tbl_rows'); + var $size_td = $parent_tr.find('.tbl_size'); + var num_rows = parseInt($rows_td.text()); + // set number of rows to 0 + // (not really needed in case we are dropping the table) + $rows_td.text('0'); + // set size to unknown (not sure how to get the exact + // value here, as an empty InnoDB table would have a size) + $size_td.text('-'); + + // try to compute a new total row number + if (! isNaN(num_rows)) { + $total_rows_td = $('#tbl_summary_row').find('.tbl_rows'); + var total_rows = parseInt($total_rows_td.text()); + if (! isNaN(total_rows)) { + $total_rows_td.text(total_rows - num_rows); + } + } + + // prefix total size with "~" + var $total_size_td = $('#tbl_summary_row').find('.tbl_size'); + $total_size_td.text($total_size_td.text().replace(/^/,'~')); +} + $(document).ready(function() { /** @@ -53,28 +86,7 @@ $(document).ready(function() { //Fetch inner span of this anchor //and replace the icon with its disabled version var span = $this_anchor.html().replace(/b_empty.png/, 'bd_empty.png'); - var $parent_tr = $this_anchor.closest('tr'); - var $rows_td = $parent_tr.find('.tbl_rows'); - var $size_td = $parent_tr.find('.tbl_size'); - var num_rows = parseInt($rows_td.text()); - // set number of rows to 0 - $rows_td.text('0'); - // set size to unknown (not sure how to get the exact - // value here, as an empty InnoDB table would have a size) - $size_td.text('-'); - - // try to compute a new total row number - if (! isNaN(num_rows)) { - $total_rows_td = $('#tbl_summary_row').find('.tbl_rows'); - var total_rows = parseInt($total_rows_td.text()); - if (! isNaN(total_rows)) { - $total_rows_td.text(total_rows - num_rows); - } - } - - // prefix total size with "~" - var $total_size_td = $('#tbl_summary_row').find('.tbl_size'); - $total_size_td.text($total_size_td.text().replace(/^/,'~')); + PMA_adjustTotals($this_anchor); //To disable further attempts to truncate the table, //replace the a element with its inner span (modified) @@ -120,7 +132,7 @@ $(document).ready(function() { $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { if (data.success == true) { PMA_ajaxShowMessage(data.message); - //need to find a better solution here. The icon should be replaced + PMA_adjustTotals($this_anchor); $curr_row.hide("medium").remove(); if (window.parent && window.parent.frame_navigation) { hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git