diff --git a/ChangeLog b/ChangeLog index dd5797117b..780f46cd8e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-06-12 Marc Delisle + * bug 432091: missing column in show processes + * add $strKill + 2001-06-11 Marc Delisle * italian translation update by Alessandro Astarita * german translation update by Kristof Hamann (korelstar) diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index 6aa83ca936..3d290dc3fd 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/lang/brazilian_portuguese.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Sim"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index 3c5a08eeae..59748604a4 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/lang/bulgarian-win1251.inc.php3 @@ -260,4 +260,5 @@ $strYes = " // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index efbcb1fa5e..e8aea150fa 100644 --- a/lang/catala.inc.php3 +++ b/lang/catala.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Si"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index 378f9eb356..91c4191896 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -260,4 +260,5 @@ $strYes = " // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 88d14cdcb1..09845d0633 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -260,4 +260,5 @@ $strYes = " // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index bbba908ada..b86f3aa2fa 100644 --- a/lang/czech-win1250.inc.php3 +++ b/lang/czech-win1250.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Ano"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3 index baffa93205..de6923b9fc 100644 --- a/lang/danish.inc.php3 +++ b/lang/danish.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Ja"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3 index 4fea2ad2e0..b1e5bcabb7 100644 --- a/lang/dutch.inc.php3 +++ b/lang/dutch.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Ja"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 54e18f5e8b..4025ccab52 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Yes"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill="Kill"; ?> diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index 9e4c7d8c8a..078ffbd95d 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Oui"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill="Supprimer"; ?> diff --git a/lang/german.inc.php3 b/lang/german.inc.php3 index 18af668f14..7a39295084 100644 --- a/lang/german.inc.php3 +++ b/lang/german.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Ja"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3 index 9157b03e01..360e7d25da 100644 --- a/lang/italian.inc.php3 +++ b/lang/italian.inc.php3 @@ -260,4 +260,5 @@ $strYes = " Si "; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3 index e84906bdd4..477811084f 100644 --- a/lang/norwegian.inc.php3 +++ b/lang/norwegian.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Ja"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3 index 04d216bcad..df85c4270f 100644 --- a/lang/polish.inc.php3 +++ b/lang/polish.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Tak"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3 index 3c0ababe27..203bbf7377 100644 --- a/lang/portuguese.inc.php3 +++ b/lang/portuguese.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Sim"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3 index 8497dc9491..f3f4137f71 100644 --- a/lang/russian-koi8.inc.php3 +++ b/lang/russian-koi8.inc.php3 @@ -260,4 +260,5 @@ $strYes = " // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3 index a2f571e9fe..c89542bec4 100644 --- a/lang/russian-win1251.inc.php3 +++ b/lang/russian-win1251.inc.php3 @@ -260,4 +260,5 @@ $strYes = " // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3 index 3ab902ffda..6cae536b27 100644 --- a/lang/spanish.inc.php3 +++ b/lang/spanish.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Si"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3 index b94cafacf5..5b5db825e6 100644 --- a/lang/swedish.inc.php3 +++ b/lang/swedish.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Ja"; // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3 index e7a7da1890..9aec3de3dc 100644 --- a/lang/thai.inc.php3 +++ b/lang/thai.inc.php3 @@ -260,4 +260,5 @@ $strYes = "Yes"; //to translate // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) +$strKill=" Kill "; //to translate ?> diff --git a/lib.inc.php3 b/lib.inc.php3 index 19748c94ab..2dd003f161 100755 --- a/lib.inc.php3 +++ b/lib.inc.php3 @@ -297,6 +297,7 @@ function display_table ($dt_result, $is_simple = false) { global $strTotal, $strEdit, $strPrevious, $strNext, $strDelete, $strDeleted; global $strPos1, $strEnd, $sessionMaxRows, $strGo, $strShow, $strRowsFrom; global $cfgModifyDeleteAtLeft, $cfgModifyDeleteAtRight; + global $strKill; $cfgMaxRows = isset($sessionMaxRows) ? $sessionMaxRows : $cfgMaxRows; $sessionMaxRows = isset($sessionMaxRows) ? $sessionMaxRows : $cfgMaxRows; @@ -353,6 +354,9 @@ function display_table ($dt_result, $is_simple = false) { if($cfgModifyDeleteAtLeft && !$is_simple) { echo "\n"; } + if($sql_query == "SHOW PROCESSLIST") { + echo ""; + } while($field = mysql_fetch_field($dt_result)) { if(@mysql_num_rows($dt_result)>1 && !$is_simple) @@ -441,7 +445,7 @@ function display_table ($dt_result, $is_simple = false) { //end correction uva 19991216 pt. 3 ----------------------------- if($sql_query == "SHOW PROCESSLIST") - echo "KILL\n"; + echo "$strKill\n"; //possibility to have the modify/delete button on the left added // 2000-08-29