Git August 2011

git@phpmyadmin.net

8 participants
476 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-68-gda9d10a
by Madhura Jayaratne 08 Aug '11

08 Aug '11

The branch, QA_3_4 has been updated via da9d10a3ef54b8a67a8be9e4edb504d714bc25fc (commit) from 7b13b6f8645ad3514e8aa1472562c8fbffd20d11 (commit) - Log ----------------------------------------------------------------- commit da9d10a3ef54b8a67a8be9e4edb504d714bc25fc Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Aug 7 18:49:34 2011 +0530 Typo ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7119a5d..3e83a6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing -- bug #3383711 [display] Order by a column in a view doesn't work in some cases +- patch #3383711 [display] Order by a column in a view doesn't work in some cases - bug #3386434 [interface] Add missing space to server status 3.4.4.0 (not yet released) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13340-gc00b1e5
by Michal Čihař 07 Aug '11

07 Aug '11

The branch, master has been updated via c00b1e54a132b294d2c5675c27fb4e4908fc349d (commit) via b5d2c16963b7000b4034fd139d8577a2267193ad (commit) via df6f937ec6b9b6f5d1ff3220353250799d10c79e (commit) via 09968eba03d8e29b64895db724115e77f13ab1e7 (commit) via 85a0b528b8f5e391ce72f8eacd177c20a5aa9dfd (commit) via e970931a6e01dd50e61f330fc10a482c1ef3291e (commit) via fdfa5184013a5589f1464909960c06d4a9e8b15b (commit) via 50cb69b039d08a02414007087f3c437f86fa740a (commit) via f9035b01c09980b89f4365c816b828d4206e5819 (commit) via 302adcafc72aeb2196396c9bd05f09187941d7e5 (commit) via fd1ae662973fe29d224277d3b44895b9936262e0 (commit) via 318d5cc46e8b268afad6d47522b68cb0e3ee4df7 (commit) via 1094982fed48f68e059745efd4e83a0b64d93b65 (commit) via 05182054e8ced4b00fea2ff08b951322844f304d (commit) via 6573549f77cb2ee511619ca08b44e8a580f9ef58 (commit) via 4037e20b0436290b34e9eead70c51117a39d8a83 (commit) via 2c940769b615405e79ecf25b442c1ba86c34a5be (commit) via 7c9a145984e05e0d751d7ba7cff78161cec2d557 (commit) via 7c720fe37bfa51a1fa63e2e9dd3510ab5e259fa4 (commit) via 6c8b1639c32fe8f95a8091163ee9d4be5d35e3d3 (commit) via 5d572ac4f5a8aa65448ce0bfd17c16f21f437268 (commit) via 18228d443018bc14b26ad19aef53f2d691e91293 (commit) via 2a7e20b3cf2574269abab75da2e817e1e1e07ee5 (commit) via 8400bec0ded982e7219bc0197511b8290f095913 (commit) via 7632ccd932475fe9eb1c9e3cd3fa180843da30aa (commit) via 26e783a9062cb5d961cbe848ae0c0e799ed51170 (commit) via ed009b4dbcacc5ee0fbd1411bf01a0dc5606bd2a (commit) via 30f66fea11dcefadd1051c4ff48ff052e4b269c4 (commit) via 050422360d1fcec576da347a44727f4fb147449a (commit) via c7ea143efa56709f67b53b3ca0d8612182dc1686 (commit) via c6834f6279666b57375d20fd9496d26b662d4609 (commit) via d1a32f1d08b6bc171ad0bde7abeb70c304ffd17d (commit) via 14599efd3eb62ca76c8e4d1e7ea7a0fc57f52313 (commit) via 44e380b802448341962b55b46b5ab20dde657744 (commit) via 8562577f03c4dc7637bc42278c76b8ac5441fd65 (commit) via fdb4b9213b5f480537819ea15726fbdf56121e51 (commit) via ae2415f45371e5e7fbd921f396cc18ddc1472560 (commit) via 6e7bd5dba80eb467c9d79dff4164e0dae8b7870b (commit) via 1e83fc945ccfa0661d2375b69f9eb51bee6529b0 (commit) via 1a2f348cdf5efd7ef91596711043e95a3fc70c3f (commit) via 68102d8af990ffbc06ca9be84027e55e1607d0cb (commit) via fd322a24125d3f57d06ba2eccc71eb0582388a77 (commit) via 30b4cad7e267910a8f69d02cbce066964da38f19 (commit) via d444eb634714337c958b6c0b9b208f5a9d4a425e (commit) via c0548ddc7873bad4c3c1fe5563e50904b1cfff9c (commit) via 5b0a228d759f6684efd9a5ac6c42c02b73e475d6 (commit) via 9d1b62e523db25b3d60409ede9e48045107794d0 (commit) via b2d50fb9a96157c74c8e52d74e7039b39f71a8d9 (commit) via 70be3a9f924bd8277d276b3c7fbc67a93307838a (commit) via a1b0c1cd697c7ba69ce158ffb1380131d03cf575 (commit) via 833438ee1bec418b758a7659ff72c808da1fe94d (commit) via 2dbb1d61d9354d7747a49c81f8ca3e0f946a7268 (commit) via e6b0fdabae2895f3f71a29a558906d345138331b (commit) via 269eeb77153a806eaef05a56ab3b90c91eadf068 (commit) via 39d645f09010dce4b3dd9b8a79d4f90d69d93988 (commit) via fa7b34c90096055fb22e96ffed4f7b56170323e2 (commit) via 79e9e0695e1632596ee5aa586b5c11df863d60a9 (commit) from ff6b491a63d8053b34f3e7e1f9c9049ffc4f7919 (commit) - Log ----------------------------------------------------------------- commit c00b1e54a132b294d2c5675c27fb4e4908fc349d Merge: b5d2c16 ff6b491 Author: Pootle server <pootle(a)cihar.com> Date: Sun Aug 7 16:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' commit b5d2c16963b7000b4034fd139d8577a2267193ad Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:51:51 2011 +0200 Translation update done using Pootle. commit df6f937ec6b9b6f5d1ff3220353250799d10c79e Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:50:33 2011 +0200 Translation update done using Pootle. commit 09968eba03d8e29b64895db724115e77f13ab1e7 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:50:09 2011 +0200 Translation update done using Pootle. commit 85a0b528b8f5e391ce72f8eacd177c20a5aa9dfd Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:49:52 2011 +0200 Translation update done using Pootle. commit e970931a6e01dd50e61f330fc10a482c1ef3291e Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:49:42 2011 +0200 Translation update done using Pootle. commit fdfa5184013a5589f1464909960c06d4a9e8b15b Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:49:30 2011 +0200 Translation update done using Pootle. commit 50cb69b039d08a02414007087f3c437f86fa740a Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:48:29 2011 +0200 Translation update done using Pootle. commit f9035b01c09980b89f4365c816b828d4206e5819 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:47:45 2011 +0200 Translation update done using Pootle. commit 302adcafc72aeb2196396c9bd05f09187941d7e5 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:47:34 2011 +0200 Translation update done using Pootle. commit fd1ae662973fe29d224277d3b44895b9936262e0 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:47:22 2011 +0200 Translation update done using Pootle. commit 318d5cc46e8b268afad6d47522b68cb0e3ee4df7 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:45:44 2011 +0200 Translation update done using Pootle. commit 1094982fed48f68e059745efd4e83a0b64d93b65 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:44:41 2011 +0200 Translation update done using Pootle. commit 05182054e8ced4b00fea2ff08b951322844f304d Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:44:28 2011 +0200 Translation update done using Pootle. commit 6573549f77cb2ee511619ca08b44e8a580f9ef58 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:44:17 2011 +0200 Translation update done using Pootle. commit 4037e20b0436290b34e9eead70c51117a39d8a83 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:43:54 2011 +0200 Translation update done using Pootle. commit 2c940769b615405e79ecf25b442c1ba86c34a5be Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:43:28 2011 +0200 Translation update done using Pootle. commit 7c9a145984e05e0d751d7ba7cff78161cec2d557 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:42:37 2011 +0200 Translation update done using Pootle. commit 7c720fe37bfa51a1fa63e2e9dd3510ab5e259fa4 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:42:13 2011 +0200 Translation update done using Pootle. commit 6c8b1639c32fe8f95a8091163ee9d4be5d35e3d3 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:41:49 2011 +0200 Translation update done using Pootle. commit 5d572ac4f5a8aa65448ce0bfd17c16f21f437268 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:41:11 2011 +0200 Translation update done using Pootle. commit 18228d443018bc14b26ad19aef53f2d691e91293 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:40:59 2011 +0200 Translation update done using Pootle. commit 2a7e20b3cf2574269abab75da2e817e1e1e07ee5 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:39:51 2011 +0200 Translation update done using Pootle. commit 8400bec0ded982e7219bc0197511b8290f095913 Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:39:31 2011 +0200 Translation update done using Pootle. commit 7632ccd932475fe9eb1c9e3cd3fa180843da30aa Author: Abdullah Al-Saedi <abdullah.10(a)windowslive.com> Date: Sun Aug 7 03:38:33 2011 +0200 Translation update done using Pootle. commit 26e783a9062cb5d961cbe848ae0c0e799ed51170 Author: Sven Strickroth <email(a)cs-ware.de> Date: Sat Aug 6 23:06:33 2011 +0200 Translation update done using Pootle. commit ed009b4dbcacc5ee0fbd1411bf01a0dc5606bd2a Author: Sven Strickroth <email(a)cs-ware.de> Date: Sat Aug 6 23:06:25 2011 +0200 Translation update done using Pootle. commit 30f66fea11dcefadd1051c4ff48ff052e4b269c4 Author: Sven Strickroth <email(a)cs-ware.de> Date: Sat Aug 6 23:06:09 2011 +0200 Translation update done using Pootle. commit 050422360d1fcec576da347a44727f4fb147449a Author: Sven Strickroth <email(a)cs-ware.de> Date: Sat Aug 6 23:05:50 2011 +0200 Translation update done using Pootle. commit c7ea143efa56709f67b53b3ca0d8612182dc1686 Author: Sven Strickroth <email(a)cs-ware.de> Date: Sat Aug 6 23:05:36 2011 +0200 Translation update done using Pootle. commit c6834f6279666b57375d20fd9496d26b662d4609 Author: Sven Strickroth <email(a)cs-ware.de> Date: Sat Aug 6 23:04:41 2011 +0200 Translation update done using Pootle. commit d1a32f1d08b6bc171ad0bde7abeb70c304ffd17d Merge: 14599ef a5394bd Author: Pootle server <pootle(a)cihar.com> Date: Sat Aug 6 18:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit 14599efd3eb62ca76c8e4d1e7ea7a0fc57f52313 Merge: 44e380b db29c02 Author: Pootle server <pootle(a)cihar.com> Date: Sat Aug 6 14:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit 44e380b802448341962b55b46b5ab20dde657744 Merge: 8562577 017c1ee Author: Pootle server <pootle(a)cihar.com> Date: Sat Aug 6 12:40:12 2011 +0200 Merge remote-tracking branch 'origin/master' commit 8562577f03c4dc7637bc42278c76b8ac5441fd65 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 12:16:33 2011 +0200 Translation update done using Pootle. commit fdb4b9213b5f480537819ea15726fbdf56121e51 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 12:15:23 2011 +0200 Translation update done using Pootle. commit ae2415f45371e5e7fbd921f396cc18ddc1472560 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:59:54 2011 +0200 Translation update done using Pootle. commit 6e7bd5dba80eb467c9d79dff4164e0dae8b7870b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:58:36 2011 +0200 Translation update done using Pootle. commit 1e83fc945ccfa0661d2375b69f9eb51bee6529b0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:39:34 2011 +0200 Translation update done using Pootle. commit 1a2f348cdf5efd7ef91596711043e95a3fc70c3f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:39:30 2011 +0200 Translation update done using Pootle. commit 68102d8af990ffbc06ca9be84027e55e1607d0cb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:32:12 2011 +0200 Translation update done using Pootle. commit fd322a24125d3f57d06ba2eccc71eb0582388a77 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:31:46 2011 +0200 Translation update done using Pootle. commit 30b4cad7e267910a8f69d02cbce066964da38f19 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:31:36 2011 +0200 Translation update done using Pootle. commit d444eb634714337c958b6c0b9b208f5a9d4a425e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:31:13 2011 +0200 Translation update done using Pootle. commit c0548ddc7873bad4c3c1fe5563e50904b1cfff9c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:29:01 2011 +0200 Translation update done using Pootle. commit 5b0a228d759f6684efd9a5ac6c42c02b73e475d6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:27:11 2011 +0200 Translation update done using Pootle. commit 9d1b62e523db25b3d60409ede9e48045107794d0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:26:05 2011 +0200 Translation update done using Pootle. commit b2d50fb9a96157c74c8e52d74e7039b39f71a8d9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:25:50 2011 +0200 Translation update done using Pootle. commit 70be3a9f924bd8277d276b3c7fbc67a93307838a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:22:32 2011 +0200 Translation update done using Pootle. commit a1b0c1cd697c7ba69ce158ffb1380131d03cf575 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:22:00 2011 +0200 Translation update done using Pootle. commit 833438ee1bec418b758a7659ff72c808da1fe94d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:21:23 2011 +0200 Translation update done using Pootle. commit 2dbb1d61d9354d7747a49c81f8ca3e0f946a7268 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Aug 6 11:21:12 2011 +0200 Translation update done using Pootle. commit e6b0fdabae2895f3f71a29a558906d345138331b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Aug 6 11:10:30 2011 +0200 Translation update done using Pootle. commit 269eeb77153a806eaef05a56ab3b90c91eadf068 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Aug 6 11:09:52 2011 +0200 Translation update done using Pootle. commit 39d645f09010dce4b3dd9b8a79d4f90d69d93988 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Aug 6 11:09:35 2011 +0200 Translation update done using Pootle. commit fa7b34c90096055fb22e96ffed4f7b56170323e2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Aug 6 11:09:06 2011 +0200 Translation update done using Pootle. commit 79e9e0695e1632596ee5aa586b5c11df863d60a9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Aug 6 11:07:44 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ar.po | 66 +++++++++++++++++++++++++++---------------------------------- po/de.po | 15 +++++-------- po/ja.po | 45 ++++++++++++++++------------------------- po/tr.po | 20 ++++++++---------- 4 files changed, 62 insertions(+), 84 deletions(-) diff --git a/po/ar.po b/po/ar.po index c99330f..747dead 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-07-25 22:07+0200\n" +"PO-Revision-Date: 2011-08-07 03:51+0200\n" "Last-Translator: Abdullah Al-Saedi <abdullah.10(a)windowslive.com>\n" "Language-Team: arabic <ar(a)li.org>\n" "Language: ar\n" @@ -419,10 +419,10 @@ msgid "You have to choose at least one column to display" msgstr "عليك اختيار عمود واحد على الأقل للعرض" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "الباني المرئي" +msgstr "التحويل إلى %sالباني المرئي%s" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:939 @@ -1154,32 +1154,28 @@ msgid "Average load" msgstr "متوسط التحميل" #: js/messages.php:101 -#, fuzzy #| msgid "System memory" msgid "Total memory" -msgstr "ذاكرة النظام" +msgstr "إجمالي الذاكرة" #: js/messages.php:102 -#, fuzzy #| msgid "System memory" msgid "Cached memory" -msgstr "ذاكرة النظام" +msgstr "الذاكرة المؤقتة" #: js/messages.php:103 msgid "Buffered memory" msgstr "" #: js/messages.php:104 -#, fuzzy #| msgid "System memory" msgid "Free memory" -msgstr "ذاكرة النظام" +msgstr "الذاكرة الحرة" #: js/messages.php:105 -#, fuzzy #| msgid "System memory" msgid "Used memory" -msgstr "ذاكرة النظام" +msgstr "الذاكرة المستخدمة" #: js/messages.php:107 #, fuzzy @@ -1203,13 +1199,12 @@ msgstr "صفحات حرة" #: js/messages.php:112 msgid "Bytes sent" -msgstr "" +msgstr "بايتات أُرسلت" #: js/messages.php:113 -#, fuzzy #| msgid "Received" msgid "Bytes received" -msgstr "استلم" +msgstr "بايتات أُستلمت" #: js/messages.php:114 server_status.php:991 msgid "Connections" @@ -1234,10 +1229,9 @@ msgid "Remove chart" msgstr "حذف الرسم البياني" #: js/messages.php:122 -#, fuzzy #| msgid "Edit labels and series" msgid "Edit title and labels" -msgstr "حذف العناوين والسلاسل" +msgstr "تحرير العناوين" #: js/messages.php:123 msgid "Add chart to grid" @@ -1264,19 +1258,19 @@ msgstr "" #: js/messages.php:130 msgid "general_log and slow_query_log are enabled." -msgstr "" +msgstr "(general_log و slow_query_log) مفعلة." #: js/messages.php:131 msgid "general_log is enabled." -msgstr "" +msgstr "general_log مفعل." #: js/messages.php:132 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log مفعل." #: js/messages.php:133 msgid "slow_query_log and general_log are disabled." -msgstr "" +msgstr "(general_log و slow_query_log) معطلة." #: js/messages.php:134 msgid "log_output is not set to TABLE." @@ -1297,7 +1291,7 @@ msgstr "" #: js/messages.php:137 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time محددة بـ %d ثانية." #: js/messages.php:138 msgid "" @@ -1307,48 +1301,48 @@ msgstr "" #. l10n: %s is FILE or TABLE #: js/messages.php:140 -#, fuzzy, php-format +#, php-format #| msgid "Save as file" msgid "Set log_output to %s" -msgstr "حفظ كملف" +msgstr "تعيين log_output بـ %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:142 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" -msgstr "مفعل" +msgstr "تفعيل %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:144 -#, fuzzy, php-format +#, php-format #| msgid "Disable" msgid "Disable %s" -msgstr "عطل" +msgstr "تعطيل %s" #. l10n: %d seconds #: js/messages.php:146 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "تعيين long_query_time بـ %ds" #: js/messages.php:147 msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"لاتستطيع تغير هذه المتغيرات , فضلاً سجل دخولك كمدير أو أتصل بمدير قاعدة " +"البيانات." #: js/messages.php:148 -#, fuzzy #| msgid "General relation features" msgid "Change settings" -msgstr "المزايا العامّة للرابط" +msgstr "تغيير الإعدادات" #: js/messages.php:149 -#, fuzzy #| msgid "General relation features" msgid "Current settings" -msgstr "المزايا العامّة للرابط" +msgstr "الإعدادات الحالية" #: js/messages.php:151 server_status.php:1467 #, fuzzy @@ -1358,15 +1352,14 @@ msgstr "استورد الملفات" #. l10n: As in differential values #: js/messages.php:153 -#, fuzzy #| msgid "Difference" msgid "Differential" -msgstr "فرق" +msgstr "الفارق" #: js/messages.php:154 #, php-format msgid "Divided by %s:" -msgstr "" +msgstr "مقسوم على %s :" #: js/messages.php:156 msgid "From slow log" @@ -1399,10 +1392,9 @@ msgid "Log data loaded. Queries executed in this time span:" msgstr "" #: js/messages.php:163 -#, fuzzy #| msgid "Jump to database" msgid "Jump to Log table" -msgstr "قفز لقاعدة البيانات" +msgstr "قفز لجدول التسجيل" #: js/messages.php:164 msgid "Log analysed, but no data found in this time span." diff --git a/po/de.po b/po/de.po index 1d2fd27..6653ff9 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(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-08-05 03:43+0200\n" +"PO-Revision-Date: 2011-08-06 23:06+0200\n" "Last-Translator: Sven Strickroth <email(a)cs-ware.de>\n" "Language-Team: german <de(a)li.org>\n" "Language: de\n" @@ -1454,7 +1454,6 @@ msgid "" msgstr "" #: js/messages.php:178 -#, fuzzy #| msgid "Reload" msgid "Reload page" msgstr "Neuladen" @@ -2316,7 +2315,7 @@ msgstr "PBMS: Infos über BLOB nicht erhalten:" #, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "Fehler beim Lesen des BLOB Content-Typs" +msgstr "PBMS konnte den BLOB Content-Typs nicht bestimmen" #: libraries/blobstreaming.lib.php:358 msgid "View image" @@ -6324,10 +6323,9 @@ msgid "Stand-in structure for view" msgstr "Stellvertreter-Struktur des Views" #: libraries/export/sql.php:1071 -#, fuzzy #| msgid "Allows reading data." msgid "Error reading data:" -msgstr "Erlaubt das Auslesen von Daten." +msgstr "Fehler beim Lesen der Daten:" #: libraries/export/xml.php:19 libraries/import/xml.php:21 msgid "XML" @@ -6394,10 +6392,10 @@ msgid "Go to database" msgstr "Gehe zur Datenbank" #: libraries/import.lib.php:1077 libraries/import.lib.php:1101 -#, fuzzy, php-format +#, php-format #| msgid "Missing data for %s" msgid "Edit settings for %s" -msgstr "Fehlende Daten für %s" +msgstr "Einstellung für %s bearbeiten" #: libraries/import.lib.php:1096 msgid "Go to table" @@ -6407,7 +6405,7 @@ msgstr "Gehe zur Tabelle" #, fuzzy, php-format #| msgid "Structure only" msgid "Structure of %s" -msgstr "Nur Struktur" +msgstr "Struktur von %s" #: libraries/import.lib.php:1105 msgid "Go to view" @@ -10120,7 +10118,6 @@ msgid "Refresh rate" msgstr "Aktualisierungs-Intervall" #: server_status.php:1414 -#, fuzzy #| msgid "Chart columns:" msgid "Chart columns" msgstr "Schaubild-Spalten" diff --git a/po/ja.po b/po/ja.po index 96ce7a5..97a2e00 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-08-05 12:00+0200\n" +"PO-Revision-Date: 2011-08-06 12:16+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -417,7 +417,7 @@ msgstr "最低 1 つは表示するカラムを選択してください" #, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "%sビジュアルクエリビルダ%s に切り替える" +msgstr "%sビジュアル・クエリ・ビルダ%sに切り替える" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:939 @@ -1150,64 +1150,56 @@ msgid "Average load" msgstr "平均負荷" #: js/messages.php:101 -#, fuzzy #| msgid "System memory" msgid "Total memory" -msgstr "システムメモリ" +msgstr "総メモリ" #: js/messages.php:102 -#, fuzzy #| msgid "System memory" msgid "Cached memory" -msgstr "システムメモリ" +msgstr "キャッシュ割り当てメモリ" #: js/messages.php:103 -#, fuzzy #| msgid "Buffer Pool" msgid "Buffered memory" -msgstr "バッファプール" +msgstr "バッファ割り当てメモリ" #: js/messages.php:104 -#, fuzzy #| msgid "System memory" msgid "Free memory" -msgstr "システムメモリ" +msgstr "空きメモリ" #: js/messages.php:105 -#, fuzzy #| msgid "System memory" msgid "Used memory" -msgstr "システムメモリ" +msgstr "使用中メモリ" #: js/messages.php:107 -#, fuzzy #| msgid "Total" msgid "Total Swap" -msgstr "合計" +msgstr "総スワップ領域" #: js/messages.php:108 msgid "Cached Swap" -msgstr "" +msgstr "キャッシュ割り当てスワップ領域" #: js/messages.php:109 msgid "Used Swap" -msgstr "" +msgstr "使用中スワップ領域" #: js/messages.php:110 -#, fuzzy #| msgid "Free pages" msgid "Free Swap" -msgstr "フリーページ数" +msgstr "空きスワップ領域" #: js/messages.php:112 msgid "Bytes sent" -msgstr "" +msgstr "送信" #: js/messages.php:113 -#, fuzzy #| msgid "Received" msgid "Bytes received" -msgstr "受信済" +msgstr "受信" #: js/messages.php:114 server_status.php:991 msgid "Connections" @@ -1439,7 +1431,7 @@ msgstr "ログの読み込み" #: js/messages.php:176 msgid "Monitor refresh failed" -msgstr "" +msgstr "モニタの再描画に失敗しました" #: js/messages.php:177 msgid "" @@ -1994,7 +1986,8 @@ msgid "" "Error moving the uploaded file, see [a@./Documentation." "html#faq1_11@Documentation]FAQ 1.11[/a]" msgstr "" -"アップロードされたファイルの移動に失敗しました。FAQ 1.11 をご覧ください。" +"アップロードされたファイルの移動に失敗しました。[a@./Documentation.html#faq1_11@Documentation]FAQ " +"1.11[/a] をご覧ください。" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." @@ -2294,10 +2287,9 @@ msgid "PBMS get BLOB info failed:" msgstr "PBMS が BLOB 情報取得に失敗しました:" #: libraries/blobstreaming.lib.php:332 -#, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "BLOB の Content-Type の取得に失敗しました" +msgstr "PBMS が BLOB の Content-Type の取得に失敗しました" #: libraries/blobstreaming.lib.php:358 msgid "View image" @@ -4579,7 +4571,7 @@ msgstr "パスワード変更フォームの表示" #: libraries/config/messages.inc.php:452 msgid "Show create database form" -msgstr "「新規データベース作成」部分を表示する" +msgstr "「データベースを作成する」の部分を表示する" #: libraries/config/messages.inc.php:453 msgid "" @@ -9938,7 +9930,6 @@ msgid "Refresh rate" msgstr "再描画間隔" #: server_status.php:1414 -#, fuzzy #| msgid "Chart columns:" msgid "Chart columns" msgstr "1 段のグラフ数" diff --git a/po/tr.po b/po/tr.po index b8efcb3..5c1d4a2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-08-04 19:08+0200\n" +"PO-Revision-Date: 2011-08-06 11:10+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -414,10 +414,10 @@ msgid "You have to choose at least one column to display" msgstr "Görüntülemek için en az bir sütun seçmelisiniz" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "görsel yaratıcı" +msgstr "%sGörsel yaratıcı'ya%s geç" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:939 @@ -2279,10 +2279,9 @@ msgid "PBMS get BLOB info failed:" msgstr "PBMS, BLOB bilgisi alması başarısız:" #: libraries/blobstreaming.lib.php:332 -#, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "BLOB İçerik Türü alma başarısız" +msgstr "PBMS, BLOB İçerik Türü alması başarısız" #: libraries/blobstreaming.lib.php:358 msgid "View image" @@ -6283,10 +6282,9 @@ msgid "Stand-in structure for view" msgstr "Görünüm yapısı durumu" #: libraries/export/sql.php:1071 -#, fuzzy #| msgid "Allows reading data." msgid "Error reading data:" -msgstr "Veri okunmasına izin verir." +msgstr "Veri okunması hatası:" #: libraries/export/xml.php:19 libraries/import/xml.php:21 msgid "XML" @@ -6351,20 +6349,20 @@ msgid "Go to database" msgstr "Veritabanına git" #: libraries/import.lib.php:1077 libraries/import.lib.php:1101 -#, fuzzy, php-format +#, php-format #| msgid "Missing data for %s" msgid "Edit settings for %s" -msgstr "%s için kayıp veri" +msgstr "%s için ayarları düzenle" #: libraries/import.lib.php:1096 msgid "Go to table" msgstr "Tabloya git" #: libraries/import.lib.php:1099 -#, fuzzy, php-format +#, php-format #| msgid "Structure only" msgid "Structure of %s" -msgstr "Sadece yapı" +msgstr "%s yapısı" #: libraries/import.lib.php:1105 msgid "Go to view" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13283-gff6b491
by Madhura Jayaratne 07 Aug '11

07 Aug '11

The branch, master has been updated via ff6b491a63d8053b34f3e7e1f9c9049ffc4f7919 (commit) from a137097f20211f2393bd4a2283773e3afb2695ca (commit) - Log ----------------------------------------------------------------- commit ff6b491a63d8053b34f3e7e1f9c9049ffc4f7919 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Aug 7 18:49:34 2011 +0530 Typo ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca7feb5..128f603 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,7 +46,7 @@ phpMyAdmin - ChangeLog - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing -- bug #3383711 [display] Order by a column in a view doesn't work in some cases +- patch #3383711 [display] Order by a column in a view doesn't work in some cases - bug #3386434 [interface] Add missing space to server status 3.4.4.0 (not yet released) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13282-ga137097
by Madhura Jayaratne 07 Aug '11

07 Aug '11

The branch, master has been updated via a137097f20211f2393bd4a2283773e3afb2695ca (commit) from 275637daa25a94e8e29f07137403a7a17aac9b1d (commit) - Log ----------------------------------------------------------------- commit a137097f20211f2393bd4a2283773e3afb2695ca Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Aug 7 18:41:04 2011 +0530 Wrong ChangeLog entry ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6bc67e4..ca7feb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,7 +48,6 @@ phpMyAdmin - ChangeLog - bug #3374802 [interface] Comment on a column breaks inline editing - bug #3383711 [display] Order by a column in a view doesn't work in some cases - bug #3386434 [interface] Add missing space to server status -- patch #3385954 [interface] "Unknown table status: Create_time" on dispalying view 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13281-g275637d
by Madhura Jayaratne 07 Aug '11

07 Aug '11

The branch, master has been updated via 275637daa25a94e8e29f07137403a7a17aac9b1d (commit) via fcb4986598223d6aa61bc2d1d6c6215bf9fdfda5 (commit) via ed45a8e1f5502995c219144d4dbbb2b276aec28d (commit) from a11a782cb6a387a9defb380887844ccd7bcbe96b (commit) - Log ----------------------------------------------------------------- commit 275637daa25a94e8e29f07137403a7a17aac9b1d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Aug 7 18:33:13 2011 +0530 ChangeLog entry for patch #3385954 commit fcb4986598223d6aa61bc2d1d6c6215bf9fdfda5 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 4 01:50:04 2011 +0200 there is no create_time-status for views Signed-off-by: Sven Strickroth <email(a)cs-ware.de> commit ed45a8e1f5502995c219144d4dbbb2b276aec28d Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 4 01:31:30 2011 +0200 use i10n for error message Signed-off-by: Sven Strickroth <email(a)cs-ware.de> ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/Table.class.php | 8 ++++---- libraries/display_tbl.lib.php | 6 ++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca7feb5..6bc67e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ phpMyAdmin - ChangeLog - bug #3374802 [interface] Comment on a column breaks inline editing - bug #3383711 [display] Order by a column in a view doesn't work in some cases - bug #3386434 [interface] Add missing space to server status +- patch #3385954 [interface] "Unknown table status: Create_time" on dispalying view 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/libraries/Table.class.php b/libraries/Table.class.php index d2a0dbe..80ab727 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -300,7 +300,7 @@ class PMA_Table if (! isset(PMA_Table::$cache[$db][$table][$info])) { if (! $disable_error) { - trigger_error('unknown table status: ' . $info, E_USER_WARNING); + trigger_error(__('unknown table status: ') . $info, E_USER_WARNING); } return false; } @@ -1338,7 +1338,7 @@ class PMA_Table } } else if ($property == self::PROP_COLUMN_ORDER || $property == self::PROP_COLUMN_VISIB) { - if (isset($this->uiprefs[$property])) { + if (! PMA_Table::isView($this->db_name, $this->name) && isset($this->uiprefs[$property])) { // check if the table has not been modified if (self::sGetStatusInfo($this->db_name, $this->name, 'Create_time') == $this->uiprefs['CREATE_TIME']) { @@ -1376,8 +1376,8 @@ class PMA_Table $this->loadUiPrefs(); } // we want to save the create time if the property is PROP_COLUMN_ORDER - if ($property == self::PROP_COLUMN_ORDER || - $property == self::PROP_COLUMN_VISIB) { + if (! PMA_Table::isView($this->db_name, $this->name) && ($property == self::PROP_COLUMN_ORDER || + $property == self::PROP_COLUMN_VISIB)) { $curr_create_time = self::sGetStatusInfo($this->db_name, $this->name, 'CREATE_TIME'); if (isset($table_create_time) && diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 797a3eb..19a1749 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -414,8 +414,10 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di echo '<input id="col_visib" type="hidden" value="' . implode(',', $col_visib) . '" />'; } // generate table create time - echo '<input id="table_create_time" type="hidden" value="' . - PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], 'Create_time') . '" />'; + if (! PMA_Table::isView($GLOBALS['table'], $GLOBALS['db'])) { + echo '<input id="table_create_time" type="hidden" value="' . + PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], 'Create_time') . '" />'; + } } // generate hints echo '<input id="col_order_hint" type="hidden" value="' . __('Drag to reorder') . '" />'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13278-ga11a782
by Madhura Jayaratne 07 Aug '11

07 Aug '11

The branch, master has been updated via a11a782cb6a387a9defb380887844ccd7bcbe96b (commit) via 969c59e8a676746c5a14881698fb473bd4c60c26 (commit) via 7b13b6f8645ad3514e8aa1472562c8fbffd20d11 (commit) from a5394bdc1de0382f7939233a04a0b5f3a0491219 (commit) - Log ----------------------------------------------------------------- commit a11a782cb6a387a9defb380887844ccd7bcbe96b Merge: 969c59e8a676746c5a14881698fb473bd4c60c26 a5394bdc1de0382f7939233a04a0b5f3a0491219 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Aug 7 18:23:22 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 969c59e8a676746c5a14881698fb473bd4c60c26 Merge: 55c6eacf3e56da064dae69650480d84acd92d5a3 7b13b6f8645ad3514e8aa1472562c8fbffd20d11 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Aug 7 18:21:34 2011 +0530 Merge branch 'QA_3_4' Conflicts: server_status.php ----------------------------------------------------------------------- Summary of changes: Documentation.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Documentation.html b/Documentation.html index 393e5c7..72387ab 100644 --- a/Documentation.html +++ b/Documentation.html @@ -3095,6 +3095,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L] <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.post.max_arr…">suhosin.post.max_array_index_length</a> should be increased (eg. 256)</li> <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.request.max_…">suhosin.request.max_totalname_length</a> should be increased (eg. 8192)</li> <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.post.max_tot…">suhosin.post.max_totalname_length</a> should be increased (eg. 8192)</li> + <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.get.max_valu…">suhosin.get.max_value_length</a> should be increased (eg. 1024)</li> <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.sql.bailout_…">suhosin.sql.bailout_on_error</a> needs to be disabled (the default)</li> <li><a href="http://www.hardened-php.net/suhosin/configuration.html#logging_configuration">suhosin.log.*</a> should not include SQL, otherwise you get big slowdown</li> </ul> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-67-g7b13b6f
by Madhura Jayaratne 07 Aug '11

07 Aug '11

The branch, QA_3_4 has been updated via 7b13b6f8645ad3514e8aa1472562c8fbffd20d11 (commit) from 20298630ed949dba0cab7f6b4bb968c8a5de935f (commit) - Log ----------------------------------------------------------------- commit 7b13b6f8645ad3514e8aa1472562c8fbffd20d11 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Aug 7 18:08:25 2011 +0530 Documentation about suhosin.get.max_value_length limitation ----------------------------------------------------------------------- Summary of changes: Documentation.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Documentation.html b/Documentation.html index d7f2501..f8791d6 100644 --- a/Documentation.html +++ b/Documentation.html @@ -3036,6 +3036,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L] <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.post.max_arr…">suhosin.post.max_array_index_length</a> should be increased (eg. 256)</li> <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.request.max_…">suhosin.request.max_totalname_length</a> should be increased (eg. 8192)</li> <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.post.max_tot…">suhosin.post.max_totalname_length</a> should be increased (eg. 8192)</li> + <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.get.max_valu…">suhosin.get.max_value_length</a> should be increased (eg. 1024)</li> <li><a href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.sql.bailout_…">suhosin.sql.bailout_on_error</a> needs to be disabled (the default)</li> <li><a href="http://www.hardened-php.net/suhosin/configuration.html#logging_configuration">suhosin.log.*</a> should not include SQL, otherwise you get big slowdown</li> </ul> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13275-ga5394bd
by Herman van Rink 06 Aug '11

06 Aug '11

The branch, master has been updated via a5394bdc1de0382f7939233a04a0b5f3a0491219 (commit) via f1025544e631c4006ac42be2ddcc5904b567ae8d (commit) from db29c02f7a96d10e0369e1adf43fd285cdb3f230 (commit) - Log ----------------------------------------------------------------- commit a5394bdc1de0382f7939233a04a0b5f3a0491219 Merge: f1025544e631c4006ac42be2ddcc5904b567ae8d db29c02f7a96d10e0369e1adf43fd285cdb3f230 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Aug 6 17:13:04 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit f1025544e631c4006ac42be2ddcc5904b567ae8d Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Aug 6 17:09:01 2011 +0200 Added SQL dump of databases and tables useful for security testing ----------------------------------------------------------------------- Summary of changes: test/test_data/exploit_test.sql | 150 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 150 insertions(+), 0 deletions(-) create mode 100644 test/test_data/exploit_test.sql diff --git a/test/test_data/exploit_test.sql b/test/test_data/exploit_test.sql new file mode 100644 index 0000000..dce733f --- /dev/null +++ b/test/test_data/exploit_test.sql @@ -0,0 +1,150 @@ +-- phpMyAdmin SQL Dump +-- version 3.5.0-dev +-- http://www.phpmyadmin.net +-- +-- Host: barclay +-- Generation Time: Aug 06, 2011 at 04:53 PM +-- Server version: 5.1.49-3-log +-- PHP Version: 5.3.3-7+squeeze1 + +SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + +DROP DATABASE `"><script>alert(200);</script>`; +DROP DATABASE `'><script>alert(201);</script>`; +DROP DATABASE `exploit_test`; + +-- +-- Database: `"><script>alert(200);</script>` +-- +CREATE DATABASE `"><script>alert(200);</script>` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci; + +-- +-- Database: `'><script>alert(201);</script>` +-- +CREATE DATABASE `'><script>alert(201);</script>` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci; + +-- +-- Database: `exploit_test` +-- +CREATE DATABASE `exploit_test` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci; +USE `exploit_test`; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `"><script>alert(109);</script>` +-- + +CREATE TABLE IF NOT EXISTS `"><script>alert(109);</script>` ( + `id` int(2) NOT NULL, + `foo` varchar(255) NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `"><script>alert(109);</script>` +-- + +INSERT INTO `"><script>alert(109);</script>` (`id`, `foo`) VALUES +(1, ''), +(2, ''); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `'; eval('alert(107)')` +-- + +CREATE TABLE IF NOT EXISTS `'; eval('alert(107)')` ( + `id` int(11) NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `'><script>alert(106);</script>` +-- + +CREATE TABLE IF NOT EXISTS `'><script>alert(106);</script>` ( + `id` int(2) NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `<script>alert(105);</script>` +-- + +CREATE TABLE IF NOT EXISTS `<script>alert(105);</script>` ( + `dsaf` int(4) NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `<script>alert(105);</script>` +-- + +INSERT INTO `<script>alert(105);</script>` (`dsaf`) VALUES +(1); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `evil_column_names` +-- + +CREATE TABLE IF NOT EXISTS `evil_column_names` ( + `<script>alert(100);</script>` int(1) NOT NULL, + `"><script>alert(101);</script>` int(2) NOT NULL, + `'><script>alert(102);</script>` int(2) NOT NULL, + `evil_comment` int(3) NOT NULL COMMENT '<script>alert(104);</script>' +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `evil_column_names` +-- + +INSERT INTO `evil_column_names` (`<script>alert(100);</script>`, `"><script>alert(101);</script>`, `'><script>alert(102);</script>`, `evil_comment`) VALUES +(1, 23, 45, 5), +(2, 3, 77, 3); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `evil_content` +-- + +CREATE TABLE IF NOT EXISTS `evil_content` ( + `text` varchar(255) NOT NULL + ) ENGINE=MyISAM DEFAULT CHARSET=latin1; + + +-- +-- Dumping data for table `evil_content` +-- + +INSERT INTO `evil_content` (`text`) VALUES +('"><script>alert(301);</script>'), +('''><script>alert(302);</script>'), +('<script>alert(303);</script>'), +('''; eval(''alert(304)'');'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `evil_table_comment` +-- + +CREATE TABLE IF NOT EXISTS `evil_table_comment` ( + `id` int(1) NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='"><script>alert(400);</script>'; + + +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13273-gdb29c02
by Piotr Przybylski 06 Aug '11

06 Aug '11

The branch, master has been updated via db29c02f7a96d10e0369e1adf43fd285cdb3f230 (commit) via 7e749a5f43dfe665cdf566da9963b4b2595fe789 (commit) from 017c1ee960e8f3b3fc2c36e15330c1af72991e4c (commit) - Log ----------------------------------------------------------------- commit db29c02f7a96d10e0369e1adf43fd285cdb3f230 Merge: 7e749a5f43dfe665cdf566da9963b4b2595fe789 017c1ee960e8f3b3fc2c36e15330c1af72991e4c Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Aug 6 12:54:28 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin Conflicts: libraries/advisory_rules.txt commit 7e749a5f43dfe665cdf566da9963b4b2595fe789 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Aug 6 12:50:20 2011 +0200 Fix broken character ----------------------------------------------------------------------- Summary of changes: libraries/advisory_rules.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index da95d48..c193f85 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -139,7 +139,7 @@ rule 'Query cache fragmentation' [!fired('Query cache disabled')] Qcache_free_blocks / (Qcache_total_blocks / 2) * 100 value > 20 The query cache is considerably fragmented. - Severe fragmentation is likely to (further) increase Qcache_lowmem_prunes. This might be caused by many Query cache low memory prunes due to {query_cache_size} being too small. For a immediate but short lived fix you can flush the query cache (might lock the query cache for a long time). Carefully adjusting {query_cache_min_res_unit} to a lower value might help too, e.g. you can set it to the average size of your queries in the cache using this formula: (query_cache_size � qcache_free_memory) / qcache_queries_in_cache + Severe fragmentation is likely to (further) increase Qcache_lowmem_prunes. This might be caused by many Query cache low memory prunes due to {query_cache_size} being too small. For a immediate but short lived fix you can flush the query cache (might lock the query cache for a long time). Carefully adjusting {query_cache_min_res_unit} to a lower value might help too, e.g. you can set it to the average size of your queries in the cache using this formula: (query_cache_size - qcache_free_memory) / qcache_queries_in_cache The cache is currently fragmented by %s% , with 100% fragmentation meaning that the query cache is an alternating pattern of free and used blocks. This value should be below 20%. | round(value,1) rule 'Query cache low memory prunes' [Qcache_inserts > 0 && !fired('Query cache disabled')] hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13271-g017c1ee
by Dieter Adriaenssens 06 Aug '11

06 Aug '11

The branch, master has been updated via 017c1ee960e8f3b3fc2c36e15330c1af72991e4c (commit) from 67d5346da5fdcfacdd73bf49c444a88842c88ae7 (commit) - Log ----------------------------------------------------------------- commit 017c1ee960e8f3b3fc2c36e15330c1af72991e4c Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sat Aug 6 12:24:17 2011 +0200 fix typos ----------------------------------------------------------------------- Summary of changes: libraries/advisory_rules.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index 3f3f985..da95d48 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -78,7 +78,7 @@ rule 'Slow query logging' rule 'Release Series' version !PMA_DRIZZLE && substr(value,0,3) != "5.1" - The MySQL server version less than 5.1. + The MySQL server version is less than 5.1. You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 even more so. Current version: %s | value @@ -139,7 +139,7 @@ rule 'Query cache fragmentation' [!fired('Query cache disabled')] Qcache_free_blocks / (Qcache_total_blocks / 2) * 100 value > 20 The query cache is considerably fragmented. - Severe fragementation is likely to (further) increase Qcache_lowmem_prunes. This might be caused by many Query cache low memory prunes due to {query_cache_size} being too small. For a immediate but short lived fix you can flush the query cache (might lock the query cache for a long time). Carefully adjusting {query_cache_min_res_unit} to a lower value might help too, e.g. you can set it to the average size of your queries in the cache using this formula: (query_cache_size � qcache_free_memory) / qcache_queries_in_cache + Severe fragmentation is likely to (further) increase Qcache_lowmem_prunes. This might be caused by many Query cache low memory prunes due to {query_cache_size} being too small. For a immediate but short lived fix you can flush the query cache (might lock the query cache for a long time). Carefully adjusting {query_cache_min_res_unit} to a lower value might help too, e.g. you can set it to the average size of your queries in the cache using this formula: (query_cache_size � qcache_free_memory) / qcache_queries_in_cache The cache is currently fragmented by %s% , with 100% fragmentation meaning that the query cache is an alternating pattern of free and used blocks. This value should be below 20%. | round(value,1) rule 'Query cache low memory prunes' [Qcache_inserts > 0 && !fired('Query cache disabled')] hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git August 2011