From 331208d33aaad13996f74c989e443fbbb976a433 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:25:36 +0200 Subject: [PATCH 001/270] Translation update done using Pootle. --- po/sl.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/sl.po b/po/sl.po index 877790d8fb..f29b94f42c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-16 22:58+0200\n" +"PO-Revision-Date: 2011-08-18 00:25+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:316 @@ -855,10 +855,10 @@ msgid "Dump has been saved to file %s." msgstr "Dump je shranjen v datoteko %s." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Vrednosti za stolpec \"%s\"" +msgstr "Vrednost za stolpec \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" From 918dbee07fd66c617cd60b15bcce42c6f8597895 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:26:18 +0200 Subject: [PATCH 002/270] Translation update done using Pootle. --- po/sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index f29b94f42c..a13e1ed27f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:25+0200\n" +"PO-Revision-Date: 2011-08-18 00:26+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -866,7 +866,7 @@ msgstr "Uporabi OpenStreetMaps kot osnovni sloj" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 From b9e6a67c9d7597796fbb315eccf9d484e9becdf8 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:26:22 +0200 Subject: [PATCH 003/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index a13e1ed27f..51be725300 100644 --- a/po/sl.po +++ b/po/sl.po @@ -876,7 +876,7 @@ msgstr "Geometrija" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 msgid "Point" -msgstr "" +msgstr "Točka" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 From f701fd26e9ad5931d6f216f987f8c61c095f8c5d Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:26:26 +0200 Subject: [PATCH 004/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 51be725300..6e6179ceb1 100644 --- a/po/sl.po +++ b/po/sl.po @@ -881,7 +881,7 @@ msgstr "Točka" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 From 02afc390116150ca6d600b7306e37f1e20ea5a26 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:26:28 +0200 Subject: [PATCH 005/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 6e6179ceb1..1691a3de73 100644 --- a/po/sl.po +++ b/po/sl.po @@ -886,7 +886,7 @@ msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 From ce93f7a920e5134e358e3546c51f823a457e8e62 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:26:32 +0200 Subject: [PATCH 006/270] Translation update done using Pootle. --- po/sl.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 1691a3de73..bb3d87850c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -890,10 +890,9 @@ msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add routine" msgid "Add a point" -msgstr "Dodaj rutino" +msgstr "Dodaj točko" #: gis_data_editor.php:218 js/messages.php:287 #, fuzzy From 6189e5b84f986f916a3b081604ad310eb3c3aa67 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:26:50 +0200 Subject: [PATCH 007/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index bb3d87850c..a6dc086fa7 100644 --- a/po/sl.po +++ b/po/sl.po @@ -902,7 +902,7 @@ msgstr "Vrstice zaključene z" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" -msgstr "" +msgstr "Zunanji obroč:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" From 9a7c14698e02067e7bde8c63673a02e15030ff74 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:26:56 +0200 Subject: [PATCH 008/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index a6dc086fa7..613df8a641 100644 --- a/po/sl.po +++ b/po/sl.po @@ -906,7 +906,7 @@ msgstr "Zunanji obroč:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" -msgstr "" +msgstr "Notranji obroč" #: gis_data_editor.php:248 #, fuzzy From c27f650c30edf76496c1c2e826a337857964b297 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:27:36 +0200 Subject: [PATCH 009/270] Translation update done using Pootle. --- po/sl.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/sl.po b/po/sl.po index 613df8a641..7f0eb263d0 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:26+0200\n" +"PO-Revision-Date: 2011-08-18 00:27+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -909,10 +909,9 @@ msgid "Inner Ring" msgstr "Notranji obroč" #: gis_data_editor.php:248 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Dodaj novega uporabnika" +msgstr "Dodaj daljico" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 #, fuzzy From 5f6775931a0721f425ca5306420dbb8d33397844 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:27:40 +0200 Subject: [PATCH 010/270] Translation update done using Pootle. --- po/sl.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 7f0eb263d0..e98feae0df 100644 --- a/po/sl.po +++ b/po/sl.po @@ -895,10 +895,9 @@ msgid "Add a point" msgstr "Dodaj točko" #: gis_data_editor.php:218 js/messages.php:287 -#, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Vrstice zaključene z" +msgstr "Daljica" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" From 57f12c4a04194feb31cf8f5f6e050238cb870c6f Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:27:46 +0200 Subject: [PATCH 011/270] Translation update done using Pootle. --- po/sl.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index e98feae0df..2f42dc85e5 100644 --- a/po/sl.po +++ b/po/sl.po @@ -913,10 +913,9 @@ msgid "Add a linestring" msgstr "Dodaj daljico" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" -msgstr "Dodaj novega uporabnika" +msgstr "Dodaj notranji obroč" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" From 046f79ee40f76a948336c0ebe537897c458ef59d Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:27:50 +0200 Subject: [PATCH 012/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 2f42dc85e5..4be96317c9 100644 --- a/po/sl.po +++ b/po/sl.po @@ -919,7 +919,7 @@ msgstr "Dodaj notranji obroč" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Večkotnik" #: gis_data_editor.php:300 js/messages.php:294 #, fuzzy From c815b1ef5053ee9761769a29eeaaf9c2c65adfbb Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:27:54 +0200 Subject: [PATCH 013/270] Translation update done using Pootle. --- po/sl.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 4be96317c9..9ae723c0a9 100644 --- a/po/sl.po +++ b/po/sl.po @@ -922,10 +922,9 @@ msgid "Polygon" msgstr "Večkotnik" #: gis_data_editor.php:300 js/messages.php:294 -#, fuzzy #| msgid "Add column" msgid "Add a polygon" -msgstr "Dodaj stolpec" +msgstr "Dodaj večkotnik" #: gis_data_editor.php:304 #, fuzzy From fdd5b081339c242e687cd4b800f13723d8807633 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:28:16 +0200 Subject: [PATCH 014/270] Translation update done using Pootle. --- po/sl.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/sl.po b/po/sl.po index 9ae723c0a9..300ded56e6 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:27+0200\n" +"PO-Revision-Date: 2011-08-18 00:28+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -927,10 +927,9 @@ msgid "Add a polygon" msgstr "Dodaj večkotnik" #: gis_data_editor.php:304 -#, fuzzy #| msgid "Geometry" msgid "Add geometry" -msgstr "Geometrija" +msgstr "Dodaj geometrijo" #: gis_data_editor.php:312 msgid "" From 98b26a9b2053ad1eae67517ee57e17787850a450 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:31:17 +0200 Subject: [PATCH 015/270] Translation update done using Pootle. --- po/sl.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 300ded56e6..facb0a3e92 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:28+0200\n" +"PO-Revision-Date: 2011-08-18 00:31+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -1223,6 +1223,10 @@ msgid "" "likely that your current configuration will not work anymore. Please reset " "your configuration to default in the Settings menu." msgstr "" +"Konfiguracija razvrstitve grafikonov v lokalni shrambi brskalnika ni več " +"združljiva z novejšo različico pogovornega okna nadziranja. Zelo verjetno " +"je, da vaša trenutna konfiguracija ne bo več delovala. Prosimo, ponastavite " +"svojo konfiguracijo na privzeto v meniju Nastavitve." #: js/messages.php:96 msgid "Query cache efficiency" From 18841f8078ba99e2d8f557012a1fb26fe4bd488e Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:33:08 +0200 Subject: [PATCH 016/270] Translation update done using Pootle. --- po/sl.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index facb0a3e92..c60fdb9306 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:31+0200\n" +"PO-Revision-Date: 2011-08-18 00:33+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -1547,6 +1547,9 @@ msgid "" "This is most likely because your session expired. Reloading the page and " "reentering your credentials should help." msgstr "" +"Med zahtevo podatkov novega grafikona je strežnik vrnil neveljavni odziv. To " +"se je najverjetneje zgodilo, ker je vaša seja potekla. Ponovno nalaganje " +"strani in ponovni vnos poveril bi morala pomagati." #: js/messages.php:184 msgid "Reload page" From dac9192a3862104d09c4330a73ed43d5f0343b64 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:33:29 +0200 Subject: [PATCH 017/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index c60fdb9306..3caf933d30 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1765,7 +1765,7 @@ msgstr "Vsaka točka predstavlja podatkovno vrstico." #: js/messages.php:266 msgid "Hovering over a point will show its label." -msgstr "" +msgstr "Prehod z miško čez točko bo pokazalo njeno oznako." #: js/messages.php:268 msgid "Drag and select an area in the plot to zoom into it." From 84f45312af223da9b6c272413708cfc790211506 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:34:06 +0200 Subject: [PATCH 018/270] Translation update done using Pootle. --- po/sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 3caf933d30..0a8e37e09e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:33+0200\n" +"PO-Revision-Date: 2011-08-18 00:34+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -1769,7 +1769,7 @@ msgstr "Prehod z miško čez točko bo pokazalo njeno oznako." #: js/messages.php:268 msgid "Drag and select an area in the plot to zoom into it." -msgstr "" +msgstr "Povlecite in izberite območje na izrisu, ki ga želite povečati." #: js/messages.php:270 msgid "Click reset zoom link to come back to original state." From 9d1b774e840f6d64f24805bd6746f688d4c2551a Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:34:14 +0200 Subject: [PATCH 019/270] Translation update done using Pootle. --- po/sl.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 0a8e37e09e..7b3ff0f7b6 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1754,10 +1754,9 @@ msgid "Show search criteria" msgstr "Prikaži iskalne pogoje" #: js/messages.php:262 libraries/tbl_select.lib.php:150 -#, fuzzy #| msgid "Search" msgid "Zoom Search" -msgstr "Iskanje" +msgstr "Iskanje s povečevanjem" #: js/messages.php:264 msgid "Each point represents a data row." From 79782e517d95c0e227798c986cca30f3a0bd2fd6 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:35:08 +0200 Subject: [PATCH 020/270] Translation update done using Pootle. --- po/sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 7b3ff0f7b6..941a7d8a9a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:34+0200\n" +"PO-Revision-Date: 2011-08-18 00:35+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -1782,7 +1782,7 @@ msgstr "" #: js/messages.php:274 msgid "The plot can be resized by dragging it along the bottom right corner." -msgstr "" +msgstr "Izris lahko povečate tako, da ga vlečete ob spodnjem desnem kotu." #: js/messages.php:276 msgid "Strings are converted into integer for plotting" From b7a29702abdeb8d1b78044b325ec8b69a6d7be77 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:35:22 +0200 Subject: [PATCH 021/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 941a7d8a9a..f1724f457b 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1786,7 +1786,7 @@ msgstr "Izris lahko povečate tako, da ga vlečete ob spodnjem desnem kotu." #: js/messages.php:276 msgid "Strings are converted into integer for plotting" -msgstr "" +msgstr "Nizi so pri izrisovanju pretvorjeni v cela števila" #: js/messages.php:278 msgid "Select two columns" From fa88ee25febf6e812355d6aae2b53edb878f8762 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:35:28 +0200 Subject: [PATCH 022/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index f1724f457b..caf2dbe34b 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1807,7 +1807,7 @@ msgstr "Kopiraj" #: js/messages.php:291 msgid "Outer Ring" -msgstr "" +msgstr "Zunanji obroč" #: js/messages.php:297 msgid "Add columns" From 3514ec156ba63df22c69409f59c6bbe6fda87eca Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:36:04 +0200 Subject: [PATCH 023/270] Translation update done using Pootle. --- po/sl.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index caf2dbe34b..9dabdb409f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:35+0200\n" +"PO-Revision-Date: 2011-08-18 00:36+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -2167,6 +2167,8 @@ msgstr "Sekunda" #, php-format msgid "Failed formatting string for rule '%s'. PHP threw following error: %s" msgstr "" +"Oblikovanje niza za pravilo '%s' je spodletelo. PHP je vrnil naslednjo " +"napako: %s" #: libraries/Config.class.php:1159 msgid "Font size" From 7a30d433f5f7de5fd6a4e7c92639acaa25cb3385 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:36:25 +0200 Subject: [PATCH 024/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 9dabdb409f..aa92cada75 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6697,7 +6697,7 @@ msgstr "Uvozi denarne enote (npr. $5.00 v 5.00)" #: libraries/import/shp.php:14 msgid "ESRI Shape File" -msgstr "" +msgstr "Datoteka oblik ESRI" #: libraries/import/shp.php:254 #, php-format From 5a2a434aa25d25ff6f0ec1099b7e7cc32de371e0 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:36:40 +0200 Subject: [PATCH 025/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index aa92cada75..5d3a387cdc 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6702,7 +6702,7 @@ msgstr "Datoteka oblik ESRI" #: libraries/import/shp.php:254 #, php-format msgid "There was an error importing the ESRI shape file: \"%s\"." -msgstr "" +msgstr "Med uvažanjem datoteke oblik ESRI je prišlo do napake: \"%s\"." #: libraries/import/shp.php:310 msgid "" From 87f13c365c783f8d36fed448cc931f09551fadd5 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:37:06 +0200 Subject: [PATCH 026/270] Translation update done using Pootle. --- po/sl.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 5d3a387cdc..2a5814fa53 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:36+0200\n" +"PO-Revision-Date: 2011-08-18 00:37+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -6709,6 +6709,8 @@ msgid "" "You tried to import an invalid file or the imported file contains invalid " "data" msgstr "" +"Poskušali ste uvoziti neveljavno datoteko ali pa uvožena datoteka vsebuje " +"neveljavne podatke" #: libraries/import/shp.php:312 #, php-format From 19cbe0ed94eb3c7f7c535d3d999800e8e2ebf7a6 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:37:29 +0200 Subject: [PATCH 027/270] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 2a5814fa53..9b703681d0 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6715,7 +6715,7 @@ msgstr "" #: libraries/import/shp.php:312 #, php-format msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." -msgstr "" +msgstr "Prostorska razširitev MySQL ne podpira ESRI vrste \"%s\"." #: libraries/import/shp.php:350 #, fuzzy From fbdbe889e5d5fbca1d7f7af2384ac4865d25ab33 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:37:40 +0200 Subject: [PATCH 028/270] Translation update done using Pootle. --- po/sl.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 9b703681d0..5e1d1102fa 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6718,10 +6718,9 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." msgstr "Prostorska razširitev MySQL ne podpira ESRI vrste \"%s\"." #: libraries/import/shp.php:350 -#, fuzzy #| msgid "This page does not contain any tables!" msgid "The imported file does not contain any data" -msgstr "Ta stran ne vsebuje nobenih tabel!" +msgstr "Uvožena datoteka ne vsebuje nobenih podatkov" #: libraries/import/sql.php:33 msgid "SQL compatibility mode:" From ac0b3d4221e93eaf2262b453b6ce9181cce0e25f Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:37:46 +0200 Subject: [PATCH 029/270] Translation update done using Pootle. --- po/sl.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 5e1d1102fa..cfe65fdca6 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8045,10 +8045,9 @@ msgid "Table Search" msgstr "Iskanje po tabeli" #: libraries/tbl_select.lib.php:229 tbl_change.php:994 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Vstavi" +msgstr "Uredi/Vstavi" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" From c74e97e597e4929392e0e50d25a256714bf9252f Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:40:21 +0200 Subject: [PATCH 030/270] Translation update done using Pootle. --- po/sl.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index cfe65fdca6..12eac1ad2f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:37+0200\n" +"PO-Revision-Date: 2011-08-18 00:40+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -10341,6 +10341,10 @@ msgid "" "table is supported by MySQL 5.1.6 and onwards. You may still use the server " "charting features however." msgstr "" +"Žal vaš strežnik zbirk podatkov ne podpira beleženja v tabelo, ki je " +"zahtevano za analiziranje dnevnikov zbirk podatov s phpMyAdmin. Beleženje v " +"tabelo podpira MySQL 5.1.6 in novejši. Kljub temu lahko še vedno uporabljate " +"strežniške zmožnosti izrisa grafikonov." #: server_status.php:1508 msgid "Using the monitor:" From 547ea92d175171fd2279dd4f1f4c72d57bb899e6 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:41:18 +0200 Subject: [PATCH 031/270] Translation update done using Pootle. --- po/sl.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 12eac1ad2f..63e12cc472 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:40+0200\n" +"PO-Revision-Date: 2011-08-18 00:41+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11678,6 +11678,8 @@ msgstr "Neprekinjeno delovanje krajše od enega dneva" #: po/advisory_rules.php:6 msgid "Uptime is less than 1 day, performance tuning may not be accurate." msgstr "" +"Neprekinjeno delovanje je krajše od enega dneva; nastavitev zmogljivosti " +"morda ni točna." #: po/advisory_rules.php:7 msgid "" From e8a8107ed9993cef2e66b868e805737f5fd83c57 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:41:56 +0200 Subject: [PATCH 032/270] Translation update done using Pootle. --- po/sl.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/sl.po b/po/sl.po index 63e12cc472..ae2f6928b1 100644 --- a/po/sl.po +++ b/po/sl.po @@ -11701,6 +11701,8 @@ msgid "" "Fewer than 1,000 questions have been run against this server. The " "recommendations may not be accurate." msgstr "" +"Na tem strežniku je bilo zagnanih manj kot 1.000 vprašanj. Priporočila morda " +"niso točna." #: po/advisory_rules.php:12 msgid "" From 93b78c3c3f5c508ed0f4d2e2050bef69886daae5 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:43:06 +0200 Subject: [PATCH 033/270] Translation update done using Pootle. --- po/sl.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index ae2f6928b1..b9e6a1c6b3 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:41+0200\n" +"PO-Revision-Date: 2011-08-18 00:43+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11763,6 +11763,8 @@ msgid "" "long_query_time is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." msgstr "" +"long_query_time je nastavljen na 10 sekund ali več, zato so zabeležene samo " +"počasne poizvedbe, ki trajajo več kot 10 sekund." #: po/advisory_rules.php:27 msgid "" From 13ba9ce44af7b9c58f445e4163ee15d8f29e81ee Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:43:31 +0200 Subject: [PATCH 034/270] Translation update done using Pootle. --- po/sl.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index b9e6a1c6b3..3280c367c5 100644 --- a/po/sl.po +++ b/po/sl.po @@ -11796,10 +11796,9 @@ msgid "log_slow_queries is set to 'OFF'" msgstr "log_slow_queries je nastavljen na 'OFF'" #: po/advisory_rules.php:35 -#, fuzzy #| msgid "Clear series" msgid "Release Series" -msgstr "Počisti serije" +msgstr "Serije izdaj" #: po/advisory_rules.php:36 msgid "The MySQL server version less then 5.1." From 8cd8081761285f83471bddeef51c64252be17f4d Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:44:57 +0200 Subject: [PATCH 035/270] Translation update done using Pootle. --- po/sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 3280c367c5..606af1be20 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:43+0200\n" +"PO-Revision-Date: 2011-08-18 00:44+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -12349,7 +12349,7 @@ msgstr "" #: po/advisory_rules.php:172 msgid "You may need to increase {key_buffer_size}." -msgstr "" +msgstr "Mord boste morali povečati {key_buffer_size}." #: po/advisory_rules.php:173 #, php-format From 4406805cd81e5749030ca7589fd64385691cecbe Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:45:26 +0200 Subject: [PATCH 036/270] Translation update done using Pootle. --- po/sl.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 606af1be20..9b3371bf57 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:44+0200\n" +"PO-Revision-Date: 2011-08-18 00:45+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -12355,6 +12355,7 @@ msgstr "Mord boste morali povečati {key_buffer_size}." #, php-format msgid "Index reads from memory: %s%%, this value should be above 95%%" msgstr "" +"Branj indeksov iz pomnilnika: %s %%; ta vrednost bi morala biti nad 95 %%" #: po/advisory_rules.php:175 msgid "Rate of table open" From 1bcbc0a9b24abf1d19101459ec087f428cdd4d66 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:47:55 +0200 Subject: [PATCH 037/270] Translation update done using Pootle. --- po/sl.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 9b3371bf57..5c33df9f83 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:45+0200\n" +"PO-Revision-Date: 2011-08-18 00:47+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -12590,6 +12590,9 @@ msgid "" "MySQL properly. This can be due to network issues or code not closing a " "database handler properly. Check your network and code." msgstr "" +"Odjemalci so ponavadi prekinjeni, ker niso pravilno zaprli svoje povezave z " +"MySQL. To je lahko zaradi omrežnih težav ali pa koda ne zapira pravilno " +"upravljavca zbirk podatkov. Preverite svoje omrežje in kodo." #: po/advisory_rules.php:238 #, php-format From 95b7783b64ce6b242a4c66816dbe0289276b542a Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 18 Aug 2011 00:48:20 +0200 Subject: [PATCH 038/270] Translation update done using Pootle. --- po/sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 5c33df9f83..5911f224f2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 00:47+0200\n" +"PO-Revision-Date: 2011-08-18 00:48+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -12741,7 +12741,7 @@ msgstr "" #: po/advisory_rules.php:268 msgid "concurrent_insert is set to 0" -msgstr "" +msgstr "concurrent_insert je nastavljeno na 0" #, fuzzy #~ msgid "memcached usage" From 9984c2ffaa408cf252fbbf488c0a8373a0d8b028 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 06:52:25 +0200 Subject: [PATCH 039/270] Translation update done using Pootle. --- po/tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 72536dfbf2..97fd939487 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-16 16:49+0200\n" +"PO-Revision-Date: 2011-08-18 06:52+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -847,10 +847,10 @@ msgid "Dump has been saved to file %s." msgstr "Döküm, %s dosyasına kaydedildi." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "\"%s\" sütunu için değerler" +msgstr "\"%s\" sütunu için değer" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" From df7604a7e7026d1e168e3fd65e010e67a855d487 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 06:53:35 +0200 Subject: [PATCH 040/270] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 97fd939487..9e5ba4093f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 06:52+0200\n" +"PO-Revision-Date: 2011-08-18 06:53+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -882,10 +882,9 @@ msgstr "" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add routine" msgid "Add a point" -msgstr "Yordam ekle" +msgstr "Nokta ekle" #: gis_data_editor.php:218 js/messages.php:287 #, fuzzy From 2513900ba9a9bcdb346a7d93b49c0bbc0b7a0be9 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 06:54:24 +0200 Subject: [PATCH 041/270] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 9e5ba4093f..3cd7158d6c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 06:53+0200\n" +"PO-Revision-Date: 2011-08-18 06:54+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -887,10 +887,9 @@ msgid "Add a point" msgstr "Nokta ekle" #: gis_data_editor.php:218 js/messages.php:287 -#, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Satırı sonlandıran:" +msgstr "Satır dizgisi" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" From 77007091b7543deecf05a6281c21f567997434b0 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 06:54:55 +0200 Subject: [PATCH 042/270] Translation update done using Pootle. --- po/tr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 3cd7158d6c..b0ccb11123 100644 --- a/po/tr.po +++ b/po/tr.po @@ -900,10 +900,9 @@ msgid "Inner Ring" msgstr "" #: gis_data_editor.php:248 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Yeni Kullanıcı ekle" +msgstr "Satır dizgisi ekle" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 #, fuzzy From 196e5a07ff8dd8c9aa3d7f2de866151d10f9ee60 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 06:55:38 +0200 Subject: [PATCH 043/270] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index b0ccb11123..2307d6e9ef 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 06:54+0200\n" +"PO-Revision-Date: 2011-08-18 06:55+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -905,10 +905,9 @@ msgid "Add a linestring" msgstr "Satır dizgisi ekle" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" -msgstr "Yeni Kullanıcı ekle" +msgstr "İç halka ekle" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" From 40d64616194f9e36fd341c4f84cdba34b531b58d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 06:56:38 +0200 Subject: [PATCH 044/270] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 2307d6e9ef..0ef61f5bc1 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 06:55+0200\n" +"PO-Revision-Date: 2011-08-18 06:56+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -914,10 +914,9 @@ msgid "Polygon" msgstr "" #: gis_data_editor.php:300 js/messages.php:294 -#, fuzzy #| msgid "Add column" msgid "Add a polygon" -msgstr "Sütun ekle" +msgstr "Poligon ekle" #: gis_data_editor.php:304 #, fuzzy From 224e0b6ddf2362c3536f23a14ecdefa8ecc387d7 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 06:56:51 +0200 Subject: [PATCH 045/270] Translation update done using Pootle. --- po/tr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 0ef61f5bc1..d76a1a66dd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -919,10 +919,9 @@ msgid "Add a polygon" msgstr "Poligon ekle" #: gis_data_editor.php:304 -#, fuzzy #| msgid "Geometry" msgid "Add geometry" -msgstr "Geometri" +msgstr "Geometri ekle" #: gis_data_editor.php:312 msgid "" From ffbdac704da17bf03f6e7abe0adf49d9835252d7 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 06:57:10 +0200 Subject: [PATCH 046/270] Translation update done using Pootle. --- po/tr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index d76a1a66dd..5824b7e461 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 06:56+0200\n" +"PO-Revision-Date: 2011-08-18 06:57+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -1205,7 +1205,6 @@ msgid "Query statistics" msgstr "Sorgu istatistikleri" #: js/messages.php:93 -#, fuzzy #| msgid "Local monitor configuration icompatible" msgid "Local monitor configuration incompatible" msgstr "Yerel izleme yapılandırması uyumsuz" From e21f330170cffbb993cea2c9cd721c540b752f20 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 06:58:44 +0200 Subject: [PATCH 047/270] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 5824b7e461..4e84016b58 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 06:57+0200\n" +"PO-Revision-Date: 2011-08-18 06:58+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -6730,10 +6730,9 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." msgstr "" #: libraries/import/shp.php:350 -#, fuzzy #| msgid "This page does not contain any tables!" msgid "The imported file does not contain any data" -msgstr "Bu sayfa herhangi bir tablo içermiyor!" +msgstr "İçe aktarılan dosya herhangi bir veri içermiyor" #: libraries/import/sql.php:33 msgid "SQL compatibility mode:" From 61fd30e902808fdb69c5947502e0beff739c2e0b Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 06:58:53 +0200 Subject: [PATCH 048/270] Translation update done using Pootle. --- po/tr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 4e84016b58..f571a09a89 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8057,10 +8057,9 @@ msgid "Table Search" msgstr "Tablo Arama" #: libraries/tbl_select.lib.php:229 tbl_change.php:994 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Ekle" +msgstr "Düzenle/Ekle" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" From 3261e5e1741c2e84666321b94b430ea30d69978c Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:00:55 +0200 Subject: [PATCH 049/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index f571a09a89..f1924c3adb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 06:58+0200\n" +"PO-Revision-Date: 2011-08-18 07:00+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -858,7 +858,7 @@ msgstr "Taban Katman olarak OpenStreetMaps kullan" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 From f884e8e1cbe12497d31cba7a84d3f9fb7d693aa9 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:01:05 +0200 Subject: [PATCH 050/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index f1924c3adb..acfaabc9e8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:00+0200\n" +"PO-Revision-Date: 2011-08-18 07:01+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -868,7 +868,7 @@ msgstr "Geometri" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 msgid "Point" -msgstr "" +msgstr "Nokta" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 From c6dc72c20baeaab63f98c63cb604c78ad45753f2 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:01:08 +0200 Subject: [PATCH 051/270] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index acfaabc9e8..907c98d0ec 100644 --- a/po/tr.po +++ b/po/tr.po @@ -873,7 +873,7 @@ msgstr "Nokta" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 From 7139201d6ba2acaa034cf786aae9ff3a66c92570 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:01:10 +0200 Subject: [PATCH 052/270] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 907c98d0ec..d19ae2ba7e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -878,7 +878,7 @@ msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 From 3a37005ab0245dd8206985bcd49db9ccd76166ec Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:01:21 +0200 Subject: [PATCH 053/270] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index d19ae2ba7e..6ae10fa743 100644 --- a/po/tr.po +++ b/po/tr.po @@ -893,7 +893,7 @@ msgstr "Satır dizgisi" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" -msgstr "" +msgstr "Dış Halka:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" From 494c178d8349a4dc3a4fbd33a617c65e7b5a7689 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:01:30 +0200 Subject: [PATCH 054/270] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 6ae10fa743..4fdfac1b38 100644 --- a/po/tr.po +++ b/po/tr.po @@ -897,7 +897,7 @@ msgstr "Dış Halka:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" -msgstr "" +msgstr "İç Halka" #: gis_data_editor.php:248 #| msgid "Add a new User" From 69b51155d9b7747924f3c3be8fd20ed46ad2ffa7 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:02:39 +0200 Subject: [PATCH 055/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 4fdfac1b38..995e56c8fb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:01+0200\n" +"PO-Revision-Date: 2011-08-18 07:02+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -911,7 +911,7 @@ msgstr "İç halka ekle" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Poligon" #: gis_data_editor.php:300 js/messages.php:294 #| msgid "Add column" From 972aaed554199cd626eea14bd7eebea06159758b Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:04:37 +0200 Subject: [PATCH 056/270] Translation update done using Pootle. --- po/tr.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 995e56c8fb..3cfff0c3e5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:02+0200\n" +"PO-Revision-Date: 2011-08-18 07:04+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -928,6 +928,8 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" +"\"Function\" sütunundan \"GeomFromText\" seçin ve \"Value\" alanı içine alttaki " +"dizgiyi yapıştırın" #: import.php:57 #, php-format From 0868fbf3511300ca9cd1a7e38c8d7f073f04e28d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:04:48 +0200 Subject: [PATCH 057/270] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 3cfff0c3e5..8fb0e75e9a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1805,7 +1805,7 @@ msgstr "Kopyala" #: js/messages.php:291 msgid "Outer Ring" -msgstr "" +msgstr "Dış Halka" #: js/messages.php:297 msgid "Add columns" From 54280fb1fd6af6eb306b0ebbf6d26428ba3c096a Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:07:02 +0200 Subject: [PATCH 058/270] Translation update done using Pootle. --- po/tr.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 8fb0e75e9a..12510d1d10 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:04+0200\n" +"PO-Revision-Date: 2011-08-18 07:07+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -2170,6 +2170,8 @@ msgstr "Saniye" #, php-format msgid "Failed formatting string for rule '%s'. PHP threw following error: %s" msgstr "" +"'%s' kuralı için dizgi biçimlendirme başarısız. PHP aşağıdaki hatayı " +"yöneltti: %s" #: libraries/Config.class.php:1159 msgid "Font size" From 42e908d64a9d4f4f3947f717a66772fc73b2dccc Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:08:01 +0200 Subject: [PATCH 059/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 12510d1d10..05d06e8156 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:07+0200\n" +"PO-Revision-Date: 2011-08-18 07:08+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -6715,7 +6715,7 @@ msgstr "Parasalları içe aktar (örn. $5.00'ı 5.00'a)" #: libraries/import/shp.php:14 msgid "ESRI Shape File" -msgstr "" +msgstr "ESRI Şekil Dosyası" #: libraries/import/shp.php:254 #, php-format From a5a9b06bc40f5eb39a3a19853f6522cd9b22af97 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:11:01 +0200 Subject: [PATCH 060/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 05d06e8156..ff182fe460 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:08+0200\n" +"PO-Revision-Date: 2011-08-18 07:11+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -6720,7 +6720,7 @@ msgstr "ESRI Şekil Dosyası" #: libraries/import/shp.php:254 #, php-format msgid "There was an error importing the ESRI shape file: \"%s\"." -msgstr "" +msgstr "ESRI şekil dosyasının içe aktarılmasında hata var: \"%s\"." #: libraries/import/shp.php:310 msgid "" From b29f3c3d01d0a90079e258afd828792e1febaf30 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:11:56 +0200 Subject: [PATCH 061/270] Translation update done using Pootle. --- po/tr.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/tr.po b/po/tr.po index ff182fe460..9d3e687cf3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6727,6 +6727,8 @@ msgid "" "You tried to import an invalid file or the imported file contains invalid " "data" msgstr "" +"Geçersiz bir dosyayı içe aktarmayı deniyorsunuz ya da içe aktarılan dosya " +"geçersiz veri içeriyor" #: libraries/import/shp.php:312 #, php-format From 9102eabc99c23e1632126646a2118607babf046e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:13:16 +0200 Subject: [PATCH 062/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 9d3e687cf3..4243f776c3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:11+0200\n" +"PO-Revision-Date: 2011-08-18 07:13+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -6733,7 +6733,7 @@ msgstr "" #: libraries/import/shp.php:312 #, php-format msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." -msgstr "" +msgstr "MySQL Uzaysal Uzantısı ESRI türü \"%s\" desteklemiyor." #: libraries/import/shp.php:350 #| msgid "This page does not contain any tables!" From d44c8ddbf221da96d5ae45214882dab72734ebfd Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:14:06 +0200 Subject: [PATCH 063/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 4243f776c3..df6e3224cd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:13+0200\n" +"PO-Revision-Date: 2011-08-18 07:14+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -11141,7 +11141,7 @@ msgstr "-- Yok --" #: tbl_gis_visualization.php:151 msgid "Spatial column" -msgstr "Uzamsal sütun" +msgstr "Uzaysal sütun" #: tbl_gis_visualization.php:175 msgid "Redraw" From b3f92a21f9cfb464c130c997eaab165e8f690844 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:18:17 +0200 Subject: [PATCH 064/270] Translation update done using Pootle. --- po/tr.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index df6e3224cd..d8d036c011 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:14+0200\n" +"PO-Revision-Date: 2011-08-18 07:18+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12029,6 +12029,8 @@ msgid "" "The current ratio of free query cache memory to total query cache size is %s" "%%. It should be above 80%%" msgstr "" +"Boş sorgu önbellek belleğinden toplam sorgu önbelleği boyutuna şu anki oranı " +"%%%s. %%80'in üzerinde olmalıdır" #: po/advisory_rules.php:85 msgid "Query cache fragmentation" From 0005c2cbeced9fb2e6a4fda171d0689a0a21e5e2 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 07:19:22 +0200 Subject: [PATCH 065/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index d8d036c011..4a03bac4b5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:18+0200\n" +"PO-Revision-Date: 2011-08-18 07:19+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12038,7 +12038,7 @@ msgstr "Sorgu önbelleği parçalama" #: po/advisory_rules.php:86 msgid "The query cache is considerably fragmented." -msgstr "" +msgstr "Sorgu önbelleği oldukça parçalanmış." #: po/advisory_rules.php:87 msgid "" From 91ff2e25ba6573b4498e239561661c5a7a5c81f7 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 08:58:14 +0200 Subject: [PATCH 066/270] Translation update done using Pootle. --- po/tr.po | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 4a03bac4b5..0fb5c8e484 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 07:19+0200\n" +"PO-Revision-Date: 2011-08-18 08:58+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12051,6 +12051,15 @@ msgid "" "using this formula: (query_cache_size - qcache_free_memory) / " "qcache_queries_in_cache" msgstr "" +"Şiddetli parçalanma Qcache_lowmem_prunes değerini muhtemelen (daha fazla) " +"arttırır. Buna {query_cache_size} çok küçük olmasından dolayı çoğu düşük " +"Sorgu önbellek belleği azalması sebep oluyor olabilir. Hemen ama kısa süreli " +"onarım için sorgu önbelleğini (uzun bir süreliğine sorgu önbelleğini " +"kilitleyebilir) temizleyebilirsiniz. {query_cache_min_res_unit} değerini " +"daha düşük bir değere dikkatlice ayarlamak da yardımcı olabilir, örn. " +"önbellekteki sorgularınızın ortalama boyutunu bu formülü kullanarak " +"ayarlayabilirsiniz: (query_cache_size - qcache_free_memory) / " +"qcache_queries_in_cache" #: po/advisory_rules.php:88 #, php-format From db28d8b1f727a8db8892b40cd053c163efce57ee Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 08:58:34 +0200 Subject: [PATCH 067/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 0fb5c8e484..25ca142a55 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12055,8 +12055,8 @@ msgstr "" "arttırır. Buna {query_cache_size} çok küçük olmasından dolayı çoğu düşük " "Sorgu önbellek belleği azalması sebep oluyor olabilir. Hemen ama kısa süreli " "onarım için sorgu önbelleğini (uzun bir süreliğine sorgu önbelleğini " -"kilitleyebilir) temizleyebilirsiniz. {query_cache_min_res_unit} değerini " -"daha düşük bir değere dikkatlice ayarlamak da yardımcı olabilir, örn. " +"kilitleyebilir) temizleyebilirsiniz. {query_cache_min_res_unit}değerini daha " +"düşük bir değere dikkatlice ayarlamak da yardımcı olabilir, örn. " "önbellekteki sorgularınızın ortalama boyutunu bu formülü kullanarak " "ayarlayabilirsiniz: (query_cache_size - qcache_free_memory) / " "qcache_queries_in_cache" From 866a104db6c9978bf95e35488651093677e13d88 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 09:14:19 +0200 Subject: [PATCH 068/270] Translation update done using Pootle. --- po/tr.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 25ca142a55..f121359179 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 08:58+0200\n" +"PO-Revision-Date: 2011-08-18 09:14+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12068,6 +12068,9 @@ msgid "" "that the query cache is an alternating pattern of free and used blocks. This " "value should be below 20%%." msgstr "" +"Önbellek şu an %%%s olarak parçalanmış, %%100 parçalanma, sorgu önbelleğinin " +"boş ve kullanılan bloklarının alternatif bir kalıp olduğu anlamına gelir. " +"Bu değer %%20'nin altında olmalıdır." #: po/advisory_rules.php:90 msgid "Query cache low memory prunes" From 00548376b7aed29eec560ab1a4f14dc60440b540 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 09:16:51 +0200 Subject: [PATCH 069/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index f121359179..7e6b2faa65 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 09:14+0200\n" +"PO-Revision-Date: 2011-08-18 09:16+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12074,7 +12074,7 @@ msgstr "" #: po/advisory_rules.php:90 msgid "Query cache low memory prunes" -msgstr "" +msgstr "Düşük sorgu önbellek belleği azalması" #: po/advisory_rules.php:91 msgid "" From 161710e01983b30a6ddf298114966ca9541737a0 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 09:36:28 +0200 Subject: [PATCH 070/270] Translation update done using Pootle. --- po/tr.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 7e6b2faa65..bd99fa779c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 09:16+0200\n" +"PO-Revision-Date: 2011-08-18 09:36+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12090,6 +12090,9 @@ msgid "" "overhead of maintaining the cache is likely to increase with its size, so do " "this in small increments and monitor the results." msgstr "" +"Ancak aklınızdan çıkarmayın, baştan başa önbellek koruması muhtemelen " +"boyutunu arttırır bu yüzden bunu küçük artışlarla yapın ve sonuçlarını " +"izleyin." #: po/advisory_rules.php:93 msgid "" From a59f4af3f9cb7a32c934edcc57c015e531f33057 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 09:55:20 +0200 Subject: [PATCH 071/270] Translation update done using Pootle. --- po/tr.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index bd99fa779c..478dcae887 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 09:36+0200\n" +"PO-Revision-Date: 2011-08-18 09:55+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12099,6 +12099,8 @@ msgid "" "The ratio of removed queries to inserted queries is %s%%. The lower this " "value is, the better (This rules firing limit: 0.1%)" msgstr "" +"Kaldırılan sorguların eklenen sorgulara oranı %%%s. En düşük bu değer en " +"iyisidir (Bu kuralları atan sınır: %0.1)" #: po/advisory_rules.php:95 msgid "Query cache max size" From d2961028822d0f606dfabf26326d0de4d2f0464e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 09:57:17 +0200 Subject: [PATCH 072/270] Translation update done using Pootle. --- po/tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 478dcae887..1c71a15727 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 09:55+0200\n" +"PO-Revision-Date: 2011-08-18 09:57+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12029,8 +12029,8 @@ msgid "" "The current ratio of free query cache memory to total query cache size is %s" "%%. It should be above 80%%" msgstr "" -"Boş sorgu önbellek belleğinden toplam sorgu önbelleği boyutuna şu anki oranı " -"%%%s. %%80'in üzerinde olmalıdır" +"Boş sorgu önbellek belleğinin, toplam sorgu önbelleği boyutuna şu anki oranı " +"%%%s. Bu %%80'in üzerinde olmalıdır" #: po/advisory_rules.php:85 msgid "Query cache fragmentation" From 29efa19261f5f6ba45bf6c77a989006e28b067ae Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 10:11:06 +0200 Subject: [PATCH 073/270] Translation update done using Pootle. --- po/tr.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 1c71a15727..c873fe1a89 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 09:57+0200\n" +"PO-Revision-Date: 2011-08-18 10:11+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12111,6 +12111,8 @@ msgid "" "The query cache size is above 128 MiB. Big query caches may cause " "significant overhead that is required to maintain the cache." msgstr "" +"Sorgu önbelleği boyutu 128MiB'ın üzerinde. Büyük sorgu önbellekleri, " +"önbelleği korumak için gereken önemli ölçüde ek yüke sebep olabilir." #: po/advisory_rules.php:97 msgid "" From e270c8df8abf3c57f2257e3dceb4863941b3b4a0 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 10:12:22 +0200 Subject: [PATCH 074/270] Translation update done using Pootle. --- po/tr.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/tr.po b/po/tr.po index c873fe1a89..8158e1d10b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 10:11+0200\n" +"PO-Revision-Date: 2011-08-18 10:12+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12090,9 +12090,8 @@ msgid "" "overhead of maintaining the cache is likely to increase with its size, so do " "this in small increments and monitor the results." msgstr "" -"Ancak aklınızdan çıkarmayın, baştan başa önbellek koruması muhtemelen " -"boyutunu arttırır bu yüzden bunu küçük artışlarla yapın ve sonuçlarını " -"izleyin." +"Ancak aklınızdan çıkarmayın, önbellek koruması ek yükü muhtemelen boyutunu " +"arttırır bu yüzden bunu küçük artışlarla yapın ve sonuçlarını izleyin." #: po/advisory_rules.php:93 msgid "" From 9db34b87298111f1292b16b3440a9d2e67f7e1e8 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 10:33:09 +0200 Subject: [PATCH 075/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 8158e1d10b..0f071bfd0a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 10:12+0200\n" +"PO-Revision-Date: 2011-08-18 10:33+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12117,7 +12117,7 @@ msgstr "" msgid "" "Depending on your environment, it might be performance increasing to reduce " "this value." -msgstr "" +msgstr "Ortamınıza bağlıdır, bu değeri düşürmek performansı arttırabilir." #: po/advisory_rules.php:98 #, php-format From e9da8d747273129fc72e9e691466d6f44b808289 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 10:35:34 +0200 Subject: [PATCH 076/270] Translation update done using Pootle. --- po/tr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 0f071bfd0a..88062daf6c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 10:33+0200\n" +"PO-Revision-Date: 2011-08-18 10:35+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12132,6 +12132,7 @@ msgstr "Sorgu önbelleği en az sonuç boyutu" msgid "" "The max size of the result set in the query cache is the default of 1 MiB." msgstr "" +"Sorgu önbelleğinde sonuç grubunun en fazla boyutu varsayılanı 1 MiB'tır." #: po/advisory_rules.php:102 msgid "" From 701c10ff751d59a52ae6b89e1393f09395769783 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 10:35:41 +0200 Subject: [PATCH 077/270] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 88062daf6c..568dfdedc5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12110,7 +12110,7 @@ msgid "" "The query cache size is above 128 MiB. Big query caches may cause " "significant overhead that is required to maintain the cache." msgstr "" -"Sorgu önbelleği boyutu 128MiB'ın üzerinde. Büyük sorgu önbellekleri, " +"Sorgu önbelleği boyutu 128 MiB'ın üzerinde. Büyük sorgu önbellekleri, " "önbelleği korumak için gereken önemli ölçüde ek yüke sebep olabilir." #: po/advisory_rules.php:97 From 610c4098e981c483712ce303050b15ef420dad82 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 10:36:39 +0200 Subject: [PATCH 078/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 568dfdedc5..56e6ef2d92 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 10:35+0200\n" +"PO-Revision-Date: 2011-08-18 10:36+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -928,7 +928,7 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" -"\"Function\" sütunundan \"GeomFromText\" seçin ve \"Value\" alanı içine alttaki " +"\"Function\" sütunundan \"GeomFromText\" seçin ve \"Value\" alanı içine alttaki " "dizgiyi yapıştırın" #: import.php:57 From c2f52e26e2e36c651028872e8b9931421e1344e5 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 10:37:12 +0200 Subject: [PATCH 079/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 56e6ef2d92..fefa9f141c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 10:36+0200\n" +"PO-Revision-Date: 2011-08-18 10:37+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -1557,7 +1557,7 @@ msgstr "Etkilenen satırlar:" msgid "Failed parsing config file. It doesn't seem to be valid JSON code" msgstr "" "Yapılandırma dosyasının ayrıştırılması başarısız. Bu geçerli JSON kodu " -"görünmüyor." +"görünmüyor" #: js/messages.php:189 msgid "" From fc65172c63038bc2047524ebd04fb6bc3ff49a86 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 10:37:40 +0200 Subject: [PATCH 080/270] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index fefa9f141c..6f8b8c7b93 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7905,7 +7905,7 @@ msgstr "END RAW" #: libraries/sqlparser.lib.php:382 msgid "Automatically appended backtick to the end of query!" -msgstr "Otomatik olarak sorgunun sonuna ters işaret ekle" +msgstr "Otomatik olarak sorgunun sonuna ters işaret ekle!" #: libraries/sqlparser.lib.php:385 msgid "Unclosed quote" From 922a5ca45b80bead07a5192d9d05f57560ce758e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 10:37:45 +0200 Subject: [PATCH 081/270] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 6f8b8c7b93..49eedd0b33 100644 --- a/po/tr.po +++ b/po/tr.po @@ -10951,7 +10951,7 @@ msgstr "Sunucuya parolasız bağlanmaya izin verdiniz." #: setup/lib/index.lib.php:389 msgid "Key is too short, it should have at least 8 characters." -msgstr "Anahtar çok kısa, en az 8 karakter olmalıdır" +msgstr "Anahtar çok kısa, en az 8 karakter olmalıdır." #: setup/lib/index.lib.php:396 msgid "Key should contain letters, numbers [em]and[/em] special characters." From 3217f24df0d6891e3783ed8295bbc98dfebe909a Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 18 Aug 2011 10:40:21 +0200 Subject: [PATCH 082/270] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 49eedd0b33..40c0dd229a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 10:37+0200\n" +"PO-Revision-Date: 2011-08-18 10:40+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -9596,7 +9596,7 @@ msgid "" "the replication section." msgstr "" "Sunucudaki kopya etme durumuyla ilgili daha ayrıntılı bilgi için lütfen kopya etme bölümünü ziyaret edin." +"href=\"#replication\">kopya etme bölümünü ziyaret edin." #: server_status.php:979 msgid "Replication status" From de98961029477e1680805bb82d5d375d87420ebc Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 13:16:03 +0300 Subject: [PATCH 083/270] SQL pretty printer feature using the codemirror tokenizer. Replaced this with old pretty-printer regexp collection in query analyzer dialog. --- js/codemirror/mode/mysql/mysql.js | 49 ++++++-- js/functions.js | 148 +++++++++++++++++++++++- js/server_status_monitor.js | 27 +---- themes/original/css/theme_right.css.php | 2 +- themes/pmahomme/css/theme_right.css.php | 2 +- 5 files changed, 195 insertions(+), 33 deletions(-) diff --git a/js/codemirror/mode/mysql/mysql.js b/js/codemirror/mode/mysql/mysql.js index 657942d2cd..755e3ec85d 100644 --- a/js/codemirror/mode/mysql/mysql.js +++ b/js/codemirror/mode/mysql/mysql.js @@ -1,11 +1,14 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { var indentUnit = config.indentUnit, keywords = parserConfig.keywords, + verbs = parserConfig.verbs, functions = parserConfig.functions, types = parserConfig.types, - attributes = parserConfig.attributes, - multiLineStrings = parserConfig.multiLineStrings; + attributes = parserConfig.attributes, + multiLineStrings = parserConfig.multiLineStrings, + multiPartKeywords= parserConfig.multiPartKeywords; var isOperatorChar = /[+\-*&%=<>!?:\/|]/; + function chain(stream, state, f) { state.tokenize = f; return f(stream, state); @@ -64,14 +67,35 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { else { // get the whole word stream.eatWhile(/[\w\$_]/); + var word = stream.current().toLowerCase(); + var oldPos = stream.pos; + // is it one of the listed verbs? + if (verbs && verbs.propertyIsEnumerable(word)) return ret("keyword", "statement-verb"); // is it one of the listed keywords? - if (keywords && keywords.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "keyword"); + if (keywords && keywords.propertyIsEnumerable(word)) return ret("keyword", "keyword"); // is it one of the listed functions? - if (functions && functions.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "builtin"); + if (functions && functions.propertyIsEnumerable(word)) { + // All functions begin with '(' + stream.eatSpace(); + if(stream.peek() == '(') + return ret("keyword", "builtin"); + // Not func => restore old pos + stream.pos = oldPos; + } // is it one of the listed types? - if (types && types.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "variable-2"); + if (types && types.propertyIsEnumerable(word)) return ret("keyword", "variable-2"); // is it one of the listed attributes? - if (attributes && attributes.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "variable-3"); + if (attributes && attributes.propertyIsEnumerable(word)) return ret("keyword", "variable-3"); + // is it a multipart keyword? (currently only checks 2 word parts) + + stream.eatSpace(); + stream.eatWhile(/[\w\$_]/); + var doubleWord = stream.current().toLowerCase(); + if (multiPartKeywords && multiPartKeywords.propertyIsEnumerable(doubleWord)) return ret("keyword", "keyword"); + + // restore old pos + stream.pos = oldPos; + // default: just a "word" return ret("word", "mysql-word"); } @@ -122,11 +146,14 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { (function() { function keywords(str) { - var obj = {}, words = str.split(" "); + var obj = {}, words = str; + if(typeof str == 'string') words = str.split(" "); for (var i = 0; i < words.length; ++i) obj[words[i]] = true; return obj; } - var cKeywords = "accessible add all alter analyze and as asc asensitive before between bigint binary blob both by call cascade case change char character check collate column condition constraint continue convert create cross current_date current_time current_timestamp current_user cursor database databases day_hour day_microsecond day_minute day_second dec decimal declare default delayed delete desc describe deterministic distinct distinctrow div double drop dual each else elseif enclosed escaped exists exit explain false fetch float float4 float8 for force foreign from fulltext grant group having high_priority hour_microsecond hour_minute hour_second if ignore in index infile inner inout insensitive insert int int1 int2 int3 int4 int8 integer interval into is iterate join key keys kill leading leave left like limit linear lines load localtime localtimestamp lock long longblob longtext loop low_priority master_ssl_verify_server_cert match maxvalue mediumblob mediumint mediumtext middleint minute_microsecond minute_second mod modifies natural not no_write_to_binlog null numeric on optimize option optionally or order out outer outfile precision primary procedure purge range read reads read_write real references regexp release rename repeat replace require resignal restrict return revoke right rlike schema schemas second_microsecond select sensitive separator set show signal smallint spatial specific sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl starting straight_join table terminated then tinyblob tinyint tinytext to trailing trigger true undo union unique unlock unsigned update usage use using utc_date utc_time utc_timestamp values varbinary varchar varcharacter varying when where while with write xor year_month zerofill"; + var cKeywords = "accessible add all and as asc asensitive before between bigint binary blob both cascade case char character collate column condition constraint continue convert cross current_date current_time current_timestamp current_user cursor database databases day_hour day_microsecond day_minute day_second dec decimal declare default delayed desc deterministic distinct distinctrow div double dual each else elseif enclosed escaped exists exit explain false fetch float float4 float8 for force foreign fulltext from having high_priority hour_microsecond hour_minute hour_second if ignore in index infile inner inout insensitive int int1 int2 int3 int4 int8 integer interval is iterate join key keys leading leave left like limit linear lines localtime localtimestamp long longblob longtext loop low_priority master_ssl_verify_server_cert match maxvalue mediumblob mediumint mediumtext middleint minute_microsecond minute_second mod modifies natural not no_write_to_binlog null numeric on option optionally or out outer outfile precision primary procedure range read reads read_write real references regexp repeat require restrict return right rlike schema schemas second_microsecond sensitive separator smallint spatial specific sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl starting straight_join table terminated then tinyblob tinyint tinytext to trailing trigger true undo union unique unsigned usage using utc_date utc_time utc_timestamp values varbinary varchar varcharacter varying when where while with write xor year_month zerofill"; + + var cVerbs = "alter analyze begin binlog call change check checksum commit create deallocate describe do drop execute flush grant handler install kill load lock optimize cache partition prepare purge release rename repair replace reset resignal revoke rollback savepoint select set signal show start truncate uninstall unlock update use xa"; var cFunctions = "abs acos adddate addtime aes_decrypt aes_encrypt area asbinary ascii asin astext atan atan2 avg bdmpolyfromtext bdmpolyfromwkb bdpolyfromtext bdpolyfromwkb benchmark bin bit_and bit_count bit_length bit_or bit_xor boundary buffer cast ceil ceiling centroid char character_length charset char_length coalesce coercibility collation compress concat concat_ws connection_id contains conv convert convert_tz convexhull cos cot count crc32 crosses curdate current_date current_time current_timestamp current_user curtime database date datediff date_add date_diff date_format date_sub day dayname dayofmonth dayofweek dayofyear decode default degrees des_decrypt des_encrypt difference dimension disjoint distance elt encode encrypt endpoint envelope equals exp export_set exteriorring extract extractvalue field find_in_set floor format found_rows from_days from_unixtime geomcollfromtext geomcollfromwkb geometrycollection geometrycollectionfromtext geometrycollectionfromwkb geometryfromtext geometryfromwkb geometryn geometrytype geomfromtext geomfromwkb get_format get_lock glength greatest group_concat group_unique_users hex hour if ifnull inet_aton inet_ntoa insert instr interiorringn intersection intersects interval isclosed isempty isnull isring issimple is_free_lock is_used_lock last_day last_insert_id lcase least left length linefromtext linefromwkb linestring linestringfromtext linestringfromwkb ln load_file localtime localtimestamp locate log log10 log2 lower lpad ltrim makedate maketime make_set master_pos_wait max mbrcontains mbrdisjoint mbrequal mbrintersects mbroverlaps mbrtouches mbrwithin md5 microsecond mid min minute mlinefromtext mlinefromwkb mod month monthname mpointfromtext mpointfromwkb mpolyfromtext mpolyfromwkb multilinestring multilinestringfromtext multilinestringfromwkb multipoint multipointfromtext multipointfromwkb multipolygon multipolygonfromtext multipolygonfromwkb name_const now nullif numgeometries numinteriorrings numpoints oct octet_length old_password ord overlaps password period_add period_diff pi point pointfromtext pointfromwkb pointn pointonsurface polyfromtext polyfromwkb polygon polygonfromtext polygonfromwkb position pow power quarter quote radians rand related release_lock repeat replace reverse right round row_count rpad rtrim schema second sec_to_time session_user sha sha1 sign sin sleep soundex space sqrt srid startpoint std stddev stddev_pop stddev_samp strcmp str_to_date subdate substr substring substring_index subtime sum symdifference sysdate system_user tan time timediff timestamp timestampadd timestampdiff time_format time_to_sec touches to_days trim truncate ucase uncompress uncompressed_length unhex unique_users unix_timestamp updatexml upper user utc_date utc_time utc_timestamp uuid variance var_pop var_samp version week weekday weekofyear within x y year yearweek"; @@ -134,11 +161,15 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { var cAttributes = "archive ascii auto_increment bdb berkeleydb binary blackhole csv default example federated heap innobase innodb isam maria memory merge mrg_isam mrg_myisam myisam national ndb ndbcluster precision undefined unicode unsigned varying zerofill"; + var cmultiPartKeywords = ['insert into', 'group by', 'order by', 'delete from']; + CodeMirror.defineMIME("text/x-mysql", { name: "mysql", keywords: keywords(cKeywords), + multiPartKeywords: keywords(cmultiPartKeywords), + verbs: keywords(cVerbs), functions: keywords(cFunctions), types: keywords(cTypes), attributes: keywords(cAttributes) }); -}()); +}()); \ No newline at end of file diff --git a/js/functions.js b/js/functions.js index d1c554436c..d0ba6eb507 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1613,7 +1613,13 @@ function PMA_createProfilingChart(data, options) },options)); } -// Formats a profiling duration nicely. Used in PMA_createProfilingChart() and server_status.js +/** + * Formats a profiling duration nicely (in us and ms time). Used in PMA_createProfilingChart() and server_status.js + * + * @param integer Number to be formatted, should be in the range of microsecond to second + * @param integer Acuracy, how many numbers right to the comma should be + * @return string The formatted number + */ function PMA_prettyProfilingNum(num, acc) { if (!acc) { @@ -1631,6 +1637,146 @@ function PMA_prettyProfilingNum(num, acc) return num + 's'; } + +/** + * Formats a SQL Query nicely with newlines and indentation. Depends on Codemirror and MySQL Mode! + * + * @param string Query to be formatted + * @return string The formatted query + */ +function PMA_SQLPrettyPrint(string) +{ + var mode = CodeMirror.getMode({},"text/x-mysql"); + var stream = new CodeMirror.StringStream(string); + var state = mode.startState(); + var token, tokens = []; + var output = ''; + var tabs = function(cnt) { + var ret = ''; + for (var i=0; i<4*cnt; i++) + ret += " "; + return ret; + }; + + // "root-level" statements + var statements = { + 'select': ['select', 'from','on','where','having','limit','order by','group by'], + 'update': ['update', 'set','where'], + 'insert into': ['insert into', 'values'] + }; + // don't put spaces before these tokens + var spaceExceptionsBefore = { ';':true, ',': true, '.': true, '(': true }; + // don't put spaces after these tokens + var spaceExceptionsAfter = { '.': true }; + + // Populate tokens array + var str=''; + while (! stream.eol()) { + stream.start = stream.pos; + token = mode.token(stream, state); + if(token != null) { + tokens.push([token, stream.current().toLowerCase()]); + } + } + + var currentStatement = tokens[0][1]; + + if(! statements[currentStatement]) { + return string; + } + // Holds all currently opened code blocks (statement, function or generic) + var blockStack = []; + // Holds the type of block from last iteration (the current is in blockStack[0]) + var previousBlock; + // If a new code block is found, newBlock contains its type for one iteration and vice versa for endBlock + var newBlock, endBlock; + // How much to indent in the current line + var indentLevel = 0; + // Holds the "root-level" statements + var statementPart, lastStatementPart = statements[currentStatement][0]; + + blockStack.unshift('statement'); + + // Iterate through every token and format accordingly + for (var i = 0; i < tokens.length; i++) { + previousBlock = blockStack[0]; + + // New block => push to stack + if (tokens[i][1] == '(') { + if (i < tokens.length - 1 && tokens[i+1][0] == 'statement-verb') { + blockStack.unshift(newBlock = 'statement'); + } else if (i > 0 && tokens[i-1][0] == 'builtin') { + blockStack.unshift(newBlock = 'function'); + } else { + blockStack.unshift(newBlock = 'generic'); + } + } else { + newBlock = null; + } + + // Block end => pop from stack + if (tokens[i][1] == ')') { + endBlock = blockStack[0]; + blockStack.shift(); + } else { + endBlock = null; + } + + // A subquery is starting + if (i > 0 && newBlock == 'statement') { + indentLevel++; + output += "\n" + tabs(indentLevel) + tokens[i][1] + ' ' + tokens[i+1][1] + "\n" + tabs(indentLevel + 1); + currentStatement = tokens[i+1][1]; + i++; + continue; + } + + // A subquery is ending + if (endBlock == 'statement' && indentLevel > 0) { + output += "\n" + tabs(indentLevel); + indentLevel--; + } + + // One less indentation for statement parts (from, where, order by, etc.) and a newline + statementPart = statements[currentStatement].indexOf(tokens[i][1]); + if (statementPart != -1) { + if (i > 0) output += "\n"; + output += tabs(indentLevel) + tokens[i][1]; + output += "\n" + tabs(indentLevel + 1); + lastStatementPart = tokens[i][1]; + } + // Normal indentatin and spaces for everything else + else { + if (! spaceExceptionsBefore[tokens[i][1]] + && ! (i > 0 && spaceExceptionsAfter[tokens[i-1][1]]) + && output.charAt(output.length -1) != ' ' ) { + output += " "; + } + output += tokens[i][1]; + } + + // split columns in select and 'update set' clauses, but only inside statements blocks + if (( lastStatementPart == 'select' || lastStatementPart == 'where' || lastStatementPart == 'set') + && tokens[i][1]==',' && blockStack[0] == 'statement') { + + output += "\n" + tabs(indentLevel + 1); + } + + // split conditions in where clauses, but only inside statements blocks + if (lastStatementPart == 'where' + && (tokens[i][1]=='and' || tokens[i][1]=='or' || tokens[i][1]=='xor')) { + + if (blockStack[0] == 'statement') { + output += "\n" + tabs(indentLevel + 1); + } + // Todo: Also split and or blocks in newlines & identation++ + //if(blockStack[0] == 'generic') + // output += ... + } + } + return output; +} + /** * jQuery function that uses jQueryUI's dialogs to confirm with user. Does not * return a jQuery object yet and hence cannot be chained diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 7ac2498810..c82eedeb57 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1688,33 +1688,18 @@ $(function() { return cols; } - + /* Opens the query analyzer dialog */ function openQueryAnalyzer() { var rowData = $(this).parent().data('query'); var query = rowData.argument || rowData.sql_text; - /* A very basic SQL Formatter. Totally fails in the cases of - - Any string appearance containing a MySQL Keyword, surrounded by whitespaces, e.g. WHERE bar = "This where the formatter fails" - - Subqueries too probably - */ - - // Matches the columns to be selected - // .* selector doesn't include whitespace and we have no PCRE_DOTALL modifier, (.|\s)+ crashes Chrome (reported and confirmed), - // [^]+ results in JS error in IE8, thus we use [^\0]+ for matching each column since the zero-byte char (hopefully) doesn't appear in column names ;) - var sLists = query.match(/SELECT\s+[^\0]+\s+FROM\s+/gi); - if (sLists) { - for (var i = 0; i < sLists.length; i++) { - query = query.replace(sLists[i], sLists[i].replace(/\s*((`|'|"|).*?\1,)\s*/gi, '$1\n\t')); - } - query = query - .replace(/(\s+|^)(SELECT|FROM|WHERE|GROUP BY|HAVING|ORDER BY|LIMIT)(\s+|$)/gi, '\n$2\n\t') - .replace(/\s+UNION\s+/gi, '\n\nUNION\n\n') - .replace(/\s+(AND)\s+/gi, ' $1\n\t') - .trim(); - } - + query = PMA_SQLPrettyPrint(query); codemirror_editor.setValue(query); + // Codemirror is bugged, it doesn't refresh properly sometimes. Following lines seem to fix that + setTimeout(function() { + codemirror_editor.refresh() + },50); var profilingChart = null; var dlgBtns = {}; diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 83590f927d..8649d45e66 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -2270,7 +2270,7 @@ span.CodeMirror-selected { .CodeMirror-matchingbracket {color: #0f0 !important;} .CodeMirror-nonmatchingbracket {color: #f22 !important;} -span.cm-keyword { +span.cm-keyword, span.cm-statement-verb { color: ; } span.cm-variable { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 805041939e..0b77c962eb 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2688,7 +2688,7 @@ span.CodeMirror-selected { .CodeMirror-matchingbracket {color: #0f0 !important;} .CodeMirror-nonmatchingbracket {color: #f22 !important;} -span.cm-keyword { +span.cm-keyword, span.cm-statement-verb { color: ; } span.cm-variable { From 917aa3e1825e4f86466a3c48c8c27f6cf4eb90ad Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 13:37:01 +0300 Subject: [PATCH 084/270] SQL Pretty printer: Uppercase for keywords --- js/functions.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index d0ba6eb507..aac55a710e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1725,7 +1725,7 @@ function PMA_SQLPrettyPrint(string) // A subquery is starting if (i > 0 && newBlock == 'statement') { indentLevel++; - output += "\n" + tabs(indentLevel) + tokens[i][1] + ' ' + tokens[i+1][1] + "\n" + tabs(indentLevel + 1); + output += "\n" + tabs(indentLevel) + tokens[i][1] + ' ' + tokens[i+1][1].toUpperCase() + "\n" + tabs(indentLevel + 1); currentStatement = tokens[i+1][1]; i++; continue; @@ -1741,7 +1741,7 @@ function PMA_SQLPrettyPrint(string) statementPart = statements[currentStatement].indexOf(tokens[i][1]); if (statementPart != -1) { if (i > 0) output += "\n"; - output += tabs(indentLevel) + tokens[i][1]; + output += tabs(indentLevel) + tokens[i][1].toUpperCase(); output += "\n" + tabs(indentLevel + 1); lastStatementPart = tokens[i][1]; } @@ -1752,7 +1752,11 @@ function PMA_SQLPrettyPrint(string) && output.charAt(output.length -1) != ' ' ) { output += " "; } - output += tokens[i][1]; + if (tokens[i][0] == 'keyword') { + output += tokens[i][1].toUpperCase(); + } else { + output += tokens[i][1]; + } } // split columns in select and 'update set' clauses, but only inside statements blocks From 24ffd3e1d30bb5ccb08cfcf7bce118fc11bbd65f Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Thu, 18 Aug 2011 13:17:23 +0200 Subject: [PATCH 085/270] Change sprites for .headerSortUp and .headerSortDown to match original phpMyAdmin behavior --- themes/original/css/theme_right.css.php | 4 ++-- themes/pmahomme/css/theme_right.css.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 6ab3b1f802..e97b1e9c9d 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -279,10 +279,10 @@ button { img.sortableIcon { background-position: -1727px 0; } /* Same as s_asc */ -th.headerSortUp img.sortableIcon { background-position: 0 -1445px; width: 11px; height: 9px; } +th.headerSortUp img.sortableIcon { background-position: 0 -1528px; width: 11px; height: 9px; } /* Same as s_desc */ -th.headerSortDown img.sortableIcon { background-position: 0 -1528px; width: 11px; height: 9px; } +th.headerSortDown img.sortableIcon { background-position: 0 -1445px; width: 11px; height: 9px; } /* Fix position */ .ic_more { vertical-align: middle; } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 589fa54c68..914ef0bf09 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -462,10 +462,10 @@ select[multiple] { img.sortableIcon { background-position: -1812px 0; } /* Same as s_asc */ -th.headerSortUp img.sortableIcon { background-position: -1516px 0; } +th.headerSortUp img.sortableIcon { background-position: 0 0; } /* Same as s_desc */ -th.headerSortDown img.sortableIcon { background-position: 0 0; } +th.headerSortDown img.sortableIcon { background-position: -1516px 0; } /* Fix position */ .ic_more { vertical-align: middle; } From 84cc7837f5da69c588f7503da0acc9512ff29619 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Thu, 18 Aug 2011 13:39:06 +0200 Subject: [PATCH 086/270] Use PMA_addDatepicker only when $.datetimepicker is defined, prevents JS error on server status page where timepicker.js is loaded on demand --- js/functions.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index 11e264e71a..54a08d5371 100644 --- a/js/functions.js +++ b/js/functions.js @@ -685,10 +685,12 @@ $(document).ready(function() { /** * Add a date/time picker to each element that needs it */ - $('.datefield, .datetimefield').each(function() { - PMA_addDatepicker($(this)); - }); -}) + if ($.datetimepicker != undefined) { + $('.datefield, .datetimefield').each(function() { + PMA_addDatepicker($(this)); + }); + } +}); /** * True if last click is to check a row. From 9f476c85a819af1cda160256a443d31c35f9951d Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Thu, 18 Aug 2011 14:19:51 +0200 Subject: [PATCH 087/270] Server status: faster perceived page loading Tab initialization is moved to the moment when tab is selected. All other tabs are initialized after tabs are displayed --- js/server_status.js | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/js/server_status.js b/js/server_status.js index bcb25b8f90..1d892e20e4 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -110,7 +110,13 @@ $(function() { cookie: { name: 'pma_serverStatusTabs', expires: 1 }, show: function(event, ui) { // Fixes line break in the menu bar when the page overflows and scrollbar appears - menuResize(); + menuResize(); + + // Initialize selected tab + if (!$(ui.tab.hash).data('init-done')) { + initTab($(ui.tab.hash), null); + } + // Load Server status monitor if (ui.tab.hash == '#statustabs_charting' && ! monitorLoaded) { $('div#statustabs_charting').append( //PMA_messages['strLoadingMonitor'] + ' ' + @@ -143,8 +149,12 @@ $(function() { // Initialize each tab $('div.ui-tabs-panel').each(function() { - initTab($(this), null); - tabStatus[$(this).attr('id')] = 'static'; + var $tab = $(this); + tabStatus[$tab.attr('id')] = 'static'; + // Initialize tabs after browser catches up with previous changes and displays tabs + setTimeout(function() { + initTab($tab, null); + }, 0.5); }); // Handles refresh rate changing @@ -362,7 +372,7 @@ $(function() { }); $('#filterText').keyup(function(e) { - word = $(this).val().replace(/_/g, ' '); + var word = $(this).val().replace(/_/g, ' '); if (word.length == 0) { textFilter = null; @@ -389,6 +399,10 @@ $(function() { /* Adjust DOM / Add handlers to the tabs */ function initTab(tab, data) { + if ($(tab).data('init-done') && !data) { + return; + } + $(tab).data('init-done', true); switch(tab.attr('id')) { case 'statustabs_traffic': if (data != null) { From 25e0482a4a4db8533adbce331bdd76037dc982a3 Mon Sep 17 00:00:00 2001 From: stoyanster Date: Thu, 18 Aug 2011 14:54:52 +0200 Subject: [PATCH 088/270] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 0d170e6ed6..da6966a965 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-07-19 14:58+0200\n" +"PO-Revision-Date: 2011-08-18 14:54+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -6206,7 +6206,7 @@ msgstr "" #: libraries/export/sql.php:174 #, php-format msgid "Add %s statement" -msgstr "Ново заявление %s" +msgstr "Добавяне на заявление %s" #: libraries/export/sql.php:152 msgid "Add statements:" From e08ce9450bc99da18f4d74333a7dcd35aa33618d Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Thu, 18 Aug 2011 14:59:15 +0200 Subject: [PATCH 089/270] Faster zebra widget for tablesorter, reduces processing time of status variables table from ~200ms to ~100ms --- js/server_status.js | 23 ++++++++++++++++++++--- js/server_status_monitor.js | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/js/server_status.js b/js/server_status.js index 1d892e20e4..dcf59d852a 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -43,7 +43,24 @@ $(function() { }, type: "numeric" }); - + // faster zebra widget: no row visibility check, faster css class switching, no cssChildRow check + jQuery.tablesorter.addWidget({ + id: "fast-zebra", + format: function (table) { + if (table.config.debug) { + var time = new Date(); + } + $("tr:even", table.tBodies[0]) + .removeClass(table.config.widgetZebra.css[0]) + .addClass(table.config.widgetZebra.css[1]); + $("tr:odd", table.tBodies[0]) + .removeClass(table.config.widgetZebra.css[1]) + .addClass(table.config.widgetZebra.css[0]); + if (table.config.debug) { + $.tablesorter.benchmark("Applying Fast-Zebra widget", time); + } + } + }); // Popup behaviour $('a[rel="popupLink"]').click( function() { @@ -474,7 +491,7 @@ $(function() { case 'statustabs_queries': $('#serverstatusqueriesdetails').tablesorter({ sortList: [[3, 1]], - widgets: ['zebra'], + widgets: ['fast-zebra'], headers: { 1: { sorter: 'fancyNumber' }, 2: { sorter: 'fancyNumber' } @@ -489,7 +506,7 @@ $(function() { case 'statustabs_allvars': $('#serverstatusvariables').tablesorter({ sortList: [[0, 0]], - widgets: ['zebra'], + widgets: ['fast-zebra'], headers: { 1: { sorter: 'fancyNumber' } } diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 7ac2498810..fa0f28eb77 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1680,7 +1680,7 @@ $(function() { $('div#logTable table').tablesorter({ sortList: [[cols.length - 1, 1]], - widgets: ['zebra'] + widgets: ['fast-zebra'] }); $('div#logTable table thead th') From ceee6082378c61b4e13e406a461c3990ccc09788 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Thu, 18 Aug 2011 15:21:17 +0200 Subject: [PATCH 090/270] Tablesorter: don't apply widget twice during initialization --- js/jquery/jquery.tablesorter.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/jquery/jquery.tablesorter.js b/js/jquery/jquery.tablesorter.js index e8e2323489..909d947425 100644 --- a/js/jquery/jquery.tablesorter.js +++ b/js/jquery/jquery.tablesorter.js @@ -826,9 +826,11 @@ // if user has supplied a sort list to constructor. if (config.sortList.length > 0) { $this.trigger("sorton", [config.sortList]); + } else { + // appendToTable used in sorton event already calls applyWidget + // apply widgets + applyWidget(this); } - // apply widgets - applyWidget(this); }); }; this.addParser = function (parser) { From 676b0cc925482a0662562fca485fb4064b228a7f Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Thu, 18 Aug 2011 15:34:57 +0200 Subject: [PATCH 091/270] Refactor initTableSorter and use it only when needed --- js/server_status.js | 50 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/js/server_status.js b/js/server_status.js index dcf59d852a..08d7679530 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -473,6 +473,7 @@ $(function() { } } }); + initTableSorter(tab.attr('id')); break; case 'statustabs_allvars': @@ -480,43 +481,40 @@ $(function() { tab.find('.tabInnerContent').html(data); filterVariables(); } + initTableSorter(tab.attr('id')); break; } - - initTableSorter(tab.attr('id')); } + // TODO: tablesorter shouldn't sort already sorted columns function initTableSorter(tabid) { + var $table, opts; switch(tabid) { case 'statustabs_queries': - $('#serverstatusqueriesdetails').tablesorter({ - sortList: [[3, 1]], - widgets: ['fast-zebra'], - headers: { - 1: { sorter: 'fancyNumber' }, - 2: { sorter: 'fancyNumber' } - } - }); - - $('#serverstatusqueriesdetails tr:first th') - .append(''); - + $table = $('#serverstatusqueriesdetails'); + opts = { + sortList: [[3, 1]], + widgets: ['fast-zebra'], + headers: { + 1: { sorter: 'fancyNumber' }, + 2: { sorter: 'fancyNumber' } + } + }; break; - case 'statustabs_allvars': - $('#serverstatusvariables').tablesorter({ - sortList: [[0, 0]], - widgets: ['fast-zebra'], - headers: { - 1: { sorter: 'fancyNumber' } - } - }); - - $('#serverstatusvariables tr:first th') - .append(''); - + $table = $('#serverstatusvariables'); + opts = { + sortList: [[0, 0]], + widgets: ['fast-zebra'], + headers: { + 1: { sorter: 'fancyNumber' } + } + }; break; } + $table.tablesorter(opts); + $table.find('tr:first th') + .append(''); } /* Filters the status variables by name/category/alert in the variables tab */ From dd36db9ca9b60da5196303e8a4aaaa0a50e2f177 Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 17:31:27 +0300 Subject: [PATCH 092/270] Fix: Incorrect word filter regex for status variables --- js/server_status.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/server_status.js b/js/server_status.js index 08d7679530..c24c15b778 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -394,7 +394,7 @@ $(function() { if (word.length == 0) { textFilter = null; } - else textFilter = new RegExp("(^|_)" + word, 'i'); + else textFilter = new RegExp("(^| )" + word, 'i'); text = word; From 67f396a7b69f06a0c756ed5212470890082a317a Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 17:46:40 +0300 Subject: [PATCH 093/270] Fix: Correct sorting for status variable values --- js/server_status.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/js/server_status.js b/js/server_status.js index c24c15b778..594e8d9ed2 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -43,6 +43,19 @@ $(function() { }, type: "numeric" }); + + jQuery.tablesorter.addParser({ + id: "withinSpanNumber", + is: function(s) { + return /(.*)?<\/span>/); + return (res && res.length >= 3) ? res[2] : 0; + }, + type: "numeric" + }); + // faster zebra widget: no row visibility check, faster css class switching, no cssChildRow check jQuery.tablesorter.addWidget({ id: "fast-zebra", @@ -507,7 +520,7 @@ $(function() { sortList: [[0, 0]], widgets: ['fast-zebra'], headers: { - 1: { sorter: 'fancyNumber' } + 1: { sorter: 'withinSpanNumber' } } }; break; From ba21b5f3a24c893506debeb2acffe472c92547ea Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 19:11:00 +0300 Subject: [PATCH 094/270] Commit 84cc7837f5da69c588f7503da0acc9512ff29619 broke the datetime picker for the monitor loading log dialog --- js/server_status_monitor.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 94d38bea33..ed84879dca 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -9,6 +9,10 @@ $(function() { codemirror_editor = CodeMirror.fromTextArea(elm[0], { lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql" }); } } + // Timepicker is loaded on demand so we need to initialize datetime fields from the 'load log' dialog + $('div#logAnalyseDialog .datetimefield').each(function() { + PMA_addDatepicker($(this)); + }); /**** Monitor charting implementation ****/ /* Saves the previous ajax response for differential values */ @@ -1022,8 +1026,6 @@ $(function() { removeVariables: $('input#removeVariables').prop('checked'), limitTypes: $('input#limitTypes').prop('checked') }); - - $('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy'); } $('#logAnalyseDialog').dialog({ From ccf3f5999db459d851a80ae14ac11f96c3f312f5 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:20:11 +0200 Subject: [PATCH 095/270] Translation update done using Pootle. --- po/de.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 3286d5c0a6..85eaf060e8 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-17 13:24+0200\n" -"Last-Translator: \n" +"PO-Revision-Date: 2011-08-18 18:20+0200\n" +"Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -854,10 +854,10 @@ msgid "Dump has been saved to file %s." msgstr "Dump wurde in Datei %s gespeichert." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Werte für die Spalte \"%s\"" +msgstr "Wert für die Spalte \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" From fd7f71b4ed290a3e530d73aaef4a890aec6fadd2 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:20:38 +0200 Subject: [PATCH 096/270] Translation update done using Pootle. --- po/de.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 85eaf060e8..707d1e1b11 100644 --- a/po/de.po +++ b/po/de.po @@ -864,8 +864,9 @@ msgid "Use OpenStreetMaps as Base Layer" msgstr "Verwende OpenStreetMaps als Basis-Layer" #: gis_data_editor.php:134 +#, fuzzy msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 From f6a5e7ff0a87e36f026c78523d4d2dbdebc274f0 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:20:48 +0200 Subject: [PATCH 097/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 707d1e1b11..d0ee806a11 100644 --- a/po/de.po +++ b/po/de.po @@ -876,7 +876,7 @@ msgstr "Gestaltung" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 msgid "Point" -msgstr "" +msgstr "Punkt" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 From 342b765409386f6aa8729996487d04a0d7da21ff Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:20:57 +0200 Subject: [PATCH 098/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index d0ee806a11..7640f3a7d0 100644 --- a/po/de.po +++ b/po/de.po @@ -871,7 +871,7 @@ msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 msgid "Geometry" -msgstr "Gestaltung" +msgstr "Geometrie" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 From 1ca6ea0af2155b1188b0742ac67e49a061ee86ee Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 19:21:04 +0300 Subject: [PATCH 099/270] Better wording --- js/messages.php | 2 +- js/server_status_monitor.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/messages.php b/js/messages.php index 10beb0ad66..7bb7bd3fa1 100644 --- a/js/messages.php +++ b/js/messages.php @@ -170,7 +170,7 @@ $js_messages['strJumpToTable'] = __('Jump to Log table'); $js_messages['strNoDataFound'] = __('Log analysed, but no data found in this time span.'); /* l10n: A collection of available filters */ -$js_messages['strFilters'] = __('Filters'); +$js_messages['strFiltersForLogTable'] = __('Log table filter options'); /* l10n: Filter as in "Start Filtering" */ $js_messages['strFilter'] = __('Filter'); $js_messages['strFilterByWordRegexp'] = __('Filter queries by word/regexp:'); diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index ed84879dca..e89f0488bd 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1390,7 +1390,7 @@ $(function() { if (logData.numRows > 12) { $('div#logTable').prepend( '
' + - ' ' + PMA_messages['strFilters'] + '' + + ' ' + PMA_messages['strFiltersForLogTable'] + '' + '
' + ' ' + ' ' + From b3f048c2f2a9d938869d311164ef86e76f60fbd5 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:21:09 +0200 Subject: [PATCH 100/270] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 7640f3a7d0..570906f96c 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:20+0200\n" +"PO-Revision-Date: 2011-08-18 18:21+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -881,7 +881,7 @@ msgstr "Punkt" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 From 2cb5ff8a8a47e03ad19d625b75fbf8c7da7b970e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:21:14 +0200 Subject: [PATCH 101/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 570906f96c..40585a7960 100644 --- a/po/de.po +++ b/po/de.po @@ -886,7 +886,7 @@ msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 From 9e9c62de622d0af4a44ca577d5d56447bf54fa54 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:21:29 +0200 Subject: [PATCH 102/270] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 40585a7960..f26e2d4f05 100644 --- a/po/de.po +++ b/po/de.po @@ -890,10 +890,9 @@ msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add routine" msgid "Add a point" -msgstr "Prozedur hinzufügen" +msgstr "Punkt hinzufügen" #: gis_data_editor.php:218 js/messages.php:287 #, fuzzy From f570fce5ce0069f6ef8423b60578324d250c7a62 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:22:12 +0200 Subject: [PATCH 103/270] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index f26e2d4f05..0e4c112c90 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:21+0200\n" +"PO-Revision-Date: 2011-08-18 18:22+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -898,7 +898,7 @@ msgstr "Punkt hinzufügen" #, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Zeilen getrennt mit" +msgstr "Linestring" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" From 98901983d582766c1c91c2da3d53415613a8404e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:23:33 +0200 Subject: [PATCH 104/270] Translation update done using Pootle. --- po/de.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 0e4c112c90..763960b923 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:22+0200\n" +"PO-Revision-Date: 2011-08-18 18:23+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -900,9 +900,11 @@ msgstr "Punkt hinzufügen" msgid "Linestring" msgstr "Linestring" +# ist hiermit der Um-kreis gemeint? #: gis_data_editor.php:221 gis_data_editor.php:275 +#, fuzzy msgid "Outer Ring:" -msgstr "" +msgstr "Außenring:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" From 75331372a547045ed5d75d4e14900ba22c97edab Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:24:53 +0200 Subject: [PATCH 105/270] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 763960b923..80750e95d4 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:23+0200\n" +"PO-Revision-Date: 2011-08-18 18:24+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -900,7 +900,7 @@ msgstr "Punkt hinzufügen" msgid "Linestring" msgstr "Linestring" -# ist hiermit der Um-kreis gemeint? +# ist hiermit der Umkreis gemeint? http://de.wikipedia.org/wiki/Umkreis #: gis_data_editor.php:221 gis_data_editor.php:275 #, fuzzy msgid "Outer Ring:" From 2329265d52c5d792f9d084d759a07e42b56a8806 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:25:37 +0200 Subject: [PATCH 106/270] Translation update done using Pootle. --- po/de.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 80750e95d4..072351d98e 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:24+0200\n" +"PO-Revision-Date: 2011-08-18 18:25+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -906,9 +906,11 @@ msgstr "Linestring" msgid "Outer Ring:" msgstr "Außenring:" +# Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 +#, fuzzy msgid "Inner Ring" -msgstr "" +msgstr "Innenring:" #: gis_data_editor.php:248 #, fuzzy From db7f4797a9ed238e9cd2e7b8dd91124f3ac7bb17 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:25:48 +0200 Subject: [PATCH 107/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 072351d98e..d281646c10 100644 --- a/po/de.po +++ b/po/de.po @@ -916,7 +916,7 @@ msgstr "Innenring:" #, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Neuen Benutzer hinzufügen" +msgstr "Linestring hinzufügen" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 #, fuzzy From e4c580aa613c4472754d3d457cb3a678a86257ce Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:26:07 +0200 Subject: [PATCH 108/270] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index d281646c10..020c44b31d 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:25+0200\n" +"PO-Revision-Date: 2011-08-18 18:26+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -926,7 +926,7 @@ msgstr "Neuen Benutzer hinzufügen" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Polygon" #: gis_data_editor.php:300 js/messages.php:294 #, fuzzy From ba51fe1500e07c514891a63fae59769dd356fdb6 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:26:17 +0200 Subject: [PATCH 109/270] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 020c44b31d..c6891538f4 100644 --- a/po/de.po +++ b/po/de.po @@ -929,10 +929,9 @@ msgid "Polygon" msgstr "Polygon" #: gis_data_editor.php:300 js/messages.php:294 -#, fuzzy #| msgid "Add column" msgid "Add a polygon" -msgstr "Spalte hinzufügen" +msgstr "Polygon hinzufügen" #: gis_data_editor.php:304 #, fuzzy From 172c48f410d93db707b8643c8410251b592caba9 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:26:42 +0200 Subject: [PATCH 110/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index c6891538f4..b1a53348b4 100644 --- a/po/de.po +++ b/po/de.po @@ -937,7 +937,7 @@ msgstr "Polygon hinzufügen" #, fuzzy #| msgid "Geometry" msgid "Add geometry" -msgstr "Gestaltung" +msgstr "Geometrie hinzufügen" #: gis_data_editor.php:312 msgid "" From 64396743a16f1e8040a0f33b867444703a60a914 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:28:41 +0200 Subject: [PATCH 111/270] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index b1a53348b4..e725a99348 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:26+0200\n" +"PO-Revision-Date: 2011-08-18 18:28+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -1788,7 +1788,7 @@ msgstr "Jeder Punkt stellt eine Datenreihe dar" #: js/messages.php:266 msgid "Hovering over a point will show its label." -msgstr "" +msgstr "Das Überfliegen eines Punktes zeigt seine Bezeichnung." #: js/messages.php:268 msgid "Drag and select an area in the plot to zoom into it." From 41c8e7b9a20afa71b67467e883e1f7c84920b0e5 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:28:53 +0200 Subject: [PATCH 112/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index e725a99348..29b8d8b6e6 100644 --- a/po/de.po +++ b/po/de.po @@ -1792,7 +1792,7 @@ msgstr "Das Überfliegen eines Punktes zeigt seine Bezeichnung." #: js/messages.php:268 msgid "Drag and select an area in the plot to zoom into it." -msgstr "" +msgstr "Mit gedrückter Maustaste eine Fläche aufziehen um hineinzuzoomen." #: js/messages.php:270 msgid "Click reset zoom link to come back to original state." From 0b225ab17ab14b23251ec190dfd71422454381cc Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:29:01 +0200 Subject: [PATCH 113/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 29b8d8b6e6..c2aab43ae5 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:28+0200\n" +"PO-Revision-Date: 2011-08-18 18:29+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" From 1126128143fa51af10a0b01ea1c8b413b998181b Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:29:13 +0200 Subject: [PATCH 114/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index c2aab43ae5..5ae14c9684 100644 --- a/po/de.po +++ b/po/de.po @@ -1796,7 +1796,7 @@ msgstr "Mit gedrückter Maustaste eine Fläche aufziehen um hineinzuzoomen." #: js/messages.php:270 msgid "Click reset zoom link to come back to original state." -msgstr "" +msgstr "Auf \"Zoom zurücksetzen\" klicken um zum Original zurückzukehren." #: js/messages.php:272 msgid "Click a data point to view and possibly edit the data row." From 0fda6a558178f554fd0c7f7b304fe58e6dbb53c8 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:29:38 +0200 Subject: [PATCH 115/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 5ae14c9684..6f2db99b46 100644 --- a/po/de.po +++ b/po/de.po @@ -1812,7 +1812,7 @@ msgstr "" #: js/messages.php:276 msgid "Strings are converted into integer for plotting" -msgstr "" +msgstr "Zeichenketten werden für die Zeichnung in Integerwerte umgewandelt." #: js/messages.php:278 #, fuzzy From ca6a5315deaa68007d64e5d158c6b97411254d29 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:29:50 +0200 Subject: [PATCH 116/270] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 6f2db99b46..07eb9a9c8c 100644 --- a/po/de.po +++ b/po/de.po @@ -1815,10 +1815,9 @@ msgid "Strings are converted into integer for plotting" msgstr "Zeichenketten werden für die Zeichnung in Integerwerte umgewandelt." #: js/messages.php:278 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "Spalten hinzufügen/entfernen" +msgstr "2 Spalten auswählen" #: js/messages.php:279 msgid "Select two different columns" From 73df898bdf7dfbb5be4c078ff4ae6623531c2950 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:29:56 +0200 Subject: [PATCH 117/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 07eb9a9c8c..e2f5e44c5d 100644 --- a/po/de.po +++ b/po/de.po @@ -1817,7 +1817,7 @@ msgstr "Zeichenketten werden für die Zeichnung in Integerwerte umgewandelt." #: js/messages.php:278 #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "2 Spalten auswählen" +msgstr "Zwei Spalten auswählen" #: js/messages.php:279 msgid "Select two different columns" From b6b21af405496e3b12734ac9653af03c4c3f575e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:30:05 +0200 Subject: [PATCH 118/270] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index e2f5e44c5d..4675c32e18 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:29+0200\n" +"PO-Revision-Date: 2011-08-18 18:30+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -1834,7 +1834,7 @@ msgstr "Kopieren" #: js/messages.php:291 msgid "Outer Ring" -msgstr "" +msgstr "Aussenring" #: js/messages.php:297 msgid "Add columns" From e9338dbb9c5cfe71177ae81b9bddbe0d03d47c40 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:31:12 +0200 Subject: [PATCH 119/270] Translation update done using Pootle. --- po/de.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 4675c32e18..44b9e79965 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:30+0200\n" +"PO-Revision-Date: 2011-08-18 18:31+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -1908,6 +1908,8 @@ msgstr "" msgid "" "You can also edit most columns
by clicking directly on their content." msgstr "" +"Sie können die meisten Spalten bearbeiten
indem Sie auf den Inhalt " +"klicken." #: js/messages.php:319 #, fuzzy From d64439ba1991101581fad726a7851ff1fac0c490 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:31:24 +0200 Subject: [PATCH 120/270] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 44b9e79965..44af756152 100644 --- a/po/de.po +++ b/po/de.po @@ -1912,10 +1912,9 @@ msgstr "" "klicken." #: js/messages.php:319 -#, fuzzy #| msgid "Go to view" msgid "Go to link" -msgstr "Gehe zum View" +msgstr "Gehe zur Verknüpfung" #: js/messages.php:322 msgid "Generate password" From c29f50d562ddd5820f8c5033fe62d1153d05b640 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:32:14 +0200 Subject: [PATCH 121/270] Translation update done using Pootle. --- po/de.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 44af756152..d02fd8d247 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:31+0200\n" +"PO-Revision-Date: 2011-08-18 18:32+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -4960,10 +4960,9 @@ msgid "Show function fields" msgstr "Funktionsfelder anzeigen" #: libraries/config/messages.inc.php:462 -#, fuzzy #| msgid "Where to show the table row links" msgid "Whether to show hint or not" -msgstr "Wo die Datensatz-Links angezeigt werden sollen" +msgstr "Hinweise anzeigen" #: libraries/config/messages.inc.php:463 #, fuzzy From f7f312eb399f1aface7a3bbf13bd39810906dba4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:32:22 +0200 Subject: [PATCH 122/270] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index d02fd8d247..6b984c0d1e 100644 --- a/po/de.po +++ b/po/de.po @@ -4965,10 +4965,9 @@ msgid "Whether to show hint or not" msgstr "Hinweise anzeigen" #: libraries/config/messages.inc.php:463 -#, fuzzy #| msgid "Show indexes" msgid "Show hint" -msgstr "Indexes anzeigen" +msgstr "Hinweis anzeigen" #: libraries/config/messages.inc.php:464 msgid "" From 08d8416c85ae86a2989617618d98bfb9f15c09cf Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:32:50 +0200 Subject: [PATCH 123/270] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 6b984c0d1e..53e8319ec0 100644 --- a/po/de.po +++ b/po/de.po @@ -6789,10 +6789,9 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." msgstr "" #: libraries/import/shp.php:350 -#, fuzzy #| msgid "This page does not contain any tables!" msgid "The imported file does not contain any data" -msgstr "Diese Seite enthält keine Tabellen!" +msgstr "Die importierte Datei enthält keine Daten" #: libraries/import/sql.php:33 msgid "SQL compatibility mode:" From 642159db368e9ccf63d68426e1f435b62bf0323e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:33:08 +0200 Subject: [PATCH 124/270] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 53e8319ec0..694e4a9e76 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:32+0200\n" +"PO-Revision-Date: 2011-08-18 18:33+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -7322,7 +7322,7 @@ msgstr "Abfrage ausführen" #| msgid "Start" msgctxt "Start of recurring event" msgid "Start" -msgstr "Anfang" +msgstr "Start" #: libraries/rte/rte_events.lib.php:457 #, fuzzy From 6aff680e4c59e5da6f3bce833b8adaee7f2f8ba2 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:33:25 +0200 Subject: [PATCH 125/270] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 694e4a9e76..1aa28e9f1a 100644 --- a/po/de.po +++ b/po/de.po @@ -8133,10 +8133,9 @@ msgid "Operator" msgstr "Operator" #: libraries/tbl_select.lib.php:143 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "Suche" +msgstr "Tabellensuche" #: libraries/tbl_select.lib.php:229 tbl_change.php:994 #, fuzzy From 788241c3f8f80eaba7c1cf45200596e8109c1771 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:33:34 +0200 Subject: [PATCH 126/270] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 1aa28e9f1a..3eef27850c 100644 --- a/po/de.po +++ b/po/de.po @@ -8138,10 +8138,9 @@ msgid "Table Search" msgstr "Tabellensuche" #: libraries/tbl_select.lib.php:229 tbl_change.php:994 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Einfügen" +msgstr "Bearbeiten/Einfügen" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" From 41386b87f562563ea9683cd96faca48c9859a6bd Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:33:53 +0200 Subject: [PATCH 127/270] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 3eef27850c..57bb1ad2b1 100644 --- a/po/de.po +++ b/po/de.po @@ -9587,10 +9587,9 @@ msgid "Related links:" msgstr "Verwandte Links:" #: server_status.php:800 -#, fuzzy #| msgid "Query analyzer" msgid "Run analyzer" -msgstr "Query Analyzer" +msgstr "Analyse durchführen" #: server_status.php:801 #, fuzzy From 3b81da6e3684888fa10e8545c76e789d04234941 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:34:00 +0200 Subject: [PATCH 128/270] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 57bb1ad2b1..2af540a543 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:33+0200\n" +"PO-Revision-Date: 2011-08-18 18:34+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -9592,7 +9592,6 @@ msgid "Run analyzer" msgstr "Analyse durchführen" #: server_status.php:801 -#, fuzzy #| msgid "Introduction" msgid "Instructions" msgstr "Einführung" From 5e0eba45f314accab620d98cbe305cd91f655950 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:35:17 +0200 Subject: [PATCH 129/270] Translation update done using Pootle. --- po/de.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 2af540a543..ccd82bfc28 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:34+0200\n" +"PO-Revision-Date: 2011-08-18 18:35+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -10493,10 +10493,9 @@ msgid "" msgstr "" #: server_status.php:1508 -#, fuzzy #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "Überwachung pausieren" +msgstr "Benutzung der Überwachung:" #: server_status.php:1510 #, fuzzy From e25547ee6fb61d23cc9b61fbc0de3d919c0d1be4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:35:33 +0200 Subject: [PATCH 130/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index ccd82bfc28..6982670d8b 100644 --- a/po/de.po +++ b/po/de.po @@ -10495,7 +10495,7 @@ msgstr "" #: server_status.php:1508 #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "Benutzung der Überwachung:" +msgstr "Verwendung der Überwachung:" #: server_status.php:1510 #, fuzzy From 3d8939dbcdd13bb24a6bbdf260566b54f1176b0e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:36:02 +0200 Subject: [PATCH 131/270] Translation update done using Pootle. --- po/de.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/de.po b/po/de.po index 6982670d8b..9143cba918 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:35+0200\n" +"PO-Revision-Date: 2011-08-18 18:36+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -10514,16 +10514,15 @@ msgid "" "change the refresh rate under 'Settings', or remove any chart using the cog " "icon on each respective chart." msgstr "" -"Verwendung der Überwachung:
OK, Sie sind bereit zum Starten! " -"Sobald Sie 'Überwachung starten' angeklickt haben, wird Ihr Browser in " -"regelmäßigen Intervallen alle angezeigten Diagramme aktualisieren. Unter " -"'Einstellungen' können Sie Diagramme hinzufügen und das " -"Aktualisierungsintervall ändern oder beliebige Diagramme entfernen, wenn Sie " -"das Zahnrad-Icon des entsprechenden Schaubilds verwenden.

Wenn Sie eine " -"plötzliche Spitze in der Aktivität feststellen, wählen Sie den " -"entsprechenden Zeitraum in einem beliebigen Diagramm, indem Sie die linke " -"Maustaste gedrückt halten und über das Schaubild ziehen. Dies wird " -"Statistiken aus den Protokollen laden um Sie bei der Auffindung der " +"OK, Sie sind bereit zum Starten! Sobald Sie 'Überwachung starten' angeklickt " +"haben, wird Ihr Browser in regelmäßigen Intervallen alle angezeigten " +"Diagramme aktualisieren. Unter 'Einstellungen' können Sie Diagramme " +"hinzufügen und das Aktualisierungsintervall ändern oder beliebige Diagramme " +"entfernen, wenn Sie das Zahnrad-Icon des entsprechenden Schaubilds " +"verwenden.

Wenn Sie eine plötzliche Spitze in der Aktivität feststellen, " +"wählen Sie den entsprechenden Zeitraum in einem beliebigen Diagramm, indem " +"Sie die linke Maustaste gedrückt halten und über das Schaubild ziehen. Dies " +"wird Statistiken aus den Protokollen laden um Sie bei der Auffindung der " "Aktivitätsspitze zu unterstützen.

" #: server_status.php:1512 From 43ff3852dd132c08943ddeff1c46613c691b0fdd Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:36:22 +0200 Subject: [PATCH 132/270] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 9143cba918..6f4c7d2932 100644 --- a/po/de.po +++ b/po/de.po @@ -10556,7 +10556,7 @@ msgstr "" #: server_status.php:1519 msgid "Please note:" -msgstr "" +msgstr "Bitte beachten Sie:" #: server_status.php:1521 #, fuzzy From 9e72f2ff196d068a051a96497b9a9b1a8db36082 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:36:59 +0200 Subject: [PATCH 133/270] Translation update done using Pootle. --- po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 6f4c7d2932..1727775465 100644 --- a/po/de.po +++ b/po/de.po @@ -10559,7 +10559,6 @@ msgid "Please note:" msgstr "Bitte beachten Sie:" #: server_status.php:1521 -#, fuzzy #| msgid "" #| "Please note: Enabling the general_log may increase the server load " #| "by 5-15%. Also be aware that generating statistics from the logs is a " @@ -10572,10 +10571,11 @@ msgid "" "it is advisable to select only a small time span and to disable the " "general_log and empty its table once monitoring is not required any more." msgstr "" -"Bitte beachten Sie: Das Aktivieren des general_log kann die " -"Serverlast um 5-15% steigern. Seien Sie sich bewusst, dass das Erzeugen von " -"Statistiken aus den Logs ein sehr aufwändiger Prozess ist. Deshalb ist es " -"ratsam, nur einen kleinen Zeitraum auszuwählen." +"Das Aktivieren des general_log kann die Serverlast um 5-15% steigern. Seien " +"Sie sich bewusst, dass das Erzeugen von Statistiken aus den Logs ein sehr " +"aufwändiger Prozess ist. Deshalb ist es ratsam, nur einen kleinen Zeitraum " +"auszuwählen und die gerneral_log nach der Überwachung wieder zu " +"deaktivieren." #: server_status.php:1533 #, fuzzy From 98de725b80b384a0f644f87a344b46d37ce9bb7f Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:00:22 +0200 Subject: [PATCH 134/270] Translation update done using Pootle. --- po/br.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/br.po b/po/br.po index 7701946651..f93be450cf 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-10 22:33+0200\n" +"PO-Revision-Date: 2011-08-18 20:00+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -856,10 +856,10 @@ msgid "Dump has been saved to file %s." msgstr "Enrollet eo bet ar restr ezporzhiañ e%s." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Talvoudoù evit ar bann \"%s\"" +msgstr "Talvoud evit ar bann \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" From 830d5bf7cc4851542296d9308142a840818ab1e3 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:01:49 +0200 Subject: [PATCH 135/270] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index f93be450cf..c4fa5b2630 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:00+0200\n" +"PO-Revision-Date: 2011-08-18 20:01+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -863,7 +863,7 @@ msgstr "Talvoud evit ar bann \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" -msgstr "" +msgstr "Ober gant OpenStreetMaps evit ar gwiskad diazez" #: gis_data_editor.php:134 msgid "SRID" From a317eafbc3c17bdd386572a219178f8f2e67ff9a Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:02 +0200 Subject: [PATCH 136/270] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index c4fa5b2630..5e6930c38c 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:01+0200\n" +"PO-Revision-Date: 2011-08-18 20:02+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -872,7 +872,7 @@ msgstr "" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 msgid "Geometry" -msgstr "" +msgstr "Mentoniezh" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 From ff62e7687a9f122f633e9c7775304e92edda6d5a Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:07 +0200 Subject: [PATCH 137/270] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 5e6930c38c..73f4a4ff19 100644 --- a/po/br.po +++ b/po/br.po @@ -877,7 +877,7 @@ msgstr "Mentoniezh" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 msgid "Point" -msgstr "" +msgstr "Poent" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 From 12495bf010f0ece83f93e47c9c0f44fb00e37523 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:12 +0200 Subject: [PATCH 138/270] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 73f4a4ff19..ec7cb72fcd 100644 --- a/po/br.po +++ b/po/br.po @@ -882,7 +882,7 @@ msgstr "Poent" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 From 660eda0aa6a8d92aee802aaef2331c7bcb2a3bd0 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:15 +0200 Subject: [PATCH 139/270] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index ec7cb72fcd..1a52de9a61 100644 --- a/po/br.po +++ b/po/br.po @@ -887,7 +887,7 @@ msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 From d96530b4b6e44094aa8e7504a8ad273005a2ad2a Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:31 +0200 Subject: [PATCH 140/270] Translation update done using Pootle. --- po/br.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 1a52de9a61..a7f4aeb7ac 100644 --- a/po/br.po +++ b/po/br.po @@ -891,10 +891,9 @@ msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add constraints" msgid "Add a point" -msgstr "Ouzhpennañ ar strishadurioù" +msgstr "Ouzhpennañ ur poent" #: gis_data_editor.php:218 js/messages.php:287 #, fuzzy From 5f927b658440297ecb9e6a8a0ae77f1f6225533a Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:58 +0200 Subject: [PATCH 141/270] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index a7f4aeb7ac..a8092276fb 100644 --- a/po/br.po +++ b/po/br.po @@ -921,7 +921,7 @@ msgstr "" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Lieskorneg" #: gis_data_editor.php:300 js/messages.php:294 msgid "Add a polygon" From 2f3d4439b6b64d646c944baccdb9a1477ac4e7ce Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:03:09 +0200 Subject: [PATCH 142/270] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index a8092276fb..4c93c332b1 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:02+0200\n" +"PO-Revision-Date: 2011-08-18 20:03+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -925,7 +925,7 @@ msgstr "Lieskorneg" #: gis_data_editor.php:300 js/messages.php:294 msgid "Add a polygon" -msgstr "" +msgstr "Ouzhpennañ ul lieskorneg" #: gis_data_editor.php:304 #, fuzzy From a472784e80fca05b1e0d220243fef9134a82f278 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:03:16 +0200 Subject: [PATCH 143/270] Translation update done using Pootle. --- po/br.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 4c93c332b1..1f2c6aeacc 100644 --- a/po/br.po +++ b/po/br.po @@ -928,10 +928,9 @@ msgid "Add a polygon" msgstr "Ouzhpennañ ul lieskorneg" #: gis_data_editor.php:304 -#, fuzzy #| msgid "Add user" msgid "Add geometry" -msgstr "Ouzhpennañ un implijer" +msgstr "Ouzhpennañ mentoniezh" #: gis_data_editor.php:312 msgid "" From f5d643fb23ba600f5f528f05212a40b53fb50ad3 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:04:33 +0200 Subject: [PATCH 144/270] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 1f2c6aeacc..b193bc2426 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:03+0200\n" +"PO-Revision-Date: 2011-08-18 20:04+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1170,7 +1170,7 @@ msgstr "Udb all" #. l10n: Thousands separator #: js/messages.php:75 libraries/common.lib.php:1359 msgid "," -msgstr "" +msgstr " " #. l10n: Decimal separator #: js/messages.php:77 libraries/common.lib.php:1361 From 2ae1dd4d18ff276b04fc3943b082abe73188d5aa Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:05:25 +0200 Subject: [PATCH 145/270] Translation update done using Pootle. --- po/br.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/br.po b/po/br.po index b193bc2426..ce71ce9982 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:04+0200\n" +"PO-Revision-Date: 2011-08-18 20:05+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1230,10 +1230,9 @@ msgid "" msgstr "" #: js/messages.php:96 -#, fuzzy #| msgid "Tracking is not active." msgid "Query cache efficiency" -msgstr "N'eo ket oberiant an heuliañ." +msgstr "Efeduster ar grubuilh rekedoù" #: js/messages.php:97 po/advisory_rules.php:70 msgid "Query cache usage" From 019a64c03485439bd5259207e405874acbe0fa94 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:05:41 +0200 Subject: [PATCH 146/270] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index ce71ce9982..de28b5066c 100644 --- a/po/br.po +++ b/po/br.po @@ -1236,7 +1236,7 @@ msgstr "Efeduster ar grubuilh rekedoù" #: js/messages.php:97 po/advisory_rules.php:70 msgid "Query cache usage" -msgstr "" +msgstr "Implij ar grubuilh rekedoù" #: js/messages.php:98 msgid "Query cache used" From e2a10ea57e87c839ad24c19caa69c8706feaf58c Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:05:55 +0200 Subject: [PATCH 147/270] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index de28b5066c..15b0fb989f 100644 --- a/po/br.po +++ b/po/br.po @@ -1240,7 +1240,7 @@ msgstr "Implij ar grubuilh rekedoù" #: js/messages.php:98 msgid "Query cache used" -msgstr "" +msgstr "Krubuilh rekedoù implijet" #: js/messages.php:100 msgid "System CPU Usage" From dd8b6b1f619e756d69d88559ec77fee249a16b9e Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:06:29 +0200 Subject: [PATCH 148/270] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 15b0fb989f..360ef84d29 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:05+0200\n" +"PO-Revision-Date: 2011-08-18 20:06+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1400,7 +1400,7 @@ msgstr "" #: js/messages.php:143 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "Reizhet eo bet long_query_time da %d eilenn." #: js/messages.php:144 msgid "" From b062112d3fede536e6c7ce3653176e0097340a2a Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:08:44 +0200 Subject: [PATCH 149/270] Translation update done using Pootle. --- po/br.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 360ef84d29..c16133f6fe 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:06+0200\n" +"PO-Revision-Date: 2011-08-18 20:08+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1407,6 +1407,8 @@ msgid "" "Following settings will be applied globally and reset to default on server " "restart:" msgstr "" +"Lakaet e vo e pleustr dre-vras ar reizhadurioù da-heul hag adlakaet e vint " +"d'an talvoud dre ziouer pa adloc'ho ar servijer :" #. l10n: %s is FILE or TABLE #: js/messages.php:146 From 7b0ee1f98e05aa0a4028e58157cba07572ce7e36 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:09:10 +0200 Subject: [PATCH 150/270] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index c16133f6fe..27b1bf5423 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:08+0200\n" +"PO-Revision-Date: 2011-08-18 20:09+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1414,7 +1414,7 @@ msgstr "" #: js/messages.php:146 #, php-format msgid "Set log_output to %s" -msgstr "" +msgstr "Reizhañ log_output da %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:148 From d967cd95b9c8b08a0acb3ec740f977abe4316374 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:09:20 +0200 Subject: [PATCH 151/270] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 27b1bf5423..dfd6118f74 100644 --- a/po/br.po +++ b/po/br.po @@ -1418,10 +1418,10 @@ msgstr "Reizhañ log_output da %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:148 -#, fuzzy, php-format +#, php-format #| msgid "Enable Ajax" msgid "Enable %s" -msgstr "Gweredekaat Ajax" +msgstr "Gweredekaat %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:150 From ab5fb53098d07a48fcb73fedf7ec40428e858d0d Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:09:38 +0200 Subject: [PATCH 152/270] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index dfd6118f74..bf704c3964 100644 --- a/po/br.po +++ b/po/br.po @@ -1425,10 +1425,10 @@ msgstr "Gweredekaat %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:150 -#, fuzzy, php-format +#, php-format #| msgid "Disabled" msgid "Disable %s" -msgstr "Diweredekaet" +msgstr "Diweredekaat %s" #. l10n: %d seconds #: js/messages.php:152 From 8c7a2a418dce68c1fb5869a74b099d31e7495877 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:09:54 +0200 Subject: [PATCH 153/270] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index bf704c3964..290d75064a 100644 --- a/po/br.po +++ b/po/br.po @@ -1434,7 +1434,7 @@ msgstr "Diweredekaat %s" #: js/messages.php:152 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "Reizhañ long_query_time da %ds" #: js/messages.php:153 msgid "" From fa3f55e086c864d6b5abc63103d79cddb4f124d9 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:10:53 +0200 Subject: [PATCH 154/270] Translation update done using Pootle. --- po/br.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 290d75064a..8e3b8cdb09 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:09+0200\n" +"PO-Revision-Date: 2011-08-18 20:10+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1441,6 +1441,8 @@ msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"N'hallit ket cheñch an arventennoù-mañ. Kevreit dindan root pe kit e " +"darempred gant merour ar servijer." #: js/messages.php:154 #, fuzzy From cfa5ec283fe4993fa8dbcb031a218f43d6cadff8 Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 22:05:22 +0300 Subject: [PATCH 155/270] - Easy editing of byte values using kb,mb,gb - Keyboard shortcuts: Enter to save, Escape to cancel --- js/server_variables.js | 13 ++++++++++++- server_variables.php | 19 +++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/js/server_variables.js b/js/server_variables.js index 0ca530440f..cb4f8c3a02 100644 --- a/js/server_variables.js +++ b/js/server_variables.js @@ -173,9 +173,20 @@ function editVariable(link) // hide original content $cell.html(''); // put edit field and save/cancel link - $cell.prepend(''); + $cell.prepend('
'); $cell.find('table td:first').append(mySaveLink); + $cell.find('table td:first').append(' '); $cell.find('table td:first').append(myCancelLink); + + // Keyboard shortcuts to the rescue + $('input#variableEditArea').focus(); + $('input#variableEditArea').keydown(function(event) { + // Enter key + if(event.keyCode == 13) mySaveLink.trigger('click'); + // Escape key + if(event.keyCode == 27) myCancelLink.trigger('click'); + }); }); return false; diff --git a/server_variables.php b/server_variables.php index ca39a5ed4f..4c2086ab89 100644 --- a/server_variables.php +++ b/server_variables.php @@ -43,11 +43,26 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { switch($_REQUEST['type']) { case 'getval': $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="' . PMA_sqlAddslashes($_REQUEST['varName']) . '";', 'NUM'); + if (isset($VARIABLE_DOC_LINKS[$_REQUEST['varName']][3]) + && $VARIABLE_DOC_LINKS[$_REQUEST['varName']][3] == 'byte') { + exit(implode(' ', PMA_formatByteDown($varValue[1],3,3))); + } exit($varValue[1]); break; + case 'setval': - $value = PMA_sqlAddslashes($_REQUEST['varValue']); - if (!is_numeric($value)) $value="'" . $value . "'"; + $value = $_REQUEST['varValue']; + + if (isset($VARIABLE_DOC_LINKS[$_REQUEST['varName']][3]) + && $VARIABLE_DOC_LINKS[$_REQUEST['varName']][3] == 'byte' + && preg_match('/^\s*(\d+(\.\d+)?)\s*(mb|kb|mib|kib|gb|gib)\s*$/i',$value,$matches)) { + $exp = array('kb' => 1, 'kib' => 1, 'mb' => 2, 'mib' => 2, 'gb' => 3, 'gib' => 3); + $value = floatval($matches[1]) * pow(1024, $exp[strtolower($matches[3])]); + } else { + $value = PMA_sqlAddslashes($value); + } + + if (! is_numeric($value)) $value="'" . $value . "'"; if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value)) { // Some values are rounded down etc. From 1b5a61a89d011c730dcfe63228d9869047388ab7 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:02 +0200 Subject: [PATCH 156/270] Translation update done using Pootle. --- po/en_GB.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index c85eaa077b..81920b9aa9 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-04 21:47+0200\n" -"Last-Translator: Marc Delisle \n" +"PO-Revision-Date: 2011-08-18 22:37+0200\n" +"Last-Translator: Robert Readman \n" "Language-Team: english-gb \n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -416,10 +416,10 @@ msgid "You have to choose at least one column to display" msgstr "You have to choose at least one column to display" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "visual builder" +msgstr "Switch to %svisual builder%s" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:955 From f65350aa55d40fcc6201e052dd0d591fdf354684 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:08 +0200 Subject: [PATCH 157/270] Translation update done using Pootle. --- po/en_GB.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 81920b9aa9..a30b979ec4 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -851,10 +851,10 @@ msgid "Dump has been saved to file %s." msgstr "Dump has been saved to file %s." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Values for the column \"%s\"" +msgstr "Value for the column \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" From 9b8641bbcfa8aae49ea6bcb409b99030c81ec39f Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:11 +0200 Subject: [PATCH 158/270] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index a30b979ec4..5ed131f6bd 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -862,7 +862,7 @@ msgstr "Use OpenStreetMaps as Base Layer" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 From 7a817143aedc2f6c9925330508da5ad718426ab3 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:15 +0200 Subject: [PATCH 159/270] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index 5ed131f6bd..c6ad41433d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -872,7 +872,7 @@ msgstr "Geometry" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 msgid "Point" -msgstr "" +msgstr "Point" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 From e14022efcc161d2bff26287e8bfa6e9eb25cad53 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:18 +0200 Subject: [PATCH 160/270] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index c6ad41433d..a97154e47c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -877,7 +877,7 @@ msgstr "Point" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 From d1b812f0bb5c8bc57bf059a559739bfabfe43bcf Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:21 +0200 Subject: [PATCH 161/270] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index a97154e47c..d4064cfa4a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -882,7 +882,7 @@ msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 From ad156d47043f5a515977374cad48ddf6129bc152 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:26 +0200 Subject: [PATCH 162/270] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index d4064cfa4a..7e5e8ae1a1 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -886,10 +886,9 @@ msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add routine" msgid "Add a point" -msgstr "Add routine" +msgstr "Add a point" #: gis_data_editor.php:218 js/messages.php:287 #, fuzzy From e17bc6cb6ca851747f14600252def380f060b3c9 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:34 +0200 Subject: [PATCH 163/270] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 7e5e8ae1a1..0361df0a09 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -891,10 +891,9 @@ msgid "Add a point" msgstr "Add a point" #: gis_data_editor.php:218 js/messages.php:287 -#, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Lines terminated by" +msgstr "Linestring" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" From 6c10ef3ddc150257ed3ff28fba9c7dd88da6b055 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:37 +0200 Subject: [PATCH 164/270] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index 0361df0a09..73167f8885 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -897,7 +897,7 @@ msgstr "Linestring" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" -msgstr "" +msgstr "Outer Ring:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" From a6ef77d298010c7a36a7333bc9fdc3b038ad3780 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:41 +0200 Subject: [PATCH 165/270] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index 73167f8885..c328b78084 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -901,7 +901,7 @@ msgstr "Outer Ring:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" -msgstr "" +msgstr "Inner Ring" #: gis_data_editor.php:248 #, fuzzy From b83f5ce6a45778479c8387e3ffca73bd5b561716 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:44 +0200 Subject: [PATCH 166/270] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index c328b78084..2f7a11b03d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -904,10 +904,9 @@ msgid "Inner Ring" msgstr "Inner Ring" #: gis_data_editor.php:248 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Add a new User" +msgstr "Add a linestring" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 #, fuzzy From b0db44d4516bdbb5137fe24fed3ba8cfc5ca1bfc Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:48 +0200 Subject: [PATCH 167/270] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 2f7a11b03d..fd4cdbb4c0 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -909,10 +909,9 @@ msgid "Add a linestring" msgstr "Add a linestring" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" -msgstr "Add a new User" +msgstr "Add an inner ring" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" From 4281a1a4afa03e93ece3ed9a8efd951edb35252f Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:52 +0200 Subject: [PATCH 168/270] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index fd4cdbb4c0..c7026f5e2f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -915,7 +915,7 @@ msgstr "Add an inner ring" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Polygon" #: gis_data_editor.php:300 js/messages.php:294 #, fuzzy From 1b9d104a90cf601ad7b0f3d73877b01b2c84457a Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:55 +0200 Subject: [PATCH 169/270] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index c7026f5e2f..92dca6d7a4 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -918,10 +918,9 @@ msgid "Polygon" msgstr "Polygon" #: gis_data_editor.php:300 js/messages.php:294 -#, fuzzy #| msgid "Add column" msgid "Add a polygon" -msgstr "Add column" +msgstr "Add a polygon" #: gis_data_editor.php:304 #, fuzzy From e779b6d8d770d336340f69755941e2323d76453c Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:38:05 +0200 Subject: [PATCH 170/270] Translation update done using Pootle. --- po/en_GB.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 92dca6d7a4..a4f0ebef53 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 22:37+0200\n" +"PO-Revision-Date: 2011-08-18 22:38+0200\n" "Last-Translator: Robert Readman \n" "Language-Team: english-gb \n" "Language: en_GB\n" @@ -923,10 +923,9 @@ msgid "Add a polygon" msgstr "Add a polygon" #: gis_data_editor.php:304 -#, fuzzy #| msgid "Geometry" msgid "Add geometry" -msgstr "Geometry" +msgstr "Add geometry" #: gis_data_editor.php:312 msgid "" From f8b1c96eb5a773e774e74e8e66d2137798f8550e Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:40:06 +0200 Subject: [PATCH 171/270] Translation update done using Pootle. --- po/en_GB.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index a4f0ebef53..5b6d84416d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 22:38+0200\n" +"PO-Revision-Date: 2011-08-18 22:40+0200\n" "Last-Translator: Robert Readman \n" "Language-Team: english-gb \n" "Language: en_GB\n" @@ -932,6 +932,8 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" +"Chose \"GeomFromText\" from the \"Function\" column and paste the below string " +"into the \"Value\" field" #: import.php:57 #, php-format From 59ad6b06c8dabf62a22d89b3c26fcdb2674176cf Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:40:16 +0200 Subject: [PATCH 172/270] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 5b6d84416d..0d385b7d6b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1207,10 +1207,9 @@ msgid "Query statistics" msgstr "Query statistics" #: js/messages.php:93 -#, fuzzy #| msgid "Failed to read configuration file" msgid "Local monitor configuration incompatible" -msgstr "Failed to read configuration file" +msgstr "Local monitor configuration incompatible" #: js/messages.php:94 msgid "" From 1e84e4c4c14fe2bb0a2f265994cf51daed9da538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:00 +0200 Subject: [PATCH 173/270] Translation update done using Pootle. --- po/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 394a791071..53ab45104b 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-16 21:46+0200\n" +"PO-Revision-Date: 2011-08-19 00:55+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -856,10 +856,10 @@ msgid "Dump has been saved to file %s." msgstr "El volcado ha sido guardado al archivo %s." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Valores para la columna \"%s\"" +msgstr "Valor para la columna \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" From 1539119bc85ca7312fecc46cc97b3f33354d0a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:15 +0200 Subject: [PATCH 174/270] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 53ab45104b..67c72d6a03 100644 --- a/po/es.po +++ b/po/es.po @@ -867,7 +867,7 @@ msgstr "Utilizar OpenStreetMaps como capa base" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 From 8e586dac89f4a81f717145f9b3962ac533498dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:21 +0200 Subject: [PATCH 175/270] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 67c72d6a03..786fd59c1f 100644 --- a/po/es.po +++ b/po/es.po @@ -877,7 +877,7 @@ msgstr "Geometría" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 msgid "Point" -msgstr "" +msgstr "Punto" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 From fda3f52d1ec0dbb84300d09f69fccc602837a6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:25 +0200 Subject: [PATCH 176/270] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 786fd59c1f..44c19bf643 100644 --- a/po/es.po +++ b/po/es.po @@ -882,7 +882,7 @@ msgstr "Punto" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 From 1e23bb4366df7b9748586bc3e59db9e176a38403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:27 +0200 Subject: [PATCH 177/270] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 44c19bf643..12db5dbace 100644 --- a/po/es.po +++ b/po/es.po @@ -887,7 +887,7 @@ msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 From 6d41dc4b4a7f68b11eeb79788521b58bc15a34ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:33 +0200 Subject: [PATCH 178/270] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 12db5dbace..05f855b020 100644 --- a/po/es.po +++ b/po/es.po @@ -891,10 +891,9 @@ msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add routine" msgid "Add a point" -msgstr "Agregar rutina" +msgstr "Agregar un punto" #: gis_data_editor.php:218 js/messages.php:287 #, fuzzy From a5bd138d5d7947fe053ebcbb18668babb82fb757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:56:02 +0200 Subject: [PATCH 179/270] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 05f855b020..798f7d99e0 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 00:55+0200\n" +"PO-Revision-Date: 2011-08-19 00:56+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -896,10 +896,9 @@ msgid "Add a point" msgstr "Agregar un punto" #: gis_data_editor.php:218 js/messages.php:287 -#, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Líneas terminadas en" +msgstr "Cadena de línea" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" From bb383ccb1fb1036e763318d687d0e770e90d10dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:56:17 +0200 Subject: [PATCH 180/270] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 798f7d99e0..959e9b0eee 100644 --- a/po/es.po +++ b/po/es.po @@ -902,7 +902,7 @@ msgstr "Cadena de línea" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" -msgstr "" +msgstr "Círculo exterior" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" From c5919522761463e4abde1fd81928e199e3871696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:56:25 +0200 Subject: [PATCH 181/270] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 959e9b0eee..d5cfd94bd2 100644 --- a/po/es.po +++ b/po/es.po @@ -906,7 +906,7 @@ msgstr "Círculo exterior" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" -msgstr "" +msgstr "Círculo interior" #: gis_data_editor.php:248 #, fuzzy From fb400c4034c83e1a278816c2b169299df8d91ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:56:29 +0200 Subject: [PATCH 182/270] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index d5cfd94bd2..5279ca91b7 100644 --- a/po/es.po +++ b/po/es.po @@ -902,7 +902,7 @@ msgstr "Cadena de línea" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" -msgstr "Círculo exterior" +msgstr "Círculo exterior:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" From 2347a5458f50729c58b7a7e75030b1856be8eadf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:03 +0200 Subject: [PATCH 183/270] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 5279ca91b7..bb38f9de18 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 00:56+0200\n" +"PO-Revision-Date: 2011-08-19 00:57+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -898,7 +898,7 @@ msgstr "Agregar un punto" #: gis_data_editor.php:218 js/messages.php:287 #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Cadena de línea" +msgstr "Cadena de líneas" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" From d456c4fb361b1e82cd3641ee201588327cc14c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:08 +0200 Subject: [PATCH 184/270] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index bb38f9de18..60a5310b95 100644 --- a/po/es.po +++ b/po/es.po @@ -909,10 +909,9 @@ msgid "Inner Ring" msgstr "Círculo interior" #: gis_data_editor.php:248 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Agregar un nuevo usuario" +msgstr "Agregar una cadena de líneas" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 #, fuzzy From 9a1972565594d19d01b881dd852c24be9b915fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:16 +0200 Subject: [PATCH 185/270] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 60a5310b95..fafde8610d 100644 --- a/po/es.po +++ b/po/es.po @@ -914,10 +914,9 @@ msgid "Add a linestring" msgstr "Agregar una cadena de líneas" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" -msgstr "Agregar un nuevo usuario" +msgstr "Agregar un círculo interior" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" From be8cd5978a733476db63e48f6aacdd7ce5c80533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:20 +0200 Subject: [PATCH 186/270] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index fafde8610d..7bdba839bb 100644 --- a/po/es.po +++ b/po/es.po @@ -920,7 +920,7 @@ msgstr "Agregar un círculo interior" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Polígono" #: gis_data_editor.php:300 js/messages.php:294 #, fuzzy From 529fd302e8779c1e60b870d593abd8bf6fe3ce93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:26 +0200 Subject: [PATCH 187/270] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 7bdba839bb..105eb05a1b 100644 --- a/po/es.po +++ b/po/es.po @@ -923,10 +923,9 @@ msgid "Polygon" msgstr "Polígono" #: gis_data_editor.php:300 js/messages.php:294 -#, fuzzy #| msgid "Add column" msgid "Add a polygon" -msgstr "Añadir columna" +msgstr "Agregar un polígono" #: gis_data_editor.php:304 #, fuzzy From 60f054c3ee395f767958ef6e7c24eaeb192ac2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:35 +0200 Subject: [PATCH 188/270] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 105eb05a1b..4864ce4b3a 100644 --- a/po/es.po +++ b/po/es.po @@ -928,10 +928,9 @@ msgid "Add a polygon" msgstr "Agregar un polígono" #: gis_data_editor.php:304 -#, fuzzy #| msgid "Geometry" msgid "Add geometry" -msgstr "Geometría" +msgstr "Agregar geometría" #: gis_data_editor.php:312 msgid "" From 88140560e198d1b7210241405caa4c57a1ebbd70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:58:31 +0200 Subject: [PATCH 189/270] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 4864ce4b3a..85be370967 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 00:57+0200\n" +"PO-Revision-Date: 2011-08-19 00:58+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -937,6 +937,8 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" +"Selecciones «GeomFromText» de la columna \"Función\" y pague la cadena ubicada " +"debajo en el campo \"Valor\"" #: import.php:57 #, php-format From 6d8b54790f56e29decacab59a5bd80f2b1e9fd31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:58:48 +0200 Subject: [PATCH 190/270] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 85be370967..7057f57ec9 100644 --- a/po/es.po +++ b/po/es.po @@ -1219,10 +1219,9 @@ msgid "Query statistics" msgstr "Estadísticas de Consulta" #: js/messages.php:93 -#, fuzzy #| msgid "Local monitor configuration icompatible" msgid "Local monitor configuration incompatible" -msgstr "Configuración de monitorización local incompatible" +msgstr "Configuración local de monitorización incompatible" #: js/messages.php:94 msgid "" From 4acf467b69e0bdbc09d68e0c54a5fd04b5132d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:58:54 +0200 Subject: [PATCH 191/270] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 7057f57ec9..8a377c1127 100644 --- a/po/es.po +++ b/po/es.po @@ -1820,7 +1820,7 @@ msgstr "Copiar" #: js/messages.php:291 msgid "Outer Ring" -msgstr "" +msgstr "Círculo exterior" #: js/messages.php:297 msgid "Add columns" From 1387307cfed4d227b3ac8b34c838b57239b3d972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:06:28 +0200 Subject: [PATCH 192/270] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 8a377c1127..d274f550d8 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 00:58+0200\n" +"PO-Revision-Date: 2011-08-19 01:06+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -2186,6 +2186,8 @@ msgstr "Segundo" #, php-format msgid "Failed formatting string for rule '%s'. PHP threw following error: %s" msgstr "" +"No se pudo dar formato a una cadena para la regla '%s'. PHP devolvió el " +"siguiente error: %s" #: libraries/Config.class.php:1159 msgid "Font size" From 4941ab5b59cc4edfb030ef36fa9b46f31858969b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:07:17 +0200 Subject: [PATCH 193/270] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index d274f550d8..b3074e2c47 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:06+0200\n" +"PO-Revision-Date: 2011-08-19 01:07+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -6804,7 +6804,7 @@ msgstr "Importar monedas (por ejemplo: $5.00 como 5.00)" #: libraries/import/shp.php:14 msgid "ESRI Shape File" -msgstr "" +msgstr "Archivo de forma ESRI" #: libraries/import/shp.php:254 #, php-format From fb8b1f01fe135a1295cba450ca53eac13b937748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:08:10 +0200 Subject: [PATCH 194/270] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index b3074e2c47..7fc2be06dc 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:07+0200\n" +"PO-Revision-Date: 2011-08-19 01:08+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -6809,7 +6809,7 @@ msgstr "Archivo de forma ESRI" #: libraries/import/shp.php:254 #, php-format msgid "There was an error importing the ESRI shape file: \"%s\"." -msgstr "" +msgstr "Hubo un error importando el archivo de forma ESRI: \"%s\"." #: libraries/import/shp.php:310 msgid "" From 5bba25d1be446d6c74206425c86745a2dd01a704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:09:34 +0200 Subject: [PATCH 195/270] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 7fc2be06dc..190854ecfa 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:08+0200\n" +"PO-Revision-Date: 2011-08-19 01:09+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -6816,6 +6816,8 @@ msgid "" "You tried to import an invalid file or the imported file contains invalid " "data" msgstr "" +"Intentó importar un archivo no válido o el archivo importado contiene datos " +"inválidos" #: libraries/import/shp.php:312 #, php-format From b5c62a8818314302e642e7b83f21ac96b0796218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:11:34 +0200 Subject: [PATCH 196/270] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 190854ecfa..ab1e235a26 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:09+0200\n" +"PO-Revision-Date: 2011-08-19 01:11+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -6822,7 +6822,7 @@ msgstr "" #: libraries/import/shp.php:312 #, php-format msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." -msgstr "" +msgstr "La extensión espacial MySQL no soporta el tipo ESRI \"%s\"." #: libraries/import/shp.php:350 #, fuzzy From 1487e8dff13f68a5a4753bc27a2dff17f38ebad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:12:05 +0200 Subject: [PATCH 197/270] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index ab1e235a26..27372fd8f1 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:11+0200\n" +"PO-Revision-Date: 2011-08-19 01:12+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -6825,10 +6825,9 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." msgstr "La extensión espacial MySQL no soporta el tipo ESRI \"%s\"." #: libraries/import/shp.php:350 -#, fuzzy #| msgid "This page does not contain any tables!" msgid "The imported file does not contain any data" -msgstr "Esta página no contiene ninguna tabla" +msgstr "El archivo importado no contiene datos" #: libraries/import/sql.php:33 msgid "SQL compatibility mode:" From ab5155fed30bbd4f585910c6cad7249fbe9cb50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:12:14 +0200 Subject: [PATCH 198/270] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 27372fd8f1..9bb30102ee 100644 --- a/po/es.po +++ b/po/es.po @@ -8161,10 +8161,9 @@ msgid "Table Search" msgstr "Búsqueda de tablas" #: libraries/tbl_select.lib.php:229 tbl_change.php:994 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Insertar" +msgstr "Editar/Insertar" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" From 1073f6dd0ad4d32d6850df337d7db0a5d94b2d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:12:55 +0200 Subject: [PATCH 199/270] Translation update done using Pootle. --- po/es.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 9bb30102ee..7f9017e742 100644 --- a/po/es.po +++ b/po/es.po @@ -12271,12 +12271,13 @@ msgid "Query cache low memory prunes" msgstr "Reducciones al caché de consultas por falta de memoria" #: po/advisory_rules.php:91 -#, fuzzy #| msgid "The amount of free memory for query cache." msgid "" "Cached queries are removed due to low query cache memory from the query " "cache." -msgstr "La cantidad de memoria libre para el cache de consultas." +msgstr "" +"Las consultas en caché son eliminadas debido a la poca cantidad de memoria " +"de caché para el caché de consultas." #: po/advisory_rules.php:92 msgid "" From f69a04bb90aa12d9921ff1bddf637df4193bdfd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:14:18 +0200 Subject: [PATCH 200/270] Translation update done using Pootle. --- po/es.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 7f9017e742..5d9f780f9a 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:12+0200\n" +"PO-Revision-Date: 2011-08-19 01:14+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12285,6 +12285,10 @@ msgid "" "overhead of maintaining the cache is likely to increase with its size, so do " "this in small increments and monitor the results." msgstr "" +"Podría llegar a querer aumentar «query_cache_size». Recuerde sin embargo que " +"la sobrecarga de mantener el caché es probable que aumente con su tamaño, " +"por lo que se recomienda hacerlo en pequeñas cantidades y monitorizar los " +"resultados." #: po/advisory_rules.php:93 msgid "" From 4125abd459db8a8e8b460e554c554105085ec6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:16:17 +0200 Subject: [PATCH 201/270] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 5d9f780f9a..709d102386 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:14+0200\n" +"PO-Revision-Date: 2011-08-19 01:16+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12295,6 +12295,8 @@ msgid "" "The ratio of removed queries to inserted queries is %s%%. The lower this " "value is, the better (This rules firing limit: 0.1%)" msgstr "" +"La tasa de consultas eliminadas respecto de las agregadas es %s%%. Mejor es " +"mientras menor sea este valor (el límite de disparo de la regla es: 0.1%)" #: po/advisory_rules.php:95 #, fuzzy From 7e210372b2a89fbf3622799df62fe26c586778c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:16:29 +0200 Subject: [PATCH 202/270] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 709d102386..e3490035c4 100644 --- a/po/es.po +++ b/po/es.po @@ -12299,10 +12299,9 @@ msgstr "" "mientras menor sea este valor (el límite de disparo de la regla es: 0.1%)" #: po/advisory_rules.php:95 -#, fuzzy #| msgid "Query cache" msgid "Query cache max size" -msgstr "Cache de consultas" +msgstr "Tamaño máximo del caché de consultas." #: po/advisory_rules.php:96 msgid "" From ace483fe9de1c23c6179fa52b0933045a73477e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:16:36 +0200 Subject: [PATCH 203/270] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index e3490035c4..bc301d83fc 100644 --- a/po/es.po +++ b/po/es.po @@ -12301,7 +12301,7 @@ msgstr "" #: po/advisory_rules.php:95 #| msgid "Query cache" msgid "Query cache max size" -msgstr "Tamaño máximo del caché de consultas." +msgstr "Tamaño máximo del caché de consultas" #: po/advisory_rules.php:96 msgid "" From dfd707f445ed01404fad6b4a7511d755b3fb4692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:17:27 +0200 Subject: [PATCH 204/270] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index bc301d83fc..83b68b0c99 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:16+0200\n" +"PO-Revision-Date: 2011-08-19 01:17+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12308,6 +12308,8 @@ msgid "" "The query cache size is above 128 MiB. Big query caches may cause " "significant overhead that is required to maintain the cache." msgstr "" +"El tamaño del caché de consultas es mayor a 128 MiB. Grandes cachés pueden " +"causar grandes sobrecargas para manterlo." #: po/advisory_rules.php:97 msgid "" From 6d279568bca8e72dbbd007a385f379b7d34bc372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:18:50 +0200 Subject: [PATCH 205/270] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 83b68b0c99..6024513125 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:17+0200\n" +"PO-Revision-Date: 2011-08-19 01:18+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12316,6 +12316,8 @@ msgid "" "Depending on your environment, it might be performance increasing to reduce " "this value." msgstr "" +"Dependiendo de su entorno, podría aumentar la performance reducir este " +"valor." #: po/advisory_rules.php:98 #, php-format From 05917283064b13e7b27728e8212578cd61a2baab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:19:07 +0200 Subject: [PATCH 206/270] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 6024513125..0c63d1c64d 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:18+0200\n" +"PO-Revision-Date: 2011-08-19 01:19+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12322,7 +12322,7 @@ msgstr "" #: po/advisory_rules.php:98 #, php-format msgid "Current query cache size: %s" -msgstr "" +msgstr "Tamaño del caché de consultas: %s" #: po/advisory_rules.php:100 #, fuzzy From 850c187504f285b95757b10ba2ffcfb30dba4d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:19:48 +0200 Subject: [PATCH 207/270] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 0c63d1c64d..8fc356cd43 100644 --- a/po/es.po +++ b/po/es.po @@ -12325,10 +12325,9 @@ msgid "Current query cache size: %s" msgstr "Tamaño del caché de consultas: %s" #: po/advisory_rules.php:100 -#, fuzzy #| msgid "Query results" msgid "Query cache min result size" -msgstr "Resultados de la Consulta" +msgstr "Tamaño mínimo de resultado en caché de consultas" #: po/advisory_rules.php:101 msgid "" From fd60f78d3bfc0822c7a0c13330e9375ab2abfbb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:20:47 +0200 Subject: [PATCH 208/270] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 8fc356cd43..f14f230476 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:19+0200\n" +"PO-Revision-Date: 2011-08-19 01:20+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12333,6 +12333,8 @@ msgstr "Tamaño mínimo de resultado en caché de consultas" msgid "" "The max size of the result set in the query cache is the default of 1 MiB." msgstr "" +"El tamaño máximo del conjunto de resultados en el caché de consultas es el " +"valor predeterminado de 1 MiB." #: po/advisory_rules.php:102 msgid "" From 46262835b6eb88290fbe32eec53c71b2568360a4 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 10:03:35 +0530 Subject: [PATCH 209/270] Only non-empty search values should go into where clause --- libraries/tbl_select.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index af97aa434e..bec997f871 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -342,7 +342,7 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $fields = ''; $w = $backquoted_name . ' ' . $func_type; - } elseif (in_array($types, PMA_getGISDatatypes())) { + } elseif (in_array($types, PMA_getGISDatatypes()) && ! empty($fields)) { // create gis data from the string $gis_data = PMA_createGISData($fields); $w = $backquoted_name . ' ' . $func_type . ' ' . $gis_data; From 2d4a4427ef861373065b8630d5d6b6377c425eb3 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 10:42:57 +0530 Subject: [PATCH 210/270] Fix doc blocks --- libraries/tbl_select.lib.php | 137 +++++++++++++---------------------- 1 file changed, 51 insertions(+), 86 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index bec997f871..d97c12cb1e 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -11,15 +11,14 @@ require_once 'url_generating.lib.php'; - /** - * PMA_tbl_setTitle() sets the title for foreign keys display link +/** + * Sets the title for foreign keys display link. * - * @param $propertiesIconic Type of icon property - * @param $themeImage Icon Image - * @return string $str Value of the Title + * @param mixed $propertiesIconic Type of icon property + * @param string $pmaThemeImage Icon Image * + * @return string $str Value of the Title */ - function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage){ if ($propertiesIconic == true) { $str = '' . __('Browse foreign values') . ''; + .'b_browse.png" alt="' . __('Browse foreign values') . '" title="' + . __('Browse foreign values') . '" />'; - if ($propertiesIconic === 'both') { - $str .= __('Browse foreign values'); + if ($propertiesIconic === 'both') { + $str .= __('Browse foreign values'); return $str; - } - } else { - return __('Browse foreign values'); - } + } + } else { + return __('Browse foreign values'); + } } /** @@ -113,7 +113,7 @@ return ' - + '; @@ -184,19 +184,19 @@ function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fie } elseif ($foreignData['foreign_link'] == true) { if(isset($fields[$i]) && is_string($fields[$i])){ - $str .= '' ; + $str .= '' ; } else{ - $str .= '' ; + $str .= '' ; } ?> - '; + '; // ' . str_replace("'", "\'", $titles['Browse']) . ''; From 4f438c33170e44f16282156540a1a6ab0b097035 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 11:07:11 +0530 Subject: [PATCH 212/270] Coding style corrections --- libraries/tbl_select.lib.php | 40 ++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index d14db6cc21..4aaddc0bc7 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -19,14 +19,15 @@ require_once 'url_generating.lib.php'; * * @return string $str Value of the Title */ -function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage){ +function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage) +{ if ($propertiesIconic == true) { $str = '' . __('Browse foreign values') . ''; - if ($propertiesIconic === 'both') { - $str .= __('Browse foreign values'); + if ($propertiesIconic === 'both') { + $str .= __('Browse foreign values'); return $str; } } else { @@ -44,28 +45,33 @@ function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage){ * @return array Array containing the field list, field types, collations * and null constraint */ -function PMA_tbl_getFields($table,$db) { - +function PMA_tbl_getFields($table,$db) +{ // Gets the list and number of fields - - $result = PMA_DBI_query('SHOW FULL FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query( + 'SHOW FULL FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ';', + null, PMA_DBI_QUERY_STORE + ); $fields_cnt = PMA_DBI_num_rows($result); $fields_list = $fields_null = $fields_type = $fields_collation = array(); $geom_column_present = false; $geom_types = PMA_getGISDatatypes(); + while ($row = PMA_DBI_fetch_assoc($result)) { $fields_list[] = $row['Field']; $type = $row['Type']; + // check whether table contains geometric columns if (in_array($type, $geom_types)) { $geom_column_present = true; } + // reformat mysql query output if (strncasecmp($type, 'set', 3) == 0 - || strncasecmp($type, 'enum', 4) == 0) { + || strncasecmp($type, 'enum', 4) == 0 + ) { $type = str_replace(',', ', ', $type); } else { - // strip the "BINARY" attribute, except if we find "BINARY(" because // this would be a BINARY or VARBINARY field type if (!preg_match('@BINARY[\(]@i', $type)) { @@ -81,7 +87,7 @@ function PMA_tbl_getFields($table,$db) { } $fields_null[] = $row['Null']; $fields_type[] = $type; - $fields_collation[] = !empty($row['Collation']) && $row['Collation'] != 'NULL' + $fields_collation[] = ! empty($row['Collation']) && $row['Collation'] != 'NULL' ? $row['Collation'] : ''; } // end while @@ -99,21 +105,21 @@ function PMA_tbl_getFields($table,$db) { * * @return HTML content, the tags and content for table header */ -function PMA_tbl_setTableHeader($geom_column_present = false){ - +function PMA_tbl_setTableHeader($geom_column_present = false) +{ // Display the Function column only if there is alteast one geomety colum $func = ''; if ($geom_column_present) { $func = ''; } -return ' + return '' . $func . ' - + '; @@ -126,10 +132,9 @@ return ' * @return array Array containing configuration (icon, text, link, id, args) * of sub-tabs for Table Search and Zoom search */ -function PMA_tbl_getSubTabs(){ - +function PMA_tbl_getSubTabs() +{ $subtabs = array(); - $subtabs['search']['icon'] = 'b_search.png'; $subtabs['search']['text'] = __('Table Search'); $subtabs['search']['link'] = 'tbl_select.php'; @@ -142,7 +147,6 @@ function PMA_tbl_getSubTabs(){ $subtabs['zoom']['id'] = 'zoom_search_id'; return $subtabs; - } /** From 77b2b7627d714f2621c5d320b5cfe5450229b7a5 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 11:21:21 +0530 Subject: [PATCH 213/270] Adhere to PEAR coding standards --- libraries/tbl_select.lib.php | 69 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 4aaddc0bc7..b2eb0b0e57 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -88,13 +88,13 @@ function PMA_tbl_getFields($table,$db) $fields_null[] = $row['Null']; $fields_type[] = $type; $fields_collation[] = ! empty($row['Collation']) && $row['Collation'] != 'NULL' - ? $row['Collation'] - : ''; + ? $row['Collation'] + : ''; } // end while PMA_DBI_free_result($result); unset($result, $type); - return array($fields_list,$fields_type,$fields_collation,$fields_null, $geom_column_present); + return array($fields_list, $fields_type, $fields_collation, $fields_null, $geom_column_present); } @@ -121,8 +121,6 @@ function PMA_tbl_setTableHeader($geom_column_present = false) '; - - } /** @@ -286,7 +284,6 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu ); $w = ''; - // If geometry function is set apply it to the field name if ($geom_func != null && trim($geom_func) != '') { // Get details about the geometry fucntions @@ -295,8 +292,8 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu // If the function takes a single parameter if ($geom_funcs[$geom_func]['params'] == 1) { $backquoted_name = $geom_func . '(' . PMA_backquote($names) . ')'; - // If the function takes two parameters } else { + // If the function takes two parameters // create gis data from the string $gis_data = PMA_createGISData($fields); @@ -307,7 +304,7 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu // New output type is the output type of the function being applied $types = $geom_funcs[$geom_func]['type']; - // If the intended where clause is something like 'IsEmpty(`spatial_col_name`)' + // If the where clause is something like 'IsEmpty(`spatial_col_name`)' if (isset($geom_unary_functions[$geom_func]) && trim($fields) == '') { $w = $backquoted_name; return $w; @@ -316,9 +313,9 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $backquoted_name = PMA_backquote($names); } - if($unaryFlag){ + if ($unaryFlag) { $fields = ''; - $w = $backquoted_name . ' ' . $func_type; + $w = $backquoted_name . ' ' . $func_type; } elseif (in_array($types, PMA_getGISDatatypes()) && ! empty($fields)) { // create gis data from the string @@ -341,23 +338,25 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $parens_open = '('; $parens_close = ')'; - } else { - $parens_open = ''; - $parens_close = ''; - } - $enum_where = '\'' . PMA_sqlAddslashes($fields[0]) . '\''; - for ($e = 1; $e < $enum_selected_count; $e++) { - $enum_where .= ', \'' . PMA_sqlAddslashes($fields[$e]) . '\''; - } + } else { + $parens_open = ''; + $parens_close = ''; + } + $enum_where = '\'' . PMA_sqlAddslashes($fields[0]) . '\''; + for ($e = 1; $e < $enum_selected_count; $e++) { + $enum_where .= ', \'' . PMA_sqlAddslashes($fields[$e]) . '\''; + } - $w = $backquoted_name . ' ' . $func_type . ' ' . $parens_open . $enum_where . $parens_close; + $w = $backquoted_name . ' ' . $func_type . ' ' . $parens_open . $enum_where . $parens_close; } } elseif ($fields != '') { // For these types we quote the value. Even if it's another type (like INT), // for a LIKE we always quote the value. MySQL converts strings to numbers // and numbers to strings as necessary during the comparison - if (preg_match('@char|binary|blob|text|set|date|time|year@i', $types) || strpos(' ' . $func_type, 'LIKE')) { + if (preg_match('@char|binary|blob|text|set|date|time|year@i', $types) + || strpos(' ' . $func_type, 'LIKE') + ) { $quot = '\''; } else { $quot = ''; @@ -373,23 +372,28 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $fields = '^' . $fields . '$'; } - if ($func_type == 'IN (...)' || $func_type == 'NOT IN (...)' || $func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') { + if ($func_type == 'IN (...)' + || $func_type == 'NOT IN (...)' + || $func_type == 'BETWEEN' + || $func_type == 'NOT BETWEEN' + ) { $func_type = str_replace(' (...)', '', $func_type); - // quote values one by one - $values = explode(',', $fields); - foreach ($values as &$value) - $value = $quot . PMA_sqlAddslashes(trim($value)) . $quot; + // quote values one by one + $values = explode(',', $fields); + foreach ($values as &$value) { + $value = $quot . PMA_sqlAddslashes(trim($value)) . $quot; + } - if ($func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') - $w = $backquoted_name . ' ' . $func_type . ' ' . (isset($values[0]) ? $values[0] : '') . ' AND ' . (isset($values[1]) ? $values[1] : ''); - else + if ($func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') { + $w = $backquoted_name . ' ' . $func_type . ' ' . (isset($values[0]) ? $values[0] : '') + . ' AND ' . (isset($values[1]) ? $values[1] : ''); + } else { $w = $backquoted_name . ' ' . $func_type . ' (' . implode(',', $values) . ')'; - } - else { + } + } else { $w = $backquoted_name . ' ' . $func_type . ' ' . $quot . PMA_sqlAddslashes($fields) . $quot;; } - } // end if return $w; @@ -405,7 +409,7 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu */ function PMA_SVG_scatter_plot($data, &$settings) { - require_once './libraries/svg_plot/pma_scatter_plot.php'; + include_once './libraries/svg_plot/pma_scatter_plot.php'; if (empty($data)) { // empty data @@ -422,6 +426,5 @@ function PMA_SVG_scatter_plot($data, &$settings) } return $scatter_plot->asSVG(); } - } ?> From ecb999e010986143bb1c715c932f3c94d676f72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:02:11 +0200 Subject: [PATCH 214/270] Remove some unused variables --- libraries/replication.inc.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 58ed7c5acc..857f4dc8da 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -298,21 +298,14 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) { $src_db = $trg_db = $db; - $src_connection = PMA_DBI_select_db($src_db, $src_link); - $trg_connection = PMA_DBI_select_db($trg_db, $trg_link); - $src_tables = PMA_DBI_get_tables($src_db, $src_link); - $source_tables_num = sizeof($src_tables); $trg_tables = PMA_DBI_get_tables($trg_db, $trg_link); - $target_tables_num = sizeof($trg_tables); /** * initializing arrays to save table names */ - $unmatched_num_src = 0; $source_tables_uncommon = array(); - $unmatched_num_trg = 0; $target_tables_uncommon = array(); $matching_tables = array(); $matching_tables_num = 0; @@ -367,6 +360,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) $source_indexes = array(); $target_indexes = array(); $add_indexes_array = array(); + $alter_indexes_array = array(); $remove_indexes_array = array(); $criteria = array('Field', 'Type', 'Null', 'Collation', 'Key', 'Default', 'Comment'); @@ -378,17 +372,11 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) $add_indexes_array, $alter_indexes_array,$remove_indexes_array, $counter); } - $matching_table_data_diff = array(); - $matching_table_structure_diff = array(); - $uncommon_table_structure_diff = array(); - $uncommon_table_data_diff = array(); - $uncommon_tables = $source_tables_uncommon; - /** * Generating Create Table query for all the non-matching tables present in Source but not in Target and populating tables. */ for ($q = 0; $q < sizeof($source_tables_uncommon); $q++) { - if (isset($uncommon_tables[$q])) { + if (isset($source_tables_uncommon[$q])) { PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, false); } if (isset($row_count[$q]) && $data) { From ab166dd8490cba11d172e8573f8b407fe4d776d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:06:46 +0200 Subject: [PATCH 215/270] Remove some unused vars --- libraries/schema/User_Schema.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 95d60e127b..53d29fec07 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -38,7 +38,7 @@ class PMA_User_Schema public function processUserChoice() { - global $action_choose,$db,$cfgRelation,$cfg; + global $action_choose, $db, $cfgRelation; if (isset($this->action)) { switch ($this->action) { @@ -207,7 +207,7 @@ class PMA_User_Schema */ public function showTableDashBoard() { - global $db,$cfgRelation,$table,$cfg,$with_field_names; + global $db, $cfgRelation, $table, $with_field_names; /* * We will need an array of all tables in this db */ @@ -479,7 +479,7 @@ class PMA_User_Schema */ private function _displayScratchboardTables($array_sh_page) { - global $with_field_names,$cfg,$db; + global $with_field_names, $db; ?>
@@ -505,12 +505,12 @@ class PMA_User_Schema $reset_draginit .= ' document.edcoord.elements["c_table_' . $i . '[x]"].value = "2"' . "\n"; $reset_draginit .= ' document.edcoord.elements["c_table_' . $i . '[y]"].value = "' . (15 * $i) . '"' . "\n"; + /* TODO: use PMA_DBI_get_columns */ $local_query = 'SHOW FIELDS FROM ' . PMA_backquote($temp_sh_page['table_name']) . ' FROM ' . PMA_backquote($db); $fields_rs = PMA_DBI_query($local_query); unset($local_query); - $fields_cnt = PMA_DBI_num_rows($fields_rs); echo '
' . $temp_sh_page['table_name'] . ''; if (isset($with_field_names)) { From 88ef580bd5c575b8cdaa8dea2a3968cfd2504efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:09:12 +0200 Subject: [PATCH 216/270] Use PMA_DBI_get_columns instead of custom query --- libraries/schema/User_Schema.class.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 53d29fec07..4ed00f2e18 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -505,22 +505,14 @@ class PMA_User_Schema $reset_draginit .= ' document.edcoord.elements["c_table_' . $i . '[x]"].value = "2"' . "\n"; $reset_draginit .= ' document.edcoord.elements["c_table_' . $i . '[y]"].value = "' . (15 * $i) . '"' . "\n"; - /* TODO: use PMA_DBI_get_columns */ - $local_query = 'SHOW FIELDS FROM ' - . PMA_backquote($temp_sh_page['table_name']) - . ' FROM ' . PMA_backquote($db); - $fields_rs = PMA_DBI_query($local_query); - unset($local_query); - echo '
' . $temp_sh_page['table_name'] . ''; if (isset($with_field_names)) { - while ($row = PMA_DBI_fetch_assoc($fields_rs)) { + $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']) + foreach ($fields as $row) { echo '
' . htmlspecialchars($row['Field']) . "\n"; } } echo '
' . "\n"; - PMA_DBI_free_result($fields_rs); - unset($fields_rs); $i++; } ?> From dd046f10b338bbdd491526a12f3e6dd0a7c45dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:11:01 +0200 Subject: [PATCH 217/270] Fix typo --- libraries/schema/User_Schema.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 4ed00f2e18..36029587f5 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -507,7 +507,7 @@ class PMA_User_Schema echo '
' . $temp_sh_page['table_name'] . ''; if (isset($with_field_names)) { - $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']) + $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']); foreach ($fields as $row) { echo '
' . htmlspecialchars($row['Field']) . "\n"; } From f0babc56a34afaf2664328a332e871c0116468d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:11:06 +0200 Subject: [PATCH 218/270] Fix indentation --- libraries/schema/User_Schema.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 36029587f5..41a2b9e6fe 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -509,7 +509,7 @@ class PMA_User_Schema if (isset($with_field_names)) { $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']); foreach ($fields as $row) { - echo '
' . htmlspecialchars($row['Field']) . "\n"; + echo '
' . htmlspecialchars($row['Field']) . "\n"; } } echo '
' . "\n"; From e350eaeae71dcacc946e5686a526576103f5f32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:13:21 +0200 Subject: [PATCH 219/270] Use PMA_DBI_get_columns instead of custom query --- db_search.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/db_search.php b/db_search.php index c0f2c082af..6242a53d9b 100644 --- a/db_search.php +++ b/db_search.php @@ -128,8 +128,7 @@ if (isset($_REQUEST['submit_search'])) { $sqlstr_delete = 'DELETE'; // Fields to select - $tblfields = PMA_DBI_fetch_result('SHOW FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($GLOBALS['db']), - null, 'Field'); + $tblfields = PMA_DBI_get_columns($GLOBALS['db'], $table); // Table to use $sqlstr_from = ' FROM ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($table); @@ -148,8 +147,8 @@ if (isset($_REQUEST['submit_search'])) { $thefieldlikevalue = array(); foreach ($tblfields as $tblfield) { - if (! isset($field) || strlen($field) == 0 || $tblfield == $field) { - $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield) . ' USING utf8)' + if (! isset($field) || strlen($field) == 0 || $tblfield['Field'] == $field) { + $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield['Field']) . ' USING utf8)' . ' ' . $like_or_regex . ' ' . "'" . $automatic_wildcard . $search_word From f66f8b7074679180790312f87c874fecda86b86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:14:54 +0200 Subject: [PATCH 220/270] Use PMA_DBI_get_columns instead of custom query --- libraries/schema/Pdf_Relation_Schema.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index e74c14d126..ed96efd053 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -923,8 +923,8 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->SetX(10); $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); // $pdf->Ln(1); - $result = PMA_DBI_query('SHOW FIELDS FROM ' . PMA_backquote($table) . ';'); - while ($row = PMA_DBI_fetch_assoc($result)) { + $fields = PMA_DBI_get_columns($GLOBALS['db'], $table); + foreach($fields as $row) { $pdf->SetX(20); $field_name = $row['Field']; $pdf->PMA_links['doc'][$table][$field_name] = $pdf->AddLink(); From 624fdc8b2a62971abe3dc14a46132bc61356a888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:16:17 +0200 Subject: [PATCH 221/270] Remove not used variable --- transformation_wrapper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 577a4353a0..1c5e16a3ec 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -27,7 +27,6 @@ require_once './libraries/db_table_exists.lib.php'; * Get the list of the fields of the current table */ PMA_DBI_select_db($db); -$table_def = PMA_DBI_query('SHOW FIELDS FROM ' . PMA_backquote($table), null, PMA_DBI_QUERY_STORE); if (isset($where_clause)) { $result = PMA_DBI_query('SELECT * FROM ' . PMA_backquote($table) . ' WHERE ' . $where_clause . ';', null, PMA_DBI_QUERY_STORE); $row = PMA_DBI_fetch_assoc($result); From cea5d8791ef776dc87961ae4f69c393acdffe381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:17:21 +0200 Subject: [PATCH 222/270] Use PMA_DBI_get_columns instead of custom query --- tbl_change.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index 5329f159a1..bf0704a899 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -165,8 +165,7 @@ unset($show_create_table); * Get the list of the fields of the current table */ PMA_DBI_select_db($db); -$table_fields = PMA_DBI_fetch_result('SHOW FIELDS FROM ' . PMA_backquote($table) . ';', - null, null, null, PMA_DBI_QUERY_STORE); +$table_fields = PMA_DBI_get_columns($db, $table); $rows = array(); if (isset($where_clause)) { // when in edit mode load all selected rows from table From 5209562dd3504c160f26f3d6466683fda7cdabfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:18:27 +0200 Subject: [PATCH 223/270] Use PMA_DBI_get_columns instead of custom query --- libraries/sql_query_form.lib.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 542cfc3306..beab95d80b 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -213,9 +213,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter // Get the list and number of fields // we do a try_query here, because we could be in the query window, // trying to synchonize and the table has not yet been created - $fields_list = PMA_DBI_fetch_result( - 'SHOW FULL COLUMNS FROM ' . PMA_backquote($db) - . '.' . PMA_backquote($GLOBALS['table'])); + $fields_list = PMA_DBI_get_columns($db, $GLOBALS['table'], true); $tmp_db_link = ' Date: Fri, 19 Aug 2011 09:20:23 +0200 Subject: [PATCH 224/270] Use PMA_DBI_get_columns instead of custom query --- libraries/tbl_select.lib.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index af97aa434e..57c520dfc5 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -59,12 +59,11 @@ function PMA_tbl_getFields($table,$db) { // Gets the list and number of fields - $result = PMA_DBI_query('SHOW FULL FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE); - $fields_cnt = PMA_DBI_num_rows($result); + $fields = PMA_DBI_get_columns($db, $table, true); $fields_list = $fields_null = $fields_type = $fields_collation = array(); $geom_column_present = false; $geom_types = PMA_getGISDatatypes(); - while ($row = PMA_DBI_fetch_assoc($result)) { + foreach ($fields as $row) { $fields_list[] = $row['Field']; $type = $row['Type']; // check whether table contains geometric columns @@ -96,8 +95,6 @@ function PMA_tbl_getFields($table,$db) { ? $row['Collation'] : ''; } // end while - PMA_DBI_free_result($result); - unset($result, $type); return array($fields_list,$fields_type,$fields_collation,$fields_null, $geom_column_present); From 555aa5cfa2f40382068c9f23c12ecc3c7023c2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:31:43 +0200 Subject: [PATCH 225/270] Fix indentation --- server_status.php | 366 +++++++++++++++++++++++----------------------- 1 file changed, 185 insertions(+), 181 deletions(-) diff --git a/server_status.php b/server_status.php index 8d196adb85..ce4df7564e 100644 --- a/server_status.php +++ b/server_status.php @@ -31,161 +31,161 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { // real-time charting data if (isset($_REQUEST['chart_data'])) { switch($_REQUEST['type']) { - // Process and Connections realtime chart - case 'proc': - $c = PMA_DBI_fetch_result("SHOW GLOBAL STATUS WHERE Variable_name = 'Connections'", 0, 1); - $result = PMA_DBI_query('SHOW PROCESSLIST'); - $num_procs = PMA_DBI_num_rows($result); + // Process and Connections realtime chart + case 'proc': + $c = PMA_DBI_fetch_result("SHOW GLOBAL STATUS WHERE Variable_name = 'Connections'", 0, 1); + $result = PMA_DBI_query('SHOW PROCESSLIST'); + $num_procs = PMA_DBI_num_rows($result); - $ret = array( - 'x' => microtime(true)*1000, - 'y_proc' => $num_procs, - 'y_conn' => $c['Connections'] - ); + $ret = array( + 'x' => microtime(true)*1000, + 'y_proc' => $num_procs, + 'y_conn' => $c['Connections'] + ); - exit(json_encode($ret)); + exit(json_encode($ret)); - // Query realtime chart - case 'queries': - $queries = PMA_DBI_fetch_result( - "SHOW GLOBAL STATUS - WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions') - AND Value > 0'", 0, 1); - cleanDeprecated($queries); - // admin commands are not queries - unset($queries['Com_admin_commands']); - $questions = $queries['Questions']; - unset($queries['Questions']); + // Query realtime chart + case 'queries': + $queries = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions') + AND Value > 0'", 0, 1); + cleanDeprecated($queries); + // admin commands are not queries + unset($queries['Com_admin_commands']); + $questions = $queries['Questions']; + unset($queries['Questions']); - //$sum=array_sum($queries); - $ret = array( - 'x' => microtime(true)*1000, - 'y' => $questions, - 'pointInfo' => $queries - ); + //$sum=array_sum($queries); + $ret = array( + 'x' => microtime(true)*1000, + 'y' => $questions, + 'pointInfo' => $queries + ); - exit(json_encode($ret)); + exit(json_encode($ret)); - // Traffic realtime chart - case 'traffic': - $traffic = PMA_DBI_fetch_result( - "SHOW GLOBAL STATUS - WHERE Variable_name = 'Bytes_received' - OR Variable_name = 'Bytes_sent'", 0, 1); + // Traffic realtime chart + case 'traffic': + $traffic = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE Variable_name = 'Bytes_received' + OR Variable_name = 'Bytes_sent'", 0, 1); - $ret = array( - 'x' => microtime(true)*1000, - 'y_sent' => $traffic['Bytes_sent'], - 'y_received' => $traffic['Bytes_received'] - ); + $ret = array( + 'x' => microtime(true)*1000, + 'y_sent' => $traffic['Bytes_sent'], + 'y_received' => $traffic['Bytes_received'] + ); - exit(json_encode($ret)); + exit(json_encode($ret)); - // Data for the monitor - case 'chartgrid': - $ret = json_decode($_REQUEST['requiredData'], true); - $statusVars = array(); - $serverVars = array(); - $sysinfo = $cpuload = $memory = 0; - $pName = ''; + // Data for the monitor + case 'chartgrid': + $ret = json_decode($_REQUEST['requiredData'], true); + $statusVars = array(); + $serverVars = array(); + $sysinfo = $cpuload = $memory = 0; + $pName = ''; - /* Accumulate all required variables and data */ - // For each chart - foreach ($ret as $chart_id => $chartNodes) { - // For each data series - foreach ($chartNodes as $node_id => $nodeDataPoints) { - // For each data point in the series (usually just 1) - foreach ($nodeDataPoints as $point_id => $dataPoint) { - $pName = $dataPoint['name']; + /* Accumulate all required variables and data */ + // For each chart + foreach ($ret as $chart_id => $chartNodes) { + // For each data series + foreach ($chartNodes as $node_id => $nodeDataPoints) { + // For each data point in the series (usually just 1) + foreach ($nodeDataPoints as $point_id => $dataPoint) { + $pName = $dataPoint['name']; - switch ($dataPoint['type']) { - /* We only collect the status and server variables here to - * read them all in one query, and only afterwards assign them. - * Also do some white list filtering on the names - */ - case 'servervar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) - $serverVars[] = $pName; - break; + switch ($dataPoint['type']) { + /* We only collect the status and server variables here to + * read them all in one query, and only afterwards assign them. + * Also do some white list filtering on the names + */ + case 'servervar': + if (!preg_match('/[^a-zA-Z_]+/', $pName)) + $serverVars[] = $pName; + break; - case 'statusvar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) - $statusVars[] = $pName; - break; + case 'statusvar': + if (!preg_match('/[^a-zA-Z_]+/', $pName)) + $statusVars[] = $pName; + break; - case 'proc': - $result = PMA_DBI_query('SHOW PROCESSLIST'); - $ret[$chart_id][$node_id][$point_id]['value'] = PMA_DBI_num_rows($result); - break; + case 'proc': + $result = PMA_DBI_query('SHOW PROCESSLIST'); + $ret[$chart_id][$node_id][$point_id]['value'] = PMA_DBI_num_rows($result); + break; - case 'cpu': - if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); - $sysinfo = getSysInfo(); - } - if (!$cpuload) - $cpuload = $sysinfo->loadavg(); - - if (PHP_OS == 'Linux') { - $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle']; - $ret[$chart_id][$node_id][$point_id]['busy'] = $cpuload['busy']; - } else - $ret[$chart_id][$node_id][$point_id]['value'] = $cpuload['loadavg']; - - break; - - case 'memory': - if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); - $sysinfo = getSysInfo(); - } - if (!$memory) - $memory = $sysinfo->memory(); - - $ret[$chart_id][$node_id][$point_id]['value'] = $memory[$pName]; - break; + case 'cpu': + if (!$sysinfo) { + require_once('libraries/sysinfo.lib.php'); + $sysinfo = getSysInfo(); } + if (!$cpuload) + $cpuload = $sysinfo->loadavg(); + + if (PHP_OS == 'Linux') { + $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle']; + $ret[$chart_id][$node_id][$point_id]['busy'] = $cpuload['busy']; + } else + $ret[$chart_id][$node_id][$point_id]['value'] = $cpuload['loadavg']; + + break; + + case 'memory': + if (!$sysinfo) { + require_once('libraries/sysinfo.lib.php'); + $sysinfo = getSysInfo(); + } + if (!$memory) + $memory = $sysinfo->memory(); + + $ret[$chart_id][$node_id][$point_id]['value'] = $memory[$pName]; + break; + } /* switch */ + } /* foreach */ + } /* foreach */ + } /* foreach */ + + // Retrieve all required status variables + if (count($statusVars)) { + $statusVarValues = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1); + } else { + $statusVarValues = array(); + } + + // Retrieve all required server variables + if (count($serverVars)) { + $serverVarValues = PMA_DBI_fetch_result( + "SHOW GLOBAL VARIABLES + WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1); + } else { + $serverVarValues = array(); + } + + // ...and now assign them + foreach ($ret as $chart_id => $chartNodes) { + foreach ($chartNodes as $node_id => $nodeDataPoints) { + foreach ($nodeDataPoints as $point_id => $dataPoint) { + switch($dataPoint['type']) { + case 'statusvar': + $ret[$chart_id][$node_id][$point_id]['value'] = $statusVarValues[$dataPoint['name']]; + break; + case 'servervar': + $ret[$chart_id][$node_id][$point_id]['value'] = $serverVarValues[$dataPoint['name']]; + break; } } } + } - // Retrieve all required status variables - if (count($statusVars)) { - $statusVarValues = PMA_DBI_fetch_result( - "SHOW GLOBAL STATUS - WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1); - } else { - $statusVarValues = array(); - } + $ret['x'] = microtime(true)*1000; - // Retrieve all required server variables - if (count($serverVars)) { - $serverVarValues = PMA_DBI_fetch_result( - "SHOW GLOBAL VARIABLES - WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1); - } else { - $serverVarValues = array(); - } - - // ...and now assign them - foreach ($ret as $chart_id => $chartNodes) { - foreach ($chartNodes as $node_id => $nodeDataPoints) { - foreach ($nodeDataPoints as $point_id => $dataPoint) { - switch($dataPoint['type']) { - case 'statusvar': - $ret[$chart_id][$node_id][$point_id]['value'] = $statusVarValues[$dataPoint['name']]; - break; - case 'servervar': - $ret[$chart_id][$node_id][$point_id]['value'] = $serverVarValues[$dataPoint['name']]; - break; - } - } - } - } - - $ret['x'] = microtime(true)*1000; - - exit(json_encode($ret)); + exit(json_encode($ret)); } } @@ -210,16 +210,18 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $type = strtolower(substr($row['sql_text'], 0, strpos($row['sql_text'], ' '))); switch($type) { - case 'insert': - case 'update': - // Cut off big inserts and updates, but append byte count therefor - if(strlen($row['sql_text']) > 220) - $row['sql_text'] = substr($row['sql_text'], 0, 200) . '... [' . - implode(' ', PMA_formatByteDown(strlen($row['sql_text']), 2, 2)) . ']'; - - break; - default: - break; + case 'insert': + case 'update': + // Cut off big inserts and updates, but append byte count therefor + if (strlen($row['sql_text']) > 220) { + $row['sql_text'] = substr($row['sql_text'], 0, 200) + . '... [' + . implode(' ', PMA_formatByteDown(strlen($row['sql_text']), 2, 2)) + . ']'; + } + break; + default: + break; } if(!isset($return['sum'][$type])) $return['sum'][$type] = 0; @@ -261,35 +263,37 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $return['sum'][$type] += $row['#']; switch($type) { - case 'insert': - // Group inserts if selected - if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { - $insertTables[$matches[2]]++; - if ($insertTables[$matches[2]] > 1) { - $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; + case 'insert': + // Group inserts if selected + if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { + $insertTables[$matches[2]]++; + if ($insertTables[$matches[2]] > 1) { + $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; - // Add a ... to the end of this query to indicate that there's been other queries - if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') - $return['rows'][$insertTablesFirst]['argument'] .= '
...'; + // Add a ... to the end of this query to indicate that there's been other queries + if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') + $return['rows'][$insertTablesFirst]['argument'] .= '
...'; - // Group this value, thus do not add to the result list - continue 2; - } else { - $insertTablesFirst = $i; - $insertTables[$matches[2]] += $row['#'] - 1; - } + // Group this value, thus do not add to the result list + continue 2; + } else { + $insertTablesFirst = $i; + $insertTables[$matches[2]] += $row['#'] - 1; } - // No break here + } + // No break here - case 'update': - // Cut off big inserts and updates, but append byte count therefor - if(strlen($row['argument']) > 220) - $row['argument'] = substr($row['argument'], 0, 200) . '... [' . - implode(' ', PMA_formatByteDown(strlen($row['argument'])), 2, 2) . ']'; + case 'update': + // Cut off big inserts and updates, but append byte count therefor + if(strlen($row['argument']) > 220) { + $row['argument'] = substr($row['argument'], 0, 200) + . '... [' + . implode(' ', PMA_formatByteDown(strlen($row['argument'])), 2, 2) + . ']'; + } + break; - break; - - default: break; + default: break; } $return['rows'][] = $row; @@ -623,19 +627,19 @@ if(PMA_DRIZZLE) { /* Ajax request refresh */ if (isset($_REQUEST['show']) && isset($_REQUEST['ajax_request'])) { switch($_REQUEST['show']) { - case 'query_statistics': - printQueryStatistics(); - exit(); - case 'server_traffic': - printServerTraffic(); - exit(); - case 'variables_table': - // Prints the variables table - printVariablesTable(); - exit(); + case 'query_statistics': + printQueryStatistics(); + exit(); + case 'server_traffic': + printServerTraffic(); + exit(); + case 'variables_table': + // Prints the variables table + printVariablesTable(); + exit(); - default: - break; + default: + break; } } From 6f33d1366af39331653d29df5a739ee036ce2997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:32:26 +0200 Subject: [PATCH 226/270] Fix coding style --- server_status.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server_status.php b/server_status.php index ce4df7564e..6bd9fd6330 100644 --- a/server_status.php +++ b/server_status.php @@ -38,7 +38,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $num_procs = PMA_DBI_num_rows($result); $ret = array( - 'x' => microtime(true)*1000, + 'x' => microtime(true) * 1000, 'y_proc' => $num_procs, 'y_conn' => $c['Connections'] ); @@ -59,7 +59,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { //$sum=array_sum($queries); $ret = array( - 'x' => microtime(true)*1000, + 'x' => microtime(true) * 1000, 'y' => $questions, 'pointInfo' => $queries ); @@ -74,7 +74,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { OR Variable_name = 'Bytes_sent'", 0, 1); $ret = array( - 'x' => microtime(true)*1000, + 'x' => microtime(true) * 1000, 'y_sent' => $traffic['Bytes_sent'], 'y_received' => $traffic['Bytes_received'] ); @@ -183,7 +183,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } } - $ret['x'] = microtime(true)*1000; + $ret['x'] = microtime(true) * 1000; exit(json_encode($ret)); } @@ -649,7 +649,7 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost' PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" . 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n" . - 'server_time_diff = new Date().getTime() - ' . (microtime(true)*1000) . ";\n" . + 'server_time_diff = new Date().getTime() - ' . (microtime(true) * 1000) . ";\n" . 'server_os = \'' . PHP_OS . "';\n" . 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" . 'server_db_isLocal = ' . ($server_db_isLocal ? 'true' : 'false') . ";\n" . From c5b393665ca77d719bc67290cc4ddd003354cf4a Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 13:36:28 +0530 Subject: [PATCH 227/270] More code style corrections --- libraries/tbl_select.lib.php | 82 +++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index b2eb0b0e57..bcfe96caaa 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -95,7 +95,6 @@ function PMA_tbl_getFields($table,$db) unset($result, $type); return array($fields_list, $fields_type, $fields_collation, $fields_null, $geom_column_present); - } /** @@ -167,24 +166,23 @@ function PMA_tbl_getSubTabs() * @return string HTML content for viewing foreing data and elements * for search criteria input. */ -function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table, $titles, $foreignMaxLimit, $fields, $in_fbs = false){ - +function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table, $titles, $foreignMaxLimit, $fields, $in_fbs = false) +{ $str = ''; - if ($foreigners && isset($foreigners[$field]) && is_array($foreignData['disp_row'])) { // f o r e i g n k e y s - $str .= ' ' . "\n"; // go back to first row // here, the 4th parameter is empty because there is no current // value of data for the dropdown (the search page initial values // are displayed empty) - $str .= PMA_foreignDropdown($foreignData['disp_row'], - $foreignData['foreign_field'], - $foreignData['foreign_display'], - '', $foreignMaxLimit); - $str .= ' ' . "\n"; - } - elseif ($foreignData['foreign_link'] == true) { + $str .= PMA_foreignDropdown( + $foreignData['disp_row'], $foreignData['foreign_field'], + $foreignData['foreign_display'], '', $foreignMaxLimit + ); + $str .= '' . "\n"; + + } elseif ($foreignData['foreign_link'] == true) { if(isset($fields[$i]) && is_string($fields[$i])){ $str .= '' . str_replace("'", "\'", $titles['Browse']) . ''; // ]] $str .= ''; + } elseif (in_array($tbl_fields_type[$i], PMA_getGISDatatypes())) { // g e o m e t r y $str .= '' . "\n"; - for ($j = 0; $j < $cnt_enum_value; $j++) { - if(isset($fields[$i]) && is_array($fields[$i]) && in_array($enum_value[$j],$fields[$i])){ - $str .= ' '; - } - else{ - $str .= ' '; - } - } // end for - $str .= ' ' . "\n"; - } - else { + .' multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n"; + + for ($j = 0; $j < $cnt_enum_value; $j++) { + if (isset($fields[$i]) + && is_array($fields[$i]) + && in_array($enum_value[$j], $fields[$i]) + ) { + $str .= ''; + } else { + $str .= ''; + } + } // end for + $str .= '' . "\n"; + + } else { // o t h e r c a s e s $the_class = 'textfield'; $type = $tbl_fields_type[$i]; + if ($type == 'date') { $the_class .= ' datefield'; } elseif ($type == 'datetime' || substr($type, 0, 9) == 'timestamp') { $the_class .= ' datetimefield'; } - if(isset($fields[$i]) && is_string($fields[$i])){ - $str .= ' ' . "\n"; - } - else{ - $str .= ' ' . "\n"; - } - }; - return $str; + if (isset($fields[$i]) && is_string($fields[$i])) { + $str .= '' . "\n"; + } else { + $str .= '' . "\n"; + } + } + return $str; } - /** * Return the where clause for query generation based on the inputs provided. * @@ -271,8 +275,8 @@ EOT; * @return string HTML content for viewing foreing data and elements * for search criteria input. */ -function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $func_type, $unaryFlag, $geom_func = null){ - +function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $func_type, $unaryFlag, $geom_func = null) +{ /** * @todo move this to a more apropriate place */ From 61335cdc2ed5839ac2914c83c9508cd9e4a6e5ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:30:56 +0200 Subject: [PATCH 228/270] Improve coding style --- server_status.php | 92 ++++++++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/server_status.php b/server_status.php index 6bd9fd6330..7c2f30a658 100644 --- a/server_status.php +++ b/server_status.php @@ -15,8 +15,9 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) { define('PMA_NO_VARIABLES_IMPORT', true); } -if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) +if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $GLOBALS['is_header_sent'] = true; +} require_once './libraries/common.inc.php'; @@ -104,13 +105,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { * Also do some white list filtering on the names */ case 'servervar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) + if (!preg_match('/[^a-zA-Z_]+/', $pName)) { $serverVars[] = $pName; + } break; case 'statusvar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) + if (!preg_match('/[^a-zA-Z_]+/', $pName)) { $statusVars[] = $pName; + } break; case 'proc': @@ -123,8 +126,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { require_once('libraries/sysinfo.lib.php'); $sysinfo = getSysInfo(); } - if (!$cpuload) + if (!$cpuload) { $cpuload = $sysinfo->loadavg(); + } if (PHP_OS == 'Linux') { $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle']; @@ -139,8 +143,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { require_once('libraries/sysinfo.lib.php'); $sysinfo = getSysInfo(); } - if (!$memory) + if (!$memory) { $memory = $sysinfo->memory(); + } $ret[$chart_id][$node_id][$point_id]['value'] = $memory[$pName]; break; @@ -190,7 +195,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (isset($_REQUEST['log_data'])) { - if(PMA_MYSQL_INT_VERSION < 50106) exit('""'); + if (PMA_MYSQL_INT_VERSION < 50106) { + /* FIXME: why this? */ + exit('""'); + } $start = intval($_REQUEST['time_start']); $end = intval($_REQUEST['time_end']); @@ -224,7 +232,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { break; } - if(!isset($return['sum'][$type])) $return['sum'][$type] = 0; + if (!isset($return['sum'][$type])) { + $return['sum'][$type] = 0; + } $return['sum'][$type] += $row['#']; $return['rows'][] = $row; } @@ -237,7 +247,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($return)); } - if($_REQUEST['type'] == 'general') { + if ($_REQUEST['type'] == 'general') { $limitTypes = (isset($_REQUEST['limitTypes']) && $_REQUEST['limitTypes']) ? 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' ' : ''; @@ -259,20 +269,23 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { preg_match('/^(\w+)\s/', $row['argument'], $match); $type = strtolower($match[1]); - if(!isset($return['sum'][$type])) $return['sum'][$type] = 0; + if (!isset($return['sum'][$type])) { + $return['sum'][$type] = 0; + } $return['sum'][$type] += $row['#']; switch($type) { case 'insert': // Group inserts if selected - if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { + if ($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { $insertTables[$matches[2]]++; if ($insertTables[$matches[2]] > 1) { $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; // Add a ... to the end of this query to indicate that there's been other queries - if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') + if ($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') { $return['rows'][$insertTablesFirst]['argument'] .= '
...'; + } // Group this value, thus do not add to the result list continue 2; @@ -285,7 +298,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { case 'update': // Cut off big inserts and updates, but append byte count therefor - if(strlen($row['argument']) > 220) { + if (strlen($row['argument']) > 220) { $row['argument'] = substr($row['argument'], 0, 200) . '... [' . implode(' ', PMA_formatByteDown(strlen($row['argument'])), 2, 2) @@ -310,12 +323,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (isset($_REQUEST['logging_vars'])) { - if(isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { + if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { $value = PMA_sqlAddslashes($_REQUEST['varValue']); - if(!is_numeric($value)) $value="'" . $value . "'"; + if (!is_numeric($value)) { + $value="'" . $value . "'"; + } - if(! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])) + if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])) { PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value); + } } @@ -323,14 +339,16 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($loggingVars)); } - if(isset($_REQUEST['query_analyzer'])) { + if (isset($_REQUEST['query_analyzer'])) { $return = array(); - if(strlen($_REQUEST['database'])) + if (strlen($_REQUEST['database'])) { PMA_DBI_select_db($_REQUEST['database']); + } - if ($profiling = PMA_profilingSupported()) + if ($profiling = PMA_profilingSupported()) { PMA_DBI_query('SET PROFILING=1;'); + } // Do not cache query $query = preg_replace('/^(\s*SELECT)/i', '\\1 SQL_NO_CACHE', $_REQUEST['query']); @@ -348,7 +366,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { PMA_DBI_free_result($result); - if($profiling) { + if ($profiling) { $return['profiling'] = array(); $result = PMA_DBI_try_query('SELECT seq,state,duration FROM INFORMATION_SCHEMA.PROFILING WHERE QUERY_ID=1 ORDER BY seq'); while ($row = PMA_DBI_fetch_assoc($result)) { @@ -360,7 +378,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($return)); } - if(isset($_REQUEST['advisor'])) { + if (isset($_REQUEST['advisor'])) { include('libraries/Advisor.class.php'); $advisor = new Advisor(); exit(json_encode($advisor->run())); @@ -610,7 +628,9 @@ foreach ($server_status as $name => $value) { foreach ($allocations as $filter => $section) { if (strpos($name, $filter) !== false) { $allocationMap[$name] = $section; - if ($section == 'com' && $value > 0) $used_queries[$name] = $value; + if ($section == 'com' && $value > 0) { + $used_queries[$name] = $value; + } break; // Only exits inner loop } } @@ -776,7 +796,9 @@ echo __('Runtime Information'); echo ' '; $i=0; foreach ($section_links as $link_name => $link_url) { - if ($i > 0) echo ', '; + if ($i > 0) { + echo ', '; + } if ('doc' == $link_name) { echo PMA_showMySQLDocu($link_url, $link_url); } else { @@ -898,9 +920,11 @@ function printQueryStatistics() $name = str_replace(array('Com_', '_'), array('', ' '), $name); // Group together values that make out less than 2% into "Other", but only if we have more than 6 fractions already - if ($value < $query_sum * 0.02 && count($chart_json)>6) + if ($value < $query_sum * 0.02 && count($chart_json)>6) { $other_sum += $value; - else $chart_json[$name] = $value; + } else { + $chart_json[$name] = $value; + } ?>
@@ -919,8 +943,9 @@ function printQueryStatistics()
0) + if ($other_sum > 0) { $chart_json[__('Other')] = $other_sum; + } echo json_encode($chart_json); ?> @@ -975,8 +1000,7 @@ function printServerTraffic() } /* if the server works as master or slave in replication process, display useful information */ - if ($server_master_status || $server_slave_status) - { + if ($server_master_status || $server_slave_status) { ?>
@@ -1125,7 +1149,8 @@ function printServerTraffic()
From f6fd4323381cb0e8c041e8d7f1b3cfc13302bb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 11:57:44 +0200 Subject: [PATCH 246/270] Use PMA_DBI_get_tables instead of own query --- db_datadict.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 0331e4bda3..e9a8c551f0 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -55,10 +55,10 @@ if ($cfgRelation['commwork']) { * Selects the database and gets tables names */ PMA_DBI_select_db($db); -$rowset = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE); +$tables = PMA_DBI_get_tables($db); $count = 0; -while ($row = PMA_DBI_fetch_row($rowset)) { +foreach($tables as $row) { $table = $row[0]; $comments = PMA_getComments($db, $table); From 889ea0afb047b255e81ebb1fe54f5bb825a804ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:05:15 +0200 Subject: [PATCH 247/270] Fix getting tables --- db_datadict.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index e9a8c551f0..e74524d09d 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -58,8 +58,7 @@ PMA_DBI_select_db($db); $tables = PMA_DBI_get_tables($db); $count = 0; -foreach($tables as $row) { - $table = $row[0]; +foreach($tables as $table) { $comments = PMA_getComments($db, $table); echo '
' . "\n"; From 414363d38d788c1c126d0aafc4eda69c0a8157c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:06:04 +0200 Subject: [PATCH 248/270] Revert "More of missing escaping" This reverts commit 599c9b5e1bacc01a9c9bb6621ec1ed3279c4104a. --- db_datadict.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 6981462972..938ebf7a1a 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
From 8cec4ac91ce0da8e73d8b8313cdb5c34d03bdb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:07:32 +0200 Subject: [PATCH 249/270] Revert "Revert "More of missing escaping"" This reverts commit 414363d38d788c1c126d0aafc4eda69c0a8157c8. Okay, it needs to be escaped here, but not escaped above. --- db_datadict.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 938ebf7a1a..6981462972 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { From da6e51d00780dd941f4b496c69ae15d0d09bd3a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:08:07 +0200 Subject: [PATCH 250/270] Do not escape field here, it is used as index to vairous arrays --- db_datadict.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db_datadict.php b/db_datadict.php index 6981462972..b910c761ae 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -227,7 +227,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { } else { $row['Default'] = htmlspecialchars($row['Default']); } - $field_name = htmlspecialchars($row['Field']); + $field_name = $row['Field']; if (PMA_MYSQL_INT_VERSION < 50025 && ! empty($analyzed_sql[0]['create_table_fields'][$field_name]['type']) From 679814416f4842f8e0e189c054772edf2d20ddef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:11:31 +0200 Subject: [PATCH 251/270] Format --- server_privileges.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server_privileges.php b/server_privileges.php index 78e4f06933..a1b7acb839 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2353,7 +2353,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' ' . ($current['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . "\n" . ' ' . "\n" . ' - @@ -185,6 +172,11 @@ for ($i = 0; $i < $name_cnt; $i++) { + +
+ +
+ ]" type="hidden" id="t_v__" /> -
' + + '
' . __('Collation') . ' ' . __('Operator') . ' ' . __('Value') . '
' . __('Function') . '
' . __('Column') . ' ' . __('Type') . ' ' . __('Collation') . ' ' . __('Operator') . ' ' . __('Value') . '
' . __('Value') . '
+ if (! PMA_DRIZZLE) { + ?> - +

$value) { if (is_numeric($value)) { - if ($i++ > 0) echo ", "; + if ($i++ > 0) { + echo ", "; + } echo "'" . $name . "'"; } } @@ -1652,10 +1679,11 @@ function refreshList($name, $defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, foreach ($refreshRates as $rate) { $selected = ($rate == $defaultRate)?' selected="selected"':''; - if ($rate<60) + if ($rate<60) { echo ''; - else + } else { echo ''; + } } ?> From d2df35108eb6fb98199cde72b4b9fbf00f9e1fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:33:13 +0200 Subject: [PATCH 229/270] Wrap some long lines --- libraries/core.lib.php | 3 ++- server_status.php | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index dcc5208bc6..909f5db66f 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -708,7 +708,8 @@ function PMA_includeJS($url) } /** - * Adds JS code snippets to be displayed by header.inc.php. Adds a newline to each snippet. + * Adds JS code snippets to be displayed by header.inc.php. Adds a + * newline to each snippet. * * @param string $str Js code to be added (e.g. "token=1234;") * diff --git a/server_status.php b/server_status.php index 7c2f30a658..4e215a445a 100644 --- a/server_status.php +++ b/server_status.php @@ -620,7 +620,8 @@ $links['innodb']['doc'] = 'innodb'; // Variable to contain all com_ variables $used_queries = array(); -// Variable to map variable names to their respective section name (used for js category filtering) +// Variable to map variable names to their respective section name +// (used for js category filtering) $allocationMap = array(); // sort vars into arrays @@ -637,10 +638,15 @@ foreach ($server_status as $name => $value) { } if(PMA_DRIZZLE) { - $used_queries = PMA_DBI_fetch_result('SELECT * FROM data_dictionary.global_statements', 0, 1); + $used_queries = PMA_DBI_fetch_result( + 'SELECT * FROM data_dictionary.global_statements', + 0, + 1 + ); unset($used_queries['admin_commands']); } else { - // admin commands are not queries (e.g. they include COM_PING, which is excluded from $server_status['Questions']) + // admin commands are not queries (e.g. they include COM_PING, + // which is excluded from $server_status['Questions']) unset($used_queries['Com_admin_commands']); } From 17f4b82821695fba5317cb98dc86a692ccc11015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:35:00 +0200 Subject: [PATCH 230/270] Factor out code escaping from echo --- libraries/js_escape.lib.php | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 656794f819..25fb5bfbc7 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -56,25 +56,42 @@ function PMA_escapeJsString($string) "\r" => '\r'))); } +/** + * Formats an javascript assignment with proper escaping of a value + * and support for assigning array of strings. + * + * @param string $key Name of value to set + * @param mixed $value Value to set, can be either string or array of strings + * + * @return string Javascript code. + */ +function PMA_getJsValue($key, $value) +{ + $result = $key . ' = '; + if (is_array($value)) { + $result .= '['; + foreach ($value as $id => $val) { + $result .= "'" . PMA_escapeJsString($val) . "',"; + } + $result .= "];\n"; + } else { + $result .= "'" . PMA_escapeJsString($value) . "';\n"; + } + return $result; +} + /** * Prints an javascript assignment with proper escaping of a value * and support for assigning array of strings. * * @param string $key Name of value to set * @param mixed $value Value to set, can be either string or array of strings + * + * @return nothing */ function PMA_printJsValue($key, $value) { - echo $key . ' = '; - if (is_array($value)) { - echo '['; - foreach ($value as $id => $val) { - echo "'" . PMA_escapeJsString($val) . "',"; - } - echo "];\n"; - } else { - echo "'" . PMA_escapeJsString($value) . "';\n"; - } + echo PMA_getJsValue($key, $value); } ?> From 4b5ae952dd6486735ed066b69e22962af72f80c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:36:22 +0200 Subject: [PATCH 231/270] Function for setting variable --- libraries/core.lib.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 909f5db66f..a277f29629 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -714,8 +714,21 @@ function PMA_includeJS($url) * @param string $str Js code to be added (e.g. "token=1234;") * */ -function PMA_AddJSCode($str) { +function PMA_AddJSCode($str) +{ $GLOBALS['js_script'][] = $str; } +/** + * Adds JS code snippet for variable assignment to be displayed by header.inc.php. + * + * @param string $key Name of value to set + * @param mixed $value Value to set, can be either string or array of strings + * + */ +function PMA_AddJSVar($key, $value) +{ + PMA_AddJsCode(PMA_getJsValue($key, $value)); +} + ?> From 1b45290d5551a5619dcd1e29cd8956e30aeb690f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:38:51 +0200 Subject: [PATCH 232/270] Use PMA_AddJSVar --- server_status.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server_status.php b/server_status.php index 4e215a445a..30c3c5a850 100644 --- a/server_status.php +++ b/server_status.php @@ -673,14 +673,14 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost' || $cfg['Server']['host'] == '127.0.0.1' || $cfg['Server']['host'] == '::1'; -PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" . - 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n" . - 'server_time_diff = new Date().getTime() - ' . (microtime(true) * 1000) . ";\n" . - 'server_os = \'' . PHP_OS . "';\n" . - 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" . - 'server_db_isLocal = ' . ($server_db_isLocal ? 'true' : 'false') . ";\n" . - 'profiling_docu = \'' . PMA_showMySQLDocu('general-thread-states', 'general-thread-states') . "';\n" . - 'explain_docu = \'' . PMA_showMySQLDocu('explain-output', 'explain-output') . ";'\n"); +PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']); +PMA_AddJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db))); +PMA_AddJSVar('server_time_diff', 'new Date().getTime() - ' . (microtime(true) * 1000)); +PMA_AddJSVar('server_os', PHP_OS); +PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false); +PMA_AddJSVar('server_db_isLocal', $server_db_isLocal ? true : false); +PMA_AddJSVar('profiling_docu', PMA_showMySQLDocu('general-thread-states', 'general-thread-states')); +PMA_AddJSVar('explain_docu', PMA_showMySQLDocu('explain-output', 'explain-output')); /** * start output From 38e8365e5d502120534b8fa60a22d210eb8b1760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:39:45 +0200 Subject: [PATCH 233/270] Use PMA_AddJSVar --- server_variables.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server_variables.php b/server_variables.php index 4c2086ab89..af47f1fe83 100644 --- a/server_variables.php +++ b/server_variables.php @@ -16,9 +16,9 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'server_variables.js'; -PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" . - 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" . - 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n"); +PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']); +PMA_AddJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db))); +PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false); /** @@ -179,4 +179,4 @@ function formatVariable($name,$value) */ require './libraries/footer.inc.php'; -?> \ No newline at end of file +?> From fb1c4bd9ee35e3b873bf0cb28a11ca860a09384e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:43:08 +0200 Subject: [PATCH 234/270] Handle more types in js variable formatting --- libraries/js_escape.lib.php | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 25fb5bfbc7..85b62e1e53 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -56,6 +56,27 @@ function PMA_escapeJsString($string) "\r" => '\r'))); } +/** + * Formats a value for javascript code. + * + * @param string $value String to be formatted. + * + * @retrun string formatted value. + */ +function PMA_formatJsVal($value) +{ + if (is_bool($value)) { + if ($value) { + return 'true'; + } else { + return 'false'; + } else if (is_int($value)) { + return int($value); + } else { + return '"' . PMA_escapeJsString($value) . '"'; + } +} + /** * Formats an javascript assignment with proper escaping of a value * and support for assigning array of strings. @@ -71,11 +92,11 @@ function PMA_getJsValue($key, $value) if (is_array($value)) { $result .= '['; foreach ($value as $id => $val) { - $result .= "'" . PMA_escapeJsString($val) . "',"; + $result .= PMA_formatJsVal($value) . ","; } $result .= "];\n"; } else { - $result .= "'" . PMA_escapeJsString($value) . "';\n"; + $result .= PMA_formatJsVal($value) . ";\n"; } return $result; } From e479f1c8431eb3a1b138d7812a1ab0f6d1020188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:47:45 +0200 Subject: [PATCH 235/270] Add test for js escaping --- test/libraries/js_escape_test.php | 37 +++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 test/libraries/js_escape_test.php diff --git a/test/libraries/js_escape_test.php b/test/libraries/js_escape_test.php new file mode 100644 index 0000000000..d29fcff743 --- /dev/null +++ b/test/libraries/js_escape_test.php @@ -0,0 +1,37 @@ +assertEquals($expected, PMA_getJsValue($key, $value)); + } + + public function variables() { + return array( + array('foo', true, "foo = true;\n"), + array('foo', false, "foo = false;\n"), + array('foo', 100, "foo = 100;\n"), + array('foo', 0, "foo = 0;\n"), + array('foo', 'text', "foo = \"text\";\n"), + array('foo', 'quote"', "foo = \"quote\\\"\";\n"), + array('foo', 'apostroph\'', "foo = \"apostroph\\'\";\n"), + ); + } +} +?> From c289045dcde84ccad43b6ce6641edf36b3fc6c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:49:58 +0200 Subject: [PATCH 236/270] Fix typo --- libraries/js_escape.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 85b62e1e53..0c795ec23c 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -70,7 +70,8 @@ function PMA_formatJsVal($value) return 'true'; } else { return 'false'; - } else if (is_int($value)) { + } + } elseif (is_int($value)) { return int($value); } else { return '"' . PMA_escapeJsString($value) . '"'; From 3ab9bdf5e371dd4b5f11545da64619da22701229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:52:09 +0200 Subject: [PATCH 237/270] Remove stray code --- test/libraries/js_escape_test.php | 1 - 1 file changed, 1 deletion(-) diff --git a/test/libraries/js_escape_test.php b/test/libraries/js_escape_test.php index d29fcff743..41d96d3939 100644 --- a/test/libraries/js_escape_test.php +++ b/test/libraries/js_escape_test.php @@ -18,7 +18,6 @@ class PMA_File_test extends PHPUnit_Framework_TestCase */ public function testFormat($key, $value, $expected) { - $arr = new PMA_File($file); $this->assertEquals($expected, PMA_getJsValue($key, $value)); } From 381b593e5997899184e1fc7f3522f4d83bd5f025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:52:32 +0200 Subject: [PATCH 238/270] Fix typecasting --- libraries/js_escape.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 0c795ec23c..87d88552a6 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -72,7 +72,7 @@ function PMA_formatJsVal($value) return 'false'; } } elseif (is_int($value)) { - return int($value); + return (int)$value; } else { return '"' . PMA_escapeJsString($value) . '"'; } From b0afa4d8bc904393d7c9902c95c24dd46ae88d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:54:59 +0200 Subject: [PATCH 239/270] Wrap long lines --- server_status.php | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/server_status.php b/server_status.php index 30c3c5a850..1dd4852369 100644 --- a/server_status.php +++ b/server_status.php @@ -673,14 +673,38 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost' || $cfg['Server']['host'] == '127.0.0.1' || $cfg['Server']['host'] == '::1'; -PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']); -PMA_AddJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db))); -PMA_AddJSVar('server_time_diff', 'new Date().getTime() - ' . (microtime(true) * 1000)); -PMA_AddJSVar('server_os', PHP_OS); -PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false); -PMA_AddJSVar('server_db_isLocal', $server_db_isLocal ? true : false); -PMA_AddJSVar('profiling_docu', PMA_showMySQLDocu('general-thread-states', 'general-thread-states')); -PMA_AddJSVar('explain_docu', PMA_showMySQLDocu('explain-output', 'explain-output')); +PMA_AddJSVar( + 'pma_token', + $_SESSION[' PMA_token '] +); +PMA_AddJSVar( + 'url_query', + str_replace('&', '&', PMA_generate_common_url($db)) +); +PMA_AddJSVar( + 'server_time_diff', + 'new Date().getTime() - ' . (microtime(true) * 1000) +); +PMA_AddJSVar( + 'server_os', + PHP_OS +); +PMA_AddJSVar( + 'is_superuser', + PMA_isSuperuser() +); +PMA_AddJSVar( + 'server_db_isLocal', + $server_db_isLocal +); +PMA_AddJSVar( + 'profiling_docu', + PMA_showMySQLDocu('general-thread-states', 'general-thread-states') +); +PMA_AddJSVar( + 'explain_docu', + PMA_showMySQLDocu('explain-output', 'explain-output') +); /** * start output From a05eb3ebcde7b04d5f742b73b9a768b3f3a5d7d9 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 14:27:25 +0530 Subject: [PATCH 240/270] Should return results when $propertiesIconic == true --- libraries/tbl_select.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index bcfe96caaa..d93ad56529 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -19,7 +19,7 @@ require_once 'url_generating.lib.php'; * * @return string $str Value of the Title */ -function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage) +function PMA_tbl_setTitle($propertiesIconic, $pmaThemeImage) { if ($propertiesIconic == true) { $str = '' . $table . '' . "\n"; + echo '

' . htmlspecialchars($table) . '

' . "\n"; /** * Gets table informations From 599c9b5e1bacc01a9c9bb6621ec1ed3279c4104a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 11:56:38 +0200 Subject: [PATCH 245/270] More of missing escaping --- db_datadict.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 938ebf7a1a..6981462972 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { 		' . $field_name . ''; + echo '' . htmlspecialchars($field_name) . ''; } else { - echo $field_name; + echo htmlspecialchars($field_name); } ?> ' . htmlspecialchars($field_name) . ''; + echo '' . $field_name . ''; } else { - echo htmlspecialchars($field_name); + echo $field_name; } ?> ' . $field_name . ''; + echo '' . htmlspecialchars($field_name) . ''; } else { - echo $field_name; + echo htmlspecialchars($field_name); } ?> ' . "\n"; - $user_form .= sprintf($link_edit, urlencode($current_user), + $user_form .= sprintf( + $link_edit, + urlencode($current_user), urlencode($current_host), urlencode(! isset($current['Db']) || $current['Db'] == '*' ? '' : $current['Db']), ''); From 7b54504cc0981821619ffd3f0759766448e6b879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:16:59 +0200 Subject: [PATCH 252/270] Fix handling of tables with something what gets urlencoded --- server_privileges.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index a1b7acb839..685b81726d 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1416,7 +1416,7 @@ if (isset($_REQUEST['flush_privileges'])) { /** * defines some standard links */ -$link_edit = ''; -$link_export = ' diff --git a/pmd_pdf.php b/pmd_pdf.php index adf5fac13d..2afe131a66 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -5,7 +5,7 @@ * @package phpMyAdmin-Designer */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; /** * If called directly from the designer, first save the positions diff --git a/pmd_relation_new.php b/pmd_relation_new.php index a104cc119c..fbd624631b 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $die_save_pos = 0; include_once 'pmd_save_pos.php'; extract($_POST, EXTR_SKIP); diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 58c9135cce..7151cf7563 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; extract($_POST, EXTR_SKIP); extract($_GET, EXTR_SKIP); $die_save_pos = 0; diff --git a/pmd_save_pos.php b/pmd_save_pos.php index c487ddb1ce..1a071aff8c 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $cfgRelation = PMA_getRelationsParam(); From cd69e5bdf2081561e5d8891d72820d16a4d99266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:25:47 +0200 Subject: [PATCH 254/270] Include missing database tabs --- db_datadict.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db_datadict.php b/db_datadict.php index fca38b70e2..89b2bc5590 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -11,7 +11,8 @@ require_once './libraries/common.inc.php'; if (! isset($selected_tbl)) { - require_once './libraries/header.inc.php'; + require './libraries/db_common.inc.php'; + require './libraries/db_info.inc.php'; } From 98e71f8805faef9787731c861543f07ff5529bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:50:28 +0200 Subject: [PATCH 255/270] First attempt to integrate designer into rest For now works only in pmahomme and needs lot of cleanups and fixes --- pmd_general.php | 30 +- themes/pmahomme/css/theme_right.css.php | 541 ++++++++++++++++++++++++ 2 files changed, 552 insertions(+), 19 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index d270cbdd6b..45b6955d30 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -8,6 +8,8 @@ * */ require_once './libraries/pmd_common.php'; +require './libraries/db_common.inc.php'; +require './libraries/db_info.inc.php'; $tab_column = get_tab_info(); $script_tabs = get_script_tabs(); @@ -17,17 +19,6 @@ $tables_pk_or_unique_keys = get_pk_or_unique_keys(); $tables_all_keys = get_all_keys(); $hidden = "hidden"; -?> - - - - - - - - Designer - $GLOBALS['lang']); if (isset($GLOBALS['db'])) { $params['db'] = $GLOBALS['db']; @@ -125,10 +116,6 @@ echo $script_tabs . $script_contr . $script_display_field; title="" /> -
- -
-
@@ -166,8 +153,8 @@ for ($i = 0; $i < $name_cnt; $i++) { echo 'checked="checked"'; } ?> />
');">
px; top: px; @@ -332,7 +324,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { } ?> -
+
Load...
Date: Fri, 19 Aug 2011 12:55:19 +0200 Subject: [PATCH 256/270] Move PMD help to documentation --- Documentation.html | 8 ++++++++ pmd_general.php | 2 +- pmd_help.php | 27 --------------------------- 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 pmd_help.php diff --git a/Documentation.html b/Documentation.html index 758a2bc90f..d7c76e16a4 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4409,6 +4409,14 @@ chmod o+rwx tmp +

+ 6.30 How do I create a relation in designer?

+ +

To select relation, click :

+ +

+

The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.

+

phpMyAdmin project

diff --git a/pmd_general.php b/pmd_general.php index 45b6955d30..3613f1f37d 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -79,7 +79,7 @@ echo $script_tabs . $script_contr . $script_display_field; /> - - - - -Designer - - - -' . __('To select relation, click :') . '
'; - echo '

'; - echo '

' . __('The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.') . '

'; -?> - - From e443bdbd5a1618c3aad6040c6c71d9b365491ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:59:46 +0200 Subject: [PATCH 257/270] Remove explicit font definitions --- themes/pmahomme/css/theme_right.css.php | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index fc04961034..0a4784553c 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3046,8 +3046,6 @@ canvas.pmd * { color: #000000; border-collapse: collapse; border: 1px solid #AAAAAA; - font-family: Tahoma, sans-serif; - font-size: 10px; z-index: 1; -moz-user-select: none; } @@ -3109,8 +3107,6 @@ canvas.pmd * { .pmd_Tabs { cursor: default; - font-family: Tahoma, sans-serif; - font-size: 10px; color: #0055bb; white-space: nowrap; text-decoration: none; @@ -3125,8 +3121,6 @@ canvas.pmd * { .pmd_Tabs2 { cursor: default; - font-family: Tahoma, sans-serif; - font-size: 10px; color: #0055bb; background: #FFEE99; text-indent: 3px; @@ -3138,10 +3132,7 @@ canvas.pmd * { } .owner { - font-family: Tahoma, sans-serif; - font-size: 9px; font-weight: normal; -/* background-color: #ffffff;*/ color: #888888; } @@ -3209,7 +3200,6 @@ canvas.pmd * { .butt { border: #4477aa solid 1px; - font-size: 11px; font-weight: bold; height: 19px; width: 70px; @@ -3219,7 +3209,6 @@ canvas.pmd * { } .L_butt2_1 { - font-size: 12px; padding: 1px; text-decoration: none; background-color: #ffffff; @@ -3229,7 +3218,6 @@ canvas.pmd * { } .L_butt2_2 { - font-size: 12px; padding: 0; border: #0099CC solid 1px; background: #FFEE99; @@ -3404,11 +3392,8 @@ a.trigger{ position: fixed; text-decoration: none; top: 60px; right: 0; -font-size: 16px; -font-family: verdana, helvetica, arial, sans-serif; color:#fff; padding: 10px 40px 10px 15px; -font-weight: 700; background:#333333 url(images/plus.png) 85% 55% no-repeat; border:1px solid #444444; display: block; @@ -3418,11 +3403,8 @@ a.trigger:hover{ position: fixed; text-decoration: none; top: 60px; right: 0; -font-size: 16px; -font-family: verdana, helvetica, arial, sans-serif; color:#080808; padding: 10px 40px 10px 15px; -font-weight: 700; background:#fff696 url(images/plus.png) 85% 55% no-repeat; border:1px solid #999; display: block; @@ -3442,7 +3424,6 @@ h2.tiger{ background-repeat: repeat-x; padding: 1px; font-weight: bold; - font-size:14px; padding: 50 20 50 20px; margin: 0 0 5px 0; width: 250px; @@ -3543,8 +3524,6 @@ h2.active { color:black; font-weight:bold; padding-left: 2px; - font-family:"Times New Roman", Times, serif; - font-size:16px; text-align:left; } From 19dd8f292885ca6adc284b6c0977cb3ccfff20d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:04:08 +0200 Subject: [PATCH 258/270] Make canvas aligned with tables --- pmd_general.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index 3613f1f37d..bfb98187bf 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -117,6 +117,9 @@ echo $script_tabs . $script_contr . $script_display_field;
+
+ +
-
- -
Date: Fri, 19 Aug 2011 13:10:33 +0200 Subject: [PATCH 259/270] Fix js to match changes --- js/pmd/move.js | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index eb2b246476..f5456a5bbc 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -159,8 +159,8 @@ function MouseMove(e) } if (ON_relation || ON_display_field) { - document.getElementById('hint').style.left = (Glob_X + 20) + 'px'; - document.getElementById('hint').style.top = (Glob_Y + 20) + 'px'; + document.getElementById('pmd_hint').style.left = (Glob_X + 20) + 'px'; + document.getElementById('pmd_hint').style.top = (Glob_Y + 20) + 'px'; } if (layer_menu_cur_click) { @@ -225,7 +225,7 @@ function Main() Canvas_pos(); Small_tab_refresh(); Re_load(); - id_hint = document.getElementById('hint'); + id_hint = document.getElementById('pmd_hint'); if (isIE) { General_scroll(); } @@ -535,12 +535,12 @@ function Start_relation() if (!ON_relation) { document.getElementById('foreign_relation').style.display = ''; ON_relation = 1; - document.getElementById('hint').innerHTML = PMA_messages['strSelectReferencedKey']; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectReferencedKey']; + document.getElementById('pmd_hint').style.visibility = "visible"; document.getElementById('rel_button').className = 'M_butt_Selected_down'; } else { - document.getElementById('hint').innerHTML = ""; - document.getElementById('hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').innerHTML = ""; + document.getElementById('pmd_hint').style.visibility = "hidden"; document.getElementById('rel_button').className = 'M_butt'; click_field = 0; ON_relation = 0; @@ -561,7 +561,7 @@ function Click_field(T, f, PK) // table field } click_field = 1; link_relation = "T1=" + T + "&F1=" + f; - document.getElementById('hint').innerHTML = PMA_messages['strSelectForeignKey']; + document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectForeignKey']; } else { Start_relation(); // hidden hint... if (j_tabs[db + '.' + T] != '1' || !PK) { @@ -596,8 +596,8 @@ function Click_field(T, f, PK) // table field display_field[T] = f; } ON_display_field = 0; - document.getElementById('hint').innerHTML = ""; - document.getElementById('hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').innerHTML = ""; + document.getElementById('pmd_hint').style.visibility = "hidden"; document.getElementById('display_field_button').className = 'M_butt'; makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&server=' + server + '&db=' + db + '&token=' + token); } @@ -955,16 +955,16 @@ function Start_display_field() } if (!ON_display_field) { ON_display_field = 1; - document.getElementById('hint').innerHTML = PMA_messages['strChangeDisplay']; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = PMA_messages['strChangeDisplay']; + document.getElementById('pmd_hint').style.visibility = "visible"; document.getElementById('display_field_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA if (isIE) { // correct for IE document.getElementById('display_field_button').className = 'M_butt_Selected_down_IE'; } } else { - document.getElementById('hint').innerHTML = ""; - document.getElementById('hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').innerHTML = ""; + document.getElementById('pmd_hint').style.visibility = "hidden"; document.getElementById('display_field_button').className = 'M_butt'; ON_display_field = 0; } @@ -1136,8 +1136,8 @@ function add_object() var init = history_array.length; if (rel.value != '--') { if (document.getElementById('Query').value == "") { - document.getElementById('hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; + document.getElementById('pmd_hint').style.visibility = "visible"; return; } var p = document.getElementById('Query'); @@ -1168,8 +1168,8 @@ function add_object() } if (document.getElementById('h_rel_opt').value != '--') { if (document.getElementById('having').value == "") { - document.getElementById('hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; + document.getElementById('pmd_hint').style.visibility = "visible"; return; } var p = document.getElementById('having'); @@ -1186,8 +1186,8 @@ function add_object() document.getElementById('orderby').checked = false; //make orderby } - document.getElementById('hint').innerHTML = sum + "object created" ; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = sum + "object created" ; + document.getElementById('pmd_hint').style.visibility = "visible"; //output sum new objects created var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(init,history_array.length); From 12237ed84ff6549c6dbc1bc4640b320fd6184304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:10:49 +0200 Subject: [PATCH 260/270] Remove no longer used Help funciton --- js/pmd/move.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index f5456a5bbc..6f302936f0 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -868,11 +868,6 @@ function No_have_constr(id_this) } } -function Help() -{ - var WinHelp = window.open("pmd_help.php", "wind1", "top=200,left=400,width=300,height=200,resizable=yes,scrollbars=yes,menubar=no"); -} - function PDF_save() { // var WinPDF = From 9a0593ab2b76889665ceefa75214b37fc506bf8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:18:05 +0200 Subject: [PATCH 261/270] Fix expanding logic --- pmd_general.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pmd_general.php b/pmd_general.php index bfb98187bf..3cf33df50f 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -238,7 +238,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {

> + > Date: Fri, 19 Aug 2011 13:18:51 +0200 Subject: [PATCH 262/270] Fix typo --- pmd_general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd_general.php b/pmd_general.php index 3cf33df50f..89a6d5c73c 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -239,7 +239,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { > Date: Fri, 19 Aug 2011 13:22:10 +0200 Subject: [PATCH 263/270] Get rid of useless variable --- pmd_general.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index 89a6d5c73c..cf440941fe 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -17,7 +17,6 @@ $script_contr = get_script_contr(); $tab_pos = get_tab_pos(); $tables_pk_or_unique_keys = get_pk_or_unique_keys(); $tables_all_keys = get_all_keys(); -$hidden = "hidden"; $params = array('lang' => $GLOBALS['lang']); if (isset($GLOBALS['db'])) { @@ -120,7 +119,7 @@ echo $script_tabs . $script_contr . $script_display_field;
-
@@ -432,7 +431,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- @@ -554,7 +553,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- @@ -602,7 +601,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- @@ -678,7 +677,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- @@ -732,7 +731,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- From fd13e7ad67215df22983942163cfff80712637a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:25:08 +0200 Subject: [PATCH 264/270] Use display = none instead of visibility to avoid off screen invisible elements --- js/pmd/move.js | 30 +++++++++++++++--------------- pmd_general.php | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index 6f302936f0..e41b107360 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -113,7 +113,7 @@ function MouseDown(e) dx = offsetx - parseInt(cur_click.style.left); dy = offsety - parseInt(cur_click.style.top); //alert(" dx = " + dx + " dy = " +dy); - document.getElementById("canvas").style.visibility = 'hidden'; + document.getElementById("canvas").style.display = 'none'; /* var left = parseInt(cur_click.style.left); var top = parseInt(cur_click.style.top); @@ -173,7 +173,7 @@ function MouseMove(e) function MouseUp(e) { if (cur_click != null) { - document.getElementById("canvas").style.visibility = 'visible'; + document.getElementById("canvas").style.display = 'inline-block'; Re_load(); cur_click.style.zIndex = 1; cur_click = null; @@ -605,7 +605,7 @@ function Click_field(T, f, PK) // table field function New_relation() { - document.getElementById('layer_new_relation').style.visibility = 'hidden'; + document.getElementById('layer_new_relation').style.display = 'none'; link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0'; link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value; link_relation += Get_url_pos(); @@ -776,14 +776,14 @@ function Canvas_click(id) document.getElementById('layer_upd_relation').style.left = left + 'px'; var top = Glob_Y - document.getElementById('layer_upd_relation').offsetHeight - 10; document.getElementById('layer_upd_relation').style.top = top + 'px'; - document.getElementById('layer_upd_relation').style.visibility = 'visible'; + document.getElementById('layer_upd_relation').style.display = 'block'; link_relation = 'T1=' + Key0 + '&F1=' + Key1 + '&T2=' + Key2 + '&F2=' + Key3 + '&K=' + Key; } } function Upd_relation() { - document.getElementById('layer_upd_relation').style.visibility = 'hidden'; + document.getElementById('layer_upd_relation').style.display = 'none'; link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0'; link_relation += Get_url_pos(); makeRequest('pmd_relation_upd.php', link_relation); @@ -792,9 +792,9 @@ function Upd_relation() function VisibleTab(id, t_n) { if (id.checked) { - document.getElementById(t_n).style.visibility = 'visible'; + document.getElementById(t_n).style.display = 'block'; } else { - document.getElementById(t_n).style.visibility = 'hidden'; + document.getElementById(t_n).style.display = 'none'; } Re_load(); } @@ -813,10 +813,10 @@ function Hide_tab_all(id_this) // max/min all tables if (E.elements[i].type == "checkbox" && E.elements[i].id.substring(0, 10) == 'check_vis_') { if (id_this.alt == 'v') { E.elements[i].checked = true; - document.getElementById(E.elements[i].value).style.visibility = 'visible'; + document.getElementById(E.elements[i].value).style.display = 'block'; } else { E.elements[i].checked = false; - document.getElementById(E.elements[i].value).style.visibility = 'hidden'; + document.getElementById(E.elements[i].value).style.display = 'none'; } } } @@ -859,10 +859,10 @@ function No_have_constr(id_this) if (!in_array_k(E.elements[i].value, a)) if (id_this.alt == 'v') { E.elements[i].checked = true; - document.getElementById(E.elements[i].value).style.visibility = 'visible'; + document.getElementById(E.elements[i].value).style.display = 'block'; } else { E.elements[i].checked = false; - document.getElementById(E.elements[i].value).style.visibility = 'hidden'; + document.getElementById(E.elements[i].value).style.display = 'none'; } } } @@ -879,7 +879,7 @@ function General_scroll() { /* if (!document.getElementById('show_relation_olways').checked) { - document.getElementById("canvas").style.visibility = 'hidden'; + document.getElementById("canvas").style.display = 'none'; clearTimeout(timeoutID); timeoutID = setTimeout(General_scroll_end, 500); } @@ -908,7 +908,7 @@ function General_scroll_end() document.getElementById('layer_menu').style.left = document.body.scrollLeft; document.getElementById('layer_menu').style.top = document.body.scrollTop + document.getElementById('top_menu').offsetHeight; } - document.getElementById("canvas").style.visibility = 'visible'; + document.getElementById("canvas").style.display = 'block'; } */ @@ -916,7 +916,7 @@ function Show_left_menu(id_this) // max/min all tables { if (id_this.alt == "v") { document.getElementById("layer_menu").style.top = document.getElementById('top_menu').offsetHeight + 'px'; - document.getElementById("layer_menu").style.visibility = 'visible'; + document.getElementById("layer_menu").style.display = 'block'; id_this.alt = ">"; id_this.src = "pmd/images/uparrow2_m.png"; if (isIE) { @@ -924,7 +924,7 @@ function Show_left_menu(id_this) // max/min all tables } } else { document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll - document.getElementById("layer_menu").style.visibility = 'hidden'; + document.getElementById("layer_menu").style.display = 'none'; id_this.alt = "v"; id_this.src = "pmd/images/downarrow2_m.png"; } diff --git a/pmd_general.php b/pmd_general.php index cf440941fe..cf8d842d69 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -119,7 +119,7 @@ echo $script_tabs . $script_contr . $script_display_field;
-
 @@ -380,7 +380,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="" onclick="New_relation()" /> + onclick="document.getElementById('layer_new_relation').style.display = 'none';" /> @@ -396,7 +396,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -417,7 +417,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { onclick="Upd_relation()" value="" /> + onclick="document.getElementById('layer_upd_relation').style.display = 'none'; Re_load();" />
@@ -431,7 +431,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -553,7 +553,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -585,7 +585,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="" onclick="edit('Rename')" /> + onclick="document.getElementById('query_rename_to').style.display = 'none';" /> @@ -601,7 +601,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -661,7 +661,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="" onclick="edit('Having')" /> + onclick="document.getElementById('query_having').style.display = 'none';" /> @@ -677,7 +677,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -715,7 +715,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="" onclick="edit('Aggregate')" /> + onclick="document.getElementById('query_Aggregate').style.display = 'none';" /> @@ -731,7 +731,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -778,7 +778,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="" onclick="edit('Where')" /> + onclick="document.getElementById('query_where').style.display = 'none';" /> From 1fa197752bea2661a25431c9d2d3eccaa72aedef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:35:13 +0200 Subject: [PATCH 265/270] Fixed displaying of table menu --- js/pmd/move.js | 5 ++++- themes/pmahomme/css/theme_right.css.php | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index e41b107360..49be35c3be 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -915,7 +915,10 @@ function General_scroll_end() function Show_left_menu(id_this) // max/min all tables { if (id_this.alt == "v") { - document.getElementById("layer_menu").style.top = document.getElementById('top_menu').offsetHeight + 'px'; + var pos = $("#top_menu").offset(); + var height = $("#top_menu").height(); + document.getElementById("layer_menu").style.top = (pos.top + height) + 'px'; + document.getElementById("layer_menu").style.left = pos.left + 'px'; document.getElementById("layer_menu").style.display = 'block'; id_this.alt = ">"; id_this.src = "pmd/images/uparrow2_m.png"; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 0a4784553c..ae1867711a 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3325,9 +3325,9 @@ a.M_butt:hover { } #layer_menu { - clear: both; - float: left; z-index: 1000; + position: absolute; + left: 0; background-color: #EAEEF0; border: #999999 solid 1px; } From d77ee8191650ab47e5ddeffd4c81e51969da0aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:41:44 +0200 Subject: [PATCH 266/270] Fix syntax errors --- themes/pmahomme/css/theme_right.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index ae1867711a..16b73db467 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3520,7 +3520,7 @@ h2.active { left-padding:8px; margin:0; border-bottom:4px solid #3CF; - background-color: #D0DCE0; //#09c; + background-color: #D0DCE0; color:black; font-weight:bold; padding-left: 2px; @@ -3528,7 +3528,7 @@ h2.active { } #tblfooter { - background-color: D3DCE3; + background-color: #D3DCE3; float: right; padding-top:10px; color: black; From aaf92da021e9ce68d91d023e407aa85a2378be96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:42:24 +0200 Subject: [PATCH 267/270] Fix indentation --- themes/pmahomme/css/theme_right.css.php | 62 ++++++++++++------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 16b73db467..646a4e0f35 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3375,49 +3375,49 @@ a.M_butt:hover { } .panel { -position: fixed; -top: 50px; -right: 0; -display: none; -background: #FFF; -border:1px solid #F5F5F5; -width: 350 px; -height: auto; -padding: 30px 170px 30px 30px; -color:#FFF; -z-index:99; + position: fixed; + top: 50px; + right: 0; + display: none; + background: #FFF; + border:1px solid #F5F5F5; + width: 350 px; + height: auto; + padding: 30px 170px 30px 30px; + color:#FFF; + z-index:99; } a.trigger{ -position: fixed; -text-decoration: none; -top: 60px; right: 0; -color:#fff; -padding: 10px 40px 10px 15px; -background:#333333 url(images/plus.png) 85% 55% no-repeat; -border:1px solid #444444; -display: block; + position: fixed; + text-decoration: none; + top: 60px; right: 0; + color:#fff; + padding: 10px 40px 10px 15px; + background:#333333 url(images/plus.png) 85% 55% no-repeat; + border:1px solid #444444; + display: block; } a.trigger:hover{ -position: fixed; -text-decoration: none; -top: 60px; right: 0; -color:#080808; -padding: 10px 40px 10px 15px; -background:#fff696 url(images/plus.png) 85% 55% no-repeat; -border:1px solid #999; -display: block; + position: fixed; + text-decoration: none; + top: 60px; right: 0; + color:#080808; + padding: 10px 40px 10px 15px; + background:#fff696 url(images/plus.png) 85% 55% no-repeat; + border:1px solid #999; + display: block; } a.active.trigger { -background:#222222 url(images/minus.png) 85% 55% no-repeat; -z-index:999; + background:#222222 url(images/minus.png) 85% 55% no-repeat; + z-index:999; } a.active.trigger:hover { -background:#fff696 url(images/minus.png) 85% 55% no-repeat; -z-index:999; + background:#fff696 url(images/minus.png) 85% 55% no-repeat; + z-index:999; } h2.tiger{ From 8214176078993523ff967538d9a4130fc68b637d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:42:33 +0200 Subject: [PATCH 268/270] Remove tabs --- themes/pmahomme/css/theme_right.css.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 646a4e0f35..6109d89129 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1462,7 +1462,7 @@ div#queryAnalyzerDialog div.CodeMirror-scroll { } div#queryAnalyzerDialog div#queryProfiling { - height: 250px; + height: 250px; } div#queryAnalyzerDialog td.explain { @@ -1470,9 +1470,9 @@ div#queryAnalyzerDialog td.explain { } div#queryAnalyzerDialog table.queryNums { - display: none; - border:0; - text-align:left; + display: none; + border:0; + text-align:left; } .smallIndent { From 86dad703868c01089cfdceaaf3cc0a7e0bbdf10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:45:02 +0200 Subject: [PATCH 269/270] Fix some display issues --- js/pmd/move.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index 49be35c3be..6c3f56e832 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -536,11 +536,11 @@ function Start_relation() document.getElementById('foreign_relation').style.display = ''; ON_relation = 1; document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectReferencedKey']; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; document.getElementById('rel_button').className = 'M_butt_Selected_down'; } else { document.getElementById('pmd_hint').innerHTML = ""; - document.getElementById('pmd_hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').style.display = 'none'; document.getElementById('rel_button').className = 'M_butt'; click_field = 0; ON_relation = 0; @@ -551,7 +551,7 @@ function Click_field(T, f, PK) // table field { if (ON_relation) { if (!click_field) { - //.style.display=='none' .style.visibility = "hidden" + //.style.display=='none' .style.display = 'none' if (!PK) { alert(PMA_messages['strPleaseSelectPrimaryOrUniqueKey']); return;// 0; @@ -571,7 +571,7 @@ function Click_field(T, f, PK) // table field document.getElementById('layer_new_relation').style.left = left + 'px'; var top = Glob_Y - document.getElementById('layer_new_relation').offsetHeight + 40; document.getElementById('layer_new_relation').style.top = top + 'px'; - document.getElementById('layer_new_relation').style.visibility = "visible"; + document.getElementById('layer_new_relation').style.display = 'block'; link_relation += '&T2=' + T + '&F2=' + f; } } @@ -597,7 +597,7 @@ function Click_field(T, f, PK) // table field } ON_display_field = 0; document.getElementById('pmd_hint').innerHTML = ""; - document.getElementById('pmd_hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').style.display = 'none'; document.getElementById('display_field_button').className = 'M_butt'; makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&server=' + server + '&db=' + db + '&token=' + token); } @@ -954,7 +954,7 @@ function Start_display_field() if (!ON_display_field) { ON_display_field = 1; document.getElementById('pmd_hint').innerHTML = PMA_messages['strChangeDisplay']; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; document.getElementById('display_field_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA if (isIE) { // correct for IE @@ -962,7 +962,7 @@ function Start_display_field() } } else { document.getElementById('pmd_hint').innerHTML = ""; - document.getElementById('pmd_hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').style.display = 'none'; document.getElementById('display_field_button').className = 'M_butt'; ON_display_field = 0; } @@ -1019,7 +1019,7 @@ function Click_option(id_this,column_name,table_name) document.getElementById(id_this).style.left = left + 'px'; // var top = Glob_Y - document.getElementById(id_this).offsetHeight - 10; document.getElementById(id_this).style.top = (screen.height / 4) + 'px'; - document.getElementById(id_this).style.visibility = "visible"; + document.getElementById(id_this).style.display = 'block'; document.getElementById('option_col_name').innerHTML = '' + PMA_messages['strAddOption'] +'"' +column_name+ '"'; col_name = column_name; tab_name = table_name; @@ -1027,7 +1027,7 @@ function Click_option(id_this,column_name,table_name) function Close_option() { - document.getElementById('pmd_optionse').style.visibility = "hidden"; + document.getElementById('pmd_optionse').style.display = 'none'; } function Select_all(id_this,owner) @@ -1135,7 +1135,7 @@ function add_object() if (rel.value != '--') { if (document.getElementById('Query').value == "") { document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; return; } var p = document.getElementById('Query'); @@ -1167,7 +1167,7 @@ function add_object() if (document.getElementById('h_rel_opt').value != '--') { if (document.getElementById('having').value == "") { document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; return; } var p = document.getElementById('having'); @@ -1185,7 +1185,7 @@ function add_object() //make orderby } document.getElementById('pmd_hint').innerHTML = sum + "object created" ; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; //output sum new objects created var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(init,history_array.length); From d7e400416eda7ea663631ab19d8b1b59fbb1cd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:49:05 +0200 Subject: [PATCH 270/270] Fix displaying of hint --- themes/pmahomme/css/theme_right.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 6109d89129..4fc6f43cba 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3096,7 +3096,7 @@ canvas.pmd * { top: 50px; z-index: 3; border: #00CC66 solid 1px; - visibility: hidden; + display: none; } .scroll_tab {