Git May 2011

git@phpmyadmin.net

7 participants
287 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-131-gd5f4903
by Michal Čihař 11 May '11

11 May '11

The branch, master has been updated via d5f4903d208e6810ab8986b1b65bd891040c79a9 (commit) via 332f3da9026e70d460e22f12ca77ce0911fa5ee0 (commit) via 099ee52ce48f4423d29f5ddd636666131633e036 (commit) via 00630ae5e2bb636e5e0e06d672ebe02ba2438c5f (commit) via 652e6226123c9396a1616d9d79e8125f6414581a (commit) via b9f152b634a9bd86fb19e7d29684630156685e2f (commit) via 2fc8509efe1526985f30b64a5b2a611149477af2 (commit) via 4e2e6b31b0c5f56a02edd124d497a92b8b05ec9f (commit) via e85b1a80157b80785270ec7bfc1847fc48192e94 (commit) via 2861028dbad1cfda307243ba509c8d7fcac4126a (commit) via e3217406a760934267f8d6ea1a5d1d8c58c72bea (commit) via e456155177b03aae680e5f19994718d569202c2e (commit) via e54efb456ef95e8e16665dc90804512ca29b6ced (commit) via 27a01b6dfe49b43dd49da9d774b3d36d67d67ca0 (commit) via 32b52d9d3fcaff81deff4d66713c1685b6dfbc45 (commit) via b8017c65c7b6acb179bafac9867d602b01488184 (commit) via 824459de45287ef88216c46e17bd185cd82561d3 (commit) via d8779a449f57ffbcda32050a58a61ace5d61411a (commit) via e6f2631ddee812cb51c2a124d83965ddf793b77a (commit) via fb9bd402f0ec58116bb9d7a22bf2db2456b981d5 (commit) via 5f17ec23956fa6e362162e486ad1bdd67b2b9a38 (commit) via 784bda39fccc72e705db48ad7fa9fb517295c471 (commit) via 88b4eb69c755af491a258be39bbbbcb7e6a4f38b (commit) via 95c9efa1f146334cee4695c143866fac9bfdf710 (commit) via a64219057868b7db8fe017304c281b07aa6ba627 (commit) via 689b1352c254b0668069d23396bdae2790289fd7 (commit) via 921cfba0feed8b575f4d48b1258c718f8ade4757 (commit) via 034a6605c805d8f214a8a2559778e9960ccf6d66 (commit) via a8b6a2d8b77f2cdf4c656c8eddd5c79fced7bdcf (commit) via f1cb34c6bd704679013d41b6be85abc7482dcba0 (commit) via 8e01715ec3c1f59b3a2973aa89093cebbd4be51a (commit) via 1e72fc65e30bad5e7ea06fc68128f6845db61b4f (commit) via e295ef298187048d44c93a1b1880ee7d75efb966 (commit) via 047b40201eb6adae0029371ea94a799082dbc8b0 (commit) via daa021068e479826e57be67ae022e476e3d1e6a5 (commit) via 8658ddfa09f8d4a232f9a5630467dcdda2d3b3f9 (commit) via 430ac0362fac102f9c14e37daf524668c736ae10 (commit) via 9a7726d4227e44f46a95cf71bbdf4b8884414408 (commit) via f92b6e348604ba174c7bf1d4be6a70cee9c2c131 (commit) via 7cfddba6eff87b87f0075187cca2d78a870b6742 (commit) via e34f7d697ee6c2918e4b6fae1728341711084884 (commit) via f98c75248f4bcdd139288f3037944754e4f6aba6 (commit) via b85792c3b33344e185f6a15e9d2bec61aa128b99 (commit) via 94c71c4bf21c3bd6c43b9d6fb67e63dfd815a24a (commit) via 861e01ce5d1832d79bc38c392b7cb47da8c91b04 (commit) via 61c2d0cc1368223680cba65e53c5bf78ea77b7f2 (commit) via 959c415fc64a4001773ff0520c2fb7371ba11d12 (commit) via 9e3fbc7c6171fdc260fd1fcc99ae47c6e8f00945 (commit) via 6b3bd0ce503f53f007aacdd0ed3025146b24ac31 (commit) from 9fd029b10c84c689b072743bdcd11abebef30940 (commit) - Log ----------------------------------------------------------------- commit d5f4903d208e6810ab8986b1b65bd891040c79a9 Merge: 099ee52ce48f4423d29f5ddd636666131633e036 332f3da9026e70d460e22f12ca77ce0911fa5ee0 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 13:07:17 2011 +0200 Merge branch 'QA_3_4' commit 099ee52ce48f4423d29f5ddd636666131633e036 Merge: 00630ae5e2bb636e5e0e06d672ebe02ba2438c5f 9fd029b10c84c689b072743bdcd11abebef30940 Author: Pootle server <pootle(a)cihar.com> Date: Wed May 11 12:40:11 2011 +0200 Merge remote-tracking branch 'origin/master' commit 00630ae5e2bb636e5e0e06d672ebe02ba2438c5f Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:55:35 2011 +0200 Translation update done using Pootle. commit 652e6226123c9396a1616d9d79e8125f6414581a Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:55:09 2011 +0200 Translation update done using Pootle. commit b9f152b634a9bd86fb19e7d29684630156685e2f Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:54:38 2011 +0200 Translation update done using Pootle. commit 2fc8509efe1526985f30b64a5b2a611149477af2 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:54:08 2011 +0200 Translation update done using Pootle. commit 4e2e6b31b0c5f56a02edd124d497a92b8b05ec9f Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:53:38 2011 +0200 Translation update done using Pootle. commit e85b1a80157b80785270ec7bfc1847fc48192e94 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:53:13 2011 +0200 Translation update done using Pootle. commit 2861028dbad1cfda307243ba509c8d7fcac4126a Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:52:54 2011 +0200 Translation update done using Pootle. commit e3217406a760934267f8d6ea1a5d1d8c58c72bea Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:51:59 2011 +0200 Translation update done using Pootle. commit e456155177b03aae680e5f19994718d569202c2e Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:51:10 2011 +0200 Translation update done using Pootle. commit e54efb456ef95e8e16665dc90804512ca29b6ced Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:50:54 2011 +0200 Translation update done using Pootle. commit 27a01b6dfe49b43dd49da9d774b3d36d67d67ca0 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:50:23 2011 +0200 Translation update done using Pootle. commit 32b52d9d3fcaff81deff4d66713c1685b6dfbc45 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:49:58 2011 +0200 Translation update done using Pootle. commit b8017c65c7b6acb179bafac9867d602b01488184 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:48:56 2011 +0200 Translation update done using Pootle. commit 824459de45287ef88216c46e17bd185cd82561d3 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:48:33 2011 +0200 Translation update done using Pootle. commit d8779a449f57ffbcda32050a58a61ace5d61411a Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:48:14 2011 +0200 Translation update done using Pootle. commit e6f2631ddee812cb51c2a124d83965ddf793b77a Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:48:00 2011 +0200 Translation update done using Pootle. commit fb9bd402f0ec58116bb9d7a22bf2db2456b981d5 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:47:35 2011 +0200 Translation update done using Pootle. commit 5f17ec23956fa6e362162e486ad1bdd67b2b9a38 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:47:18 2011 +0200 Translation update done using Pootle. commit 784bda39fccc72e705db48ad7fa9fb517295c471 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:46:26 2011 +0200 Translation update done using Pootle. commit 88b4eb69c755af491a258be39bbbbcb7e6a4f38b Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:45:54 2011 +0200 Translation update done using Pootle. commit 95c9efa1f146334cee4695c143866fac9bfdf710 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:45:47 2011 +0200 Translation update done using Pootle. commit a64219057868b7db8fe017304c281b07aa6ba627 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:45:25 2011 +0200 Translation update done using Pootle. commit 689b1352c254b0668069d23396bdae2790289fd7 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:44:56 2011 +0200 Translation update done using Pootle. commit 921cfba0feed8b575f4d48b1258c718f8ade4757 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:44:25 2011 +0200 Translation update done using Pootle. commit 034a6605c805d8f214a8a2559778e9960ccf6d66 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:44:11 2011 +0200 Translation update done using Pootle. commit a8b6a2d8b77f2cdf4c656c8eddd5c79fced7bdcf Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:43:24 2011 +0200 Translation update done using Pootle. commit f1cb34c6bd704679013d41b6be85abc7482dcba0 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:42:44 2011 +0200 Translation update done using Pootle. commit 8e01715ec3c1f59b3a2973aa89093cebbd4be51a Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:41:56 2011 +0200 Translation update done using Pootle. commit 1e72fc65e30bad5e7ea06fc68128f6845db61b4f Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:41:37 2011 +0200 Translation update done using Pootle. commit e295ef298187048d44c93a1b1880ee7d75efb966 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:41:15 2011 +0200 Translation update done using Pootle. commit 047b40201eb6adae0029371ea94a799082dbc8b0 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:40:51 2011 +0200 Translation update done using Pootle. commit daa021068e479826e57be67ae022e476e3d1e6a5 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:40:31 2011 +0200 Translation update done using Pootle. commit 8658ddfa09f8d4a232f9a5630467dcdda2d3b3f9 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:40:12 2011 +0200 Translation update done using Pootle. commit 430ac0362fac102f9c14e37daf524668c736ae10 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:39:50 2011 +0200 Translation update done using Pootle. commit 9a7726d4227e44f46a95cf71bbdf4b8884414408 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:39:32 2011 +0200 Translation update done using Pootle. commit f92b6e348604ba174c7bf1d4be6a70cee9c2c131 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:39:08 2011 +0200 Translation update done using Pootle. commit 7cfddba6eff87b87f0075187cca2d78a870b6742 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:37:39 2011 +0200 Translation update done using Pootle. commit e34f7d697ee6c2918e4b6fae1728341711084884 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:37:28 2011 +0200 Translation update done using Pootle. commit f98c75248f4bcdd139288f3037944754e4f6aba6 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:37:05 2011 +0200 Translation update done using Pootle. commit b85792c3b33344e185f6a15e9d2bec61aa128b99 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:35:44 2011 +0200 Translation update done using Pootle. commit 94c71c4bf21c3bd6c43b9d6fb67e63dfd815a24a Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:35:27 2011 +0200 Translation update done using Pootle. commit 861e01ce5d1832d79bc38c392b7cb47da8c91b04 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:34:37 2011 +0200 Translation update done using Pootle. commit 61c2d0cc1368223680cba65e53c5bf78ea77b7f2 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:34:21 2011 +0200 Translation update done using Pootle. commit 959c415fc64a4001773ff0520c2fb7371ba11d12 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:33:49 2011 +0200 Translation update done using Pootle. commit 9e3fbc7c6171fdc260fd1fcc99ae47c6e8f00945 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:32:27 2011 +0200 Translation update done using Pootle. commit 6b3bd0ce503f53f007aacdd0ed3025146b24ac31 Author: ViktorJezek <ViktorJezek(a)email.cz> Date: Wed May 11 11:32:04 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sk.po | 105 +++++++++++++++++++++++++++---------------------------------- 1 files changed, 47 insertions(+), 58 deletions(-) diff --git a/po/sk.po b/po/sk.po index aa96f0a..eeec2d8 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-09 07:40+0200\n" -"PO-Revision-Date: 2010-07-22 02:26+0200\n" -"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" +"PO-Revision-Date: 2011-05-11 11:55+0200\n" +"Last-Translator: <ViktorJezek(a)email.cz>\n" "Language-Team: slovak <sk(a)li.org>\n" "Language: sk\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 #: libraries/display_tbl.lib.php:341 server_privileges.php:1612 @@ -96,22 +96,22 @@ msgstr "Použiť túto hodnotu" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Nie je nastavený žiadny streamovacie server!" #: bs_disp_as_mime_type.php:35 msgid "Failed to fetch headers" -msgstr "" +msgstr "Chyba pri čítaní hlavičiek" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "Nepodarilo sa otvoriť vzdialene URL" #: changelog.php:32 license.php:28 #, php-format msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." -msgstr "" +msgstr "Súbor %s nebol nájdený, viac informácií nájdete na www.phpmyadmin.net." #: db_create.php:58 #, php-format @@ -137,10 +137,9 @@ msgstr "Komentár k tabuľke" #: tbl_change.php:309 tbl_indexes.php:187 tbl_printview.php:139 #: tbl_relation.php:399 tbl_select.php:112 tbl_structure.php:198 #: tbl_tracking.php:267 tbl_tracking.php:318 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Názvy stĺpcov" +msgstr "Stĺpce" #: db_datadict.php:168 db_printview.php:104 libraries/Index.class.php:442 #: libraries/db_events.inc.php:25 libraries/db_routines.inc.php:36 @@ -424,11 +423,11 @@ msgstr "Zvolte prosím aspoň jeden stĺpec, ktorý chcete zobraziť" #: db_qbe.php:186 msgid "Switch to" -msgstr "" +msgstr "Prepnúť na" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "vizuálneho návrhára" #: db_qbe.php:222 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:852 @@ -628,11 +627,11 @@ msgstr "Tabuľka %s bola odstránená" #: db_structure.php:293 tbl_create.php:295 msgid "Tracking is active." -msgstr "" +msgstr "Sledovanie je aktívne." #: db_structure.php:295 tbl_create.php:297 msgid "Tracking is not active." -msgstr "" +msgstr "Sledovanie nie je aktívne." #: db_structure.php:379 libraries/display_tbl.lib.php:2037 #, php-format @@ -640,6 +639,7 @@ msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." msgstr "" +"Tento pohľad má aspoň toľko riadok. Podrobnosti nájdete v %sdokumentaci%s." #: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 @@ -734,7 +734,7 @@ msgstr "Dátový slovník" #: db_tracking.php:79 msgid "Tracked tables" -msgstr "" +msgstr "Sledované tabuľky" #: db_tracking.php:84 libraries/config/messages.inc.php:481 #: libraries/export/htmlword.php:89 libraries/export/latex.php:162 @@ -751,7 +751,7 @@ msgstr "Databáza" #: db_tracking.php:86 msgid "Last version" -msgstr "" +msgstr "Posledná verzia" #: db_tracking.php:87 tbl_tracking.php:588 #, fuzzy @@ -760,7 +760,7 @@ msgstr "Vytvoriť" #: db_tracking.php:88 tbl_tracking.php:589 msgid "Updated" -msgstr "" +msgstr "Aktualizované" #: db_tracking.php:89 libraries/common.lib.php:1354 #: libraries/server_links.inc.php:50 server_processlist.php:71 @@ -777,39 +777,36 @@ msgstr "Akcia" #: db_tracking.php:101 js/messages.php:34 msgid "Delete tracking data for this table" -msgstr "" +msgstr "Odstrániť všetky informácie o sledovaní tejto tabuľky" #: db_tracking.php:119 tbl_tracking.php:542 tbl_tracking.php:600 msgid "active" -msgstr "" +msgstr "zapnuté" #: db_tracking.php:121 tbl_tracking.php:544 tbl_tracking.php:602 msgid "not active" -msgstr "" +msgstr "nie je zapnuté" #: db_tracking.php:134 -#, fuzzy msgid "Versions" -msgstr "Perština" +msgstr "Verzia" #: db_tracking.php:135 tbl_tracking.php:373 tbl_tracking.php:619 msgid "Tracking report" -msgstr "" +msgstr "Informácie o monitorovanie" #: db_tracking.php:136 tbl_tracking.php:245 tbl_tracking.php:619 -#, fuzzy msgid "Structure snapshot" -msgstr "Iba štruktúru" +msgstr "Snímok štruktúry" #: db_tracking.php:181 msgid "Untracked tables" -msgstr "" +msgstr "Nesledované tabuľky" #: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:622 #: tbl_structure.php:624 -#, fuzzy msgid "Track table" -msgstr "Skontrolovať tabuľku" +msgstr "Sledovať tabuľku" #: db_tracking.php:229 #, fuzzy @@ -819,23 +816,23 @@ msgstr "Databáza" #: enum_editor.php:21 libraries/tbl_properties.inc.php:793 #, php-format msgid "Values for the column \"%s\"" -msgstr "" +msgstr "Hodnoty pre pole \"%s\"" #: enum_editor.php:22 libraries/tbl_properties.inc.php:794 msgid "Enter each value in a separate field." -msgstr "" +msgstr "Zadajte každú hodnotu do samostatného políčka." #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ Začať nové vkladanie a pridať novú hodnotu" #: enum_editor.php:67 msgid "Output" -msgstr "" +msgstr "Výstup" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Skopírujte spojené hodnoty do poľa \"Dĺžka/Hodnoty\"" #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -960,11 +957,11 @@ msgstr "phpMyAdmin funguje lepšie s prehliadačmi podporujúcimi rámy." #: server_synchronize.php:738 server_synchronize.php:766 #: server_synchronize.php:794 server_synchronize.php:806 msgid "Click to select" -msgstr "" +msgstr "Kliknite pre vybranie" #: js/messages.php:26 msgid "Click to unselect" -msgstr "" +msgstr "Kliknite pre zrušenie vyberu" #: js/messages.php:27 libraries/import.lib.php:103 sql.php:195 msgid "\"DROP DATABASE\" statements are disabled." @@ -980,23 +977,21 @@ msgstr "Chystáte sa ZRUŠIŤ celú databázu!" #: js/messages.php:32 msgid "Dropping Event" -msgstr "" +msgstr "Odstraňujem udalosť" #: js/messages.php:33 -#, fuzzy #| msgid "Procedures" msgid "Dropping Procedure" -msgstr "Procedúry" +msgstr "Odstraňujem procedúru" #: js/messages.php:35 -#, fuzzy #| msgid "Allows inserting and replacing data." msgid "Deleting tracking data" -msgstr "Povolí vkladanie a nahradzovanie dát." +msgstr "Odstraňujem sledovacie dáta" #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Odstraňujem primárny kľúč/index" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" @@ -1005,12 +1000,12 @@ msgstr "" #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "Chystáte sa vypnúť skladisko BLOBov!" #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" -msgstr "" +msgstr "Chcete vypnúť všetky odkazy do skladiska BLOBov v databáze %s?" #: js/messages.php:44 msgid "Missing value in the form!" @@ -1037,32 +1032,28 @@ msgid "The passwords aren't the same!" msgstr "Heslá sa nezhodujú!" #: js/messages.php:52 -#, fuzzy #| msgid "Add a new User" msgid "Add a New User" -msgstr "Pridať nového používateľa" +msgstr "Pridať nového uživateľa" #: js/messages.php:53 -#, fuzzy msgid "Create User" -msgstr "Vytvoriť relaciu" +msgstr "Vytvoriť uživateľa" #: js/messages.php:54 -#, fuzzy #| msgid "Reloading the privileges" msgid "Reloading Privileges" -msgstr "Znovunačítanie práv" +msgstr "Načítavam oprávnenia" #: js/messages.php:55 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Odstrániť vybraných používateľov" +msgstr "Odstránenie vybraných používateľov" #: js/messages.php:56 libraries/tbl_properties.inc.php:792 #: tbl_tracking.php:245 tbl_tracking.php:373 msgid "Close" -msgstr "" +msgstr "Zavrieť" #: js/messages.php:60 libraries/tbl_properties.inc.php:797 pmd_general.php:388 #: pmd_general.php:425 pmd_general.php:545 pmd_general.php:593 @@ -1071,27 +1062,25 @@ msgid "Cancel" msgstr "Zrušiť" #: js/messages.php:63 -#, fuzzy msgid "Loading" -msgstr "Lokálny" +msgstr "Načítanie" #: js/messages.php:64 -#, fuzzy #| msgid "Processes" msgid "Processing Request" -msgstr "Procesy" +msgstr "Prebieha spracovanie požiadavka" #: js/messages.php:65 libraries/import/ods.php:80 msgid "Error in Processing Request" -msgstr "" +msgstr "Chyba pri spracovanie požiadavku" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "Odstraňujem stĺpce" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "Pridavam primarny kľúč" #: js/messages.php:68 libraries/relation.lib.php:87 pmd_general.php:386 #: pmd_general.php:543 pmd_general.php:591 pmd_general.php:667 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-13-g332f3da
by Michal Čihař 11 May '11

11 May '11

The branch, QA_3_4 has been updated via 332f3da9026e70d460e22f12ca77ce0911fa5ee0 (commit) from d2e6208688b8fa2d2d974875538a71c3467b1006 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/sk.po | 792 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 405 insertions(+), 387 deletions(-) diff --git a/po/sk.po b/po/sk.po index aa96f0a..b70c1ad 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,4 +1,4 @@ -# +# msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" @@ -7,10 +7,10 @@ msgstr "" "PO-Revision-Date: 2010-07-22 02:26+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: slovak <sk(a)li.org>\n" -"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.1\n" @@ -96,22 +96,23 @@ msgstr "Použiť túto hodnotu" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Nie je nastavený žiadny streamovacie server!" #: bs_disp_as_mime_type.php:35 msgid "Failed to fetch headers" -msgstr "" +msgstr "Chyba pri čítaní hlavičiek" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "Nepodarilo sa otvoriť vzdialene URL" #: changelog.php:32 license.php:28 #, php-format msgid "" -"The %s file is not available on this system, please visit www.phpmyadmin.net " -"for more information." +"The %s file is not available on this system, please visit www.phpmyadmin.net" +" for more information." msgstr "" +"Súbor %s nebol nájdený, viac informácií nájdete na www.phpmyadmin.net." #: db_create.php:58 #, php-format @@ -137,10 +138,9 @@ msgstr "Komentár k tabuľke" #: tbl_change.php:309 tbl_indexes.php:187 tbl_printview.php:139 #: tbl_relation.php:399 tbl_select.php:112 tbl_structure.php:198 #: tbl_tracking.php:267 tbl_tracking.php:318 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Názvy stĺpcov" +msgstr "Stĺpce" #: db_datadict.php:168 db_printview.php:104 libraries/Index.class.php:442 #: libraries/db_events.inc.php:25 libraries/db_routines.inc.php:36 @@ -424,11 +424,11 @@ msgstr "Zvolte prosím aspoň jeden stĺpec, ktorý chcete zobraziť" #: db_qbe.php:186 msgid "Switch to" -msgstr "" +msgstr "Prepnúť na" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "vizuálneho návrhára" #: db_qbe.php:222 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:852 @@ -628,18 +628,19 @@ msgstr "Tabuľka %s bola odstránená" #: db_structure.php:293 tbl_create.php:295 msgid "Tracking is active." -msgstr "" +msgstr "Sledovanie je aktívne." #: db_structure.php:295 tbl_create.php:297 msgid "Tracking is not active." -msgstr "" +msgstr "Sledovanie nie je aktívne." #: db_structure.php:379 libraries/display_tbl.lib.php:2037 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation" -"%s." +"This view has at least this number of rows. Please refer to " +"%sdocumentation%s." msgstr "" +"Tento pohľad má aspoň toľko riadok. Podrobnosti nájdete v %sdokumentaci%s." #: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 @@ -734,7 +735,7 @@ msgstr "Dátový slovník" #: db_tracking.php:79 msgid "Tracked tables" -msgstr "" +msgstr "Sledované tabuľky" #: db_tracking.php:84 libraries/config/messages.inc.php:481 #: libraries/export/htmlword.php:89 libraries/export/latex.php:162 @@ -751,7 +752,7 @@ msgstr "Databáza" #: db_tracking.php:86 msgid "Last version" -msgstr "" +msgstr "Posledná verzia" #: db_tracking.php:87 tbl_tracking.php:588 #, fuzzy @@ -760,7 +761,7 @@ msgstr "Vytvoriť" #: db_tracking.php:88 tbl_tracking.php:589 msgid "Updated" -msgstr "" +msgstr "Aktualizované" #: db_tracking.php:89 libraries/common.lib.php:1354 #: libraries/server_links.inc.php:50 server_processlist.php:71 @@ -777,39 +778,36 @@ msgstr "Akcia" #: db_tracking.php:101 js/messages.php:34 msgid "Delete tracking data for this table" -msgstr "" +msgstr "Odstrániť všetky informácie o sledovaní tejto tabuľky" #: db_tracking.php:119 tbl_tracking.php:542 tbl_tracking.php:600 msgid "active" -msgstr "" +msgstr "zapnuté" #: db_tracking.php:121 tbl_tracking.php:544 tbl_tracking.php:602 msgid "not active" -msgstr "" +msgstr "nie je zapnuté" #: db_tracking.php:134 -#, fuzzy msgid "Versions" -msgstr "Perština" +msgstr "Verzia" #: db_tracking.php:135 tbl_tracking.php:373 tbl_tracking.php:619 msgid "Tracking report" -msgstr "" +msgstr "Informácie o monitorovanie" #: db_tracking.php:136 tbl_tracking.php:245 tbl_tracking.php:619 -#, fuzzy msgid "Structure snapshot" -msgstr "Iba štruktúru" +msgstr "Snímok štruktúry" #: db_tracking.php:181 msgid "Untracked tables" -msgstr "" +msgstr "Nesledované tabuľky" #: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:622 #: tbl_structure.php:624 -#, fuzzy msgid "Track table" -msgstr "Skontrolovať tabuľku" +msgstr "Sledovať tabuľku" #: db_tracking.php:229 #, fuzzy @@ -819,23 +817,23 @@ msgstr "Databáza" #: enum_editor.php:21 libraries/tbl_properties.inc.php:793 #, php-format msgid "Values for the column \"%s\"" -msgstr "" +msgstr "Hodnoty pre pole \"%s\"" #: enum_editor.php:22 libraries/tbl_properties.inc.php:794 msgid "Enter each value in a separate field." -msgstr "" +msgstr "Zadajte každú hodnotu do samostatného políčka." #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ Začať nové vkladanie a pridať novú hodnotu" #: enum_editor.php:67 msgid "Output" -msgstr "" +msgstr "Výstup" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Skopírujte spojené hodnoty do poľa \"Dĺžka/Hodnoty\"" #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -851,8 +849,8 @@ msgstr "Nedostatok miesta pre uloženie súboru %s." msgid "" "File %s already exists on server, change filename or check overwrite option." msgstr "" -"Súbor %s už existuje na servery, zmente názov súboru alebo zvolte prepísanie " -"súboru." +"Súbor %s už existuje na servery, zmente názov súboru alebo zvolte prepísanie" +" súboru." #: export.php:311 export.php:315 #, php-format @@ -867,8 +865,8 @@ msgstr "Dump (schéma) bol uložený do súboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation" -"%s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to " +"%sdocumentation%s for ways to workaround this limit." msgstr "" "Pravdepodobne ste sa pokúsili uploadnuť príliš veľký súbor. Prečítajte si " "prosím %sdokumentáciu%s, ako sa dá toto obmedzenie obísť." @@ -883,8 +881,8 @@ msgstr "Súbor sa nedá prečítať" #: libraries/File.class.php:705 libraries/File.class.php:713 #, php-format msgid "" -"You attempted to load file with unsupported compression (%s). Either support " -"for it is not implemented or disabled by your configuration." +"You attempted to load file with unsupported compression (%s). Either support" +" for it is not implemented or disabled by your configuration." msgstr "" "Pokúsili ste sa načítať súbor s nepodporovanou kompresiou (%s). Buď nie je " "zahrnutá podpora tejto kompresie alebo bola deaktivovaná v konfigurácii." @@ -892,8 +890,8 @@ msgstr "" #: import.php:336 msgid "" "No data was received to import. Either no file name was submitted, or the " -"file size exceeded the maximum size permitted by your PHP configuration. See " -"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." +"file size exceeded the maximum size permitted by your PHP configuration. See" +" [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" "Neboli prijaté žiadne dáta na import. Buď nebol načítaný žiadny súbor alebo " "jeho veľkosť prekročila maximálnu veľkosť povolenú v PHP. Pozri FAQ 1.16." @@ -960,11 +958,11 @@ msgstr "phpMyAdmin funguje lepšie s prehliadačmi podporujúcimi rámy." #: server_synchronize.php:738 server_synchronize.php:766 #: server_synchronize.php:794 server_synchronize.php:806 msgid "Click to select" -msgstr "" +msgstr "Kliknite pre vybranie" #: js/messages.php:26 msgid "Click to unselect" -msgstr "" +msgstr "Kliknite pre zrušenie vyberu" #: js/messages.php:27 libraries/import.lib.php:103 sql.php:195 msgid "\"DROP DATABASE\" statements are disabled." @@ -980,23 +978,21 @@ msgstr "Chystáte sa ZRUŠIŤ celú databázu!" #: js/messages.php:32 msgid "Dropping Event" -msgstr "" +msgstr "Odstraňujem udalosť" #: js/messages.php:33 -#, fuzzy #| msgid "Procedures" msgid "Dropping Procedure" -msgstr "Procedúry" +msgstr "Odstraňujem procedúru" #: js/messages.php:35 -#, fuzzy #| msgid "Allows inserting and replacing data." msgid "Deleting tracking data" -msgstr "Povolí vkladanie a nahradzovanie dát." +msgstr "Odstraňujem sledovacie dáta" #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Odstraňujem primárny kľúč/index" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" @@ -1005,12 +1001,12 @@ msgstr "" #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "Chystáte sa vypnúť skladisko BLOBov!" #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" -msgstr "" +msgstr "Chcete vypnúť všetky odkazy do skladiska BLOBov v databáze %s?" #: js/messages.php:44 msgid "Missing value in the form!" @@ -1037,32 +1033,28 @@ msgid "The passwords aren't the same!" msgstr "Heslá sa nezhodujú!" #: js/messages.php:52 -#, fuzzy #| msgid "Add a new User" msgid "Add a New User" -msgstr "Pridať nového používateľa" +msgstr "Pridať nového uživateľa" #: js/messages.php:53 -#, fuzzy msgid "Create User" -msgstr "Vytvoriť relaciu" +msgstr "Vytvoriť uživateľa" #: js/messages.php:54 -#, fuzzy #| msgid "Reloading the privileges" msgid "Reloading Privileges" -msgstr "Znovunačítanie práv" +msgstr "Načítavam oprávnenia" #: js/messages.php:55 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Odstrániť vybraných používateľov" +msgstr "Odstránenie vybraných používateľov" #: js/messages.php:56 libraries/tbl_properties.inc.php:792 #: tbl_tracking.php:245 tbl_tracking.php:373 msgid "Close" -msgstr "" +msgstr "Zavrieť" #: js/messages.php:60 libraries/tbl_properties.inc.php:797 pmd_general.php:388 #: pmd_general.php:425 pmd_general.php:545 pmd_general.php:593 @@ -1071,27 +1063,25 @@ msgid "Cancel" msgstr "Zrušiť" #: js/messages.php:63 -#, fuzzy msgid "Loading" -msgstr "Lokálny" +msgstr "Načítanie" #: js/messages.php:64 -#, fuzzy #| msgid "Processes" msgid "Processing Request" -msgstr "Procesy" +msgstr "Prebieha spracovanie požiadavka" #: js/messages.php:65 libraries/import/ods.php:80 msgid "Error in Processing Request" -msgstr "" +msgstr "Chyba pri spracovanie požiadavku" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "Odstraňujem stĺpce" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "Pridavam primarny kľúč" #: js/messages.php:68 libraries/relation.lib.php:87 pmd_general.php:386 #: pmd_general.php:543 pmd_general.php:591 pmd_general.php:667 @@ -1543,7 +1533,8 @@ msgid "Font size" msgstr "Veľkosť písma" #: libraries/File.class.php:310 -msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini." msgstr "" #: libraries/File.class.php:313 @@ -1574,8 +1565,8 @@ msgstr "" #: libraries/File.class.php:559 msgid "" -"Error moving the uploaded file, see [a@./Documentation." -"html#faq1_11@Documentation]FAQ 1.11[/a]" +"Error moving the uploaded file, see " +"[a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]" msgstr "Chyba pri presune súboru, pozrite FAQ 1.11" #: libraries/Index.class.php:427 tbl_relation.php:526 @@ -1625,8 +1616,8 @@ msgstr "Index pre %s bol odstránený" #: libraries/Index.class.php:579 #, php-format msgid "" -"The indexes %1$s and %2$s seem to be equal and one of them could possibly be " -"removed." +"The indexes %1$s and %2$s seem to be equal and one of them could possibly be" +" removed." msgstr "" #: libraries/List_Database.class.php:430 libraries/config/messages.inc.php:174 @@ -1760,14 +1751,14 @@ msgstr "" #: libraries/auth/config.auth.lib.php:115 msgid "" -"phpMyAdmin tried to connect to the MySQL server, and the server rejected the " -"connection. You should check the host, username and password in your " -"configuration and make sure that they correspond to the information given by " -"the administrator of the MySQL server." +"phpMyAdmin tried to connect to the MySQL server, and the server rejected the" +" connection. You should check the host, username and password in your " +"configuration and make sure that they correspond to the information given by" +" the administrator of the MySQL server." msgstr "" "phpMyAdmin sa pokúsil pripojiť k MySQL serveru ale ten spojenie odmietol. " -"Skontrolujte prosím meno serveru, používateľské meno a heslo v súbore config." -"inc.php a s tým, ktoré ste dostali o administrátora MySQL servera." +"Skontrolujte prosím meno serveru, používateľské meno a heslo v súbore " +"config.inc.php a s tým, ktoré ste dostali o administrátora MySQL servera." #: libraries/auth/cookie.auth.lib.php:229 msgid "Log in" @@ -1976,15 +1967,15 @@ msgstr "" #: libraries/common.inc.php:576 msgid "" "phpMyAdmin was unable to read your configuration file! This might " -"happen if PHP finds a parse error in it or PHP cannot find the file. Please call the configuration file directly using the link below and read " +"happen if PHP finds a parse error in it or PHP cannot find the file. Please call the configuration file directly using the link below and read " "the PHP error message(s) that you receive. In most cases a quote or a " -"semicolon is missing somewhere. If you receive a blank page, everything " -"is fine." +"semicolon is missing somewhere. If you receive a blank page, everything" +" is fine." msgstr "" "phpMyAdmin nebol schopný načítať konfiguračný súbor! Tento problém sa " -"zvyčajne vyskytne ak súbor obsahuje chybu alebo ho php nemohlo nájsť. Zavolajte browserom tento súbor priamo použitím nasledujúceho odkazu na " +"zvyčajne vyskytne ak súbor obsahuje chybu alebo ho php nemohlo nájsť. Zavolajte browserom tento súbor priamo použitím nasledujúceho odkazu na " "získanie chybových hlášok, ktoré sú ním spôsobené. Väčšinou sa jedná o " "chýbajúcu úvodzovku alebo bodkočiarku. Ak dostanete iba prázdnu " "stránku, všetko je v poriadku." @@ -2012,7 +2003,8 @@ msgstr "Chybný index serveru: \"%s\"" #: libraries/common.inc.php:629 #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." -msgstr "Chybný názov hostu pre server %1$s. Prosím, skontrolujte konfiguráciu." +msgstr "" +"Chybný názov hostu pre server %1$s. Prosím, skontrolujte konfiguráciu." #: libraries/common.inc.php:638 libraries/config/messages.inc.php:485 #: libraries/header.inc.php:115 main.php:161 server_synchronize.php:1174 @@ -2034,19 +2026,22 @@ msgstr "Mali by ste aktualizovať %s na verziu %s alebo vyššiu." msgid "Max: %s%s" msgstr "Maximálna veľkosť: %s%s" -#. l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation. +#. l10n: Language to use for MySQL 5.5 documentation, please use only +#. languages which do exist in official documentation. #: libraries/common.lib.php:404 msgctxt "MySQL 5.5 documentation language" msgid "en" msgstr "en" -#. l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. +#. l10n: Language to use for MySQL 5.1 documentation, please use only +#. languages which do exist in official documentation. #: libraries/common.lib.php:408 msgctxt "MySQL 5.1 documentation language" msgid "en" msgstr "en" -#. l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. +#. l10n: Language to use for MySQL 5.0 documentation, please use only +#. languages which do exist in official documentation. #: libraries/common.lib.php:412 msgctxt "MySQL 5.0 documentation language" msgid "en" @@ -2164,7 +2159,8 @@ msgstr " " msgid "." msgstr "," -#. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string +#. l10n: See http://www.php.net/manual/en/function.strftime.php to define the +#. format string #: libraries/common.lib.php:1610 #: libraries/transformations/text_plain__dateformat.inc.php:33 msgid "%B %d, %Y at %I:%M %p" @@ -2442,8 +2438,8 @@ msgstr "Nedá sa prihlásiť k MySQL serveru" #: libraries/config/messages.inc.php:21 msgid "" -"Enabling this allows a page located on a different domain to call phpMyAdmin " -"inside a frame, and is a potential [strong]security hole[/strong] allowing " +"Enabling this allows a page located on a different domain to call phpMyAdmin" +" inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" @@ -2494,8 +2490,8 @@ msgstr "Bzip2" #: libraries/config/messages.inc.php:32 msgid "" "Defines which type of editing controls should be used for CHAR and VARCHAR " -"columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" -"kbd] - allows newlines in columns" +"columns; [kbd]input[/kbd] - allows limiting of input length, " +"[kbd]textarea[/kbd] - allows newlines in columns" msgstr "" #: libraries/config/messages.inc.php:33 @@ -3032,9 +3028,9 @@ msgstr "Číslo stránky:" #: libraries/config/messages.inc.php:190 msgid "" -"Specify browser's title bar text. Refer to [a@Documentation." -"html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " -"get special values." +"Specify browser's title bar text. Refer to " +"[a(a)Documentation.html#cfg_TitleTable]documentation[/a] for magic strings " +"that can be used to get special values." msgstr "" #: libraries/config/messages.inc.php:191 @@ -3054,8 +3050,8 @@ msgstr "" #: libraries/config/messages.inc.php:194 msgid "" -"Please note that phpMyAdmin is just a user interface and its features do not " -"limit MySQL" +"Please note that phpMyAdmin is just a user interface and its features do not" +" limit MySQL" msgstr "" #: libraries/config/messages.inc.php:195 @@ -3157,9 +3153,10 @@ msgstr "SQL história" #: libraries/config/messages.inc.php:218 msgid "" "If you wish to use the SQL Validator service, you should be aware that " -"[strong]all SQL statements are stored anonymously for statistical purposes[/" -"strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], " -"Copyright 2002 Upright Database Technology. All rights reserved.[/em]" +"[strong]all SQL statements are stored anonymously for statistical " +"purposes[/strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL " +"Validator[/a], Copyright 2002 Upright Database Technology. All rights " +"reserved.[/em]" msgstr "" #: libraries/config/messages.inc.php:219 @@ -3234,8 +3231,8 @@ msgid "" "This might be good way to import large files, however it can break " "transactions." msgstr "" -"Povoliť prerušenie importu v prípade, že sa blíži časový limit behu skriptu. " -"Týmto spôsobom sa môžu importovať aj veľké súbory, ale môže to zároveň " +"Povoliť prerušenie importu v prípade, že sa blíži časový limit behu skriptu." +" Týmto spôsobom sa môžu importovať aj veľké súbory, ale môže to zároveň " "spôsobiť problémy s transakciami." #: libraries/config/messages.inc.php:235 @@ -3348,8 +3345,8 @@ msgstr "" #: libraries/config/messages.inc.php:272 msgid "" -"Only light version; display databases in a tree (determined by the separator " -"defined below)" +"Only light version; display databases in a tree (determined by the separator" +" defined below)" msgstr "" #: libraries/config/messages.inc.php:273 @@ -3615,8 +3612,8 @@ msgstr "" #: libraries/config/messages.inc.php:333 msgid "" -"Enable if you want DB-based query history (requires phpMyAdmin configuration " -"storage). If disabled, this utilizes JS-routines to display query history " +"Enable if you want DB-based query history (requires phpMyAdmin configuration" +" storage). If disabled, this utilizes JS-routines to display query history " "(lost by window close)." msgstr "" @@ -3671,7 +3668,8 @@ msgid "Recoding engine" msgstr "" #: libraries/config/messages.inc.php:346 -msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" +msgid "" +"Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" msgstr "" #: libraries/config/messages.inc.php:347 @@ -3732,8 +3730,8 @@ msgstr "" #: libraries/config/messages.inc.php:361 msgid "" "The path for the config file for [a@http://swekey.com]SweKey hardware " -"authentication[/a] (not located in your document root; suggested: /etc/" -"swekey.conf)" +"authentication[/a] (not located in your document root; suggested: " +"/etc/swekey.conf)" msgstr "" #: libraries/config/messages.inc.php:362 @@ -3760,8 +3758,8 @@ msgstr "" #: libraries/config/messages.inc.php:367 msgid "" -"Leave blank for no column comments/mime types, suggested: [kbd]" -"pma_column_info[/kbd]" +"Leave blank for no column comments/mime types, suggested: " +"[kbd]pma_column_info[/kbd]" msgstr "" #: libraries/config/messages.inc.php:368 @@ -3811,8 +3809,8 @@ msgstr "Žiadne tabuľky" #: libraries/config/messages.inc.php:378 msgid "" -"Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/" -"kbd]" +"Leave blank for no Designer support, suggested: " +"[kbd]pma_designer_coords[/kbd]" msgstr "" #: libraries/config/messages.inc.php:379 @@ -3822,8 +3820,8 @@ msgstr "Defragmentovať tabuľku" #: libraries/config/messages.inc.php:380 msgid "" -"More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug " -"tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]" +"More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug" +" tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]" msgstr "" #: libraries/config/messages.inc.php:381 @@ -3850,8 +3848,8 @@ msgstr "Žiadne databázy" #: libraries/config/messages.inc.php:386 msgid "" -"Leave blank for no SQL query history support, suggested: [kbd]pma_history[/" -"kbd]" +"Leave blank for no SQL query history support, suggested: " +"[kbd]pma_history[/kbd]" msgstr "" #: libraries/config/messages.inc.php:387 @@ -3883,8 +3881,8 @@ msgstr "" msgid "" "You can use MySQL wildcard characters (% and _), escape them if you want to " "use their literal instances, i.e. use [kbd]'my\\_db'[/kbd] and not " -"[kbd]'my_db'[/kbd]. Using this option you can sort database list, just enter " -"their names in order and use [kbd]*[/kbd] at the end to show the rest in " +"[kbd]'my_db'[/kbd]. Using this option you can sort database list, just enter" +" their names in order and use [kbd]*[/kbd] at the end to show the rest in " "alphabetical order." msgstr "" @@ -3911,9 +3909,9 @@ msgstr "" #: libraries/config/messages.inc.php:399 msgid "" -"Database used for relations, bookmarks, and PDF features. See [a@http://wiki." -"phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for " -"no support. Suggested: [kbd]phpmyadmin[/kbd]" +"Database used for relations, bookmarks, and PDF features. See " +"[a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. " +"Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd]" msgstr "" #: libraries/config/messages.inc.php:400 @@ -3933,8 +3931,8 @@ msgstr "ID servra" #: libraries/config/messages.inc.php:403 msgid "" -"Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links" -"[/a] support, suggested: [kbd]pma_relation[/kbd]" +"Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-" +"links[/a] support, suggested: [kbd]pma_relation[/kbd]" msgstr "" #: libraries/config/messages.inc.php:404 @@ -3952,8 +3950,8 @@ msgstr "" #: libraries/config/messages.inc.php:407 msgid "" -"See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types" -"[/a] for an example" +"See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication " +"types[/a] for an example" msgstr "" #: libraries/config/messages.inc.php:408 @@ -3983,7 +3981,8 @@ msgstr "" #: libraries/config/messages.inc.php:414 msgid "" -"Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]" +"Leave blank for no PDF schema support, suggested: " +"[kbd]pma_table_coords[/kbd]" msgstr "" #: libraries/config/messages.inc.php:415 @@ -4033,7 +4032,8 @@ msgid "Add DROP VIEW" msgstr "" #: libraries/config/messages.inc.php:424 -msgid "Defines the list of statements the auto-creation uses for new versions." +msgid "" +"Defines the list of statements the auto-creation uses for new versions." msgstr "" #: libraries/config/messages.inc.php:425 @@ -4044,8 +4044,8 @@ msgstr "Údaj" #: libraries/config/messages.inc.php:426 msgid "" -"Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/" -"kbd]" +"Leave blank for no SQL query tracking support, suggested: " +"[kbd]pma_tracking[/kbd]" msgstr "" #: libraries/config/messages.inc.php:427 @@ -4066,8 +4066,8 @@ msgstr "Režim automatickej obnovy" #: libraries/config/messages.inc.php:430 msgid "" -"Leave blank for no user preferences storage in database, suggested: [kbd]" -"pma_config[/kbd]" +"Leave blank for no user preferences storage in database, suggested: " +"[kbd]pma_config[/kbd]" msgstr "" #: libraries/config/messages.inc.php:431 @@ -4099,7 +4099,8 @@ msgid "Verbose name of this server" msgstr "" #: libraries/config/messages.inc.php:438 -msgid "Whether a user should be displayed a "show all (rows)" button" +msgid "" +"Whether a user should be displayed a "show all (rows)" button" msgstr "" #: libraries/config/messages.inc.php:439 @@ -4123,8 +4124,8 @@ msgstr "" #: libraries/config/messages.inc.php:443 msgid "" -"Defines whether or not type fields should be initially displayed in edit/" -"insert mode" +"Defines whether or not type fields should be initially displayed in " +"edit/insert mode" msgstr "" #: libraries/config/messages.inc.php:444 @@ -4156,7 +4157,8 @@ msgid "Show detailed MySQL server information" msgstr "" #: libraries/config/messages.inc.php:450 -msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed" +msgid "" +"Defines whether SQL queries generated by phpMyAdmin should be displayed" msgstr "" #: libraries/config/messages.inc.php:451 @@ -4186,9 +4188,9 @@ msgstr "" #: libraries/config/messages.inc.php:456 msgid "" "When setting this to [kbd]nested[/kbd], the alias of the table name is only " -"used to split/nest the tables according to the $cfg" -"['LeftFrameTableSeparator'] directive, so only the folder is called like the " -"alias, the table name itself stays unchanged" +"used to split/nest the tables according to the " +"$cfg['LeftFrameTableSeparator'] directive, so only the folder is called like" +" the alias, the table name itself stays unchanged" msgstr "" #: libraries/config/messages.inc.php:457 @@ -4235,8 +4237,8 @@ msgstr "" #: libraries/config/messages.inc.php:470 msgid "" -"If you have a custom username, specify it here (defaults to [kbd]anonymous[/" -"kbd])" +"If you have a custom username, specify it here (defaults to " +"[kbd]anonymous[/kbd])" msgstr "" #: libraries/config/messages.inc.php:471 tbl_tracking.php:405 @@ -4374,8 +4376,8 @@ msgstr "" #: libraries/config/messages.inc.php:501 msgid "" -"Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression " -"for import and export operations" +"Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression" +" for import and export operations" msgstr "" #: libraries/config/messages.inc.php:502 @@ -4490,7 +4492,8 @@ msgstr "" msgid "Incorrect IP address: %s" msgstr "" -#. l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. +#. l10n: Language to use for PHP documentation, please use only languages +#. which do exist in official documentation. #: libraries/core.lib.php:264 msgctxt "PHP documentation language" msgid "en" @@ -4731,15 +4734,15 @@ msgstr "" #, fuzzy, php-format #| msgid "" #| "This value is interpreted using %1$sstrftime%2$s, so you can use time " -#| "formatting strings. Additionally the following transformations will " -#| "happen: %3$s. Other text will be kept as is." +#| "formatting strings. Additionally the following transformations will happen: " +#| "%3$s. Other text will be kept as is." msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " "formatting strings. Additionally the following transformations will happen: " "%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" -"Táto hodnota je interpretovaná pomocou %1$sstrftime%2$s, takže môžete použiť " -"reťazec pre formátovanie dátumu a času. Naviac budú vykonané tieto " +"Táto hodnota je interpretovaná pomocou %1$sstrftime%2$s, takže môžete použiť" +" reťazec pre formátovanie dátumu a času. Naviac budú vykonané tieto " "nahradenia: %3$s. Ostatný text bude zachovaný." #: libraries/display_export.lib.php:275 @@ -4879,24 +4882,25 @@ msgstr "Čiastočný import" #: libraries/display_import.lib.php:214 #, php-format msgid "" -"Previous import timed out, after resubmitting will continue from position %d." +"Previous import timed out, after resubmitting will continue from position " +"%d." msgstr "" -"Predchádzajúcemu importu vypršal časový limit. Po znovuodoslaní formulára sa " -"bude pokračovať od pozície %d." +"Predchádzajúcemu importu vypršal časový limit. Po znovuodoslaní formulára sa" +" bude pokračovať od pozície %d." #: libraries/display_import.lib.php:221 #, fuzzy #| msgid "" -#| "Allow the interruption of an import in case the script detects it is " -#| "close to the PHP timeout limit. This might be good way to import large " -#| "files, however it can break transactions." +#| "Allow the interruption of an import in case the script detects it is close " +#| "to the PHP timeout limit. This might be good way to import large files, " +#| "however it can break transactions." msgid "" "Allow the interruption of an import in case the script detects it is close " "to the PHP timeout limit. (This might be good way to import large files, " "however it can break transactions.)" msgstr "" -"Povoliť prerušenie importu v prípade, že sa blíži časový limit behu skriptu. " -"Týmto spôsobom sa môžu importovať aj veľké súbory, ale môže to zároveň " +"Povoliť prerušenie importu v prípade, že sa blíži časový limit behu skriptu." +" Týmto spôsobom sa môžu importovať aj veľké súbory, ale môže to zároveň " "spôsobiť problémy s transakciami." #: libraries/display_import.lib.php:228 @@ -5083,8 +5087,8 @@ msgid "" " The increment size for extending the size of an autoextending tablespace " "when it becomes full." msgstr "" -" Veľkosť, o ktorú je zväčšený automaticky sa zväčšujúci priestor tabuľky pri " -"zaplnení." +" Veľkosť, o ktorú je zväčšený automaticky sa zväčšujúci priestor tabuľky pri" +" zaplnení." #: libraries/engines/innodb.lib.php:34 msgid "Buffer pool size" @@ -5184,8 +5188,8 @@ msgstr "Režim automatickej obnovy" #: libraries/engines/myisam.lib.php:28 msgid "" -"The mode for automatic recovery of crashed MyISAM tables, as set via the --" -"myisam-recover server startup option." +"The mode for automatic recovery of crashed MyISAM tables, as set via the " +"--myisam-recover server startup option." msgstr "" "Režim automatickej obnovy poškodených MyISAM tabuliek, ktorý sa dá nastaviť " "parametrom --myisam-recover pri spúšťaní servra." @@ -5224,7 +5228,8 @@ msgstr "Opravné vlákna" #: libraries/engines/myisam.lib.php:42 msgid "" "If this value is greater than 1, MyISAM table indexes are created in " -"parallel (each index in its own thread) during the repair by sorting process." +"parallel (each index in its own thread) during the repair by sorting " +"process." msgstr "" "Ak je táto hodnota vyššia ako 1, počas procesu Opravy Zoradením sú indexy " "MyISAM tabuľky vytvárané paralelne (každý index vo svojom vlákne)." @@ -5299,8 +5304,9 @@ msgstr "" #: libraries/engines/pbms.lib.php:56 msgid "" -"The timeout for inactive connection with the keep-alive flag set. After this " -"time the connection will be closed. The time-out is in milliseconds (1/1000)." +"The timeout for inactive connection with the keep-alive flag set. After this" +" time the connection will be closed. The time-out is in milliseconds " +"(1/1000)." msgstr "" #: libraries/engines/pbms.lib.php:60 @@ -5361,8 +5367,8 @@ msgstr "" #: libraries/engines/pbxt.lib.php:33 msgid "" -"The amount of memory allocated to the transaction log cache used to cache on " -"transaction log data. The default is 16MB." +"The amount of memory allocated to the transaction log cache used to cache on" +" transaction log data. The default is 16MB." msgstr "" #: libraries/engines/pbxt.lib.php:37 @@ -5371,8 +5377,8 @@ msgstr "" #: libraries/engines/pbxt.lib.php:38 msgid "" -"The size of a transaction log before rollover, and a new log is created. The " -"default value is 16MB." +"The size of a transaction log before rollover, and a new log is created. The" +" default value is 16MB." msgstr "" #: libraries/engines/pbxt.lib.php:42 @@ -5403,8 +5409,8 @@ msgstr "" msgid "" "The maximum size of a data log file. The default value is 64MB. PBXT can " "create a maximum of 32000 data logs, which are used by all tables. So the " -"value of this variable can be increased to increase the total amount of data " -"that can be stored in the database." +"value of this variable can be increased to increase the total amount of data" +" that can be stored in the database." msgstr "" #: libraries/engines/pbxt.lib.php:57 @@ -5413,8 +5419,8 @@ msgstr "" #: libraries/engines/pbxt.lib.php:58 msgid "" -"The percentage of garbage in a data log file before it is compacted. This is " -"a value between 1 and 99. The default is 50." +"The percentage of garbage in a data log file before it is compacted. This is" +" a value between 1 and 99. The default is 50." msgstr "" #: libraries/engines/pbxt.lib.php:62 @@ -5452,8 +5458,8 @@ msgstr "" #: libraries/engines/pbxt.lib.php:78 msgid "" "This is the number of transaction log files (pbxt/system/xlog*.xt) the " -"system will maintain. If the number of logs exceeds this value then old logs " -"will be deleted, otherwise they are renamed and given the next highest " +"system will maintain. If the number of logs exceeds this value then old logs" +" will be deleted, otherwise they are renamed and given the next highest " "number." msgstr "" @@ -5694,8 +5700,8 @@ msgstr "" #: libraries/export/sql.php:154 msgid "" "include column names in every <code>INSERT</code> statement   " -"    Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES " -"(1,2,3)</code>" +"    Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES" +" (1,2,3)</code>" msgstr "" #: libraries/export/sql.php:155 @@ -5719,14 +5725,14 @@ msgstr "" #: libraries/export/sql.php:167 msgid "" -"Dump binary columns in hexadecimal notation (for example, \"abc\" becomes " -"0x616263)" +"Dump binary columns in hexadecimal notation (for example, \"abc\" becomes" +" 0x616263)" msgstr "" #: libraries/export/sql.php:171 msgid "" -"Dump TIMESTAMP columns in UTC (enables TIMESTAMP columns to be dumped and " -"reloaded between servers in different time zones)" +"Dump TIMESTAMP columns in UTC (enables TIMESTAMP columns to be dumped and" +" reloaded between servers in different time zones)" msgstr "" #: libraries/export/sql.php:209 libraries/export/xml.php:34 @@ -5813,8 +5819,7 @@ msgid "View a structure`s contents by clicking on its name" msgstr "Zobraziť obsah tabuľky kliknuťím na jej názov" #: libraries/import.lib.php:1143 -msgid "" -"Change any of its settings by clicking the corresponding \"Options\" link" +msgid "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "Zmeniť ľubovolné nastavenia kliknutím na odkaz \"Nastavenia\"" #: libraries/import.lib.php:1144 @@ -6215,8 +6220,9 @@ msgstr "" #: libraries/relation.lib.php:155 msgid "" -"Enable advanced features in configuration file (<code>config.inc.php</" -"code>), for example by starting from <code>config.sample.inc.php</code>." +"Enable advanced features in configuration file " +"(<code>config.inc.php</code>), for example by starting from " +"<code>config.sample.inc.php</code>." msgstr "" #: libraries/relation.lib.php:156 @@ -6238,8 +6244,8 @@ msgstr "" #: libraries/replication_gui.lib.php:54 msgid "" -"Make sure, you have unique server-id in your configuration file (my.cnf). If " -"not, please add the following line into [mysqld] section:" +"Make sure, you have unique server-id in your configuration file (my.cnf). If" +" not, please add the following line into [mysqld] section:" msgstr "" #: libraries/replication_gui.lib.php:57 libraries/replication_gui.lib.php:58 @@ -6629,11 +6635,12 @@ msgid "" "examine your query closely, and check that the quotes are correct and not " "mis-matched. Other possible failure causes may be that you are uploading a " "file with binary outside of a quoted text area. You can also try your query " -"on the MySQL command line interface. The MySQL server error output below, if " -"there is any, may also help you in diagnosing the problem. If you still have " -"problems or if the parser fails where the command line interface succeeds, " -"please reduce your SQL query input to the single query that causes problems, " -"and submit a bug report with the data chunk in the CUT section below:" +"on the MySQL command line interface. The MySQL server error output below, if" +" there is any, may also help you in diagnosing the problem. If you still " +"have problems or if the parser fails where the command line interface " +"succeeds, please reduce your SQL query input to the single query that causes" +" problems, and submit a bug report with the data chunk in the CUT section " +"below:" msgstr "" "Je možné, že ste našli chybu v SQL syntaktickom analyzátore. Preskúmajte " "podrobne SQL dopyt, predovšetkým správnosť umiestnenia úvodzoviek. Ďalšia " @@ -6681,7 +6688,8 @@ msgstr "Neznámy interpunkčný reťazec" #, php-format msgid "" "The SQL validator could not be initialized. Please check if you have " -"installed the necessary PHP extensions as described in the %sdocumentation%s." +"installed the necessary PHP extensions as described in the " +"%sdocumentation%s." msgstr "" "SQL validator nemohol byť inicializovaný. Prosím skontrolujte, či sú " "nainštalované všetky potrebné rozšírenia php, tak ako sú popísané v " @@ -6704,9 +6712,9 @@ msgstr "Dĺžka/Nastaviť*" #, fuzzy #| msgid "" #| "If field type is \"enum\" or \"set\", please enter the values using this " -#| "format: 'a','b','c'... If you ever need to put a backslash (\"\\\") " -#| "or a single quote (\"'\") amongst those values, precede it with a " -#| "backslash (for example '\\\\xyz' or 'a\\'b')." +#| "format: 'a','b','c'... If you ever need to put a backslash (\"\\\") or " +#| "a single quote (\"'\") amongst those values, precede it with a backslash " +#| "(for example '\\\\xyz' or 'a\\'b')." msgid "" "If column type is \"enum\" or \"set\", please enter the values using this " "format: 'a','b','c'... If you ever need to put a backslash (\"\\\") or " @@ -6715,8 +6723,8 @@ msgid "" msgstr "" "Ak je pole typu \"enum\" alebo \"set\", prosím zadávajte hodnoty v tvare: " "'a','b','c'... Ak dokonca potrebujete zadať spätné lomítko (\"\\\") " -"alebo apostrof (\"'\") pri týchto hodnotách, zadajte ich napríklad takto '\\" -"\\xyz' alebo 'a\\'b'." +"alebo apostrof (\"'\") pri týchto hodnotách, zadajte ich napríklad takto " +"'\\\\xyz' alebo 'a\\'b'." #: libraries/tbl_properties.inc.php:105 msgid "" @@ -6749,13 +6757,13 @@ msgstr "Parametre transformácie" msgid "" "Please enter the values for transformation options using this format: 'a', " "100, b,'c'... If you ever need to put a backslash (\"\\\") or a single " -"quote (\"'\") amongst those values, precede it with a backslash (for example " -"'\\\\xyz' or 'a\\'b')." +"quote (\"'\") amongst those values, precede it with a backslash (for example" +" '\\\\xyz' or 'a\\'b')." msgstr "" "Prosím zadajte hodnoty pre parametre transformácie v nasledujúcom tvare: " "'a', 100, b,'c'... Ak potrebujete použiť spätné lomítko (\"\\\") alebo " -"jednoduché úvodzovky (\"'\") medzi týmito hodnotami, vložte pred nich spätné " -"lomítko (napr. '\\\\xyz' alebo 'a\\'b')." +"jednoduché úvodzovky (\"'\") medzi týmito hodnotami, vložte pred nich spätné" +" lomítko (napr. '\\\\xyz' alebo 'a\\'b')." #: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" @@ -6829,9 +6837,9 @@ msgstr "Udalosť" #, fuzzy #| msgid "" #| "Displays a link to download the binary data of the field. You can use the " -#| "first option to specify the filename, or use the second option as the " -#| "name of a field which contains the filename. If you use the second " -#| "option, you need to set the first option to the empty string." +#| "first option to specify the filename, or use the second option as the name " +#| "of a field which contains the filename. If you use the second option, you " +#| "need to set the first option to the empty string." msgid "" "Displays a link to download the binary data of the column. You can use the " "first option to specify the filename, or use the second option as the name " @@ -6847,14 +6855,14 @@ msgid "" "Displays hexadecimal representation of data. Optional first parameter " "specifies how often space will be added (defaults to 2 nibbles)." msgstr "" -"Zobrazí dáta v ich hexadecimálnej forme. Nepovinný parameter určuje po koľko " -"znakoch je vkladaná medzera (štandardne po dvoch)." +"Zobrazí dáta v ich hexadecimálnej forme. Nepovinný parameter určuje po koľko" +" znakoch je vkladaná medzera (štandardne po dvoch)." #: libraries/transformations/image_jpeg__inline.inc.php:9 #: libraries/transformations/image_png__inline.inc.php:9 msgid "" -"Displays a clickable thumbnail. The options are the maximum width and height " -"in pixels. The original aspect ratio is preserved." +"Displays a clickable thumbnail. The options are the maximum width and height" +" in pixels. The original aspect ratio is preserved." msgstr "" "Zobrazí náhľad obrázku s odkazom na obrázok; parametre šírka a výška v " "bodoch (pomer strán obrázku zostane zachovaný)" @@ -6871,41 +6879,41 @@ msgid "" "different date/time format string. Third option determines whether you want " "to see local date or UTC one (use \"local\" or \"utc\" strings) for that. " "According to that, date format has different value - for \"local\" see the " -"documentation for PHP's strftime() function and for \"utc\" it is done using " -"gmdate() function." +"documentation for PHP's strftime() function and for \"utc\" it is done using" +" gmdate() function." msgstr "" #: libraries/transformations/text_plain__external.inc.php:9 #, fuzzy #| msgid "" -#| "LINUX ONLY: Launches an external application and feeds it the field data " -#| "via standard input. Returns the standard output of the application. The " -#| "default is Tidy, to pretty-print HTML code. For security reasons, you " -#| "have to manually edit the file libraries/transformations/" -#| "text_plain__external.inc.php and list the tools you want to make " -#| "available. The first option is then the number of the program you want to " -#| "use and the second option is the parameters for the program. The third " -#| "option, if set to 1, will convert the output using htmlspecialchars() " -#| "(Default 1). The fourth option, if set to 1, will prevent wrapping and " -#| "ensure that the output appears all on one line (Default 1)." +#| "LINUX ONLY: Launches an external application and feeds it the field data via" +#| " standard input. Returns the standard output of the application. The default" +#| " is Tidy, to pretty-print HTML code. For security reasons, you have to " +#| "manually edit the file " +#| "libraries/transformations/text_plain__external.inc.php and list the tools " +#| "you want to make available. The first option is then the number of the " +#| "program you want to use and the second option is the parameters for the " +#| "program. The third option, if set to 1, will convert the output using " +#| "htmlspecialchars() (Default 1). The fourth option, if set to 1, will prevent" +#| " wrapping and ensure that the output appears all on one line (Default 1)." msgid "" "LINUX ONLY: Launches an external application and feeds it the column data " "via standard input. Returns the standard output of the application. The " "default is Tidy, to pretty-print HTML code. For security reasons, you have " -"to manually edit the file libraries/transformations/text_plain__external.inc." -"php and list the tools you want to make available. The first option is then " -"the number of the program you want to use and the second option is the " -"parameters for the program. The third option, if set to 1, will convert the " -"output using htmlspecialchars() (Default 1). The fourth option, if set to 1, " -"will prevent wrapping and ensure that the output appears all on one line " -"(Default 1)." -msgstr "" -"PLATÍ IBA PRE LINUX: Spustí externú aplikáciu, na jej štandardný vstup pošle " -"pole a zobrazí výstup programu. Predvolený program je Tidy, ktorý pekne " +"to manually edit the file " +"libraries/transformations/text_plain__external.inc.php and list the tools " +"you want to make available. The first option is then the number of the " +"program you want to use and the second option is the parameters for the " +"program. The third option, if set to 1, will convert the output using " +"htmlspecialchars() (Default 1). The fourth option, if set to 1, will prevent" +" wrapping and ensure that the output appears all on one line (Default 1)." +msgstr "" +"PLATÍ IBA PRE LINUX: Spustí externú aplikáciu, na jej štandardný vstup pošle" +" pole a zobrazí výstup programu. Predvolený program je Tidy, ktorý pekne " "sformátuje HTML. Z bezpečnostných dôvodov musíte ručne upraviť obsah súboru " "libraries/transformations/text_plain__external.inc.php a pridať do neho " -"povolené aplikácie. Prvý parameter je číslo aplikácie, ktorú chcete použiť a " -"druhý parametre sú parametre tejto aplikácie. Ak je tretí parameter " +"povolené aplikácie. Prvý parameter je číslo aplikácie, ktorú chcete použiť a" +" druhý parametre sú parametre tejto aplikácie. Ak je tretí parameter " "nastavený na 1, výstup bude skonvertovaný funkciou htmlspecialchars() " "(predvolený je 1). Štvrtý parameter v prípade, že je nastavený na 1 pridá k " "výstupnému textu parameter NOWRAP, čím zabezpečí zachovanie formátovania " @@ -6932,23 +6940,23 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"Zobrazí obrázok a odkaz z poľa obsahujúceho odkaz na obrázok. Prvý parameter " -"je prefix URL (napr. \"http://domena.sk/\"), druhý a tretí parameter určujú " -"šírku a výšku obrázku." +"Zobrazí obrázok a odkaz z poľa obsahujúceho odkaz na obrázok. Prvý parameter" +" je prefix URL (napr. \"http://domena.sk/\"), druhý a tretí parameter určujú" +" šírku a výšku obrázku." #: libraries/transformations/text_plain__link.inc.php:9 #, fuzzy #| msgid "" -#| "Displays a link; the field contains the filename. The first option is a " -#| "URL prefix like \"http://www.example.com/\". The second option is a title " -#| "for the link." +#| "Displays a link; the field contains the filename. The first option is a URL " +#| "prefix like \"http://www.example.com/\". The second option is a title for " +#| "the link." msgid "" -"Displays a link; the column contains the filename. The first option is a URL " -"prefix like \"http://www.example.com/\". The second option is a title for " +"Displays a link; the column contains the filename. The first option is a URL" +" prefix like \"http://www.example.com/\". The second option is a title for " "the link." msgstr "" -"Zobrazí odkaz z poľa obsahujúceho odkaz. Prvý parameter je prefix URL (napr. " -"\"http://domena.sk/\"), druhý parameter je text odkazu." +"Zobrazí odkaz z poľa obsahujúceho odkaz. Prvý parameter je prefix URL (napr." +" \"http://domena.sk/\"), druhý parameter je text odkazu." #: libraries/transformations/text_plain__longToIpv4.inc.php:9 msgid "" @@ -6962,14 +6970,14 @@ msgstr "Formátuje text ako SQL príkaz pomocou syntaxového zvýrazňovania." #: libraries/transformations/text_plain__substr.inc.php:9 msgid "" -"Displays a part of a string. The first option is the number of characters to " -"skip from the beginning of the string (Default 0). The second option is the " -"number of characters to return (Default: until end of string). The third " +"Displays a part of a string. The first option is the number of characters to" +" skip from the beginning of the string (Default 0). The second option is the" +" number of characters to return (Default: until end of string). The third " "option is the string to append and/or prepend when truncation occurs " "(Default: \"...\")." msgstr "" -"Zobrazí iba časť reťazca. Prvý parameter je posun od začiatku (predvolený je " -"0) a druhý určuje dĺžku textu, ktorá sa ma zobraziť, ak nie je zadaný bude " +"Zobrazí iba časť reťazca. Prvý parameter je posun od začiatku (predvolený je" +" 0) a druhý určuje dĺžku textu, ktorá sa ma zobraziť, ak nie je zadaný bude " "zobrazený zvyšok textu. Tretí parameter určuje znaky, ktoré budú pridané na " "koniec skráteného textu (predvolené je ...)." @@ -6999,8 +7007,8 @@ msgstr "Slave replikácia" #: libraries/user_preferences.lib.php:309 msgid "" -"Your browser has phpMyAdmin configuration for this domain. Would you like to " -"import it for current session?" +"Your browser has phpMyAdmin configuration for this domain. Would you like to" +" import it for current session?" msgstr "" #: libraries/zip_extension.lib.php:25 @@ -7121,20 +7129,23 @@ msgstr "" #: main.php:264 msgid "" -"Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime(a)]session.gc_maxlifetime[/a] is lower that cookie " -"validity configured in phpMyAdmin, because of this, your login will expire " -"sooner than configured in phpMyAdmin." +"Your PHP parameter " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime(a)]session.gc_maxlifetime[/a] is lower that cookie validity " +"configured in phpMyAdmin, because of this, your login will expire sooner " +"than configured in phpMyAdmin." msgstr "" #: main.php:271 msgid "" "Login cookie store is lower than cookie validity configured in phpMyAdmin, " -"because of this, your login will expire sooner than configured in phpMyAdmin." +"because of this, your login will expire sooner than configured in " +"phpMyAdmin." msgstr "" #: main.php:279 -msgid "The configuration file now needs a secret passphrase (blowfish_secret)." +msgid "" +"The configuration file now needs a secret passphrase (blowfish_secret)." msgstr "" "Nastavte prosím kľúč pre šifrovanie cookies v konfiguračnom súbore " "(blowfish_secret)." @@ -7164,15 +7175,15 @@ msgstr "" #: main.php:311 msgid "" "Javascript support is missing or disabled in your browser, some phpMyAdmin " -"functionality will be missing. For example navigation frame will not refresh " -"automatically." +"functionality will be missing. For example navigation frame will not refresh" +" automatically." msgstr "" #: main.php:326 #, php-format msgid "" -"Your PHP MySQL library version %s differs from your MySQL server version %s. " -"This may cause unpredictable behavior." +"Your PHP MySQL library version %s differs from your MySQL server version %s." +" This may cause unpredictable behavior." msgstr "" "Verzia Vašej PHP MySQL knižnice %s je rozdielna od MySQL server verzie %s. " "Toto môže spôsobiť nepredvídateľné správanie." @@ -7703,8 +7714,8 @@ msgstr "Obmedzí počet dopytov, ktoré môže používateľ odoslať za hodinu. #: server_privileges.php:52 server_privileges.php:651 #: server_privileges.php:653 msgid "" -"Limits the number of commands that change any table or database the user may " -"execute per hour." +"Limits the number of commands that change any table or database the user may" +" execute per hour." msgstr "" "Obmedzí počet príkazov meniacich tabuľku alebo databázu, ktorá môže " "používateľ odoslať za hodinu." @@ -7765,8 +7776,8 @@ msgstr "Povolí vypnutie serveru." #: server_privileges.php:554 msgid "" "Allows connecting, even if maximum number of connections is reached; " -"required for most administrative operations like setting global variables or " -"killing threads of other users." +"required for most administrative operations like setting global variables or" +" killing threads of other users." msgstr "" "Povolí spojenie aj v prípade, že bol dosiahnutý maximálny počet spojení. " "Potrebné pre väčšinu operácií pri správe serveru ako nastavovanie globálny " @@ -7916,7 +7927,8 @@ msgid "Remove selected users" msgstr "Odstrániť vybraných používateľov" #: server_privileges.php:1716 -msgid "Revoke all active privileges from the users and delete them afterwards." +msgid "" +"Revoke all active privileges from the users and delete them afterwards." msgstr "" "Odobranie všetkých aktívnych práv používateľom a ich následné odstránenie." @@ -8039,8 +8051,10 @@ msgstr "Vlákno %s bol úspešne zabité." #: server_processlist.php:31 #, php-format msgid "" -"phpMyAdmin was unable to kill thread %s. It probably has already been closed." -msgstr "Neporadilo za zabiť vlákno %s. Jeho beh bol pravdepodobne už ukončený." +"phpMyAdmin was unable to kill thread %s. It probably has already been " +"closed." +msgstr "" +"Neporadilo za zabiť vlákno %s. Jeho beh bol pravdepodobne už ukončený." #: server_processlist.php:65 msgid "ID" @@ -8097,10 +8111,10 @@ msgstr "Master replikácia" #: server_replication.php:216 msgid "" -"This server is not configured as master server in a replication process. You " -"can choose from either replicating all databases and ignoring certain " -"(useful if you want to replicate majority of databases) or you can choose to " -"ignore all databases by default and allow only certain databases to be " +"This server is not configured as master server in a replication process. You" +" can choose from either replicating all databases and ignoring certain " +"(useful if you want to replicate majority of databases) or you can choose to" +" ignore all databases by default and allow only certain databases to be " "replicated. Please select the mode:" msgstr "" @@ -8125,8 +8139,8 @@ msgstr "" #: server_replication.php:228 msgid "" "Once you restarted MySQL server, please click on Go button. Afterwards, you " -"should see a message informing you, that this server is configured as " -"master" +"should see a message informing you, that this server is configured as" +" master" msgstr "" #: server_replication.php:291 @@ -8222,13 +8236,13 @@ msgstr "" #: server_status.php:46 msgid "" -"The number of transactions that used the temporary binary log cache but that " -"exceeded the value of binlog_cache_size and used a temporary file to store " +"The number of transactions that used the temporary binary log cache but that" +" exceeded the value of binlog_cache_size and used a temporary file to store " "statements from the transaction." msgstr "" "Počet transakcií, ktoré využili dočasnú vyrovnávaciu pamäť binárneho logu, " -"ale zároveň prekročili hodnotu binlog_cache_size a museli tak použiť dočasný " -"súbor na uloženie príkazov transakcie." +"ale zároveň prekročili hodnotu binlog_cache_size a museli tak použiť dočasný" +" súbor na uloženie príkazov transakcie." #: server_status.php:47 msgid "The number of transactions that used the temporary binary log cache." @@ -8238,13 +8252,13 @@ msgstr "Počet transakcií, ktoré využili vyrovnávaciu pamäť binárneho log msgid "" "The number of temporary tables on disk created automatically by the server " "while executing statements. If Created_tmp_disk_tables is big, you may want " -"to increase the tmp_table_size value to cause temporary tables to be memory-" -"based instead of disk-based." +"to increase the tmp_table_size value to cause temporary tables to be " +"memory-based instead of disk-based." msgstr "" "Počet dočasných tabuliek automaticky vytvorených servrom pri vykonávaní " "príkazov. Ak je hodnota Created_tmp_disk_tables príliš vysoká, môžte zvýšiť " -"hodnotu tmp_table_size, aby boli dočasné tabuľky ukladané do pamäte a nie na " -"disk." +"hodnotu tmp_table_size, aby boli dočasné tabuľky ukladané do pamäte a nie na" +" disk." #: server_status.php:49 msgid "How many temporary files mysqld has created." @@ -8252,16 +8266,16 @@ msgstr "Počet dočasných súborov vytvorených servrom mysqld." #: server_status.php:50 msgid "" -"The number of in-memory temporary tables created automatically by the server " -"while executing statements." +"The number of in-memory temporary tables created automatically by the server" +" while executing statements." msgstr "" "Počet dočasných, v pamäti uložených tabuliek, vytvorených servrom pri " "vykonávaní príkazov." #: server_status.php:51 msgid "" -"The number of rows written with INSERT DELAYED for which some error occurred " -"(probably duplicate key)." +"The number of rows written with INSERT DELAYED for which some error occurred" +" (probably duplicate key)." msgstr "" "Počet riadkov pridaných príkazom INSERT DELAYED, pri ktorých sa vyskytla " "chyba (pravdepodobne opakujúci sa kľúč)." @@ -8271,8 +8285,8 @@ msgid "" "The number of INSERT DELAYED handler threads in use. Every different table " "on which one uses INSERT DELAYED gets its own thread." msgstr "" -"Počet vlákien používaných príkazmi INSERT DELAYED. Každá samostatná tabuľka, " -"na ktorú je použitý príkaz INSERT DELAYED, ma svoje vlastné vlákno." +"Počet vlákien používaných príkazmi INSERT DELAYED. Každá samostatná tabuľka," +" na ktorú je použitý príkaz INSERT DELAYED, ma svoje vlastné vlákno." #: server_status.php:53 msgid "The number of INSERT DELAYED rows written." @@ -8302,9 +8316,9 @@ msgstr "" #: server_status.php:58 msgid "" -"The number of times the first entry was read from an index. If this is high, " -"it suggests that the server is doing a lot of full index scans; for example, " -"SELECT col1 FROM foo, assuming that col1 is indexed." +"The number of times the first entry was read from an index. If this is high," +" it suggests that the server is doing a lot of full index scans; for " +"example, SELECT col1 FROM foo, assuming that col1 is indexed." msgstr "" "Počet prečítaní prvej položky indexu. Ak je táto hodnota príliš vysoká, " "znamená to že server vykonáva príliš veľa kompletných prechádzaní indexov; " @@ -8334,31 +8348,31 @@ msgid "" "method is mainly used to optimize ORDER BY ... DESC." msgstr "" "Počet požiadavkov na načítanie predchádzajúceho riadku podľa kľúča. Táto " -"čítacia metóda sa použiva hlavne na optimalizáciu príkazov typu ORDER BY ... " -"DESC." +"čítacia metóda sa použiva hlavne na optimalizáciu príkazov typu ORDER BY ..." +" DESC." #: server_status.php:62 msgid "" -"The number of requests to read a row based on a fixed position. This is high " -"if you are doing a lot of queries that require sorting of the result. You " +"The number of requests to read a row based on a fixed position. This is high" +" if you are doing a lot of queries that require sorting of the result. You " "probably have a lot of queries that require MySQL to scan whole tables or " "you have joins that don't use keys properly." msgstr "" "Počet požiadavkov na načítanie riadku na základe určitej pozície. Táto " -"hodnota je vysoká, ak sa vykonáva veľa príkazov, ktoré si vyžadujú zoradenie " -"výsledku. Pravdepodobne sa použiva veľa príkazov, kvôli ktorým musí MySQL " -"kompletne prehľadávať tabuľky, alebo sa používajú zjednotenia, ktoré správne " -"nevyužívajú kľúče." +"hodnota je vysoká, ak sa vykonáva veľa príkazov, ktoré si vyžadujú zoradenie" +" výsledku. Pravdepodobne sa použiva veľa príkazov, kvôli ktorým musí MySQL " +"kompletne prehľadávať tabuľky, alebo sa používajú zjednotenia, ktoré správne" +" nevyužívajú kľúče." #: server_status.php:63 msgid "" "The number of requests to read the next row in the data file. This is high " "if you are doing a lot of table scans. Generally this suggests that your " -"tables are not properly indexed or that your queries are not written to take " -"advantage of the indexes you have." +"tables are not properly indexed or that your queries are not written to take" +" advantage of the indexes you have." msgstr "" -"Počet požiadavkov na načítanie nasledujúceho riadku. Táto hodnota je vysoká, " -"ak sa vykonáva veľa kompletných prehľadávaní tabuliek. Znamená to že buď " +"Počet požiadavkov na načítanie nasledujúceho riadku. Táto hodnota je vysoká," +" ak sa vykonáva veľa kompletných prehľadávaní tabuliek. Znamená to že buď " "tabuľky nie sú správne indexované alebo príkazy nedostatočne využívajú " "dostupné indexy." @@ -8383,7 +8397,8 @@ msgid "The number of pages currently dirty." msgstr "Počet nečistých stránok." #: server_status.php:69 -msgid "The number of buffer pool pages that have been requested to be flushed." +msgid "" +"The number of buffer pool pages that have been requested to be flushed." msgstr "Počet stránok, na ktoré je požiadavka na vyprázdnenie." #: server_status.php:70 @@ -8392,8 +8407,8 @@ msgstr "Počet voľných stránok." #: server_status.php:71 msgid "" -"The number of latched pages in InnoDB buffer pool. These are pages currently " -"being read or written or that can't be flushed or removed for some other " +"The number of latched pages in InnoDB buffer pool. These are pages currently" +" being read or written or that can't be flushed or removed for some other " "reason." msgstr "" "Počet uzamknutých stránok v InnoDB vyrovnávacej pamäti. Z týchto stránok sa " @@ -8402,8 +8417,8 @@ msgstr "" #: server_status.php:72 msgid "" -"The number of pages busy because they have been allocated for administrative " -"overhead such as row locks or the adaptive hash index. This value can also " +"The number of pages busy because they have been allocated for administrative" +" overhead such as row locks or the adaptive hash index. This value can also " "be calculated as Innodb_buffer_pool_pages_total - " "Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data." msgstr "" @@ -8455,8 +8470,8 @@ msgstr "" "Normálne sa zápis do vyrovnávacej pamäte InnoDB vykonáva v pozadí. Ak však " "nie sú pri požiadavke na načítanie alebo vytvorenie stránky dostupné žiadne " "čisté stránky, je potrebné počkať na ich vyčistenie. Táto hodnota zobrazuje " -"počet týchto čakaní a ak bola správne nastavená veľkosť vyrovnávacej pamäte, " -"mala by byť nízka." +"počet týchto čakaní a ak bola správne nastavená veľkosť vyrovnávacej pamäte," +" mala by byť nízka." #: server_status.php:79 msgid "The number writes done to the InnoDB buffer pool." @@ -8497,19 +8512,22 @@ msgstr "Množstvo už zapísaných dát, v bajtoch." #: server_status.php:88 msgid "The number of pages that have been written for doublewrite operations." msgstr "" -"Počet vykonaných dvojitých zápisov a počet stránok zapísaných pre tento účel." +"Počet vykonaných dvojitých zápisov a počet stránok zapísaných pre tento " +"účel." #: server_status.php:89 msgid "The number of doublewrite operations that have been performed." msgstr "" -"Počet vykonaných dvojitých zápisov a počet stránok zapísaných pre tento účel." +"Počet vykonaných dvojitých zápisov a počet stránok zapísaných pre tento " +"účel." #: server_status.php:90 msgid "" "The number of waits we had because log buffer was too small and we had to " "wait for it to be flushed before continuing." msgstr "" -"Počet čakaní na vyprázdnenie vyrovnávacej pamäte logu z dôvodu jej zaplnenia." +"Počet čakaní na vyprázdnenie vyrovnávacej pamäte logu z dôvodu jej " +"zaplnenia." #: server_status.php:91 msgid "The number of log write requests." @@ -8629,8 +8647,8 @@ msgid "" "can be calculated as Key_reads/Key_read_requests." msgstr "" "Počet načítaní kľúčového bloku priamo z disku. Ak je táto hodnota príliš " -"veľká, väčšinou to znamená, že veľkosť vyrovnávacej pamäti (key_buffer_size) " -"je príliš malá. Úspešnosť vyrovnávacej pamäte si môžte vypočítať zo vzťahu " +"veľká, väčšinou to znamená, že veľkosť vyrovnávacej pamäti (key_buffer_size)" +" je príliš malá. Úspešnosť vyrovnávacej pamäte si môžte vypočítať zo vzťahu " "Key_reads/Key_read_requests." #: server_status.php:115 @@ -8645,12 +8663,13 @@ msgstr "Počet fyzických zápisov kľúčového bloku na disk." msgid "" "The total cost of the last compiled query as computed by the query " "optimizer. Useful for comparing the cost of different query plans for the " -"same query. The default value of 0 means that no query has been compiled yet." +"same query. The default value of 0 means that no query has been compiled " +"yet." msgstr "" "Celkové náklady na posledný kompilovaný príkaz, vypočítané optimizérom " "príkazov. Užitočné na porovnávanie nákladov na rôzne príkazy pre tú istú " -"požiadavku. Prednastavená hodnota 0 znamená, že doposiaľ neboli skompilované " -"žiadne príkazy." +"požiadavku. Prednastavená hodnota 0 znamená, že doposiaľ neboli skompilované" +" žiadne príkazy." #: server_status.php:118 msgid "The number of rows waiting to be written in INSERT DELAYED queues." @@ -8695,8 +8714,8 @@ msgstr "Počet príkazov pridaných do vyrovnávacej pamäti." #: server_status.php:127 msgid "" "The number of queries that have been removed from the cache to free up " -"memory for caching new queries. This information can help you tune the query " -"cache size. The query cache uses a least recently used (LRU) strategy to " +"memory for caching new queries. This information can help you tune the query" +" cache size. The query cache uses a least recently used (LRU) strategy to " "decide which queries to remove from the cache." msgstr "" "Počet príkazov, ktoré boli odstránené z vyrovnácej pamäti na uvoľnenie " @@ -8741,15 +8760,16 @@ msgstr "" #: server_status.php:134 msgid "The number of joins that used a range search on a reference table." msgstr "" -"Počet spojení, ktoré na referenčnej tabuľke využili intervalové vyhľadávanie." +"Počet spojení, ktoré na referenčnej tabuľke využili intervalové " +"vyhľadávanie." #: server_status.php:135 msgid "" "The number of joins without keys that check for key usage after each row. " "(If this is not 0, you should carefully check the indexes of your tables.)" msgstr "" -"Počet spojení bez kľúčov, ktoré kontrolovali použitie kľúča na každom riadku " -"(ak táto hodnota nie je 0, mali by ste starostlivo skontrolovať indexy " +"Počet spojení bez kľúčov, ktoré kontrolovali použitie kľúča na každom riadku" +" (ak táto hodnota nie je 0, mali by ste starostlivo skontrolovať indexy " "vašich tabuliek)." #: server_status.php:136 @@ -8757,8 +8777,8 @@ msgid "" "The number of joins that used ranges on the first table. (It's normally not " "critical even if this is big.)" msgstr "" -"Počet spojení, ktoré na prvej tabuľke využili intervalové vyhľadávanie (táto " -"hodnota nie je kritická ani v prípade, že je vysoká)." +"Počet spojení, ktoré na prvej tabuľke využili intervalové vyhľadávanie (táto" +" hodnota nie je kritická ani v prípade, že je vysoká)." #: server_status.php:137 msgid "The number of joins that did a full scan of the first table." @@ -8832,8 +8852,8 @@ msgid "" msgstr "" "Počet prípadov keď sa zámok tabuľky nedal získať okamžite a bolo nutné " "vyčkať. Ak je táto hodnota vysoká a máte problémy s výkonom, mali by ste " -"najprv optimalizovať vaše príkazy a potom buď rozdeliť tabuľku/tabuľky alebo " -"použiť replikáciu." +"najprv optimalizovať vaše príkazy a potom buď rozdeliť tabuľku/tabuľky alebo" +" použiť replikáciu." #: server_status.php:149 msgid "" @@ -8841,8 +8861,8 @@ msgid "" "calculated as Threads_created/Connections. If this value is red you should " "raise your thread_cache_size." msgstr "" -"Počet vlákien vo vyrovnávacej pamäti. Úspešnosť tejto vyrovnávacej pamäti sa " -"dá vypočítať zo vzťahu Threads_created/Connections. Ak je táto hodnota v " +"Počet vlákien vo vyrovnávacej pamäti. Úspešnosť tejto vyrovnávacej pamäti sa" +" dá vypočítať zo vzťahu Threads_created/Connections. Ak je táto hodnota v " "červenom, mali by ste zvýšiť hodnotu thread_cache_size." #: server_status.php:150 @@ -8944,14 +8964,15 @@ msgstr "Tento server beží %s. Bol spustený %s." #, fuzzy #| msgid "This server is configured as master in a replication process." msgid "" -"This MySQL server works as master and slave in replication</" -"b> process." +"This MySQL server works as master and slave in " +"replication process." msgstr "Tento server je nakonfigurovaný ako master v replikačnom procese." #: server_status.php:488 #, fuzzy #| msgid "This server is configured as master in a replication process." -msgid "This MySQL server works as master in replication process." +msgid "" +"This MySQL server works as master in replication process." msgstr "Tento server je nakonfigurovaný ako master v replikačnom procese." #: server_status.php:490 @@ -8967,12 +8988,12 @@ msgstr "Tento server je nakonfigurovaný ako master v replikačnom procese." #| "information about replication status on the server, please visit the <a " #| "href=\"#replication\">replication section</a>." msgid "" -"For further information about replication status on the server, please visit " -"the <a href=#replication>replication section</a>." +"For further information about replication status on the server, please visit" +" the <a href=#replication>replication section</a>." msgstr "" "Tento MySQL server funguje ako %s v replikačnom procese. Pre viac " -"informácií o stave replikácie na tomto serveri navštívte prosím <a href=" -"\"#replication\">sekciu replikácie</a>." +"informácií o stave replikácie na tomto serveri navštívte prosím <a " +"href=\"#replication\">sekciu replikácie</a>." #: server_status.php:509 msgid "" @@ -9026,11 +9047,11 @@ msgstr "Prerušené" #: server_status.php:616 #, php-format msgid "" -"Query statistics: Since its startup, %s queries have been sent to the " -"server." +"Query statistics: Since its startup, %s queries have been sent to the" +" server." msgstr "" -"Query statistics: Since its startup, %s queries have been sent to the " -"server." +"Query statistics: Since its startup, %s queries have been sent to the" +" server." #: server_status.php:626 msgid "per minute" @@ -9166,8 +9187,8 @@ msgstr "Socket" #: server_synchronize.php:1228 msgid "" -"Target database will be completely synchronized with source database. Source " -"database will remain unchanged." +"Target database will be completely synchronized with source database. Source" +" database will remain unchanged." msgstr "" #: server_variables.php:39 @@ -9194,8 +9215,9 @@ msgstr "" #: setup/frames/index.inc.php:50 msgid "" "Please create web server writable folder [em]config[/em] in phpMyAdmin top " -"level directory as described in [a(a)Documentation.html#setup_script]" -"documentation[/a]. Otherwise you will be only able to download or display it." +"level directory as described in " +"[a(a)Documentation.html#setup_script]documentation[/a]. Otherwise you will be " +"only able to download or display it." msgstr "" #: setup/frames/index.inc.php:57 @@ -9207,8 +9229,8 @@ msgstr "" #: setup/frames/index.inc.php:60 #, php-format msgid "" -"If your server is also configured to accept HTTPS requests follow [a@%s]this " -"link[/a] to use a secure connection." +"If your server is also configured to accept HTTPS requests follow [a@%s]this" +" link[/a] to use a secure connection." msgstr "" #: setup/frames/index.inc.php:64 @@ -9343,8 +9365,8 @@ msgstr "" #: setup/lib/index.lib.php:252 msgid "" "You didn't have blowfish secret set and have enabled cookie authentication, " -"so a key was automatically generated for you. It is used to encrypt cookies; " -"you don't need to remember it." +"so a key was automatically generated for you. It is used to encrypt cookies;" +" you don't need to remember it." msgstr "" #: setup/lib/index.lib.php:253 @@ -9356,8 +9378,8 @@ msgstr "" #: setup/lib/index.lib.php:255 msgid "" -"This value should be double checked to ensure that this directory is neither " -"world accessible nor readable or writable by other users on your server." +"This value should be double checked to ensure that this directory is neither" +" world accessible nor readable or writable by other users on your server." msgstr "" #: setup/lib/index.lib.php:256 @@ -9375,8 +9397,8 @@ msgstr "" #: setup/lib/index.lib.php:260 #, php-format msgid "" -"%sLogin cookie validity%s greater than 1440 seconds may cause random session " -"invalidation if %ssession.gc_maxlifetime%s is lower than its value " +"%sLogin cookie validity%s greater than 1440 seconds may cause random session" +" invalidation if %ssession.gc_maxlifetime%s is lower than its value " "(currently %d)." msgstr "" @@ -9384,7 +9406,8 @@ msgstr "" #, php-format msgid "" "%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at " -"most. Values larger than 1800 may pose a security risk such as impersonation." +"most. Values larger than 1800 may pose a security risk such as " +"impersonation." msgstr "" #: setup/lib/index.lib.php:264 @@ -9409,8 +9432,8 @@ msgid "" "You set the [kbd]config[/kbd] authentication type and included username and " "password for auto-login, which is not a desirable option for live hosts. " "Anyone who knows or guesses your phpMyAdmin URL can directly access your " -"phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]" -"http[/kbd]." +"phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or " +"[kbd]http[/kbd]." msgstr "" #: setup/lib/index.lib.php:270 @@ -9496,7 +9519,8 @@ msgstr "Funkcia" #: tbl_change.php:758 #, fuzzy -#| msgid " Because of its length, this field might not be editable " +#| msgid "" +#| " Because of its length, this field might not be editable " msgid " Because of its length, this column might not be editable " msgstr " Toto možno nepôjde upraviť, kvôli svojej dĺžke " @@ -9569,8 +9593,8 @@ msgstr "Práva boli úspešne znovunačítané." #| "May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ " #| "3.11[/a]" msgid "" -"The result of this query can't be used for a chart. See [a@./Documentation." -"html#faq6_29@Documentation]FAQ 6.29[/a]" +"The result of this query can't be used for a chart. See " +"[a@./Documentation.html#faq6_29@Documentation]FAQ 6.29[/a]" msgstr "Môže byť nepresné. Pozri FAQ 3.11" #: tbl_chart.php:90 @@ -9652,8 +9676,8 @@ msgstr "" #: tbl_chart.php:173 msgid "" -"Note that not every result table can be put to the chart. See <a href=\"./" -"Documentation.html#faq6_29\" target=\"Documentation\">FAQ 6.29</a>" +"Note that not every result table can be put to the chart. See <a " +"href=\"./Documentation.html#faq6_29\" target=\"Documentation\">FAQ 6.29</a>" msgstr "" #: tbl_chart.php:181 @@ -9703,8 +9727,7 @@ msgid "Index type:" msgstr "Typ indexu :" #: tbl_indexes.php:182 -msgid "" -"(\"PRIMARY\" must be the name of and only of a primary key!)" +msgid "(\"PRIMARY\" must be the name of and only of a primary key!)" msgstr "(\"PRIMARY\" musí byť iba meno primárneho kľúča!)" #: tbl_indexes.php:249 @@ -10195,8 +10218,6 @@ msgstr "" msgid "Rename view to" msgstr "Premenovať tabuľku na" -#, fuzzy -#~| msgid "Dumping data for table" #~ msgid "Delete the matches for the " #~ msgstr "Sťahujem dáta pre tabuľku" @@ -10219,8 +10240,8 @@ msgstr "Premenovať tabuľku na" #~ "The additional features for working with linked tables have been " #~ "deactivated. To find out why click %shere%s." #~ msgstr "" -#~ "Prídavné vlastnosti pre prácu s prepojenými tabuľkami boli deaktivované. " -#~ "Ak chcete zistiť prečo, kliknite %ssem%s." +#~ "Prídavné vlastnosti pre prácu s prepojenými tabuľkami boli deaktivované. Ak " +#~ "chcete zistiť prečo, kliknite %ssem%s." #~ msgid "Ignore duplicate rows" #~ msgstr "Ignorovať opakujúce sa riadky" @@ -10235,25 +10256,24 @@ msgstr "Premenovať tabuľku na" #~ msgstr "CSV dáta" #~ msgid "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." +#~ "Enter each value in a separate field, enclosed in single quotes. If you ever" +#~ " need to put a backslash (\"\\\") or a single quote (\"'\") amongst those " +#~ "values, precede it with a backslash (for example '\\\\xyz' or 'a\\'b')." #~ msgstr "" #~ "Prosím zadajte hodnoty pre parametre transformácie v nasledujúcom tvare: " -#~ "'a', 100, b,'c'... Ak potrebujete použiť spätné lomítko (\"\\\") " -#~ "alebo jednoduché úvodzovky (\"'\") medzi týmito hodnotami, vložte pred " -#~ "nich spätné lomítko (napr. '\\\\xyz' alebo 'a\\'b')." +#~ "'a', 100, b,'c'... Ak potrebujete použiť spätné lomítko (\"\\\") alebo " +#~ "jednoduché úvodzovky (\"'\") medzi týmito hodnotami, vložte pred nich spätné" +#~ " lomítko (napr. '\\\\xyz' alebo 'a\\'b')." #~ msgid "" #~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." +#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with a " +#~ "backslash (for example '\\\\xyz' or 'a\\'b')." #~ msgstr "" #~ "Prosím zadajte hodnoty pre parametre transformácie v nasledujúcom tvare: " -#~ "'a', 100, b,'c'... Ak potrebujete použiť spätné lomítko (\"\\\") " -#~ "alebo jednoduché úvodzovky (\"'\") medzi týmito hodnotami, vložte pred " -#~ "nich spätné lomítko (napr. '\\\\xyz' alebo 'a\\'b')." +#~ "'a', 100, b,'c'... Ak potrebujete použiť spätné lomítko (\"\\\") alebo " +#~ "jednoduché úvodzovky (\"'\") medzi týmito hodnotami, vložte pred nich spätné" +#~ " lomítko (napr. '\\\\xyz' alebo 'a\\'b')." #~ msgid "New table" #~ msgstr "Žiadne tabuľky" @@ -10284,8 +10304,7 @@ msgstr "Premenovať tabuľku na" #~ msgid "Imported file compression will be automatically detected from: %s" #~ msgstr "" -#~ "Kompresia importovaného súboru bude rozpoznaná automaticky. Podporované: " -#~ "%s" +#~ "Kompresia importovaného súboru bude rozpoznaná automaticky. Podporované: %s" #~ msgid "Add into comments" #~ msgstr "Pridať do komentárov" @@ -10323,18 +10342,17 @@ msgstr "Premenovať tabuľku na" #~ msgstr "nedá sa nahrať rozšírenie %s, prosím skontrolujte konfiguráciu PHP" #~ msgid "" -#~ "Couldn't load the iconv or recode extension needed for charset " -#~ "conversion. Either configure PHP to enable these extensions or disable " -#~ "charset conversion in phpMyAdmin." +#~ "Couldn't load the iconv or recode extension needed for charset conversion. " +#~ "Either configure PHP to enable these extensions or disable charset " +#~ "conversion in phpMyAdmin." #~ msgstr "" #~ "Nie je možné nahrať rozšírenie iconv alebo recode potrebné pre prevod " #~ "znakových sad. Upravte nastavenie php tak aby umožňovalo použiť tieto " #~ "rozšírenia alebo vypnite túto vlastnosť v konfigurácii phpMyAdmina." #~ msgid "" -#~ "Couldn't use the iconv, libiconv, or recode_string functions, although " -#~ "the necessary extensions appear to be loaded. Check your PHP " -#~ "configuration." +#~ "Couldn't use the iconv, libiconv, or recode_string functions, although the " +#~ "necessary extensions appear to be loaded. Check your PHP configuration." #~ msgstr "" -#~ "Nie je možné použiť funkcie iconv, libiconv a recode_string aj napriek " -#~ "tomu, že rozšírenia sú nahrané. Skontrolujte prosím nastavenie PHP." +#~ "Nie je možné použiť funkcie iconv, libiconv a recode_string aj napriek tomu," +#~ " že rozšírenia sú nahrané. Skontrolujte prosím nastavenie PHP." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_4_0, created. RELEASE_3_4_0
by Marc Delisle 11 May '11

11 May '11

The annotated tag, RELEASE_3_4_0 has been created at 129a16b6514006de1dfdb8dc3bdeec6a362406e7 (tag) tagging 082d0e5c8ea1de4d6014a4a57de02104f1c383f4 (commit) replaces RELEASE_3_4_0RC2 tagged by Marc Delisle on Wed May 11 06:21:49 2011 -0400 - Log ----------------------------------------------------------------- Released 3.4.0 Herman van Rink (1): bug #3285929 [privileges] Don't fail silently on missing priviledge to execute REVOKE ALL PRIVILEGES Madhura Jayaratne (442): Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Bug #3295529 - SQL tab multiple AJAX requests on one click Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. DB Operations tab adjusted for low resolution browsers Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Bug #3298581 - Row marking, null-checkbox of inline edit broken Marc Delisle (20): 3.4.0-rc3-dev Separate tab/window for the page explaining how to contribute to translations Undefined variable Remove invalid_value class before validation Invalid value class did not work on input fields for pmahomme Bug #3291923, Insert Ajax form does not generate default values - partial fix for text fields Bug #3294818 Fatal error in server_privileges.php (bot access) Misleading comments Start to replace warning level with error level Continue to replace warning level with error level Continue to replace warning level with error level Continue to replace warning level with error level Put back the red X displayed on some menu tabs when the action is not possible tabcaution no longer exists This message is not needed (and does not work anyway) This message was never displayed 3.4.0 Use correct icon for database in serverinfo div New test image for views in navi panel 3.4.0 release Martín Palombo (1): Do not load all tables into memory, we need only slice. Michal Čihař (10): Fix format string Mark fuzzy, format string is missing Fix format string Check if directory exists Write to temprorary file and rename when done. Update po files to match current code Merge translations from master Merge translations from master Update translations from Pootle Drop last occurence of warning class for messages Mike Hommé (3): Darkened .notice normal text to better distinguish between hyperlinks Fix for 3299241. Updated style for "disabled" topnav buttons. updated view icon for "Create View" link Piotr Przybylski (5): Class for styling database groups Fixed and simplified setSelectOptions Comments formatting and PHPDoc fixes Don't display More for views and information_schema tables Make sure $limit is initialized Pootle server (10): Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Rouslan Placella (2): Fixed issue #1 from bug #3291301 (Problems with inline edit link for sql query) Fixed issue #2 in bug #3291301 - Problems with inline edit link for sql query Tyron Madlener (1): Adjusted chart code to use colors as defined in each theme's layout.inc.php Yuichiro (289): Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. gergo314 (211): Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. Translation update done using Pootle. tyron (3): Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/tyronm into tyronm Correct indent (spaces instead of tabs) ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-1080-g9fd029b
by Marc Delisle 11 May '11

11 May '11

The branch, master has been updated via 9fd029b10c84c689b072743bdcd11abebef30940 (commit) via d2e6208688b8fa2d2d974875538a71c3467b1006 (commit) via 082d0e5c8ea1de4d6014a4a57de02104f1c383f4 (commit) from c071582487feb3554f0f3f403ad4b2f861430478 (commit) - Log ----------------------------------------------------------------- commit 9fd029b10c84c689b072743bdcd11abebef30940 Merge: c071582487feb3554f0f3f403ad4b2f861430478 d2e6208688b8fa2d2d974875538a71c3467b1006 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed May 11 06:16:00 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fdbbe9..8621526 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ 3.4.1.0 (not yet released) -3.4.0.0 (not yet released) +3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename + rfe #838637 [privileges] Export a user's privileges - [core] Updated mootools to fix some glitches with Safari. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0RC2-1010-gd2e6208
by Marc Delisle 11 May '11

11 May '11

The branch, QA_3_4 has been updated via d2e6208688b8fa2d2d974875538a71c3467b1006 (commit) via 082d0e5c8ea1de4d6014a4a57de02104f1c383f4 (commit) from ac3dd671658f5a31afb34210d068052785e49ac2 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8637aa..d7715ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ 3.4.1.0 (not yet released) -3.4.0.0 (not yet released) +3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename + rfe #838637 [privileges] Export a user's privileges - [core] Updated mootools to fix some glitches with Safari. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0RC2-998-g082d0e5
by Marc Delisle 11 May '11

11 May '11

The branch, MAINT_3_4_0 has been updated via 082d0e5c8ea1de4d6014a4a57de02104f1c383f4 (commit) from 0d1772b6f19529a991724fc3b455f45b75be0e42 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a15934..3706aa9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.0.0 (not yet released) +3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename + rfe #838637 [privileges] Export a user's privileges - [core] Updated mootools to fix some glitches with Safari. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-1077-gc071582
by Michal Čihař 11 May '11

11 May '11

The branch, master has been updated via c071582487feb3554f0f3f403ad4b2f861430478 (commit) via ac3dd671658f5a31afb34210d068052785e49ac2 (commit) via 0d1772b6f19529a991724fc3b455f45b75be0e42 (commit) from 523f86ef6e5232d841e94a44080806f9333d4bd4 (commit) - Log ----------------------------------------------------------------- commit c071582487feb3554f0f3f403ad4b2f861430478 Merge: 523f86ef6e5232d841e94a44080806f9333d4bd4 ac3dd671658f5a31afb34210d068052785e49ac2 Author: Michal Čihař <michal(a)cihar.com> Date: Wed May 11 07:14:59 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0RC2-1008-gac3dd67
by Michal Čihař 11 May '11

11 May '11

The branch, QA_3_4 has been updated discards 523f86ef6e5232d841e94a44080806f9333d4bd4 (commit) discards 071bc679dbd8bd2ece5182bdb471c027f33daf6c (commit) discards 7698df152041315049ad0e8b7db235e7fbbe7d7c (commit) discards 4a4c7b84276dc983912fa8ec39af243238658deb (commit) discards 69c1e15473447eff3ea337eb75b6dc2432b06189 (commit) discards 329c5551d4bc8e8a2c7fe378b6d0ed26e6e2ff78 (commit) discards 994606bb23a693c9568314b016db582b20f26b1c (commit) discards 8d3ebd746dfbfe4e2ca86121f0448ba7d5187432 (commit) discards d086c01ba140b366c4cb61dee6914146df3820d5 (commit) discards ed7cd53e2aab7c1a3c296a7b2931520ce38c5db0 (commit) discards e6211f0c2fb025007125456299165d572894983f (commit) discards 13b31956aed38141836faf386d97c042a3087f48 (commit) discards d40617abc7f0f7c4e7b078e50bbb394f5cec0709 (commit) discards d37a47017e341fdf61a2739a93d4fbceafdc51d5 (commit) discards 0adf49922f4f341e7920991e2d16bd1cc667808c (commit) discards f1694d2c02fd9b66e8d6bd0265ea98051caf965f (commit) discards 555c04b4a1bb91780aa21bff2b420eb6171a995d (commit) discards 9a9e3b6a37bf3a0df4fc53847238666c968fff10 (commit) discards 197d6ffe2d648c22710c7da8b06a7c188be2f883 (commit) discards e8f0a023f3b90e4f0d973fec5eebb286be712a13 (commit) discards 83a73a2a8e8514e100fe26d8c4704c830f686525 (commit) discards ad687ae58fc0e516150531e053aa786baf6f75e7 (commit) discards a9bb12a8b9f8c6bf26cb315e15e064268e418e83 (commit) discards 1e7e0704e79bc19a8f2c29bea4e94f7dd8d27022 (commit) discards bcb528ad5ea8dd6d28b81fba83726f6b41ac38b5 (commit) discards 1b41e9cb8779288de454445b552471660e2fbd23 (commit) discards 98f390d4827da63293937ca5ddfdead4fb731945 (commit) discards 5b9b1cb613b300a7e9397c7ff5295b75073dc1db (commit) discards 50a4191ae99488e95020d38aadbbf29b0e5b4af9 (commit) discards e8539bd778bc77548d97ff866e40f2319c2fe702 (commit) discards f897eaeb3caf33fb0ffae1d424346966b3df3a71 (commit) discards 0358007018029af939ffd62e6ac42b597dcf83d3 (commit) discards e880d4ffde0f940f526a5e9e4f4f9ca228b4e081 (commit) discards 5ec068f346756d1e19c345cb5f661eb7d1f2423a (commit) discards 821814ff50f2c1a4a237d2aca3c28f2c0b58b3c0 (commit) discards 064e875f10b0244a15da56c4ca590d516c51f6b6 (commit) discards 50bc50ecdf924b441756c440195f9d5d8dcfd643 (commit) discards 0e40c042cf32db6a92ab73a8db0803e17c0e3fa7 (commit) discards 92bffeee8f13ce3c76d8ec3a3ede20be42d92749 (commit) discards e2ffec079236176eeb56cbaeeb3e1984612d48bc (commit) discards 9e99fb3a3ca4c99625a37e5c93963e930431ca1d (commit) discards fd1ac3cdac0a302ace44c966337822d7589a129c (commit) discards 401cb3c1de764c118d1e3672eca3d567f48f1450 (commit) discards d52a0476345f40b4e16183e7bd94beb99600cf44 (commit) discards de3f7e3f66ed82e1f6f4cdf36784521e00e9f8e6 (commit) discards 0dd3fe3efff0a5861e5c5af9a96828a8a3b004e9 (commit) discards 0289f78d2b73f0a394214e1441499bcb421d7bf1 (commit) discards eef8ec8e66f185cc9a066f966430b8e18bc49ad0 (commit) discards 11c8ab302507485172ab9cc25b920182b48ea71e (commit) discards 8c9af0750bf5b90ce00dfd49306b13f069a12333 (commit) discards 09e7df2d59f045a0cb44fa7a9bce383f041bd4fb (commit) discards b312e74fc4c1857e424f8563a461e973008cab62 (commit) discards 74918d3ef6bc4c1c66df369b435c6e421fb81cf3 (commit) discards 2a3009cc7e0eceba4d09523c13d2130a781c649d (commit) discards 11bef52f9b3df13eb8d089a278d0a1f6624bd9a5 (commit) discards 5b48bdbdd0a64f87520e645af916ec07c9f1f6b7 (commit) discards acf8203be2065ac84c8e314cfdf1975b2ee29695 (commit) discards 834b7be02f447f460c42e21417c63a4fb3d7cf82 (commit) discards 0d5a9ff74a7fd2fbd9cd11f612188e7e88a86de9 (commit) discards bd32365ab5a8414e626387402800fe3a5964cca7 (commit) discards a20cdada3d11eead7c25ba3e66a147f706bf46e6 (commit) discards f8304073a6ebf9fa0db393045363c90fbb9e3dda (commit) discards 5c0475100a1e8d21ab53e47de18dcb61829a4d56 (commit) discards f8748fa77faf50e37efe141b592ef87d6bb8fdc1 (commit) discards 0468e0c6fa075c74fefa5c55ebd5bb8ecb0d33c2 (commit) discards b41df896f40d732440d3f0ee2467abcf6d14632d (commit) discards f0efbc1745abf07435a4e462bbae1e262ff60776 (commit) discards 4225386a9b1ee643a9ac2a66a82875748003a942 (commit) via ac3dd671658f5a31afb34210d068052785e49ac2 (commit) via 0d1772b6f19529a991724fc3b455f45b75be0e42 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (523f86ef6e5232d841e94a44080806f9333d4bd4) \ N -- N -- N (ac3dd671658f5a31afb34210d068052785e49ac2) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 - Documentation.html | 4 +- README | 2 +- browse_foreigners.php | 2 +- db_datadict.php | 4 +- db_operations.php | 4 +- db_printview.php | 2 +- db_qbe.php | 10 ++-- export.php | 4 +- import.php | 2 +- libraries/Config.class.php | 18 ++++---- libraries/List_Database.class.php | 2 +- libraries/Table.class.php | 2 +- libraries/chart.lib.php | 4 +- libraries/common.inc.php | 4 +- libraries/common.lib.php | 22 +++++----- libraries/core.lib.php | 10 ++-- libraries/database_interface.lib.php | 2 +- libraries/db_info.inc.php | 4 +- libraries/display_export.lib.php | 2 +- libraries/display_tbl.lib.php | 38 +++++++++--------- libraries/footer.inc.php | 2 +- libraries/header.inc.php | 4 +- libraries/import.lib.php | 4 +- libraries/mysql_charsets.lib.php | 4 +- libraries/plugin_interface.lib.php | 6 +- libraries/schema/Dia_Relation_Schema.class.php | 6 +- libraries/schema/Eps_Relation_Schema.class.php | 6 +- libraries/schema/Pdf_Relation_Schema.class.php | 8 ++-- libraries/schema/Svg_Relation_Schema.class.php | 6 +- libraries/schema/User_Schema.class.php | 6 +- libraries/schema/Visio_Relation_Schema.class.php | 6 +- libraries/server_links.inc.php | 2 +- libraries/session.inc.php | 2 +- libraries/sqlparser.lib.php | 6 +- libraries/tbl_info.inc.php | 2 +- libraries/tbl_properties.inc.php | 2 +- libraries/user_preferences.inc.php | 4 +- libraries/user_preferences.lib.php | 8 ++-- main.php | 2 +- po/hi.po | 6 +- po/hu.po | 13 +++--- po/ja.po | 45 ++++++++++++++------- po/zh_CN.po | 8 ++-- prefs_forms.php | 2 +- prefs_manage.php | 2 +- schema_edit.php | 8 ++-- server_privileges.php | 16 ++++---- setup/frames/form.inc.php | 2 +- setup/lib/ConfigGenerator.class.php | 2 +- setup/lib/index.lib.php | 4 +- sql.php | 14 +++--- tbl_change.php | 6 +- tbl_printview.php | 2 +- tbl_relation.php | 2 +- tbl_replace.php | 2 +- tbl_select.php | 6 +- tbl_structure.php | 2 +- transformation_wrapper.php | 2 +- 59 files changed, 193 insertions(+), 181 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fdbbe9..f8637aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,6 @@ phpMyAdmin - ChangeLog ====================== -3.5.0.0 (not yet released) - 3.4.1.0 (not yet released) 3.4.0.0 (not yet released) diff --git a/Documentation.html b/Documentation.html index cee6a42..6a3032e 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.5.0-dev - Documentation</title> + <title>phpMyAdmin 3.4.1-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">phpMyAdmin</a> - 3.5.0-dev + 3.4.1-dev Documentation </h1> </div> diff --git a/README b/README index bbc7762..e448f18 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.0-dev +Version 3.4.1-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/browse_foreigners.php b/browse_foreigners.php index 16fa48c..c8867af 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -27,7 +27,7 @@ $foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE $override_total = TRUE; -if (! isset($pos)) { +if (!isset($pos)) { $pos = 0; } diff --git a/db_datadict.php b/db_datadict.php index e9d18fd..e67c096 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -10,7 +10,7 @@ */ require_once './libraries/common.inc.php'; -if (! isset($selected_tbl)) { +if (!isset($selected_tbl)) { require_once './libraries/header.inc.php'; } @@ -220,7 +220,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { if ($zerofill) { $attribute = 'UNSIGNED ZEROFILL'; } - if (! isset($row['Default'])) { + if (!isset($row['Default'])) { if ($row['Null'] != 'NO') { $row['Default'] = 'NULL'; } diff --git a/db_operations.php b/db_operations.php index 2e0244f..f48ba27 100644 --- a/db_operations.php +++ b/db_operations.php @@ -37,7 +37,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { $move = false; } - if (! isset($newname) || ! strlen($newname)) { + if (!isset($newname) || !strlen($newname)) { $message = PMA_Message::error(__('The database name is empty!')); } else { $sql_query = ''; // in case target db exists @@ -561,7 +561,7 @@ echo __('Remove database'); . '</form></div>' . "\n"; if ($num_tables > 0 - && ! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { + && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { $message = PMA_Message::notice(__('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.')); $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', false); $message->addParam('</a>', false); diff --git a/db_printview.php b/db_printview.php index 7e3c709..36f297c 100644 --- a/db_printview.php +++ b/db_printview.php @@ -52,7 +52,7 @@ if ($cfg['SkipLockedTables'] == true) { $result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE); if ($result != false && PMA_DBI_num_rows($result) > 0) { while ($tmp = PMA_DBI_fetch_row($result)) { - if (! isset($sot_cache[$tmp[0]])) { + if (!isset($sot_cache[$tmp[0]])) { $sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . addslashes($tmp[0]) . '\';'); $sts_tmp = PMA_DBI_fetch_assoc($sts_result); $tables[] = $sts_tmp; diff --git a/db_qbe.php b/db_qbe.php index 34c85ee..751317d 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -339,7 +339,7 @@ for ($x = 0; $x < $col; $x++) { if (isset($criteria[$x])) { $tmp_criteria = $criteria[$x]; } - if ((empty($prev_criteria) || ! isset($prev_criteria[$x])) + if ((empty($prev_criteria) || !isset($prev_criteria[$x])) || $prev_criteria[$x] != htmlspecialchars($tmp_criteria)) { $curCriteria[$z] = $tmp_criteria; } else { @@ -497,7 +497,7 @@ for ($y = 0; $y <= $row; $y++) { echo "\n"; $or = 'Or' . $y; - if (! isset(${$or})) { + if (!isset(${$or})) { ${$or} = ''; } if (!empty(${$or}) && isset(${$or}[$x])) { @@ -667,7 +667,7 @@ foreach ($tbl_names as $key => $val) { <?php // 1. SELECT $last_select = 0; -if (! isset($qry_select)) { +if (!isset($qry_select)) { $qry_select = ''; } for ($x = 0; $x < $col; $x++) { @@ -892,7 +892,7 @@ if ($criteria_cnt > 1) { $qry_where = '(' . $qry_where . ')'; } // OR rows ${'cur' . $or}[$x] -if (! isset($curAndOrRow)) { +if (!isset($curAndOrRow)) { $curAndOrRow = array(); } for ($y = 0; $y <= $row; $y++) { @@ -929,7 +929,7 @@ if (!empty($qry_where) && $qry_where != '()') { // 4. ORDER BY $last_orderby = 0; -if (! isset($qry_orderby)) { +if (!isset($qry_orderby)) { $qry_orderby = ''; } for ($x = 0; $x < $col; $x++) { diff --git a/export.php b/export.php index 22a6324..7da25fc 100644 --- a/export.php +++ b/export.php @@ -21,7 +21,7 @@ $export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $exp $type = $what; // Check export type -if (! isset($export_list[$type])) { +if (!isset($export_list[$type])) { die('Bad type!'); } @@ -451,7 +451,7 @@ if ($export_type == 'server') { // Walk over databases foreach ($GLOBALS['pma']->databases as $current_db) { if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|')) - || ! isset($tmp_select)) { + || !isset($tmp_select)) { if (!PMA_exportDBHeader($current_db)) { break 2; } diff --git a/import.php b/import.php index 0b029e5..78e5ffd 100644 --- a/import.php +++ b/import.php @@ -332,7 +332,7 @@ if ($import_file != 'none' && !$error) { $error = TRUE; } } elseif (!$error) { - if (! isset($import_text) || empty($import_text)) { + if (!isset($import_text) || empty($import_text)) { $message = PMA_Message::error(__('No data was received to import. Either no file name was submitted, or the file size exceeded the maximum size permitted by your PHP configuration. See [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a].')); $error = TRUE; } diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f71a4e9..b363089 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.0-dev'); + $this->set('PMA_VERSION', '3.4.1-dev'); /** * @deprecated */ @@ -148,7 +148,7 @@ class PMA_Config { if (PMA_getenv('HTTP_USER_AGENT')) { $HTTP_USER_AGENT = PMA_getenv('HTTP_USER_AGENT'); - } elseif (! isset($HTTP_USER_AGENT)) { + } elseif (!isset($HTTP_USER_AGENT)) { $HTTP_USER_AGENT = ''; } @@ -441,7 +441,7 @@ class PMA_Config if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) { $config_mtime = max($this->default_source_mtime, $this->source_mtime); // cache user preferences, use database only when needed - if (! isset($_SESSION['cache'][$cache_key]['userprefs']) + if (!isset($_SESSION['cache'][$cache_key]['userprefs']) || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime) { // load required libraries require_once './libraries/user_preferences.lib.php'; @@ -451,7 +451,7 @@ class PMA_Config $_SESSION['cache'][$cache_key]['userprefs_type'] = $prefs['type']; $_SESSION['cache'][$cache_key]['config_mtime'] = $config_mtime; } - } else if ($server == 0 || ! isset($_SESSION['cache'][$cache_key]['userprefs'])) { + } else if ($server == 0 || !isset($_SESSION['cache'][$cache_key]['userprefs'])) { $this->set('user_preferences', false); return; } @@ -476,7 +476,7 @@ class PMA_Config // save theme $tmanager = $_SESSION['PMA_Theme_Manager']; if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) { - if ((! isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original') + if ((!isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original') || isset($config_data['ThemeDefault']) && $config_data['ThemeDefault'] != $tmanager->theme->getId()) { // new theme was set in common.inc.php $this->setUserValue(null, 'ThemeDefault', $tmanager->theme->getId(), 'original'); @@ -491,14 +491,14 @@ class PMA_Config } // save font size - if ((! isset($config_data['fontsize']) && $org_fontsize != '82%') + if ((!isset($config_data['fontsize']) && $org_fontsize != '82%') || isset($config_data['fontsize']) && $org_fontsize != $config_data['fontsize']) { $this->setUserValue(null, 'fontsize', $org_fontsize, '82%'); } // save language if (isset($_COOKIE['pma_lang']) || isset($_POST['lang'])) { - if ((! isset($config_data['lang']) && $GLOBALS['lang'] != 'en') + if ((!isset($config_data['lang']) && $GLOBALS['lang'] != 'en') || isset($config_data['lang']) && $GLOBALS['lang'] != $config_data['lang']) { $this->setUserValue(null, 'lang', $GLOBALS['lang'], 'en'); } @@ -511,7 +511,7 @@ class PMA_Config // save connection collation if (isset($_COOKIE['pma_collation_connection']) || isset($_POST['collation_connection'])) { - if ((! isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci') + if ((!isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci') || isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != $config_data['collation_connection']) { $this->setUserValue(null, 'collation_connection', $GLOBALS['collation_connection'], 'utf8_general_ci'); } @@ -678,7 +678,7 @@ class PMA_Config */ function set($setting, $value) { - if (! isset($this->settings[$setting]) || $this->settings[$setting] != $value) { + if (!isset($this->settings[$setting]) || $this->settings[$setting] != $value) { $this->settings[$setting] = $value; $this->set_mtime = time(); } diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 2663673..c29cc9d 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -498,7 +498,7 @@ require_once './libraries/List.class.php'; if (isset($tmp_mydbs[$tmp_db]) && $tmp_mydbs[$tmp_db] == 1) { $dblist[] = $tmp_db; $tmp_mydbs[$tmp_db] = 0; - } elseif (! isset($dblist[$tmp_db])) { + } elseif (!isset($dblist[$tmp_db])) { foreach ($tmp_mydbs as $tmp_matchpattern => $tmp_value) { // fixed bad regexp // TODO: db names may contain characters diff --git a/libraries/Table.class.php b/libraries/Table.class.php index d41eadc..a29900e 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -889,7 +889,7 @@ class PMA_Table } else { // we are copying // Create new entries as duplicates from old PMA DBs - if ($what != 'dataonly' && ! isset($maintain_relations)) { + if ($what != 'dataonly' && !isset($maintain_relations)) { if ($GLOBALS['cfgRelation']['commwork']) { // Get all comments and MIME-Types for current table $comments_copy_query = 'SELECT diff --git a/libraries/chart.lib.php b/libraries/chart.lib.php index 83791fb..3911f2e 100644 --- a/libraries/chart.lib.php +++ b/libraries/chart.lib.php @@ -104,7 +104,7 @@ function PMA_chart_results($data, &$chartSettings) // default for muti series $chartSettings['multi'] = false; - if (! isset($data[0])) { + if (!isset($data[0])) { // empty data return __('No data found for the chart.'); } @@ -192,7 +192,7 @@ function PMA_chart_results($data, &$chartSettings) // the value os for this serie $chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = (int)$row[$yAxisKey]; } - else if (! isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) { + else if (!isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) { // if the value for this serie is not set, set it to 0 $chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = 0; } diff --git a/libraries/common.inc.php b/libraries/common.inc.php index ef6f64b..49937c8 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -608,7 +608,7 @@ $GLOBALS['server'] = 0; * @todo merge into PMA_Config */ // Do we have some server? -if (! isset($cfg['Servers']) || count($cfg['Servers']) == 0) { +if (!isset($cfg['Servers']) || count($cfg['Servers']) == 0) { // No server => create one with defaults $cfg['Servers'] = array(1 => $default_server); } else { @@ -664,7 +664,7 @@ if (! isset($_SESSION['PMA_Theme_Manager'])) { } // for the theme per server feature -if (isset($_REQUEST['server']) && ! isset($_REQUEST['set_theme'])) { +if (isset($_REQUEST['server']) && !isset($_REQUEST['set_theme'])) { $GLOBALS['server'] = $_REQUEST['server']; $tmp = $_SESSION['PMA_Theme_Manager']->getThemeCookie(); if (empty($tmp)) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index e8e6b8a..5b353ec 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -301,7 +301,7 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '') return htmlspecialchars($parsed_sql['raw']); } // then check for an array - if (! is_array($parsed_sql)) { + if (!is_array($parsed_sql)) { // We don't so just return the input directly // This is intended to be used for when the SQL Parser is turned off $formatted_sql = '<pre>' . "\n" @@ -781,12 +781,12 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = $group_name = $parts[$i] . $sep; $group_name_full .= $group_name; - if (! isset($group[$group_name])) { + if (!isset($group[$group_name])) { $group[$group_name] = array(); $group[$group_name]['is' . $sep . 'group'] = true; $group[$group_name]['tab' . $sep . 'count'] = 1; $group[$group_name]['tab' . $sep . 'group'] = $group_name_full; - } elseif (! isset($group[$group_name]['is' . $sep . 'group'])) { + } elseif (!isset($group[$group_name]['is' . $sep . 'group'])) { $table = $group[$group_name]; $group[$group_name] = array(); $group[$group_name][$group_name] = $table; @@ -801,7 +801,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = $i++; } } else { - if (! isset($table_groups[$table_name])) { + if (!isset($table_groups[$table_name])) { $table_groups[$table_name] = array(); } $group =& $table_groups; @@ -963,7 +963,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view * in a string. In some special cases on sql.php, buffering has to be disabled * and hence we check with $GLOBALS['buffer_message'] */ - if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { + if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) { ob_start(); } global $cfg; @@ -1280,7 +1280,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // If we are in an Ajax request, we have most probably been called in // PMA_ajaxResponse(). Hence, collect the buffer contents and return it // to PMA_ajaxResponse(), which will encode it for JSON. - if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { + if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) { $buffer_contents = ob_get_contents(); ob_end_clean(); return $buffer_contents; @@ -2001,7 +2001,7 @@ function PMA_checkParameters($params, $die = true, $request = true) { global $checked_special; - if (! isset($checked_special)) { + if (!isset($checked_special)) { $checked_special = false; } @@ -2014,7 +2014,7 @@ function PMA_checkParameters($params, $die = true, $request = true) $checked_special = true; } - if (! isset($GLOBALS[$param])) { + if (!isset($GLOBALS[$param])) { $error_message .= $reported_script_name . ': Missing parameter: ' . $param . PMA_showDocu('faqmissingparameters') @@ -2112,7 +2112,7 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force . PMA_backquote($meta->orgname) . ' '; } // end if... else... - if (! isset($row[$i]) || is_null($row[$i])) { + if (!isset($row[$i]) || is_null($row[$i])) { $condition .= 'IS NULL AND'; } else { // timestamp is numeric on some MySQL 4.1 @@ -2434,8 +2434,8 @@ function PMA_userDir($dir) */ function PMA_getDbLink($database = null) { - if (! strlen($database)) { - if (! strlen($GLOBALS['db'])) { + if (!strlen($database)) { + if (!strlen($GLOBALS['db'])) { return ''; } $database = $GLOBALS['db']; diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 1d0f3a6..76d2c86 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -386,7 +386,7 @@ function PMA_array_merge_recursive() break; case 2 : $args = func_get_args(); - if (! is_array($args[0]) || ! is_array($args[1])) { + if (!is_array($args[0]) || !is_array($args[1])) { return $args[1]; } foreach ($args[1] as $key2 => $value2) { @@ -603,7 +603,7 @@ function PMA_array_read($path, $array, $default = null) $keys = explode('/', $path); $value =& $array; foreach ($keys as $key) { - if (! isset($value[$key])) { + if (!isset($value[$key])) { return $default; } $value =& $value[$key]; @@ -624,7 +624,7 @@ function PMA_array_write($path, &$array, $value) $last_key = array_pop($keys); $a =& $array; foreach ($keys as $key) { - if (! isset($a[$key])) { + if (!isset($a[$key])) { $a[$key] = array(); } $a =& $a[$key]; @@ -650,7 +650,7 @@ function PMA_array_remove($path, &$array) $found = true; // go as deep as required or possible foreach ($keys as $key) { - if (! isset($path[$depth][$key])) { + if (!isset($path[$depth][$key])) { $found = false; break; } @@ -665,7 +665,7 @@ function PMA_array_remove($path, &$array) // remove empty nested arrays for (; $depth >= 0; $depth--) { - if (! isset($path[$depth+1]) || count($path[$depth+1]) == 0) { + if (!isset($path[$depth+1]) || count($path[$depth+1]) == 0) { unset($path[$depth][$keys[$depth]]); } else { break; diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index be8d9f5..22d9671 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -196,7 +196,7 @@ function PMA_usort_comparison_callback($a, $b) $sorter = 'strcasecmp'; } /* No sorting when key is not present */ - if (! isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) { + if (!isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) { return 0; } // produces f.e.: diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index f8bb5a0..d8610f2 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -152,7 +152,7 @@ if (true === $cfg['SkipLockedTables']) { null, PMA_DBI_QUERY_STORE); if ($db_info_result && PMA_DBI_num_rows($db_info_result) > 0) { while ($tmp = PMA_DBI_fetch_row($db_info_result)) { - if (! isset($sot_cache[$tmp[0]])) { + if (!isset($sot_cache[$tmp[0]])) { $sts_result = PMA_DBI_query( 'SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . addslashes($tmp[0]) . '\';'); @@ -160,7 +160,7 @@ if (true === $cfg['SkipLockedTables']) { PMA_DBI_free_result($sts_result); unset($sts_result); - if (! isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) { + if (!isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) { $sts_tmp['Type'] =& $sts_tmp['Engine']; } diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 88c80af..10e8178 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -65,7 +65,7 @@ echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' . // If the export method was not set, the default is quick if(isset($_GET['export_method'])) { $cfg['Export']['method'] = $_GET['export_method']; -} elseif(! isset($cfg['Export']['method'])) { +} elseif(!isset($cfg['Export']['method'])) { $cfg['Export']['method'] = 'quick'; } // The export method (quick, custom or custom-no-form) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 6fa8e9b..78b4bb6 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1091,7 +1091,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } } - if (! is_array($map)) { + if (!is_array($map)) { $map = array(); } $row_no = 0; @@ -1272,7 +1272,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $condition_field = false; } - if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical' && (! isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) { + if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical' && (!isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) { // the row number corresponds to a data row, not HTML table row $class .= ' row_' . $row_no; if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) { @@ -1328,7 +1328,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // will show both fields NULL even if only one is NULL, // so use the $pointer - if (! isset($row[$i]) || is_null($row[$i])) { + if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); } elseif ($row[$i] != '') { @@ -1351,7 +1351,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $class = str_replace('inline_edit', '', $class); if (stristr($field_flags, 'BINARY')) { - if (! isset($row[$i]) || is_null($row[$i])) { + if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); } else { // for blobstreaming @@ -1367,7 +1367,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } // not binary: } else { - if (! isset($row[$i]) || is_null($row[$i])) { + if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); } elseif ($row[$i] != '') { // if a transform function for blob is set, none of these replacements will be made @@ -1395,7 +1395,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // n o t n u m e r i c a n d n o t B L O B } else { - if (! isset($row[$i]) || is_null($row[$i])) { + if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); } elseif ($row[$i] != '') { // support blanks in the key @@ -1477,7 +1477,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // 4. Gather links of del_urls and edit_urls in an array for later // output - if (! isset($vertical_display['edit'][$row_no])) { + if (!isset($vertical_display['edit'][$row_no])) { $vertical_display['edit'][$row_no] = ''; $vertical_display['copy'][$row_no] = ''; $vertical_display['delete'][$row_no] = ''; @@ -1563,7 +1563,7 @@ function PMA_displayVerticalTable() // Displays "edit" link at top if required if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1581,7 +1581,7 @@ function PMA_displayVerticalTable() // Displays "copy" link at top if required if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1599,7 +1599,7 @@ function PMA_displayVerticalTable() // Displays "delete" link at top if required if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['edit']) && !is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1652,7 +1652,7 @@ function PMA_displayVerticalTable() // Displays "edit" link at bottom if required if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1670,7 +1670,7 @@ function PMA_displayVerticalTable() // Displays "copy" link at bottom if required if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1688,7 +1688,7 @@ function PMA_displayVerticalTable() // Displays "delete" link at bottom if required if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['edit']) && !is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -2070,7 +2070,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) PMA_showMessage($message, $sql_query, 'success'); - } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { + } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { PMA_showMessage(__('Your SQL query has been executed successfully'), $sql_query, 'success'); } @@ -2090,7 +2090,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) if ($is_display['nav_bar'] == '1') { PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'top_direction_dropdown'); echo "\n"; - } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { + } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { echo "\n" . ' ' . "\n"; } @@ -2212,12 +2212,12 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) if ($is_display['nav_bar'] == '1') { echo ' ' . "\n"; PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'bottom_direction_dropdown'); - } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { + } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { echo "\n" . ' ' . "\n"; } // 6. ----- Displays "Query results operations" - if (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { + if (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { PMA_displayResultsOperations($the_disp_mode, $analyzed_sql); } } // end of the 'PMA_displayTable()' function @@ -2298,8 +2298,8 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { // If the parser found a PROCEDURE clause // (most probably PROCEDURE ANALYSE()) it makes no sense to // display the Export link). - if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && ! isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) { - if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && ! isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) { + if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && !isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) { + if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && !isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) { $_url_params['single_table'] = 'true'; } if (!$header_shown) { diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index 5a66351..f5385d5 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -166,7 +166,7 @@ if (window.parent.frame_content) { } // Link to itself to replicate windows including frameset -if (! isset($GLOBALS['checked_special'])) { +if (!isset($GLOBALS['checked_special'])) { $GLOBALS['checked_special'] = false; } diff --git a/libraries/header.inc.php b/libraries/header.inc.php index f6c3dcd..a23d2fa 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -30,7 +30,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { // if database storage for user preferences is transient, offer to load // exported settings from localStorage (detection will be done in JavaScript) $userprefs_offer_import = $GLOBALS['PMA_Config']->get('user_preferences') == 'session' - && ! isset($_SESSION['userprefs_autoload']); + && !isset($_SESSION['userprefs_autoload']); if ($userprefs_offer_import) { $GLOBALS['js_include'][] = 'config.js'; } @@ -143,7 +143,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { * @uses $show_comment from libraries/tbl_info.inc.php * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php */ - if (!empty($show_comment) && ! isset($GLOBALS['avoid_show_comment'])) { + if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) { if (strstr($show_comment, '; InnoDB free')) { $show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment); } diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 0c77f54..a7d0b5e 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -127,7 +127,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } $msg = '# '; if ($result === FALSE) { // execution failed - if (! isset($my_die)) { + if (!isset($my_die)) { $my_die = array(); } $my_die[] = array('sql' => $import_run_buffer['full'], 'error' => PMA_DBI_getError()); @@ -697,7 +697,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * This is the first row to be analyzed */ - elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) { + elseif (!isset($last_cumulative_type) || $last_cumulative_type == NONE) { return $curr_size; } /** diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 51b79ba..45fd55a 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -37,7 +37,7 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) { : 'SELECT * FROM information_schema.COLLATIONS'; $res = PMA_DBI_query($sql); while ($row = PMA_DBI_fetch_assoc($res)) { - if (! is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) { + if (!is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) { $mysql_collations[$row['CHARACTER_SET_NAME']] = array($row['COLLATION_NAME']); } else { $mysql_collations[$row['CHARACTER_SET_NAME']][] = $row['COLLATION_NAME']; @@ -46,7 +46,7 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) { if ($row['IS_DEFAULT'] == 'Yes') { $mysql_default_collations[$row['CHARACTER_SET_NAME']] = $row['COLLATION_NAME']; } - //$mysql_collations_available[$row['Collation']] = ! isset($row['Compiled']) || $row['Compiled'] == 'Yes'; + //$mysql_collations_available[$row['Collation']] = !isset($row['Compiled']) || $row['Compiled'] == 'Yes'; $mysql_collations_available[$row['COLLATION_NAME']] = true; $mysql_charsets_available[$row['CHARACTER_SET_NAME']] = !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']]) diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index edfd02a..48dc975 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -71,7 +71,7 @@ function PMA_getString($name) function PMA_pluginCheckboxCheck($section, $opt) { // If the form is being repopulated using $_GET data, that is priority - if (isset($_GET[$opt]) || ! isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) || + if (isset($_GET[$opt]) || !isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) || (isset($GLOBALS['cfg'][$section][$opt]) && $GLOBALS['cfg'][$section][$opt]))) { return ' checked="checked"'; } @@ -160,7 +160,7 @@ function PMA_pluginIsActive($section, $opt, $val) */ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL) { - if (! isset($cfgname)) { + if (!isset($cfgname)) { $cfgname = $name; } $ret = '<select id="plugins" name="' . $name . '">'; @@ -168,7 +168,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL) foreach ($list as $plugin_name => $val) { $ret .= '<option'; // If the form is being repopulated using $_GET data, that is priority - if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) { + if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || !isset($_GET[$name]) && $plugin_name == $default) { $ret .= ' selected="selected"'; } $ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . '</option>' . "\n"; diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index a781307..e58381e 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -680,7 +680,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema $dia->startDiaDoc($this->paper,$this->_topMargin,$this->_bottomMargin,$this->_leftMargin,$this->_rightMargin,$this->orientation); $alltables = $this->getAllTables($db,$this->pageNumber); foreach ($alltables as $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys); } } @@ -725,10 +725,10 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys); } $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index edea703..5435db4 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -759,7 +759,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema $alltables = $this->getAllTables($db,$this->pageNumber); foreach ($alltables AS $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table,$eps->getFont(),$eps->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); } @@ -809,10 +809,10 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo); } $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index ef60264..6078537 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -882,7 +882,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /* snip */ foreach ($alltables as $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table, $this->_ff, $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); } if ($this->sameWide) { @@ -962,11 +962,11 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showInfo) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo); $this->_setMinMax($this->tables[$masterTable]); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo); $this->_setMinMax($this->tables[$foreignTable]); } @@ -1305,7 +1305,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema if ($zerofill) { $attribute = 'UNSIGNED ZEROFILL'; } - if (! isset($row['Default'])) { + if (!isset($row['Default'])) { if ($row['Null'] != '' && $row['Null'] != 'NO') { $row['Default'] = 'NULL'; } diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 0f6b55b..afafda7 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -742,7 +742,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema $alltables = $this->getAllTables($db,$this->pageNumber); foreach ($alltables AS $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table,$svg->getFont(),$svg->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); } @@ -805,11 +805,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo); $this->_setMinMax($this->tables[$masterTable]); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo); $this->_setMinMax($this->tables[$foreignTable]); } diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 7e8dbfb..fbec138 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -222,7 +222,7 @@ class PMA_User_Schema * Display WYSIWYG parts */ - if (! isset($_POST['with_field_names']) && ! isset($_POST['showwysiwyg'])) { + if (!isset($_POST['with_field_names']) && !isset($_POST['showwysiwyg'])) { $with_field_names = TRUE; } $this->_displayScratchboardTables($array_sh_page); @@ -783,10 +783,10 @@ class PMA_User_Schema $arrvalue = 'c_table_' . $i; global $$arrvalue; $arrvalue = $$arrvalue; - if (! isset($arrvalue['x']) || $arrvalue['x'] == '') { + if (!isset($arrvalue['x']) || $arrvalue['x'] == '') { $arrvalue['x'] = 0; } - if (! isset($arrvalue['y']) || $arrvalue['y'] == '') { + if (!isset($arrvalue['y']) || $arrvalue['y'] == '') { $arrvalue['y'] = 0; } if (isset($arrvalue['name']) && $arrvalue['name'] != '--') { diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index a9be622..ab45b13 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -505,7 +505,7 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema $alltables = $this->getAllTables($db,$this->pageNumber); foreach ($alltables as $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys); } } @@ -550,10 +550,10 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys); } $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index b8b4dcd..8196269 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -27,7 +27,7 @@ if (!$GLOBALS['is_ajax_request']) { /** * Put something in $sub_part */ - if (! isset($sub_part)) { + if (!isset($sub_part)) { $sub_part = ''; } diff --git a/libraries/session.inc.php b/libraries/session.inc.php index 465e3f0..4f8caec 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -95,7 +95,7 @@ if (! isset($_COOKIE[$session_name])) { * Token which is used for authenticating access queries. * (we use "space PMA_token space" to prevent overwriting) */ -if (! isset($_SESSION[' PMA_token '])) { +if (!isset($_SESSION[' PMA_token '])) { $_SESSION[' PMA_token '] = md5(uniqid(rand(), true)); } diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index a46b720..cbad1d6 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -46,7 +46,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (!defined('TESTSUITE')) { require_once './libraries/mysql_charsets.lib.php'; } - if (! isset($mysql_charsets)) { + if (!isset($mysql_charsets)) { $mysql_charsets = array(); $mysql_charsets_count = 0; $mysql_collations_flat = array(); @@ -828,7 +828,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ function PMA_SQP_analyze($arr) { - if ($arr == array() || ! isset($arr['len'])) { + if ($arr == array() || !isset($arr['len'])) { return array(); } $result = array(); @@ -2090,7 +2090,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { { //DEBUG echo 'in Format<pre>'; print_r($arr); echo '</pre>'; // then check for an array - if (! is_array($arr)) { + if (!is_array($arr)) { return htmlspecialchars($arr); } // first check for the SQL parser having hit an error diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index ac3a26f..00c9904 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -102,7 +102,7 @@ if ($showtable) { } } // we need explicit DEFAULT value here (different from '0') - $pack_keys = (! isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys; + $pack_keys = (!isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys; unset($create_options, $each_create_option); } // end if ?> diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 395fa7b..54e9d1d 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -378,7 +378,7 @@ for ($i = 0; $i < $num_fields; $i++) { * having NULL enabled does not implicit having Default with NULL * if (isset($row) - && ! isset($row['Default']) && isset($row['Null']) && $row['Null'] == 'YES') { + && !isset($row['Default']) && isset($row['Null']) && $row['Null'] == 'YES') { $row['Default'] = 'NULL'; } */ diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index 7d1a2d7..2aad2e6 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -15,7 +15,7 @@ require './libraries/server_links.inc.php'; // build user preferences menu $form_param = filter_input(INPUT_GET, 'form'); -if (! isset($forms[$form_param])) { +if (!isset($forms[$form_param])) { $forms_keys = array_keys($forms); $form_param = array_shift($forms_keys); } @@ -64,7 +64,7 @@ $msg->display(); // warn about using session storage for settings $cfgRelation = PMA_getRelationsParam(); -if (! $cfgRelation['userconfigwork']) { +if (!$cfgRelation['userconfigwork']) { $msg = __('Your preferences will be saved for current session only. Storing them permanently requires %sphpMyAdmin configuration storage%s.'); $msg = PMA_sanitize(sprintf($msg, '[a@./Documentation.html#linked-tables@_blank]', '[/a]')); PMA_Message::notice($msg)->display(); diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 3fb8c1b..6c48116 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -49,9 +49,9 @@ function PMA_userprefs_pageinit() function PMA_load_userprefs() { $cfgRelation = PMA_getRelationsParam(); - if (! $cfgRelation['userconfigwork']) { + if (!$cfgRelation['userconfigwork']) { // no pmadb table, use session storage - if (! isset($_SESSION['userconfig'])) { + if (!isset($_SESSION['userconfig'])) { $_SESSION['userconfig'] = array( 'db' => array(), 'ts' => time()); @@ -104,7 +104,7 @@ function PMA_save_userprefs(array $config_array) ? $GLOBALS['server'] : $GLOBALS['cfg']['ServerDefault']; $cache_key = 'server_' . $server; - if (! $cfgRelation['userconfigwork']) { + if (!$cfgRelation['userconfigwork']) { // no pmadb table, use session storage $_SESSION['userconfig'] = array( 'db' => $config_array, @@ -175,7 +175,7 @@ function PMA_apply_userprefs(array $config_data) $whitelist['Server/hide_db'] = true; $whitelist['Server/only_db'] = true; foreach ($config_data as $path => $value) { - if (! isset($whitelist[$path]) || isset($blacklist[$path])) { + if (!isset($whitelist[$path]) || isset($blacklist[$path])) { continue; } PMA_array_write($path, $cfg, $value); diff --git a/main.php b/main.php index d69b4bb..c7c25bc 100644 --- a/main.php +++ b/main.php @@ -292,7 +292,7 @@ if (file_exists('./config')) { */ if ($server > 0) { $cfgRelation = PMA_getRelationsParam(); - if(! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { + if(!$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { $message = PMA_Message::notice(__('The phpMyAdmin configuration storage is not completely configured, some extended features have been deactivated. To find out why click %shere%s.')); $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false); $message->addParam('</a>', false); diff --git a/po/hi.po b/po/hi.po index 5a673c8..a04d453 100644 --- a/po/hi.po +++ b/po/hi.po @@ -3,9 +3,9 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" -"PO-Revision-Date: 2011-05-06 09:13+0200\n" -"Last-Translator: <manojonemail(a)gmail.com>\n" +"POT-Creation-Date: 2011-05-09 07:40+0200\n" +"PO-Revision-Date: 2011-04-24 00:23+0200\n" +"Last-Translator: <rsedwardian(a)gmail.com>\n" "Language-Team: hindi <hi(a)li.org>\n" "Language: hi\n" "MIME-Version: 1.0\n" diff --git a/po/hu.po b/po/hu.po index 6a6a7ff..4dd32fb 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,9 +3,9 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" -"PO-Revision-Date: 2011-05-09 14:22+0200\n" -"Last-Translator: <gergo314(a)gmail.com>\n" +"POT-Creation-Date: 2011-05-09 14:14+0200\n" +"PO-Revision-Date: 2011-05-05 12:49+0200\n" +"Last-Translator: <gergo314(a)gmail.com>\n" "Language-Team: hungarian <hu(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3481,9 +3481,8 @@ msgstr "" " nem található" #: libraries/config/messages.inc.php:328 -#, fuzzy msgid "Missing phpMyAdmin configuration storage tables" -msgstr "Hiányzó táblák a phpMyAdmin konfigurációs tárolóhoz" +msgstr "" #: libraries/config/messages.inc.php:330 msgid "Iconic table operations" @@ -3788,8 +3787,8 @@ msgstr "" "Használhatja a MySQL-karakterhelyettesítőket (% és _), vezérelheti őket, ha " "akarja, a literális példányaik használatához, pl. használja a 'my\\_db' " "alakot, s ne a 'my_db' alakot. Ezt a lehetőséget választva rendezhet " -"adatbázislistákat, beírva a nevüket sorrendben és használja a [kbd]*[/kbd]-t " -"a végén, hogy a többi abc-sorrendben jelenjen meg." +"adatbázislistákat, beírva a nevüket sorrendben és használja a [kbd]*[/kbd]-t" +" a végén, hogy a többi abc-sorrendben jelenjen meg." #: libraries/config/messages.inc.php:394 msgid "Show only listed databases" diff --git a/po/ja.po b/po/ja.po index 11eed48..890d5a2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -111,7 +111,9 @@ msgstr "リモート URL を開けませんでした。" msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." -msgstr "ファイル %s は、このシステムでは使用できません。詳細については www.phpmyadmin.net をご覧ください。" +msgstr "" +"ファイル %s は、このシステムでは使用できません。詳細については www." +"phpmyadmin.net をご覧ください。" #: db_create.php:58 #, php-format @@ -3443,7 +3445,7 @@ msgstr "" #: libraries/config/messages.inc.php:328 msgid "Missing phpMyAdmin configuration storage tables" -msgstr "phpMyAdmin の設定保存用テーブルが不明" +msgstr "phpMyAdmin の設定保存用テーブルがありません" #: libraries/config/messages.inc.php:330 msgid "Iconic table operations" @@ -5093,7 +5095,9 @@ msgstr "ポート" msgid "" "The port for the PBMS stream-based communications. Setting this value to 0 " "will disable HTTP communication with the daemon." -msgstr "PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモンとの HTTP 通信を無効にします。" +msgstr "" +"PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモ" +"ンとの HTTP 通信を無効にします。" #: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" @@ -5164,7 +5168,9 @@ msgstr "" msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." -msgstr "PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オフィシャルサイト%sにあります。" +msgstr "" +"PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オ" +"フィシャルサイト%sにあります。" #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 msgid "Related Links" @@ -5330,7 +5336,9 @@ msgstr "" msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." -msgstr "PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイト%sにあります。" +msgstr "" +"PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイ" +"ト%sにあります。" #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" @@ -6785,7 +6793,9 @@ msgstr "設定を保存しました" msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." -msgstr "環境設定は、現在のセッションでのみ有効です。この設定を永続的に有効にするには、%sphpMyAdmin の設定保存場所%sが必要です。" +msgstr "" +"環境設定は、現在のセッションでのみ有効です。この設定を永続的に有効にするに" +"は、%sphpMyAdminの設定保存場所%sが必要です。" #: libraries/user_preferences.lib.php:142 msgid "Could not save configuration" @@ -9025,7 +9035,8 @@ msgstr "フォームを表示する" #: setup/lib/index.lib.php:119 msgid "" "Neither URL wrapper nor CURL is available. Version check is not possible." -msgstr "URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。" +msgstr "" +"URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。" #: setup/lib/index.lib.php:126 msgid "" @@ -9064,10 +9075,11 @@ msgid "" "proxies list%s. However, IP-based protection may not be reliable if your IP " "belongs to an ISP where thousands of users, including you, are connected to." msgstr "" -"この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL " -"サーバへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになります。これが必要と思われる場合には、%s信頼されたプロキシリスト%" -"sを使用します。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP " -"アドレスを基にした保護は信頼性が高いとはいえません。" +"この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL サー" +"バへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになりま" +"す。これが必要と思われる場合には、%s信頼されたプロキシリスト%sを使用します。" +"しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接" +"続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえません。" #: setup/lib/index.lib.php:252 msgid "" @@ -9150,9 +9162,11 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定（%sホスト認証%s設定および%s信頼されたプロキシのリスト" -"%s）を使用してください。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP " -"アドレスを基にした保護は信頼性が高いとはいえません。" +"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定" +"（%sホスト認証%s設定および%s信頼されたプロキシのリスト%s）を使用してくださ" +"い。しかしながら、ユーザが数千人もいるような ISP に所属している、使用してい" +"る、接続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえま" +"せん。" #: setup/lib/index.lib.php:268 #, php-format @@ -9391,7 +9405,8 @@ msgstr "" #: tbl_chart.php:166 msgid "" "When drawing a radar chart all values are normalized to a range [0..10]." -msgstr "レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。" +msgstr "" +"レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。" #: tbl_chart.php:173 msgid "" diff --git a/po/zh_CN.po b/po/zh_CN.po index ce19bb5..132a530 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" -"PO-Revision-Date: 2011-05-06 03:13+0200\n" +"POT-Creation-Date: 2011-05-09 07:40+0200\n" +"PO-Revision-Date: 2011-03-04 09:47+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" "Language: zh_CN\n" @@ -3123,7 +3123,7 @@ msgstr "树状数据库分隔符" msgid "" "Only light version; display databases in a tree (determined by the separator " "defined below)" -msgstr "只使用简洁版，以树形显示数据库 (以下面的树形分隔符来显示)" +msgstr "只使用轻量级版本，以树形显示数据库 (以下面的树形分隔符来显示)" #: libraries/config/messages.inc.php:273 msgid "Display databases in a tree" @@ -3135,7 +3135,7 @@ msgstr "如果想一次性浏览所有数据库，则禁用该选项" #: libraries/config/messages.inc.php:275 msgid "Use light version" -msgstr "使用简洁版" +msgstr "使用轻量级版本" #: libraries/config/messages.inc.php:276 msgid "Maximum table tree depth" diff --git a/prefs_forms.php b/prefs_forms.php index 4aaea9c..22ffb4c 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -23,7 +23,7 @@ PMA_userprefs_pageinit(); // handle form processing $form_param = filter_input(INPUT_GET, 'form'); -if (! isset($forms[$form_param])) { +if (!isset($forms[$form_param])) { $forms_keys = array_keys($forms); $form_param = array_shift($forms_keys); } diff --git a/prefs_manage.php b/prefs_manage.php index ec1b481..e5dbe3f 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -76,7 +76,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == $config = json_decode($json, true); $return_url = filter_input(INPUT_POST, 'return_url'); - if (! is_array($config)) { + if (!is_array($config)) { $error = __('Could not import configuration'); } else { // sanitize input values: treat them as though they came from HTTP POST request diff --git a/schema_edit.php b/schema_edit.php index 9b71500..a5d3a38 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -41,24 +41,24 @@ $query_default_option = PMA_DBI_QUERY_STORE; * correctly, so it is a good place to see which tables we can and * complain ;-) */ -if (! $cfgRelation['relwork']) { +if (!$cfgRelation['relwork']) { echo sprintf(__('%s table not found or not set in %s'), 'relation', 'config.inc.php') . ' ' . "\n" . PMA_showDocu('relation') . "\n"; require_once './libraries/footer.inc.php'; } -if (! $cfgRelation['displaywork']) { +if (!$cfgRelation['displaywork']) { echo sprintf(__('%s table not found or not set in %s'), 'table_info', 'config.inc.php') . ' ' . "\n" . PMA_showDocu('table_info') . "\n"; require_once './libraries/footer.inc.php'; } -if (! isset($cfgRelation['table_coords'])){ +if (!isset($cfgRelation['table_coords'])){ echo sprintf(__('%s table not found or not set in %s'), 'table_coords', 'config.inc.php') . ' ' . "\n" . PMA_showDocu('table_coords') . "\n"; require_once './libraries/footer.inc.php'; } -if (! isset($cfgRelation['pdf_pages'])) { +if (!isset($cfgRelation['pdf_pages'])) { echo sprintf(__('%s table not found or not set in %s'), 'pdf_page', 'config.inc.php') . ' ' . "\n" . PMA_showDocu('pdf_pages') . "\n"; require_once './libraries/footer.inc.php'; diff --git a/server_privileges.php b/server_privileges.php index daf8a99..19f9dcb 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -270,7 +270,7 @@ function PMA_extractPrivInfo($row = '', $enableHTML = FALSE) } else { $privs[] = 'USAGE'; } - } elseif ($allPrivileges && (! isset($GLOBALS['grant_count']) || count($privs) == $GLOBALS['grant_count'])) { + } elseif ($allPrivileges && (!isset($GLOBALS['grant_count']) || count($privs) == $GLOBALS['grant_count'])) { if ($enableHTML) { $privs = array('<dfn title="' . __('Includes all privileges except GRANT.') . '">ALL PRIVILEGES</dfn>'); } else { @@ -725,7 +725,7 @@ function PMA_displayLoginInformationFields($mode = 'new') . ' <select name="pred_username" id="select_pred_username" title="' . __('User name') . '"' . "\n" . ' onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n" . ' <option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . __('Any user') . '</option>' . "\n" - . ' <option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n" + . ' <option value="userdefined"' . ((!isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n" . ' </select>' . "\n" . '' . "\n" . '<input type="text" name="username" maxlength="' @@ -756,7 +756,7 @@ function PMA_displayLoginInformationFields($mode = 'new') unset($_current_user); // when we start editing a user, $GLOBALS['pred_hostname'] is not defined - if (! isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) { + if (!isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) { switch (strtolower($GLOBALS['hostname'])) { case 'localhost': case '127.0.0.1': @@ -850,7 +850,7 @@ if (isset($_REQUEST['change_copy'])) { // Recent MySQL versions have the field "Password" in mysql.user, // so the previous extract creates $Password but this script // uses $password - if (! isset($password) && isset($Password)) { + if (!isset($password) && isset($Password)) { $password = $Password; } $queries = array(); @@ -1140,7 +1140,7 @@ if (!empty($update_privs)) { $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; - if (! isset($Grant_priv) || $Grant_priv != 'Y') { + if (!isset($Grant_priv) || $Grant_priv != 'Y') { $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; @@ -1387,7 +1387,7 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s * If we are in an Ajax request for Create User/Edit User/Revoke User/Flush Privileges, * show $message and exit. */ -if( $GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog'])) { +if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && (!isset($_REQUEST['adduser']) || $_add_user_error) && !isset($_REQUEST['initial']) && !isset($_REQUEST['showall']) && !isset($_REQUEST['edit_user_dialog'])) { if(isset($sql_query)) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); @@ -2056,7 +2056,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote(PMA_unescape_mysql_wildcards($dbname)) . ';', null, PMA_DBI_QUERY_STORE)) { $pred_tbl_array = array(); while ($row = PMA_DBI_fetch_row($res)) { - if (! isset($found_rows) || !in_array($row[0], $found_rows)) { + if (!isset($found_rows) || !in_array($row[0], $found_rows)) { $pred_tbl_array[] = $row[0]; } } @@ -2279,7 +2279,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs foreach ($current_privileges as $current) { echo ' <td>' . "\n" . ' '; - if (! isset($current['Db']) || $current['Db'] == '*') { + if (!isset($current['Db']) || $current['Db'] == '*') { echo __('global'); } elseif ($current['Db'] == PMA_escape_mysql_wildcards($checkprivs)) { echo __('database-specific'); diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php index 61484b2..27429b4 100644 --- a/setup/frames/form.inc.php +++ b/setup/frames/form.inc.php @@ -21,7 +21,7 @@ require './libraries/config/setup.forms.php'; $formset_id = filter_input(INPUT_GET, 'formset'); $mode = filter_input(INPUT_GET, 'mode'); -if (! isset($forms[$formset_id])) { +if (!isset($forms[$formset_id])) { die('Incorrect formset, check $formsets array in setup/frames/form.inc.php'); } diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index 2872221..95c3325 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -113,7 +113,7 @@ class ConfigGenerator private static function _isZeroBasedArray(array $array) { for ($i = 0; $i < count($array); $i++) { - if (! isset($array[$i])) { + if (!isset($array[$i])) { return false; } } diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 2e20e5d..aa0d044 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -18,7 +18,7 @@ if (!defined('PHPMYADMIN')) { */ function messages_begin() { - if (! isset($_SESSION['messages']) || !is_array($_SESSION['messages'])) { + if (!isset($_SESSION['messages']) || !is_array($_SESSION['messages'])) { $_SESSION['messages'] = array('error' => array(), 'notice' => array()); } else { lse {ION['messages'] = array('error' => array(), 'notice' => array());.phpn($checkprivsldcards($dbname)) . ';', null, PMA_DBI_QUERY_STORE)) {$_REQUEST['showall']) && !isset($_REQUEST['edit_user_dialog'])) {) {ntation]FAQ 1.16[/a].'));p�{��@�{��\D�*6 ��!�!��{��`�{��x�yE�*p�{��"�\D�*�\D�*��{��\D�*/�{��E�*��\D�*��E�*؄�E�*��E�*�d^D�*x�yE�*p�{��@�{��\D�*�!�!��{��`�{��]YE�*P�{��"�\D�*�\D�*��{��\D�*/�{�� {��{��}D�*�p�`�{��\D�*�d^D�*P�{�� {��\D�*GHIJKMNOP��{��`�{��H0E�*��{��"�\D�*�\D�*��{��0��E�*��\D�*�yE�*�I E�*��E�*؄�E�*��E�*�d^D�*H0E�*��{��0�{��\D�*80E�*��{��`�{��\D�*(0E�*��{��{��\D�*0E�*��{��{��\D�* ��E�*��\D�*��E�*@�{�� E�*��\D�*؄�E�*`�{��y� E�*��\D�*��E�*��{��Z� E�*��\D�*�D E�*�yE�*�I E�*��E�*ؤyE�*؄�E�*��E�*�d^D�*��E�*�{��{��\D�*#%')*-.035678:<=��{��`�{��p��D�*0�{��"�\D�*8�yE�*��\D�*ؤyE�*��yE�*�d^D�*cf �D�*`�{��p��D�*0�{��{��\D�*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��D�*��{��F�@F�*F�@F�*?��D�*`�{��{��{�� D�*��\D�*��}D�*��{��B�@F�*��{��/�{��~D�*`�{��B�@F�*h�{��\D // reset message states @@ -41,7 +41,7 @@ function messages_begin() */ function messages_set($type, $id, $title, $message) { - $fresh = ! isset($_SESSION['messages'][$type][$id]); + $fresh = !isset($_SESSION['messages'][$type][$id]); $_SESSION['messages'][$type][$id] = array( 'fresh' => $fresh, 'active' => true, diff --git a/sql.php b/sql.php index d07022b..9b19174 100644 --- a/sql.php +++ b/sql.php @@ -33,7 +33,7 @@ if (! empty($goto)) { $is_gotofile = true; } // end if -if (! isset($err_url)) { +if (!isset($err_url)) { $err_url = (!empty($back) ? $back : $goto) . '?' . PMA_generate_common_url($db) . ((strpos(' ' . $goto, 'db_') != 1 && strlen($table)) ? '&table=' . urlencode($table) : ''); @@ -441,7 +441,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { if (!$is_affected) { $num_rows = ($result) ? @PMA_DBI_num_rows($result) : 0; - } elseif (! isset($num_rows)) { + } elseif (!isset($num_rows)) { $num_rows = @PMA_DBI_affected_rows(); } @@ -492,11 +492,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // due to $find_real_end == true if (!$is_group - && ! isset($analyzed_sql[0]['queryflags']['union']) - && ! isset($analyzed_sql[0]['table_ref'][1]['table_name']) + && !isset($analyzed_sql[0]['queryflags']['union']) + && !isset($analyzed_sql[0]['table_ref'][1]['table_name']) && (empty($analyzed_sql[0]['where_clause']) || $analyzed_sql[0]['where_clause'] == '1 ') - && ! isset($find_real_end) + && !isset($find_real_end) ) { // "j u s t b r o w s i n g" @@ -526,7 +526,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // long delays. Returned count will be complete anyway. // (but a LIMIT would disrupt results in an UNION) - if (! isset($analyzed_sql[0]['queryflags']['union'])) { + if (!isset($analyzed_sql[0]['queryflags']['union'])) { $count_query .= ' LIMIT 1'; } @@ -969,7 +969,7 @@ window.onload = function() /** * Displays the footer */ -if(! isset($_REQUEST['table_maintenance'])) { +if(!isset($_REQUEST['table_maintenance'])) { require './libraries/footer.inc.php'; } ?> diff --git a/tbl_change.php b/tbl_change.php index efdbd3f..22584db 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -514,7 +514,7 @@ foreach ($rows as $row_id => $vrow) { } else { // (we are inserting) // display default values - if (! isset($field['Default'])) { + if (!isset($field['Default'])) { $field['Default'] = ''; $real_null_value = TRUE; $data = ''; @@ -620,7 +620,7 @@ foreach ($rows as $row_id => $vrow) { // yet. $cnt_functions = count($cfg['Functions']); for ($j = 0; $j < $cnt_functions; $j++) { - if (! isset($dropdown_built[$cfg['Functions'][$j]]) || $dropdown_built[$cfg['Functions'][$j]] != 'TRUE') { + if (!isset($dropdown_built[$cfg['Functions'][$j]]) || $dropdown_built[$cfg['Functions'][$j]] != 'TRUE') { // Is current function defined as default? $selected = ($field['first_timestamp'] && $cfg['Functions'][$j] == $cfg['DefaultFunctions']['first_timestamp']) || (!$field['first_timestamp'] && $cfg['Functions'][$j] == $default_function) @@ -1062,7 +1062,7 @@ if (isset($where_clause)) { <?php echo "\n"; -if (! isset($after_insert)) { +if (!isset($after_insert)) { $after_insert = 'back'; } ?> diff --git a/tbl_printview.php b/tbl_printview.php index f2b80ab..74b6818 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -189,7 +189,7 @@ foreach ($the_tables as $key => $table) { if ($zerofill) { $attribute = 'UNSIGNED ZEROFILL'; } - if (! isset($row['Default'])) { + if (!isset($row['Default'])) { if ($row['Null'] != '' && $row['Null'] != 'NO') { $row['Default'] = 'NULL'; } diff --git a/tbl_relation.php b/tbl_relation.php index 90bd153..400fc63 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -186,7 +186,7 @@ if (isset($_REQUEST['destination_foreign'])) { if (! empty($foreign_string)) { list($foreign_db, $foreign_table, $foreign_field) = PMA_backquote_split($foreign_string); - if (! isset($existrel_foreign[$master_field])) { + if (!isset($existrel_foreign[$master_field])) { // no key defined for this field // The next few lines are repeated below, so they diff --git a/tbl_replace.php b/tbl_replace.php index 5b722c6..40d0ad4 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -276,7 +276,7 @@ foreach ($loop_array as $rownumber => $where_clause) { // u p d a t e } elseif (!empty($me_fields_null_prev[$key]) - && ! isset($me_fields_null[$key])) { + && !isset($me_fields_null[$key])) { // field had the null checkbox before the update // field no longer has the null checkbox $query_values[] = PMA_backquote($me_fields_name[$key]) . ' = ' . $cur_value; diff --git a/tbl_select.php b/tbl_select.php index 681083a..2cb0086 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -36,7 +36,7 @@ if ($GLOBALS['cfg']['PropertiesIconic'] == true) { /** * Not selection yet required -> displays the selection form */ -if (! isset($param) || $param[0] == '') { +if (!isset($param) || $param[0] == '') { // Gets some core libraries require_once './libraries/tbl_common.php'; //$err_url = 'tbl_select.php' . $err_url; @@ -52,7 +52,7 @@ if (! isset($param) || $param[0] == '') { */ require_once './libraries/tbl_links.inc.php'; - if (! isset($goto)) { + if (!isset($goto)) { $goto = $GLOBALS['cfg']['DefaultTabTable']; } // Defines the url to return to in case of error in the next sql statement @@ -336,7 +336,7 @@ else { } elseif (strncasecmp($types[$i], 'enum', 4) == 0) { if (!empty($fields[$i])) { - if (! is_array($fields[$i])) { + if (!is_array($fields[$i])) { $fields[$i] = explode(',', $fields[$i]); } $enum_selected_count = count($fields[$i]); diff --git a/tbl_structure.php b/tbl_structure.php index 9878b9e..99ec0e9 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -337,7 +337,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } - if (! isset($row['Default'])) { + if (!isset($row['Default'])) { if ($row['Null'] == 'YES') { $row['Default'] = 'NULL'; } diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 50d7ceb..3699dd0 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -71,7 +71,7 @@ if (isset($cn) && !empty($cn)) { header('Content-Disposition: attachment; filename=' . $cn); } -if (! isset($resize)) { +if (!isset($resize)) { echo $row[$transform_key]; } else { // if image_*__inline.inc.php finds that we can resize, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0RC2-997-g0d1772b
by Michal Čihař 11 May '11

11 May '11

The branch, MAINT_3_4_0 has been updated discards 523f86ef6e5232d841e94a44080806f9333d4bd4 (commit) discards 071bc679dbd8bd2ece5182bdb471c027f33daf6c (commit) discards b5d235593a24cb469d651a9df0d41305946eab07 (commit) discards 7698df152041315049ad0e8b7db235e7fbbe7d7c (commit) discards f56619e48251f1745d3f6bc51711fa789822a836 (commit) discards 4a4c7b84276dc983912fa8ec39af243238658deb (commit) discards 5cda32da092764f38346f984fe28a5b9142365fe (commit) discards 69c1e15473447eff3ea337eb75b6dc2432b06189 (commit) discards a604d2152904f663ad1061d4e759e893878c82fc (commit) discards 485fb634cae6c23280face51ce2891dd2dbd0795 (commit) discards 329c5551d4bc8e8a2c7fe378b6d0ed26e6e2ff78 (commit) discards 994606bb23a693c9568314b016db582b20f26b1c (commit) discards 8d3ebd746dfbfe4e2ca86121f0448ba7d5187432 (commit) discards 34ed9aa67a65b4333425014d43ccac3ddbccefda (commit) discards d086c01ba140b366c4cb61dee6914146df3820d5 (commit) discards ed7cd53e2aab7c1a3c296a7b2931520ce38c5db0 (commit) discards e6211f0c2fb025007125456299165d572894983f (commit) discards 13b31956aed38141836faf386d97c042a3087f48 (commit) discards d40617abc7f0f7c4e7b078e50bbb394f5cec0709 (commit) discards d37a47017e341fdf61a2739a93d4fbceafdc51d5 (commit) discards 0adf49922f4f341e7920991e2d16bd1cc667808c (commit) discards f1694d2c02fd9b66e8d6bd0265ea98051caf965f (commit) discards 555c04b4a1bb91780aa21bff2b420eb6171a995d (commit) discards 9a9e3b6a37bf3a0df4fc53847238666c968fff10 (commit) discards 197d6ffe2d648c22710c7da8b06a7c188be2f883 (commit) discards eb0ea6b20d0b98192d1af3c02a55fd82e0a45f4e (commit) discards b4a46962e950c46e25a1f72f009d5af6fe12c1cc (commit) discards e8f0a023f3b90e4f0d973fec5eebb286be712a13 (commit) discards 83a73a2a8e8514e100fe26d8c4704c830f686525 (commit) discards ad687ae58fc0e516150531e053aa786baf6f75e7 (commit) discards a9bb12a8b9f8c6bf26cb315e15e064268e418e83 (commit) discards 1e7e0704e79bc19a8f2c29bea4e94f7dd8d27022 (commit) discards bcb528ad5ea8dd6d28b81fba83726f6b41ac38b5 (commit) discards 1b41e9cb8779288de454445b552471660e2fbd23 (commit) discards 98f390d4827da63293937ca5ddfdead4fb731945 (commit) discards 5b9b1cb613b300a7e9397c7ff5295b75073dc1db (commit) discards 50a4191ae99488e95020d38aadbbf29b0e5b4af9 (commit) discards e8539bd778bc77548d97ff866e40f2319c2fe702 (commit) discards f897eaeb3caf33fb0ffae1d424346966b3df3a71 (commit) discards 0358007018029af939ffd62e6ac42b597dcf83d3 (commit) discards e880d4ffde0f940f526a5e9e4f4f9ca228b4e081 (commit) discards 5ec068f346756d1e19c345cb5f661eb7d1f2423a (commit) discards 821814ff50f2c1a4a237d2aca3c28f2c0b58b3c0 (commit) discards 064e875f10b0244a15da56c4ca590d516c51f6b6 (commit) discards a22c528ad40cc20924ec789ace883d29193f4761 (commit) discards 50bc50ecdf924b441756c440195f9d5d8dcfd643 (commit) discards 0e40c042cf32db6a92ab73a8db0803e17c0e3fa7 (commit) discards 9d42dfc1c4afa1e028df7fa45ec3f82c2d7d5396 (commit) discards 92bffeee8f13ce3c76d8ec3a3ede20be42d92749 (commit) discards e2ffec079236176eeb56cbaeeb3e1984612d48bc (commit) discards 9e99fb3a3ca4c99625a37e5c93963e930431ca1d (commit) discards fd1ac3cdac0a302ace44c966337822d7589a129c (commit) discards 401cb3c1de764c118d1e3672eca3d567f48f1450 (commit) discards d52a0476345f40b4e16183e7bd94beb99600cf44 (commit) discards de3f7e3f66ed82e1f6f4cdf36784521e00e9f8e6 (commit) discards 0dd3fe3efff0a5861e5c5af9a96828a8a3b004e9 (commit) discards 0289f78d2b73f0a394214e1441499bcb421d7bf1 (commit) discards eef8ec8e66f185cc9a066f966430b8e18bc49ad0 (commit) discards 11c8ab302507485172ab9cc25b920182b48ea71e (commit) discards 8c9af0750bf5b90ce00dfd49306b13f069a12333 (commit) discards 09e7df2d59f045a0cb44fa7a9bce383f041bd4fb (commit) discards b312e74fc4c1857e424f8563a461e973008cab62 (commit) discards 74918d3ef6bc4c1c66df369b435c6e421fb81cf3 (commit) discards 2a3009cc7e0eceba4d09523c13d2130a781c649d (commit) discards 11bef52f9b3df13eb8d089a278d0a1f6624bd9a5 (commit) discards 5b48bdbdd0a64f87520e645af916ec07c9f1f6b7 (commit) discards acf8203be2065ac84c8e314cfdf1975b2ee29695 (commit) discards 834b7be02f447f460c42e21417c63a4fb3d7cf82 (commit) discards 0d5a9ff74a7fd2fbd9cd11f612188e7e88a86de9 (commit) discards bd32365ab5a8414e626387402800fe3a5964cca7 (commit) discards a20cdada3d11eead7c25ba3e66a147f706bf46e6 (commit) discards f8304073a6ebf9fa0db393045363c90fbb9e3dda (commit) discards 5c0475100a1e8d21ab53e47de18dcb61829a4d56 (commit) discards f8748fa77faf50e37efe141b592ef87d6bb8fdc1 (commit) discards 0468e0c6fa075c74fefa5c55ebd5bb8ecb0d33c2 (commit) discards b41df896f40d732440d3f0ee2467abcf6d14632d (commit) discards f0efbc1745abf07435a4e462bbae1e262ff60776 (commit) discards 4225386a9b1ee643a9ac2a66a82875748003a942 (commit) via 0d1772b6f19529a991724fc3b455f45b75be0e42 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (523f86ef6e5232d841e94a44080806f9333d4bd4) \ N -- N -- N (0d1772b6f19529a991724fc3b455f45b75be0e42) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 -- Documentation.html | 4 +- README | 2 +- browse_foreigners.php | 2 +- db_datadict.php | 4 +- db_operations.php | 4 +- db_printview.php | 2 +- db_qbe.php | 10 ++-- export.php | 4 +- import.php | 2 +- libraries/Config.class.php | 18 ++++---- libraries/List_Database.class.php | 2 +- libraries/Table.class.php | 2 +- libraries/chart.lib.php | 4 +- libraries/common.inc.php | 4 +- libraries/common.lib.php | 22 +++++----- libraries/core.lib.php | 10 ++-- libraries/database_interface.lib.php | 2 +- libraries/db_info.inc.php | 4 +- libraries/display_export.lib.php | 2 +- libraries/display_tbl.lib.php | 38 +++++++++--------- libraries/footer.inc.php | 2 +- libraries/header.inc.php | 4 +- libraries/import.lib.php | 4 +- libraries/mysql_charsets.lib.php | 4 +- libraries/plugin_interface.lib.php | 6 +- libraries/schema/Dia_Relation_Schema.class.php | 6 +- libraries/schema/Eps_Relation_Schema.class.php | 6 +- libraries/schema/Pdf_Relation_Schema.class.php | 8 ++-- libraries/schema/Svg_Relation_Schema.class.php | 6 +- libraries/schema/User_Schema.class.php | 6 +- libraries/schema/Visio_Relation_Schema.class.php | 6 +- libraries/server_links.inc.php | 2 +- libraries/session.inc.php | 2 +- libraries/sqlparser.lib.php | 6 +- libraries/tbl_info.inc.php | 2 +- libraries/tbl_properties.inc.php | 2 +- libraries/user_preferences.inc.php | 4 +- libraries/user_preferences.lib.php | 8 ++-- main.php | 2 +- po/hi.po | 6 +- po/hu.po | 13 +++--- po/ja.po | 45 ++++++++++++++------- po/zh_CN.po | 8 ++-- prefs_forms.php | 2 +- prefs_manage.php | 2 +- schema_edit.php | 8 ++-- server_privileges.php | 16 ++++---- setup/frames/form.inc.php | 2 +- setup/lib/ConfigGenerator.class.php | 2 +- setup/lib/index.lib.php | 4 +- sql.php | 14 +++--- tbl_change.php | 6 +- tbl_printview.php | 2 +- tbl_relation.php | 2 +- tbl_replace.php | 2 +- tbl_select.php | 6 +- tbl_structure.php | 2 +- transformation_wrapper.php | 2 +- 59 files changed, 193 insertions(+), 183 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fdbbe9..5a15934 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,6 @@ phpMyAdmin - ChangeLog ====================== -3.5.0.0 (not yet released) - -3.4.1.0 (not yet released) - 3.4.0.0 (not yet released) + rfe #2890226 [view] Enable VIEW rename + rfe #838637 [privileges] Export a user's privileges diff --git a/Documentation.html b/Documentation.html index cee6a42..6b16dc3 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.5.0-dev - Documentation</title> + <title>phpMyAdmin 3.4.0 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">phpMyAdmin</a> - 3.5.0-dev + 3.4.0 Documentation </h1> </div> diff --git a/README b/README index bbc7762..bf564ac 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.0-dev +Version 3.4.0 A set of PHP-scripts to manage MySQL over the web. diff --git a/browse_foreigners.php b/browse_foreigners.php index 16fa48c..c8867af 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -27,7 +27,7 @@ $foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE $override_total = TRUE; -if (! isset($pos)) { +if (!isset($pos)) { $pos = 0; } diff --git a/db_datadict.php b/db_datadict.php index e9d18fd..e67c096 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -10,7 +10,7 @@ */ require_once './libraries/common.inc.php'; -if (! isset($selected_tbl)) { +if (!isset($selected_tbl)) { require_once './libraries/header.inc.php'; } @@ -220,7 +220,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { if ($zerofill) { $attribute = 'UNSIGNED ZEROFILL'; } - if (! isset($row['Default'])) { + if (!isset($row['Default'])) { if ($row['Null'] != 'NO') { $row['Default'] = 'NULL'; } diff --git a/db_operations.php b/db_operations.php index 2e0244f..f48ba27 100644 --- a/db_operations.php +++ b/db_operations.php @@ -37,7 +37,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { $move = false; } - if (! isset($newname) || ! strlen($newname)) { + if (!isset($newname) || !strlen($newname)) { $message = PMA_Message::error(__('The database name is empty!')); } else { $sql_query = ''; // in case target db exists @@ -561,7 +561,7 @@ echo __('Remove database'); . '</form></div>' . "\n"; if ($num_tables > 0 - && ! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { + && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { $message = PMA_Message::notice(__('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.')); $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', false); $message->addParam('</a>', false); diff --git a/db_printview.php b/db_printview.php index 7e3c709..36f297c 100644 --- a/db_printview.php +++ b/db_printview.php @@ -52,7 +52,7 @@ if ($cfg['SkipLockedTables'] == true) { $result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE); if ($result != false && PMA_DBI_num_rows($result) > 0) { while ($tmp = PMA_DBI_fetch_row($result)) { - if (! isset($sot_cache[$tmp[0]])) { + if (!isset($sot_cache[$tmp[0]])) { $sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . addslashes($tmp[0]) . '\';'); $sts_tmp = PMA_DBI_fetch_assoc($sts_result); $tables[] = $sts_tmp; diff --git a/db_qbe.php b/db_qbe.php index 34c85ee..751317d 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -339,7 +339,7 @@ for ($x = 0; $x < $col; $x++) { if (isset($criteria[$x])) { $tmp_criteria = $criteria[$x]; } - if ((empty($prev_criteria) || ! isset($prev_criteria[$x])) + if ((empty($prev_criteria) || !isset($prev_criteria[$x])) || $prev_criteria[$x] != htmlspecialchars($tmp_criteria)) { $curCriteria[$z] = $tmp_criteria; } else { @@ -497,7 +497,7 @@ for ($y = 0; $y <= $row; $y++) { echo "\n"; $or = 'Or' . $y; - if (! isset(${$or})) { + if (!isset(${$or})) { ${$or} = ''; } if (!empty(${$or}) && isset(${$or}[$x])) { @@ -667,7 +667,7 @@ foreach ($tbl_names as $key => $val) { <?php // 1. SELECT $last_select = 0; -if (! isset($qry_select)) { +if (!isset($qry_select)) { $qry_select = ''; } for ($x = 0; $x < $col; $x++) { @@ -892,7 +892,7 @@ if ($criteria_cnt > 1) { $qry_where = '(' . $qry_where . ')'; } // OR rows ${'cur' . $or}[$x] -if (! isset($curAndOrRow)) { +if (!isset($curAndOrRow)) { $curAndOrRow = array(); } for ($y = 0; $y <= $row; $y++) { @@ -929,7 +929,7 @@ if (!empty($qry_where) && $qry_where != '()') { // 4. ORDER BY $last_orderby = 0; -if (! isset($qry_orderby)) { +if (!isset($qry_orderby)) { $qry_orderby = ''; } for ($x = 0; $x < $col; $x++) { diff --git a/export.php b/export.php index 22a6324..7da25fc 100644 --- a/export.php +++ b/export.php @@ -21,7 +21,7 @@ $export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $exp $type = $what; // Check export type -if (! isset($export_list[$type])) { +if (!isset($export_list[$type])) { die('Bad type!'); } @@ -451,7 +451,7 @@ if ($export_type == 'server') { // Walk over databases foreach ($GLOBALS['pma']->databases as $current_db) { if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|')) - || ! isset($tmp_select)) { + || !isset($tmp_select)) { if (!PMA_exportDBHeader($current_db)) { break 2; } diff --git a/import.php b/import.php index 0b029e5..78e5ffd 100644 --- a/import.php +++ b/import.php @@ -332,7 +332,7 @@ if ($import_file != 'none' && !$error) { $error = TRUE; } } elseif (!$error) { - if (! isset($import_text) || empty($import_text)) { + if (!isset($import_text) || empty($import_text)) { $message = PMA_Message::error(__('No data was received to import. Either no file name was submitted, or the file size exceeded the maximum size permitted by your PHP configuration. See [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a].')); $error = TRUE; } diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f71a4e9..6f4dff8 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.0-dev'); + $this->set('PMA_VERSION', '3.4.0'); /** * @deprecated */ @@ -148,7 +148,7 @@ class PMA_Config { if (PMA_getenv('HTTP_USER_AGENT')) { $HTTP_USER_AGENT = PMA_getenv('HTTP_USER_AGENT'); - } elseif (! isset($HTTP_USER_AGENT)) { + } elseif (!isset($HTTP_USER_AGENT)) { $HTTP_USER_AGENT = ''; } @@ -441,7 +441,7 @@ class PMA_Config if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) { $config_mtime = max($this->default_source_mtime, $this->source_mtime); // cache user preferences, use database only when needed - if (! isset($_SESSION['cache'][$cache_key]['userprefs']) + if (!isset($_SESSION['cache'][$cache_key]['userprefs']) || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime) { // load required libraries require_once './libraries/user_preferences.lib.php'; @@ -451,7 +451,7 @@ class PMA_Config $_SESSION['cache'][$cache_key]['userprefs_type'] = $prefs['type']; $_SESSION['cache'][$cache_key]['config_mtime'] = $config_mtime; } - } else if ($server == 0 || ! isset($_SESSION['cache'][$cache_key]['userprefs'])) { + } else if ($server == 0 || !isset($_SESSION['cache'][$cache_key]['userprefs'])) { $this->set('user_preferences', false); return; } @@ -476,7 +476,7 @@ class PMA_Config // save theme $tmanager = $_SESSION['PMA_Theme_Manager']; if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) { - if ((! isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original') + if ((!isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original') || isset($config_data['ThemeDefault']) && $config_data['ThemeDefault'] != $tmanager->theme->getId()) { // new theme was set in common.inc.php $this->setUserValue(null, 'ThemeDefault', $tmanager->theme->getId(), 'original'); @@ -491,14 +491,14 @@ class PMA_Config } // save font size - if ((! isset($config_data['fontsize']) && $org_fontsize != '82%') + if ((!isset($config_data['fontsize']) && $org_fontsize != '82%') || isset($config_data['fontsize']) && $org_fontsize != $config_data['fontsize']) { $this->setUserValue(null, 'fontsize', $org_fontsize, '82%'); } // save language if (isset($_COOKIE['pma_lang']) || isset($_POST['lang'])) { - if ((! isset($config_data['lang']) && $GLOBALS['lang'] != 'en') + if ((!isset($config_data['lang']) && $GLOBALS['lang'] != 'en') || isset($config_data['lang']) && $GLOBALS['lang'] != $config_data['lang']) { $this->setUserValue(null, 'lang', $GLOBALS['lang'], 'en'); } @@ -511,7 +511,7 @@ class PMA_Config // save connection collation if (isset($_COOKIE['pma_collation_connection']) || isset($_POST['collation_connection'])) { - if ((! isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci') + if ((!isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci') || isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != $config_data['collation_connection']) { $this->setUserValue(null, 'collation_connection', $GLOBALS['collation_connection'], 'utf8_general_ci'); } @@ -678,7 +678,7 @@ class PMA_Config */ function set($setting, $value) { - if (! isset($this->settings[$setting]) || $this->settings[$setting] != $value) { + if (!isset($this->settings[$setting]) || $this->settings[$setting] != $value) { $this->settings[$setting] = $value; $this->set_mtime = time(); } diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 2663673..c29cc9d 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -498,7 +498,7 @@ require_once './libraries/List.class.php'; if (isset($tmp_mydbs[$tmp_db]) && $tmp_mydbs[$tmp_db] == 1) { $dblist[] = $tmp_db; $tmp_mydbs[$tmp_db] = 0; - } elseif (! isset($dblist[$tmp_db])) { + } elseif (!isset($dblist[$tmp_db])) { foreach ($tmp_mydbs as $tmp_matchpattern => $tmp_value) { // fixed bad regexp // TODO: db names may contain characters diff --git a/libraries/Table.class.php b/libraries/Table.class.php index d41eadc..a29900e 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -889,7 +889,7 @@ class PMA_Table } else { // we are copying // Create new entries as duplicates from old PMA DBs - if ($what != 'dataonly' && ! isset($maintain_relations)) { + if ($what != 'dataonly' && !isset($maintain_relations)) { if ($GLOBALS['cfgRelation']['commwork']) { // Get all comments and MIME-Types for current table $comments_copy_query = 'SELECT diff --git a/libraries/chart.lib.php b/libraries/chart.lib.php index 83791fb..3911f2e 100644 --- a/libraries/chart.lib.php +++ b/libraries/chart.lib.php @@ -104,7 +104,7 @@ function PMA_chart_results($data, &$chartSettings) // default for muti series $chartSettings['multi'] = false; - if (! isset($data[0])) { + if (!isset($data[0])) { // empty data return __('No data found for the chart.'); } @@ -192,7 +192,7 @@ function PMA_chart_results($data, &$chartSettings) // the value os for this serie $chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = (int)$row[$yAxisKey]; } - else if (! isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) { + else if (!isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) { // if the value for this serie is not set, set it to 0 $chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = 0; } diff --git a/libraries/common.inc.php b/libraries/common.inc.php index ef6f64b..49937c8 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -608,7 +608,7 @@ $GLOBALS['server'] = 0; * @todo merge into PMA_Config */ // Do we have some server? -if (! isset($cfg['Servers']) || count($cfg['Servers']) == 0) { +if (!isset($cfg['Servers']) || count($cfg['Servers']) == 0) { // No server => create one with defaults $cfg['Servers'] = array(1 => $default_server); } else { @@ -664,7 +664,7 @@ if (! isset($_SESSION['PMA_Theme_Manager'])) { } // for the theme per server feature -if (isset($_REQUEST['server']) && ! isset($_REQUEST['set_theme'])) { +if (isset($_REQUEST['server']) && !isset($_REQUEST['set_theme'])) { $GLOBALS['server'] = $_REQUEST['server']; $tmp = $_SESSION['PMA_Theme_Manager']->getThemeCookie(); if (empty($tmp)) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index e8e6b8a..5b353ec 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -301,7 +301,7 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '') return htmlspecialchars($parsed_sql['raw']); } // then check for an array - if (! is_array($parsed_sql)) { + if (!is_array($parsed_sql)) { // We don't so just return the input directly // This is intended to be used for when the SQL Parser is turned off $formatted_sql = '<pre>' . "\n" @@ -781,12 +781,12 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = $group_name = $parts[$i] . $sep; $group_name_full .= $group_name; - if (! isset($group[$group_name])) { + if (!isset($group[$group_name])) { $group[$group_name] = array(); $group[$group_name]['is' . $sep . 'group'] = true; $group[$group_name]['tab' . $sep . 'count'] = 1; $group[$group_name]['tab' . $sep . 'group'] = $group_name_full; - } elseif (! isset($group[$group_name]['is' . $sep . 'group'])) { + } elseif (!isset($group[$group_name]['is' . $sep . 'group'])) { $table = $group[$group_name]; $group[$group_name] = array(); $group[$group_name][$group_name] = $table; @@ -801,7 +801,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = $i++; } } else { - if (! isset($table_groups[$table_name])) { + if (!isset($table_groups[$table_name])) { $table_groups[$table_name] = array(); } $group =& $table_groups; @@ -963,7 +963,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view * in a string. In some special cases on sql.php, buffering has to be disabled * and hence we check with $GLOBALS['buffer_message'] */ - if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { + if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) { ob_start(); } global $cfg; @@ -1280,7 +1280,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // If we are in an Ajax request, we have most probably been called in // PMA_ajaxResponse(). Hence, collect the buffer contents and return it // to PMA_ajaxResponse(), which will encode it for JSON. - if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { + if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) { $buffer_contents = ob_get_contents(); ob_end_clean(); return $buffer_contents; @@ -2001,7 +2001,7 @@ function PMA_checkParameters($params, $die = true, $request = true) { global $checked_special; - if (! isset($checked_special)) { + if (!isset($checked_special)) { $checked_special = false; } @@ -2014,7 +2014,7 @@ function PMA_checkParameters($params, $die = true, $request = true) $checked_special = true; } - if (! isset($GLOBALS[$param])) { + if (!isset($GLOBALS[$param])) { $error_message .= $reported_script_name . ': Missing parameter: ' . $param . PMA_showDocu('faqmissingparameters') @@ -2112,7 +2112,7 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force . PMA_backquote($meta->orgname) . ' '; } // end if... else... - if (! isset($row[$i]) || is_null($row[$i])) { + if (!isset($row[$i]) || is_null($row[$i])) { $condition .= 'IS NULL AND'; } else { // timestamp is numeric on some MySQL 4.1 @@ -2434,8 +2434,8 @@ function PMA_userDir($dir) */ function PMA_getDbLink($database = null) { - if (! strlen($database)) { - if (! strlen($GLOBALS['db'])) { + if (!strlen($database)) { + if (!strlen($GLOBALS['db'])) { return ''; } $database = $GLOBALS['db']; diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 1d0f3a6..76d2c86 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -386,7 +386,7 @@ function PMA_array_merge_recursive() break; case 2 : $args = func_get_args(); - if (! is_array($args[0]) || ! is_array($args[1])) { + if (!is_array($args[0]) || !is_array($args[1])) { return $args[1]; } foreach ($args[1] as $key2 => $value2) { @@ -603,7 +603,7 @@ function PMA_array_read($path, $array, $default = null) $keys = explode('/', $path); $value =& $array; foreach ($keys as $key) { - if (! isset($value[$key])) { + if (!isset($value[$key])) { return $default; } $value =& $value[$key]; @@ -624,7 +624,7 @@ function PMA_array_write($path, &$array, $value) $last_key = array_pop($keys); $a =& $array; foreach ($keys as $key) { - if (! isset($a[$key])) { + if (!isset($a[$key])) { $a[$key] = array(); } $a =& $a[$key]; @@ -650,7 +650,7 @@ function PMA_array_remove($path, &$array) $found = true; // go as deep as required or possible foreach ($keys as $key) { - if (! isset($path[$depth][$key])) { + if (!isset($path[$depth][$key])) { $found = false; break; } @@ -665,7 +665,7 @@ function PMA_array_remove($path, &$array) // remove empty nested arrays for (; $depth >= 0; $depth--) { - if (! isset($path[$depth+1]) || count($path[$depth+1]) == 0) { + if (!isset($path[$depth+1]) || count($path[$depth+1]) == 0) { unset($path[$depth][$keys[$depth]]); } else { break; diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index be8d9f5..22d9671 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -196,7 +196,7 @@ function PMA_usort_comparison_callback($a, $b) $sorter = 'strcasecmp'; } /* No sorting when key is not present */ - if (! isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) { + if (!isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) { return 0; } // produces f.e.: diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index f8bb5a0..d8610f2 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -152,7 +152,7 @@ if (true === $cfg['SkipLockedTables']) { null, PMA_DBI_QUERY_STORE); if ($db_info_result && PMA_DBI_num_rows($db_info_result) > 0) { while ($tmp = PMA_DBI_fetch_row($db_info_result)) { - if (! isset($sot_cache[$tmp[0]])) { + if (!isset($sot_cache[$tmp[0]])) { $sts_result = PMA_DBI_query( 'SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . addslashes($tmp[0]) . '\';'); @@ -160,7 +160,7 @@ if (true === $cfg['SkipLockedTables']) { PMA_DBI_free_result($sts_result); unset($sts_result); - if (! isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) { + if (!isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) { $sts_tmp['Type'] =& $sts_tmp['Engine']; } diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 88c80af..10e8178 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -65,7 +65,7 @@ echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' . // If the export method was not set, the default is quick if(isset($_GET['export_method'])) { $cfg['Export']['method'] = $_GET['export_method']; -} elseif(! isset($cfg['Export']['method'])) { +} elseif(!isset($cfg['Export']['method'])) { $cfg['Export']['method'] = 'quick'; } // The export method (quick, custom or custom-no-form) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 6fa8e9b..78b4bb6 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1091,7 +1091,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } } - if (! is_array($map)) { + if (!is_array($map)) { $map = array(); } $row_no = 0; @@ -1272,7 +1272,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $condition_field = false; } - if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical' && (! isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) { + if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical' && (!isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) { // the row number corresponds to a data row, not HTML table row $class .= ' row_' . $row_no; if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) { @@ -1328,7 +1328,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // will show both fields NULL even if only one is NULL, // so use the $pointer - if (! isset($row[$i]) || is_null($row[$i])) { + if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); } elseif ($row[$i] != '') { @@ -1351,7 +1351,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $class = str_replace('inline_edit', '', $class); if (stristr($field_flags, 'BINARY')) { - if (! isset($row[$i]) || is_null($row[$i])) { + if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); } else { // for blobstreaming @@ -1367,7 +1367,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } // not binary: } else { - if (! isset($row[$i]) || is_null($row[$i])) { + if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); } elseif ($row[$i] != '') { // if a transform function for blob is set, none of these replacements will be made @@ -1395,7 +1395,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // n o t n u m e r i c a n d n o t B L O B } else { - if (! isset($row[$i]) || is_null($row[$i])) { + if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); } elseif ($row[$i] != '') { // support blanks in the key @@ -1477,7 +1477,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // 4. Gather links of del_urls and edit_urls in an array for later // output - if (! isset($vertical_display['edit'][$row_no])) { + if (!isset($vertical_display['edit'][$row_no])) { $vertical_display['edit'][$row_no] = ''; $vertical_display['copy'][$row_no] = ''; $vertical_display['delete'][$row_no] = ''; @@ -1563,7 +1563,7 @@ function PMA_displayVerticalTable() // Displays "edit" link at top if required if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1581,7 +1581,7 @@ function PMA_displayVerticalTable() // Displays "copy" link at top if required if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1599,7 +1599,7 @@ function PMA_displayVerticalTable() // Displays "delete" link at top if required if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['edit']) && !is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1652,7 +1652,7 @@ function PMA_displayVerticalTable() // Displays "edit" link at bottom if required if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1670,7 +1670,7 @@ function PMA_displayVerticalTable() // Displays "copy" link at bottom if required if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1688,7 +1688,7 @@ function PMA_displayVerticalTable() // Displays "delete" link at bottom if required if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['edit']) && !is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -2070,7 +2070,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) PMA_showMessage($message, $sql_query, 'success'); - } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { + } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { PMA_showMessage(__('Your SQL query has been executed successfully'), $sql_query, 'success'); } @@ -2090,7 +2090,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) if ($is_display['nav_bar'] == '1') { PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'top_direction_dropdown'); echo "\n"; - } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { + } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { echo "\n" . ' ' . "\n"; } @@ -2212,12 +2212,12 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) if ($is_display['nav_bar'] == '1') { echo ' ' . "\n"; PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'bottom_direction_dropdown'); - } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { + } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { echo "\n" . ' ' . "\n"; } // 6. ----- Displays "Query results operations" - if (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { + if (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { PMA_displayResultsOperations($the_disp_mode, $analyzed_sql); } } // end of the 'PMA_displayTable()' function @@ -2298,8 +2298,8 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { // If the parser found a PROCEDURE clause // (most probably PROCEDURE ANALYSE()) it makes no sense to // display the Export link). - if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && ! isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) { - if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && ! isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) { + if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && !isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) { + if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && !isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) { $_url_params['single_table'] = 'true'; } if (!$header_shown) { diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index 5a66351..f5385d5 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -166,7 +166,7 @@ if (window.parent.frame_content) { } // Link to itself to replicate windows including frameset -if (! isset($GLOBALS['checked_special'])) { +if (!isset($GLOBALS['checked_special'])) { $GLOBALS['checked_special'] = false; } diff --git a/libraries/header.inc.php b/libraries/header.inc.php index f6c3dcd..a23d2fa 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -30,7 +30,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { // if database storage for user preferences is transient, offer to load // exported settings from localStorage (detection will be done in JavaScript) $userprefs_offer_import = $GLOBALS['PMA_Config']->get('user_preferences') == 'session' - && ! isset($_SESSION['userprefs_autoload']); + && !isset($_SESSION['userprefs_autoload']); if ($userprefs_offer_import) { $GLOBALS['js_include'][] = 'config.js'; } @@ -143,7 +143,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { * @uses $show_comment from libraries/tbl_info.inc.php * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php */ - if (!empty($show_comment) && ! isset($GLOBALS['avoid_show_comment'])) { + if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) { if (strstr($show_comment, '; InnoDB free')) { $show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment); } diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 0c77f54..a7d0b5e 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -127,7 +127,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } $msg = '# '; if ($result === FALSE) { // execution failed - if (! isset($my_die)) { + if (!isset($my_die)) { $my_die = array(); } $my_die[] = array('sql' => $import_run_buffer['full'], 'error' => PMA_DBI_getError()); @@ -697,7 +697,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * This is the first row to be analyzed */ - elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) { + elseif (!isset($last_cumulative_type) || $last_cumulative_type == NONE) { return $curr_size; } /** diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 51b79ba..45fd55a 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -37,7 +37,7 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) { : 'SELECT * FROM information_schema.COLLATIONS'; $res = PMA_DBI_query($sql); while ($row = PMA_DBI_fetch_assoc($res)) { - if (! is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) { + if (!is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) { $mysql_collations[$row['CHARACTER_SET_NAME']] = array($row['COLLATION_NAME']); } else { $mysql_collations[$row['CHARACTER_SET_NAME']][] = $row['COLLATION_NAME']; @@ -46,7 +46,7 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) { if ($row['IS_DEFAULT'] == 'Yes') { $mysql_default_collations[$row['CHARACTER_SET_NAME']] = $row['COLLATION_NAME']; } - //$mysql_collations_available[$row['Collation']] = ! isset($row['Compiled']) || $row['Compiled'] == 'Yes'; + //$mysql_collations_available[$row['Collation']] = !isset($row['Compiled']) || $row['Compiled'] == 'Yes'; $mysql_collations_available[$row['COLLATION_NAME']] = true; $mysql_charsets_available[$row['CHARACTER_SET_NAME']] = !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']]) diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index edfd02a..48dc975 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -71,7 +71,7 @@ function PMA_getString($name) function PMA_pluginCheckboxCheck($section, $opt) { // If the form is being repopulated using $_GET data, that is priority - if (isset($_GET[$opt]) || ! isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) || + if (isset($_GET[$opt]) || !isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) || (isset($GLOBALS['cfg'][$section][$opt]) && $GLOBALS['cfg'][$section][$opt]))) { return ' checked="checked"'; } @@ -160,7 +160,7 @@ function PMA_pluginIsActive($section, $opt, $val) */ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL) { - if (! isset($cfgname)) { + if (!isset($cfgname)) { $cfgname = $name; } $ret = '<select id="plugins" name="' . $name . '">'; @@ -168,7 +168,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL) foreach ($list as $plugin_name => $val) { $ret .= '<option'; // If the form is being repopulated using $_GET data, that is priority - if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) { + if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || !isset($_GET[$name]) && $plugin_name == $default) { $ret .= ' selected="selected"'; } $ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . '</option>' . "\n"; diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index a781307..e58381e 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -680,7 +680,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema $dia->startDiaDoc($this->paper,$this->_topMargin,$this->_bottomMargin,$this->_leftMargin,$this->_rightMargin,$this->orientation); $alltables = $this->getAllTables($db,$this->pageNumber); foreach ($alltables as $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys); } } @@ -725,10 +725,10 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys); } $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index edea703..5435db4 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -759,7 +759,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema $alltables = $this->getAllTables($db,$this->pageNumber); foreach ($alltables AS $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table,$eps->getFont(),$eps->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); } @@ -809,10 +809,10 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo); } $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index ef60264..6078537 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -882,7 +882,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /* snip */ foreach ($alltables as $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table, $this->_ff, $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); } if ($this->sameWide) { @@ -962,11 +962,11 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showInfo) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo); $this->_setMinMax($this->tables[$masterTable]); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo); $this->_setMinMax($this->tables[$foreignTable]); } @@ -1305,7 +1305,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema if ($zerofill) { $attribute = 'UNSIGNED ZEROFILL'; } - if (! isset($row['Default'])) { + if (!isset($row['Default'])) { if ($row['Null'] != '' && $row['Null'] != 'NO') { $row['Default'] = 'NULL'; } diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 0f6b55b..afafda7 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -742,7 +742,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema $alltables = $this->getAllTables($db,$this->pageNumber); foreach ($alltables AS $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table,$svg->getFont(),$svg->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); } @@ -805,11 +805,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tathis->_tablewidth, $this->showKeys, $this->tableDimension);ration. See [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a].'));��p��~�+6 ��!�! ��x��+��"~�+~�+ ��~�+_��+�~�+��+ؤ��+��+Ȅ�+x��+��p��~�+�!�! ��}z�+��"~�+~�+ ��~�+_��P��H��+�p��~�+Ȅ�+��P��~�+GHIJKMNOP ��H5Q�+ ��"~�+~�+ ��0��+�~�+��+�i.�+��+ؤ��+��+Ȅ�+H5Q�+ ��`��~�+85Q�+ ��~�+(5Q�+ ��~�+5Q�+ ��~�+ ��+�~�+��+p��.�+�~�+ؤ��+��y�.�+�~�+��+��Z�.�+�~�+�d.�+��+�i.�+��+�Ě�+ؤ��+��+Ȅ�+�,�+@��~�+#%')*-.035678:<= ��p��+`��"~�+8Ϛ�+�~�+�Ě�+�ɚ�+Ȅ�+cf-��+��p��+`��0��~�+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��+��F�a �+F�a �+?��+��-��+�~�+��+ ��B�a �+��_��+��B�a �+��~blewidth, false, $showInfo); $this->_setMinMax($this->tables[$masterTable]); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo); $this->_setMinMax($this->tables[$foreignTable]); } diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 7e8dbfb..fbec138 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -222,7 +222,7 @@ class PMA_User_Schema * Display WYSIWYG parts */ - if (! isset($_POST['with_field_names']) && ! isset($_POST['showwysiwyg'])) { + if (!isset($_POST['with_field_names']) && !isset($_POST['showwysiwyg'])) { $with_field_names = TRUE; } $this->_displayScratchboardTables($array_sh_page); @@ -783,10 +783,10 @@ class PMA_User_Schema $arrvalue = 'c_table_' . $i; global $$arrvalue; $arrvalue = $$arrvalue; - if (! isset($arrvalue['x']) || $arrvalue['x'] == '') { + if (!isset($arrvalue['x']) || $arrvalue['x'] == '') { $arrvalue['x'] = 0; } - if (! isset($arrvalue['y']) || $arrvalue['y'] == '') { + if (!isset($arrvalue['y']) || $arrvalue['y'] == '') { $arrvalue['y'] = 0; } if (isset($arrvalue['name']) && $arrvalue['name'] != '--') { diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index a9be622..ab45b13 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -505,7 +505,7 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema $alltables = $this->getAllTables($db,$this->pageNumber); foreach ($alltables as $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys); } } @@ -550,10 +550,10 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys); } $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index b8b4dcd..8196269 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -27,7 +27,7 @@ if (!$GLOBALS['is_ajax_request']) { /** * Put something in $sub_part */ - if (! isset($sub_part)) { + if (!isset($sub_part)) { $sub_part = ''; } diff --git a/libraries/session.inc.php b/libraries/session.inc.php index 465e3f0..4f8caec 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -95,7 +95,7 @@ if (! isset($_COOKIE[$session_name])) { * Token which is used for authenticating access queries. * (we use "space PMA_token space" to prevent overwriting) */ -if (! isset($_SESSION[' PMA_token '])) { +if (!isset($_SESSION[' PMA_token '])) { $_SESSION[' PMA_token '] = md5(uniqid(rand(), true)); } diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index a46b720..cbad1d6 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -46,7 +46,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (!defined('TESTSUITE')) { require_once './libraries/mysql_charsets.lib.php'; } - if (! isset($mysql_charsets)) { + if (!isset($mysql_charsets)) { $mysql_charsets = array(); $mysql_charsets_count = 0; $mysql_collations_flat = array(); @@ -828,7 +828,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ function PMA_SQP_analyze($arr) { - if ($arr == array() || ! isset($arr['len'])) { + if ($arr == array() || !isset($arr['len'])) { return array(); } $result = array(); @@ -2090,7 +2090,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { { //DEBUG echo 'in Format<pre>'; print_r($arr); echo '</pre>'; // then check for an array - if (! is_array($arr)) { + if (!is_array($arr)) { return htmlspecialchars($arr); } // first check for the SQL parser having hit an error diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index ac3a26f..00c9904 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -102,7 +102,7 @@ if ($showtable) { } } // we need explicit DEFAULT value here (different from '0') - $pack_keys = (! isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys; + $pack_keys = (!isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys; unset($create_options, $each_create_option); } // end if ?> diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 395fa7b..54e9d1d 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -378,7 +378,7 @@ for ($i = 0; $i < $num_fields; $i++) { * having NULL enabled does not implicit having Default with NULL * if (isset($row) - && ! isset($row['Default']) && isset($row['Null']) && $row['Null'] == 'YES') { + && !isset($row['Default']) && isset($row['Null']) && $row['Null'] == 'YES') { $row['Default'] = 'NULL'; } */ diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index 7d1a2d7..2aad2e6 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -15,7 +15,7 @@ require './libraries/server_links.inc.php'; // build user preferences menu $form_param = filter_input(INPUT_GET, 'form'); -if (! isset($forms[$form_param])) { +if (!isset($forms[$form_param])) { $forms_keys = array_keys($forms); $form_param = array_shift($forms_keys); } @@ -64,7 +64,7 @@ $msg->display(); // warn about using session storage for settings $cfgRelation = PMA_getRelationsParam(); -if (! $cfgRelation['userconfigwork']) { +if (!$cfgRelation['userconfigwork']) { $msg = __('Your preferences will be saved for current session only. Storing them permanently requires %sphpMyAdmin configuration storage%s.'); $msg = PMA_sanitize(sprintf($msg, '[a@./Documentation.html#linked-tables@_blank]', '[/a]')); PMA_Message::notice($msg)->display(); diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 3fb8c1b..6c48116 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -49,9 +49,9 @@ function PMA_userprefs_pageinit() function PMA_load_userprefs() { $cfgRelation = PMA_getRelationsParam(); - if (! $cfgRelation['userconfigwork']) { + if (!$cfgRelation['userconfigwork']) { // no pmadb table, use session storage - if (! isset($_SESSION['userconfig'])) { + if (!isset($_SESSION['userconfig'])) { $_SESSION['userconfig'] = array( 'db' => array(), 'ts' => time()); @@ -104,7 +104,7 @@ function PMA_save_userprefs(array $config_array) ? $GLOBALS['server'] : $GLOBALS['cfg']['ServerDefault']; $cache_key = 'server_' . $server; - if (! $cfgRelation['userconfigwork']) { + if (!$cfgRelation['userconfigwork']) { // no pmadb table, use session storage $_SESSION['userconfig'] = array( 'db' => $config_array, @@ -175,7 +175,7 @@ function PMA_apply_userprefs(array $config_data) $whitelist['Server/hide_db'] = true; $whitelist['Server/only_db'] = true; foreach ($config_data as $path => $value) { - if (! isset($whitelist[$path]) || isset($blacklist[$path])) { + if (!isset($whitelist[$path]) || isset($blacklist[$path])) { continue; } PMA_array_write($path, $cfg, $value); diff --git a/main.php b/main.php index d69b4bb..c7c25bc 100644 --- a/main.php +++ b/main.php @@ -292,7 +292,7 @@ if (file_exists('./config')) { */ if ($server > 0) { $cfgRelation = PMA_getRelationsParam(); - if(! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { + if(!$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { $message = PMA_Message::notice(__('The phpMyAdmin configuration storage is not completely configured, some extended features have been deactivated. To find out why click %shere%s.')); $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false); $message->addParam('</a>', false); diff --git a/po/hi.po b/po/hi.po index 5a673c8..a04d453 100644 --- a/po/hi.po +++ b/po/hi.po @@ -3,9 +3,9 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" -"PO-Revision-Date: 2011-05-06 09:13+0200\n" -"Last-Translator: <manojonemail(a)gmail.com>\n" +"POT-Creation-Date: 2011-05-09 07:40+0200\n" +"PO-Revision-Date: 2011-04-24 00:23+0200\n" +"Last-Translator: <rsedwardian(a)gmail.com>\n" "Language-Team: hindi <hi(a)li.org>\n" "Language: hi\n" "MIME-Version: 1.0\n" diff --git a/po/hu.po b/po/hu.po index 6a6a7ff..4dd32fb 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,9 +3,9 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" -"PO-Revision-Date: 2011-05-09 14:22+0200\n" -"Last-Translator: <gergo314(a)gmail.com>\n" +"POT-Creation-Date: 2011-05-09 14:14+0200\n" +"PO-Revision-Date: 2011-05-05 12:49+0200\n" +"Last-Translator: <gergo314(a)gmail.com>\n" "Language-Team: hungarian <hu(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3481,9 +3481,8 @@ msgstr "" " nem található" #: libraries/config/messages.inc.php:328 -#, fuzzy msgid "Missing phpMyAdmin configuration storage tables" -msgstr "Hiányzó táblák a phpMyAdmin konfigurációs tárolóhoz" +msgstr "" #: libraries/config/messages.inc.php:330 msgid "Iconic table operations" @@ -3788,8 +3787,8 @@ msgstr "" "Használhatja a MySQL-karakterhelyettesítőket (% és _), vezérelheti őket, ha " "akarja, a literális példányaik használatához, pl. használja a 'my\\_db' " "alakot, s ne a 'my_db' alakot. Ezt a lehetőséget választva rendezhet " -"adatbázislistákat, beírva a nevüket sorrendben és használja a [kbd]*[/kbd]-t " -"a végén, hogy a többi abc-sorrendben jelenjen meg." +"adatbázislistákat, beírva a nevüket sorrendben és használja a [kbd]*[/kbd]-t" +" a végén, hogy a többi abc-sorrendben jelenjen meg." #: libraries/config/messages.inc.php:394 msgid "Show only listed databases" diff --git a/po/ja.po b/po/ja.po index 11eed48..890d5a2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -111,7 +111,9 @@ msgstr "リモート URL を開けませんでした。" msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." -msgstr "ファイル %s は、このシステムでは使用できません。詳細については www.phpmyadmin.net をご覧ください。" +msgstr "" +"ファイル %s は、このシステムでは使用できません。詳細については www." +"phpmyadmin.net をご覧ください。" #: db_create.php:58 #, php-format @@ -3443,7 +3445,7 @@ msgstr "" #: libraries/config/messages.inc.php:328 msgid "Missing phpMyAdmin configuration storage tables" -msgstr "phpMyAdmin の設定保存用テーブルが不明" +msgstr "phpMyAdmin の設定保存用テーブルがありません" #: libraries/config/messages.inc.php:330 msgid "Iconic table operations" @@ -5093,7 +5095,9 @@ msgstr "ポート" msgid "" "The port for the PBMS stream-based communications. Setting this value to 0 " "will disable HTTP communication with the daemon." -msgstr "PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモンとの HTTP 通信を無効にします。" +msgstr "" +"PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモ" +"ンとの HTTP 通信を無効にします。" #: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" @@ -5164,7 +5168,9 @@ msgstr "" msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." -msgstr "PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オフィシャルサイト%sにあります。" +msgstr "" +"PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オ" +"フィシャルサイト%sにあります。" #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 msgid "Related Links" @@ -5330,7 +5336,9 @@ msgstr "" msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." -msgstr "PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイト%sにあります。" +msgstr "" +"PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイ" +"ト%sにあります。" #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" @@ -6785,7 +6793,9 @@ msgstr "設定を保存しました" msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." -msgstr "環境設定は、現在のセッションでのみ有効です。この設定を永続的に有効にするには、%sphpMyAdmin の設定保存場所%sが必要です。" +msgstr "" +"環境設定は、現在のセッションでのみ有効です。この設定を永続的に有効にするに" +"は、%sphpMyAdminの設定保存場所%sが必要です。" #: libraries/user_preferences.lib.php:142 msgid "Could not save configuration" @@ -9025,7 +9035,8 @@ msgstr "フォームを表示する" #: setup/lib/index.lib.php:119 msgid "" "Neither URL wrapper nor CURL is available. Version check is not possible." -msgstr "URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。" +msgstr "" +"URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。" #: setup/lib/index.lib.php:126 msgid "" @@ -9064,10 +9075,11 @@ msgid "" "proxies list%s. However, IP-based protection may not be reliable if your IP " "belongs to an ISP where thousands of users, including you, are connected to." msgstr "" -"この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL " -"サーバへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになります。これが必要と思われる場合には、%s信頼されたプロキシリスト%" -"sを使用します。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP " -"アドレスを基にした保護は信頼性が高いとはいえません。" +"この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL サー" +"バへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになりま" +"す。これが必要と思われる場合には、%s信頼されたプロキシリスト%sを使用します。" +"しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接" +"続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえません。" #: setup/lib/index.lib.php:252 msgid "" @@ -9150,9 +9162,11 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定（%sホスト認証%s設定および%s信頼されたプロキシのリスト" -"%s）を使用してください。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP " -"アドレスを基にした保護は信頼性が高いとはいえません。" +"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定" +"（%sホスト認証%s設定および%s信頼されたプロキシのリスト%s）を使用してくださ" +"い。しかしながら、ユーザが数千人もいるような ISP に所属している、使用してい" +"る、接続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえま" +"せん。" #: setup/lib/index.lib.php:268 #, php-format @@ -9391,7 +9405,8 @@ msgstr "" #: tbl_chart.php:166 msgid "" "When drawing a radar chart all values are normalized to a range [0..10]." -msgstr "レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。" +msgstr "" +"レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。" #: tbl_chart.php:173 msgid "" diff --git a/po/zh_CN.po b/po/zh_CN.po index ce19bb5..132a530 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" -"PO-Revision-Date: 2011-05-06 03:13+0200\n" +"POT-Creation-Date: 2011-05-09 07:40+0200\n" +"PO-Revision-Date: 2011-03-04 09:47+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" "Language: zh_CN\n" @@ -3123,7 +3123,7 @@ msgstr "树状数据库分隔符" msgid "" "Only light version; display databases in a tree (determined by the separator " "defined below)" -msgstr "只使用简洁版，以树形显示数据库 (以下面的树形分隔符来显示)" +msgstr "只使用轻量级版本，以树形显示数据库 (以下面的树形分隔符来显示)" #: libraries/config/messages.inc.php:273 msgid "Display databases in a tree" @@ -3135,7 +3135,7 @@ msgstr "如果想一次性浏览所有数据库，则禁用该选项" #: libraries/config/messages.inc.php:275 msgid "Use light version" -msgstr "使用简洁版" +msgstr "使用轻量级版本" #: libraries/config/messages.inc.php:276 msgid "Maximum table tree depth" diff --git a/prefs_forms.php b/prefs_forms.php index 4aaea9c..22ffb4c 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -23,7 +23,7 @@ PMA_userprefs_pageinit(); // handle form processing $form_param = filter_input(INPUT_GET, 'form'); -if (! isset($forms[$form_param])) { +if (!isset($forms[$form_param])) { $forms_keys = array_keys($forms); $form_param = array_shift($forms_keys); } diff --git a/prefs_manage.php b/prefs_manage.php index ec1b481..e5dbe3f 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -76,7 +76,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == $config = json_decode($json, true); $return_url = filter_input(INPUT_POST, 'return_url'); - if (! is_array($config)) { + if (!is_array($config)) { $error = __('Could not import configuration'); } else { // sanitize input values: treat them as though they came from HTTP POST request diff --git a/schema_edit.php b/schema_edit.php index 9b71500..a5d3a38 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -41,24 +41,24 @@ $query_default_option = PMA_DBI_QUERY_STORE; * correctly, so it is a good place to see which tables we can and * complain ;-) */ -if (! $cfgRelation['relwork']) { +if (!$cfgRelation['relwork']) { echo sprintf(__('%s table not found or not set in %s'), 'relation', 'config.inc.php') . ' ' . "\n" . PMA_showDocu('relation') . "\n"; require_once './libraries/footer.inc.php'; } -if (! $cfgRelation['displaywork']) { +if (!$cfgRelation['displaywork']) { echo sprintf(__('%s table not found or not set in %s'), 'table_info', 'config.inc.php') . ' ' . "\n" . PMA_showDocu('table_info') . "\n"; require_once './libraries/footer.inc.php'; } -if (! isset($cfgRelation['table_coords'])){ +if (!isset($cfgRelation['table_coords'])){ echo sprintf(__('%s table not found or not set in %s'), 'table_coords', 'config.inc.php') . ' ' . "\n" . PMA_showDocu('table_coords') . "\n"; require_once './libraries/footer.inc.php'; } -if (! isset($cfgRelation['pdf_pages'])) { +if (!isset($cfgRelation['pdf_pages'])) { echo sprintf(__('%s table not found or not set in %s'), 'pdf_page', 'config.inc.php') . ' ' . "\n" . PMA_showDocu('pdf_pages') . "\n"; require_once './libraries/footer.inc.php'; diff --git a/server_privileges.php b/server_privileges.php index daf8a99..19f9dcb 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -270,7 +270,7 @@ function PMA_extractPrivInfo($row = '', $enableHTML = FALSE) } else { $privs[] = 'USAGE'; } - } elseif ($allPrivileges && (! isset($GLOBALS['grant_count']) || count($privs) == $GLOBALS['grant_count'])) { + } elseif ($allPrivileges && (!isset($GLOBALS['grant_count']) || count($privs) == $GLOBALS['grant_count'])) { if ($enableHTML) { $privs = array('<dfn title="' . __('Includes all privileges except GRANT.') . '">ALL PRIVILEGES</dfn>'); } else { @@ -725,7 +725,7 @@ function PMA_displayLoginInformationFields($mode = 'new') . ' <select name="pred_username" id="select_pred_username" title="' . __('User name') . '"' . "\n" . ' onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n" . ' <option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . __('Any user') . '</option>' . "\n" - . ' <option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n" + . ' <option value="userdefined"' . ((!isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n" . ' </select>' . "\n" . '' . "\n" . '<input type="text" name="username" maxlength="' @@ -756,7 +756,7 @@ function PMA_displayLoginInformationFields($mode = 'new') unset($_current_user); // when we start editing a user, $GLOBALS['pred_hostname'] is not defined - if (! isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) { + if (!isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) { switch (strtolower($GLOBALS['hostname'])) { case 'localhost': case '127.0.0.1': @@ -850,7 +850,7 @@ if (isset($_REQUEST['change_copy'])) { // Recent MySQL versions have the field "Password" in mysql.user, // so the previous extract creates $Password but this script // uses $password - if (! isset($password) && isset($Password)) { + if (!isset($password) && isset($Password)) { $password = $Password; } $queries = array(); @@ -1140,7 +1140,7 @@ if (!empty($update_privs)) { $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; - if (! isset($Grant_priv) || $Grant_priv != 'Y') { + if (!isset($Grant_priv) || $Grant_priv != 'Y') { $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; @@ -1387,7 +1387,7 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s * If we are in an Ajax request for Create User/Edit User/Revoke User/Flush Privileges, * show $message and exit. */ -if( $GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog'])) { +if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && (!isset($_REQUEST['adduser']) || $_add_user_error) && !isset($_REQUEST['initial']) && !isset($_REQUEST['showall']) && !isset($_REQUEST['edit_user_dialog'])) { if(isset($sql_query)) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); @@ -2056,7 +2056,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote(PMA_unescape_mysql_wildcards($dbname)) . ';', null, PMA_DBI_QUERY_STORE)) { $pred_tbl_array = array(); while ($row = PMA_DBI_fetch_row($res)) { - if (! isset($found_rows) || !in_array($row[0], $found_rows)) { + if (!isset($found_rows) || !in_array($row[0], $found_rows)) { $pred_tbl_array[] = $row[0]; } } @@ -2279,7 +2279,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs foreach ($current_privileges as $current) { echo ' <td>' . "\n" . ' '; - if (! isset($current['Db']) || $current['Db'] == '*') { + if (!isset($current['Db']) || $current['Db'] == '*') { echo __('global'); } elseif ($current['Db'] == PMA_escape_mysql_wildcards($checkprivs)) { echo __('database-specific'); diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php index 61484b2..27429b4 100644 --- a/setup/frames/form.inc.php +++ b/setup/frames/form.inc.php @@ -21,7 +21,7 @@ require './libraries/config/setup.forms.php'; $formset_id = filter_input(INPUT_GET, 'formset'); $mode = filter_input(INPUT_GET, 'mode'); -if (! isset($forms[$formset_id])) { +if (!isset($forms[$formset_id])) { die('Incorrect formset, check $formsets array in setup/frames/form.inc.php'); } diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index 2872221..95c3325 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -113,7 +113,7 @@ class ConfigGenerator private static function _isZeroBasedArray(array $array) { for ($i = 0; $i < count($array); $i++) { - if (! isset($array[$i])) { + if (!isset($array[$i])) { return false; } } diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 2e20e5d..aa0d044 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -18,7 +18,7 @@ if (!defined('PHPMYADMIN')) { */ function messages_begin() { - if (! isset($_SESSION['messages']) || !is_array($_SESSION['messages'])) { + if (!isset($_SESSION['messages']) || !is_array($_SESSION['messages'])) { $_SESSION['messages'] = array('error' => array(), 'notice' => array()); } else { // reset message states @@ -41,7 +41,7 @@ function messages_begin() */ function messages_set($type, $id, $title, $message) { - $fresh = ! isset($_SESSION['messages'][$type][$id]); + $fresh = !isset($_SESSION['messages'][$type][$id]); $_SESSION['messages'][$type][$id] = array( 'fresh' => $fresh, 'active' => true, diff --git a/sql.php b/sql.php index d07022b..9b19174 100644 --- a/sql.php +++ b/sql.php @@ -33,7 +33,7 @@ if (! empty($goto)) { $is_gotofile = true; } // end if -if (! isset($err_url)) { +if (!isset($err_url)) { $err_url = (!empty($back) ? $back : $goto) . '?' . PMA_generate_common_url($db) . ((strpos(' ' . $goto, 'db_') != 1 && strlen($table)) ? '&table=' . urlencode($table) : ''); @@ -441,7 +441,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { if (!$is_affected) { $num_rows = ($result) ? @PMA_DBI_num_rows($result) : 0; - } elseif (! isset($num_rows)) { + } elseif (!isset($num_rows)) { $num_rows = @PMA_DBI_affected_rows(); } @@ -492,11 +492,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // due to $find_real_end == true if (!$is_group - && ! isset($analyzed_sql[0]['queryflags']['union']) - && ! isset($analyzed_sql[0]['table_ref'][1]['table_name']) + && !isset($analyzed_sql[0]['queryflags']['union']) + && !isset($analyzed_sql[0]['table_ref'][1]['table_name']) && (empty($analyzed_sql[0]['where_clause']) || $analyzed_sql[0]['where_clause'] == '1 ') - && ! isset($find_real_end) + && !isset($find_real_end) ) { // "j u s t b r o w s i n g" @@ -526,7 +526,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // long delays. Returned count will be complete anyway. // (but a LIMIT would disrupt results in an UNION) - if (! isset($analyzed_sql[0]['queryflags']['union'])) { + if (!isset($analyzed_sql[0]['queryflags']['union'])) { $count_query .= ' LIMIT 1'; } @@ -969,7 +969,7 @@ window.onload = function() /** * Displays the footer */ -if(! isset($_REQUEST['table_maintenance'])) { +if(!isset($_REQUEST['table_maintenance'])) { require './libraries/footer.inc.php'; } ?> diff --git a/tbl_change.php b/tbl_change.php index efdbd3f..22584db 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -514,7 +514,7 @@ foreach ($rows as $row_id => $vrow) { } else { // (we are inserting) // display default values - if (! isset($field['Default'])) { + if (!isset($field['Default'])) { $field['Default'] = ''; $real_null_value = TRUE; $data = ''; @@ -620,7 +620,7 @@ foreach ($rows as $row_id => $vrow) { // yet. $cnt_functions = count($cfg['Functions']); for ($j = 0; $j < $cnt_functions; $j++) { - if (! isset($dropdown_built[$cfg['Functions'][$j]]) || $dropdown_built[$cfg['Functions'][$j]] != 'TRUE') { + if (!isset($dropdown_built[$cfg['Functions'][$j]]) || $dropdown_built[$cfg['Functions'][$j]] != 'TRUE') { // Is current function defined as default? $selected = ($field['first_timestamp'] && $cfg['Functions'][$j] == $cfg['DefaultFunctions']['first_timestamp']) || (!$field['first_timestamp'] && $cfg['Functions'][$j] == $default_function) @@ -1062,7 +1062,7 @@ if (isset($where_clause)) { <?php echo "\n"; -if (! isset($after_insert)) { +if (!isset($after_insert)) { $after_insert = 'back'; } ?> diff --git a/tbl_printview.php b/tbl_printview.php index f2b80ab..74b6818 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -189,7 +189,7 @@ foreach ($the_tables as $key => $table) { if ($zerofill) { $attribute = 'UNSIGNED ZEROFILL'; } - if (! isset($row['Default'])) { + if (!isset($row['Default'])) { if ($row['Null'] != '' && $row['Null'] != 'NO') { $row['Default'] = 'NULL'; } diff --git a/tbl_relation.php b/tbl_relation.php index 90bd153..400fc63 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -186,7 +186,7 @@ if (isset($_REQUEST['destination_foreign'])) { if (! empty($foreign_string)) { list($foreign_db, $foreign_table, $foreign_field) = PMA_backquote_split($foreign_string); - if (! isset($existrel_foreign[$master_field])) { + if (!isset($existrel_foreign[$master_field])) { // no key defined for this field // The next few lines are repeated below, so they diff --git a/tbl_replace.php b/tbl_replace.php index 5b722c6..40d0ad4 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -276,7 +276,7 @@ foreach ($loop_array as $rownumber => $where_clause) { // u p d a t e } elseif (!empty($me_fields_null_prev[$key]) - && ! isset($me_fields_null[$key])) { + && !isset($me_fields_null[$key])) { // field had the null checkbox before the update // field no longer has the null checkbox $query_values[] = PMA_backquote($me_fields_name[$key]) . ' = ' . $cur_value; diff --git a/tbl_select.php b/tbl_select.php index 681083a..2cb0086 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -36,7 +36,7 @@ if ($GLOBALS['cfg']['PropertiesIconic'] == true) { /** * Not selection yet required -> displays the selection form */ -if (! isset($param) || $param[0] == '') { +if (!isset($param) || $param[0] == '') { // Gets some core libraries require_once './libraries/tbl_common.php'; //$err_url = 'tbl_select.php' . $err_url; @@ -52,7 +52,7 @@ if (! isset($param) || $param[0] == '') { */ require_once './libraries/tbl_links.inc.php'; - if (! isset($goto)) { + if (!isset($goto)) { $goto = $GLOBALS['cfg']['DefaultTabTable']; } // Defines the url to return to in case of error in the next sql statement @@ -336,7 +336,7 @@ else { } elseif (strncasecmp($types[$i], 'enum', 4) == 0) { if (!empty($fields[$i])) { - if (! is_array($fields[$i])) { + if (!is_array($fields[$i])) { $fields[$i] = explode(',', $fields[$i]); } $enum_selected_count = count($fields[$i]); diff --git a/tbl_structure.php b/tbl_structure.php index 9878b9e..99ec0e9 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -337,7 +337,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } - if (! isset($row['Default'])) { + if (!isset($row['Default'])) { if ($row['Null'] == 'YES') { $row['Default'] = 'NULL'; } diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 50d7ceb..3699dd0 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -71,7 +71,7 @@ if (isset($cn) && !empty($cn)) { header('Content-Disposition: attachment; filename=' . $cn); } -if (! isset($resize)) { +if (!isset($resize)) { echo $row[$transform_key]; } else { // if image_*__inline.inc.php finds that we can resize, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-1074-g523f86e
by Mike Hommé 11 May '11

11 May '11

The branch, master has been updated via 523f86ef6e5232d841e94a44080806f9333d4bd4 (commit) from 071bc679dbd8bd2ece5182bdb471c027f33daf6c (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/img/b_views.png | Bin 403 -> 700 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/themes/pmahomme/img/b_views.png b/themes/pmahomme/img/b_views.png index 1031697..bc219bc 100644 Binary files a/themes/pmahomme/img/b_views.png and b/themes/pmahomme/img/b_views.png differ hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git May 2011