- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_2, updated. RELEASE_3_4_2RC1-2-g4f22514
by Michal Čihař 07 Jun '11

07 Jun '11

The branch, MAINT_3_4_2 has been updated via 4f2251417ce9944a22cef94ae72c6fa88f6037e2 (commit) from b8c45c434a6fecef3c5f065df8e649d86c546123 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/si.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/si.po b/po/si.po index 39305aa..5b15c7f 100644 --- a/po/si.po +++ b/po/si.po @@ -1131,7 +1131,7 @@ msgstr "නොසලකන්න" #: js/messages.php:101 msgid "Select referenced key" -msgstr "" +msgstr "සම්බන්දිත මූලය තෝරන්න" # ප්‍රාථමික මූලය = Primary key. Source: Glossary of Information Technology # Terms - ICTA @@ -1722,7 +1722,7 @@ msgstr "දෘඪාංග සත්‍යාපනය අසමත් විය #: libraries/auth/swekey/swekey.auth.lib.php:166 msgid "No valid authentication key plugged" -msgstr "" +msgstr "වලංගු සත්‍යාපන යතුරක් සම්බන්ද කර නැත" #: libraries/auth/swekey/swekey.auth.lib.php:202 msgid "Authenticating..." @@ -1738,11 +1738,11 @@ msgstr "PBMS සම්බන්ධතාවය අසමත් විය:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "PBMS BLOB තොරතුරු ලබාගැනීම අසමත් විය:" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "BLOB අන්තර්ගත-ප්‍රකාරය ලබාගැනීම අසමත් විය:" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1750,7 +1750,7 @@ msgstr "දසුන නරඹන්න" #: libraries/blobstreaming.lib.php:351 msgid "Play audio" -msgstr "" +msgstr "Play audio" #: libraries/blobstreaming.lib.php:356 msgid "View video" @@ -2225,12 +2225,12 @@ msgstr "\"%s\" සඳහා %s දිගුව අවශ්‍යය" #: libraries/config/FormDisplay.class.php:755 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "ආනයන අකර්මන්‍යයි, (%s) ක්‍රියාවලිය නොමැත" #: libraries/config/FormDisplay.class.php:759 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "අපනයන අකර්මන්‍යයි, (%s) ක්‍රියාවලිය නොමැත" #: libraries/config/FormDisplay.class.php:766 msgid "SQL Validator is disabled" @@ -2247,7 +2247,7 @@ msgstr "උපරිම %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" -msgstr "" +msgstr "මෙම සිටුවම අක්‍රීය කර ඇත, ඔබගේ වින්‍යාස සඳහා එය නොයෙදෙනු ඇත" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3252-gd14a687
by Michal Čihař 07 Jun '11

07 Jun '11

The branch, master has been updated via d14a6876cf75ecd1fa6375aa8a7d0da81a10b7a9 (commit) via c6a0b7c9933d10fd1dcd7ebb7bdb49fc0b38abb4 (commit) via 2c51a59ff97e24bfd69c2f0cf3e29a34ba635a30 (commit) via 2ee26061c222c50a06d9a386ae6b68df907ae817 (commit) via b6c6f9f99cd8318b728a1c1def9c19165797a1f1 (commit) via aa91133e662b9e7c5cc1fd0ae8d3e137f1cbc9f5 (commit) via c46c45f8235fd96d754f100bdae5566dc4e02922 (commit) via 627beae6706182bacd3594f878805e2254960a75 (commit) via c3081dfc121b5bd7e534fb7542ded90c74c243ad (commit) via 38d4ff35b7b7740c0a996744caf3d7f1d7d882f2 (commit) via c32d8cf1d0357111ffa48b025e74261fed2009f6 (commit) via c2420c15ee320073b114fed13d285b5a9ab7b09e (commit) via 91538ca433c1fd9cb1a9903b0190db84cd89c884 (commit) via 7182a5b1eba69876ef9b093a6d4ea2d456446c50 (commit) via 56aff8629975fe1b464735f95e69dd4ed01885ce (commit) via fe1d24906e9c0f6e0db7c06be7491d843df41140 (commit) via 1ec3963ea2e1bdb4211e702d8bbc18a0842bda93 (commit) via 4da19fe86a49f1003f636327690ae244bdbcbcce (commit) via 1c84f530c39a11609bcb241b0dea8a9a4a48865c (commit) via 653d7341ad93fb23eda97065e6921063cdd88449 (commit) via 4dd51f19a66545becfb7086d3a01831bc579b698 (commit) via a8b4ac0135b91981bd32aa642f7424866274575c (commit) via 720ce7ec2f1cb092fff417ae1e209f28db96f6cb (commit) via 1dcaa85acd15236165c9334844c0e42ac8e8a660 (commit) via 5c5d5f249a9650ebbde8ad98b736d68bd8d71313 (commit) via 654811f6aa5b28cf7b8708febe560142e4b3b34c (commit) via 9847e9e8584a7d09383b953c00376ca7e7c09e00 (commit) via 2f1a7b2f4f91deb8da17a0ee18a4cc123f1fdd23 (commit) via 095e6bf0035b4f2f8993021bc9bb532c298362ce (commit) via 31c33af3aba5a5aea0da3b9ad25550de360d57d0 (commit) via 59af4e67ef33bf53ec97a14d9f10b5ba69764c7a (commit) via aa81616836c4c420eb237ce73a4feb41a1acaa06 (commit) via 2457e47e563744f3d7ab0d947f2521d233d6fe61 (commit) via 70bef622568baf97cb21611f5e0a403c7c3e6ead (commit) via 4e1dcb4792982ebc6ea966baf82f9175c4b78345 (commit) via 79c0e89cc95ad7fbd8ac1bc3af6ebf076454845b (commit) via 81d2ce00ec6ca006662472caa75097723bddaaab (commit) via 38d32b9b3bd58893590fe673a3f8408b94334f54 (commit) via 214a38a2196a2bd66b50718f1e1d18d717f45768 (commit) via f7570c4e361c73a41a23b53c8aba69863919e0eb (commit) via c8ee453dd58c302e1fe02c1f4138acbf73f50061 (commit) via 331e42ff21ab3843ba91c2b66d23d5a071a7aa6f (commit) via a6c6d31c8cdec1b76b991e59d5dd84247ef1659e (commit) via 7e953a5bfa0a1d18677bc446c013b10667f7fa41 (commit) via 9b00b56f615306141beeff5d692d2158619c8e55 (commit) via 4298fe8e822d8a6a18f1de654bee507dca5850cd (commit) via 52cb80c09e99f08e4a5ea652607bdcdd3e5494a8 (commit) via adc4eb641506fb07b5eaa58570f6390c2bc77033 (commit) via 00589c2e3b2f9cffb92bd38216523d5ba4fe2602 (commit) via ceb575c0655840beb60e6108ac1cb445feb28bef (commit) via 947c75bfd5843829a685cf3b9089c5be9a2d4e1f (commit) via 082d7bc6177b1bdae65788898d1a87ee23060d01 (commit) via 2cfdeaa11a3dcb8bd6b2b676013485d98543e0ff (commit) via c890ae85ee0ac83cb75c1c5690b03f2309546433 (commit) via c3168a7b0b1347ac20dc4cad9f483acbafc767cf (commit) via dac265bbccb29856c5c02311cf929176a5fb195d (commit) via e7dfc9b0a017ba97f1997f8059432e241224f4b9 (commit) via 60a4ea74d93f942cad848c641b6a21cd2e267a83 (commit) via 81dff4df3b58ae3977034eeabc9b7d25d76d9369 (commit) via 50737cf2ad73ceef33d6a635279509b0a937a23d (commit) via 4331db4907c0f970ba07332726a3123e185b0ecd (commit) via 3e248e44fb2391993f62e3d40401c59bb8746d1d (commit) via d955a0d8598fb59636c3404aa687b25266738267 (commit) via 77123332b3771a49b07f890fcffecc25151c845a (commit) via 51a4d0215824ab814971ca93b2d6439a46464a4c (commit) via 01518a4dd07dae2032cef493ff7df0cc8948d1c0 (commit) via 1325eb54c0c2bac116b52bd023e5d202e63a2018 (commit) via 47b111937dd0cb3060c85af361ab21f3cc4f058d (commit) via 58a63815714b0d294045a30c7913e31593ac339d (commit) via 99aff587b1dee6de8449cfcf38ff570d36f143f3 (commit) via 9e1019d6670be66623b48e15c5bdeea1bad7ab8e (commit) from ca78ac3dc5fe7fe6c35f650430af2c192d666e10 (commit) - Log ----------------------------------------------------------------- commit d14a6876cf75ecd1fa6375aa8a7d0da81a10b7a9 Merge: ca78ac3dc5fe7fe6c35f650430af2c192d666e10 c6a0b7c9933d10fd1dcd7ebb7bdb49fc0b38abb4 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jun 7 13:23:28 2011 +0200 Merge remote-tracking branch 'pootle/master' Conflicts: po/en_GB.po po/fr.po po/ja.po commit c6a0b7c9933d10fd1dcd7ebb7bdb49fc0b38abb4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:48:30 2011 +0200 Translation update done using Pootle. commit 2c51a59ff97e24bfd69c2f0cf3e29a34ba635a30 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 12:48:03 2011 +0200 Translation update done using Pootle. commit 2ee26061c222c50a06d9a386ae6b68df907ae817 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 12:47:49 2011 +0200 Translation update done using Pootle. commit b6c6f9f99cd8318b728a1c1def9c19165797a1f1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:47:26 2011 +0200 Translation update done using Pootle. commit aa91133e662b9e7c5cc1fd0ae8d3e137f1cbc9f5 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 12:47:21 2011 +0200 Translation update done using Pootle. commit c46c45f8235fd96d754f100bdae5566dc4e02922 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 12:46:39 2011 +0200 Translation update done using Pootle. commit 627beae6706182bacd3594f878805e2254960a75 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:43:54 2011 +0200 Translation update done using Pootle. commit c3081dfc121b5bd7e534fb7542ded90c74c243ad Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 12:36:33 2011 +0200 Translation update done using Pootle. commit 38d4ff35b7b7740c0a996744caf3d7f1d7d882f2 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 12:36:21 2011 +0200 Translation update done using Pootle. commit c32d8cf1d0357111ffa48b025e74261fed2009f6 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 12:36:10 2011 +0200 Translation update done using Pootle. commit c2420c15ee320073b114fed13d285b5a9ab7b09e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:35:12 2011 +0200 Translation update done using Pootle. commit 91538ca433c1fd9cb1a9903b0190db84cd89c884 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:33:38 2011 +0200 Translation update done using Pootle. commit 7182a5b1eba69876ef9b093a6d4ea2d456446c50 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:32:38 2011 +0200 Translation update done using Pootle. commit 56aff8629975fe1b464735f95e69dd4ed01885ce Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:31:33 2011 +0200 Translation update done using Pootle. commit fe1d24906e9c0f6e0db7c06be7491d843df41140 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:30:41 2011 +0200 Translation update done using Pootle. commit 1ec3963ea2e1bdb4211e702d8bbc18a0842bda93 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:30:28 2011 +0200 Translation update done using Pootle. commit 4da19fe86a49f1003f636327690ae244bdbcbcce Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:30:01 2011 +0200 Translation update done using Pootle. commit 1c84f530c39a11609bcb241b0dea8a9a4a48865c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:29:50 2011 +0200 Translation update done using Pootle. commit 653d7341ad93fb23eda97065e6921063cdd88449 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:29:37 2011 +0200 Translation update done using Pootle. commit 4dd51f19a66545becfb7086d3a01831bc579b698 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:29:27 2011 +0200 Translation update done using Pootle. commit a8b4ac0135b91981bd32aa642f7424866274575c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:29:20 2011 +0200 Translation update done using Pootle. commit 720ce7ec2f1cb092fff417ae1e209f28db96f6cb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:27:52 2011 +0200 Translation update done using Pootle. commit 1dcaa85acd15236165c9334844c0e42ac8e8a660 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:27:24 2011 +0200 Translation update done using Pootle. commit 5c5d5f249a9650ebbde8ad98b736d68bd8d71313 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:26:28 2011 +0200 Translation update done using Pootle. commit 654811f6aa5b28cf7b8708febe560142e4b3b34c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:26:10 2011 +0200 Translation update done using Pootle. commit 9847e9e8584a7d09383b953c00376ca7e7c09e00 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:25:43 2011 +0200 Translation update done using Pootle. commit 2f1a7b2f4f91deb8da17a0ee18a4cc123f1fdd23 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:25:24 2011 +0200 Translation update done using Pootle. commit 095e6bf0035b4f2f8993021bc9bb532c298362ce Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:24:46 2011 +0200 Translation update done using Pootle. commit 31c33af3aba5a5aea0da3b9ad25550de360d57d0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:23:18 2011 +0200 Translation update done using Pootle. commit 59af4e67ef33bf53ec97a14d9f10b5ba69764c7a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:22:54 2011 +0200 Translation update done using Pootle. commit aa81616836c4c420eb237ce73a4feb41a1acaa06 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:20:01 2011 +0200 Translation update done using Pootle. commit 2457e47e563744f3d7ab0d947f2521d233d6fe61 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:19:50 2011 +0200 Translation update done using Pootle. commit 70bef622568baf97cb21611f5e0a403c7c3e6ead Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:19:18 2011 +0200 Translation update done using Pootle. commit 4e1dcb4792982ebc6ea966baf82f9175c4b78345 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:18:23 2011 +0200 Translation update done using Pootle. commit 79c0e89cc95ad7fbd8ac1bc3af6ebf076454845b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:18:12 2011 +0200 Translation update done using Pootle. commit 81d2ce00ec6ca006662472caa75097723bddaaab Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:18:03 2011 +0200 Translation update done using Pootle. commit 38d32b9b3bd58893590fe673a3f8408b94334f54 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:18:00 2011 +0200 Translation update done using Pootle. commit 214a38a2196a2bd66b50718f1e1d18d717f45768 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:17:55 2011 +0200 Translation update done using Pootle. commit f7570c4e361c73a41a23b53c8aba69863919e0eb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:17:30 2011 +0200 Translation update done using Pootle. commit c8ee453dd58c302e1fe02c1f4138acbf73f50061 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:17:05 2011 +0200 Translation update done using Pootle. commit 331e42ff21ab3843ba91c2b66d23d5a071a7aa6f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:16:02 2011 +0200 Translation update done using Pootle. commit a6c6d31c8cdec1b76b991e59d5dd84247ef1659e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:15:57 2011 +0200 Translation update done using Pootle. commit 7e953a5bfa0a1d18677bc446c013b10667f7fa41 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:15:47 2011 +0200 Translation update done using Pootle. commit 9b00b56f615306141beeff5d692d2158619c8e55 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:14:38 2011 +0200 Translation update done using Pootle. commit 4298fe8e822d8a6a18f1de654bee507dca5850cd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:14:14 2011 +0200 Translation update done using Pootle. commit 52cb80c09e99f08e4a5ea652607bdcdd3e5494a8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:12:39 2011 +0200 Translation update done using Pootle. commit adc4eb641506fb07b5eaa58570f6390c2bc77033 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:12:34 2011 +0200 Translation update done using Pootle. commit 00589c2e3b2f9cffb92bd38216523d5ba4fe2602 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:11:58 2011 +0200 Translation update done using Pootle. commit ceb575c0655840beb60e6108ac1cb445feb28bef Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:11:32 2011 +0200 Translation update done using Pootle. commit 947c75bfd5843829a685cf3b9089c5be9a2d4e1f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:11:08 2011 +0200 Translation update done using Pootle. commit 082d7bc6177b1bdae65788898d1a87ee23060d01 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:10:38 2011 +0200 Translation update done using Pootle. commit 2cfdeaa11a3dcb8bd6b2b676013485d98543e0ff Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:10:30 2011 +0200 Translation update done using Pootle. commit c890ae85ee0ac83cb75c1c5690b03f2309546433 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:10:20 2011 +0200 Translation update done using Pootle. commit c3168a7b0b1347ac20dc4cad9f483acbafc767cf Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:10:01 2011 +0200 Translation update done using Pootle. commit dac265bbccb29856c5c02311cf929176a5fb195d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:09:20 2011 +0200 Translation update done using Pootle. commit e7dfc9b0a017ba97f1997f8059432e241224f4b9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:09:13 2011 +0200 Translation update done using Pootle. commit 60a4ea74d93f942cad848c641b6a21cd2e267a83 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:08:17 2011 +0200 Translation update done using Pootle. commit 81dff4df3b58ae3977034eeabc9b7d25d76d9369 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 12:06:51 2011 +0200 Translation update done using Pootle. commit 50737cf2ad73ceef33d6a635279509b0a937a23d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:54:55 2011 +0200 Translation update done using Pootle. commit 4331db4907c0f970ba07332726a3123e185b0ecd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:54:42 2011 +0200 Translation update done using Pootle. commit 3e248e44fb2391993f62e3d40401c59bb8746d1d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:48:51 2011 +0200 Translation update done using Pootle. commit d955a0d8598fb59636c3404aa687b25266738267 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:48:26 2011 +0200 Translation update done using Pootle. commit 77123332b3771a49b07f890fcffecc25151c845a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:45:59 2011 +0200 Translation update done using Pootle. commit 51a4d0215824ab814971ca93b2d6439a46464a4c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:45:07 2011 +0200 Translation update done using Pootle. commit 01518a4dd07dae2032cef493ff7df0cc8948d1c0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:44:50 2011 +0200 Translation update done using Pootle. commit 1325eb54c0c2bac116b52bd023e5d202e63a2018 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:42:53 2011 +0200 Translation update done using Pootle. commit 47b111937dd0cb3060c85af361ab21f3cc4f058d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:42:45 2011 +0200 Translation update done using Pootle. commit 58a63815714b0d294045a30c7913e31593ac339d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:42:40 2011 +0200 Translation update done using Pootle. commit 99aff587b1dee6de8449cfcf38ff570d36f143f3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:40:23 2011 +0200 Translation update done using Pootle. commit 9e1019d6670be66623b48e15c5bdeea1bad7ab8e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jun 7 11:40:00 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 12 ++-- po/fr.po | 18 ++++-- po/ja.po | 177 +++++++++++++++++++++++------------------------------------ 3 files changed, 85 insertions(+), 122 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index e2f49e2..330618a 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(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-04 12:04+0200\n" +"PO-Revision-Date: 2011-06-07 12:36+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" "MIME-Version: 1.0\n" @@ -1097,11 +1097,10 @@ msgstr "Table must have at least one column" msgid "Create Table" msgstr "Create Table" -#: js/messages.php:82 -#, fuzzy +#: js/messages.php:83 #| msgid "Use Tables" msgid "Insert Table" -msgstr "Use Tables" +msgstr "Insert Table" #: js/messages.php:85 msgid "Searching" @@ -2581,12 +2580,13 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Disable the table maintenance mass operations, like optimizing or repairing " +"the selected tables of a database." #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Table maintenance" +msgstr "Disable multi table maintenance" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" diff --git a/po/fr.po b/po/fr.po index fd8e5fd..cf99204 100644 --- a/po/fr.po +++ b/po/fr.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-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-04 12:20+0200\n" +"PO-Revision-Date: 2011-06-07 12:48+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "MIME-Version: 1.0\n" @@ -1110,11 +1110,10 @@ msgstr "La table doit comporter au moins une colonne." msgid "Create Table" msgstr "Nouvelle table" -#: js/messages.php:82 -#, fuzzy +#: js/messages.php:83 #| msgid "Use Tables" msgid "Insert Table" -msgstr "Utiliser les tables" +msgstr "Insérer dans la table" #: js/messages.php:85 msgid "Searching" @@ -2606,12 +2605,13 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Désactiver les opérations de masse sur les tables, comme l'optimisation ou " +"la réparation." #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Maintenance de la table" +msgstr "Désactiver la maintenance de tables multiples" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -8078,10 +8078,14 @@ msgid "wildcard" msgstr "passepartout" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" +<<<<<<< HEAD msgid "User has been added." msgstr "La vue %s a été supprimée" +======= +msgid "New user has been added." +msgstr "Un utilisateur a été ajouté" +>>>>>>> pootle/master #: server_processlist.php:29 #, php-format diff --git a/po/ja.po b/po/ja.po index fd257be..d495550 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-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-05-31 12:04+0200\n" +"PO-Revision-Date: 2011-06-07 12:48+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "MIME-Version: 1.0\n" @@ -165,7 +165,7 @@ msgstr "種別" #: tbl_printview.php:142 tbl_structure.php:202 tbl_tracking.php:269 #: tbl_tracking.php:320 msgid "Null" -msgstr "ヌル(NULL)" +msgstr "NULL" #: db_datadict.php:171 db_structure.php:460 libraries/export/htmlword.php:250 #: libraries/export/latex.php:374 libraries/export/odt.php:310 @@ -1032,7 +1032,7 @@ msgstr "すべてのユーザ" #: js/messages.php:55 msgid "Reloading Privileges" -msgstr "特権をリロードする" +msgstr "特権を再読み込み" #: js/messages.php:56 msgid "Removing Selected Users" @@ -1193,7 +1193,7 @@ msgstr "主キーまたはユニークキーを選択してください" #: js/messages.php:113 pmd_general.php:87 tbl_relation.php:545 msgid "Choose column to display" -msgstr "表示するカラムを選択してください" +msgstr "表示するカラムの選択" #: js/messages.php:114 msgid "" @@ -1610,22 +1610,19 @@ msgid_plural "%1$d rows inserted." msgstr[0] "%1$d 行挿入しました。" #: libraries/RecentTable.class.php:113 -#, fuzzy #| msgid "Could not save configuration" msgid "Could not save recent table" -msgstr "設定が保存できません" +msgstr "最近使用したテーブルが保存できません" #: libraries/RecentTable.class.php:148 -#, fuzzy #| msgid "Count tables" msgid "Recent tables" -msgstr "テーブル数" +msgstr "最近使用したテーブル" #: libraries/RecentTable.class.php:154 -#, fuzzy #| msgid "There are no configured servers" msgid "There are no recent tables" -msgstr "設定するサーバがありません" +msgstr "最近使用したテーブルはありません" #: libraries/StorageEngine.class.php:194 msgid "" @@ -2213,17 +2210,16 @@ msgstr "両方" #: libraries/config.values.php:47 msgid "Nowhere" -msgstr "" +msgstr "なし" #: libraries/config.values.php:47 msgid "Left" -msgstr "" +msgstr "左" #: libraries/config.values.php:47 -#, fuzzy #| msgid "Height" msgid "Right" -msgstr "高さ" +msgstr "右" #: libraries/config.values.php:75 msgid "Open" @@ -2457,9 +2453,8 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" -"CHARとVARCHAR型のカラムに対しての編集用のフォームパーツのタイプを定義します。" -"[kbd]input[/kbd] は入力文字数を制限することができます。[kbd]textarea[/kbd] は" -"改行を入力すことができます。" +"CHAR と VARCHAR 型のカラムに対しての編集用のフォームパーツのタイプを定義します。[kbd]input[/kbd] " +"は入力文字数を制限することができます。[kbd]textarea[/kbd] は改行を入力すことができます。" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" @@ -2587,13 +2582,12 @@ msgstr "サーバをリストで表示する" msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." -msgstr "" +msgstr "データベースで選択したテーブルを最適化や修復するというような、大量操作するテーブルメンテナンスを無効にします。" #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "テーブル管理" +msgstr "複数テーブルのメンテナンスを無効にする" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -2848,11 +2842,11 @@ msgstr "外部キー制限" #: libraries/config/messages.inc.php:154 msgid "Browse mode" -msgstr "閲覧モード" +msgstr "表示モード" #: libraries/config/messages.inc.php:155 msgid "Customize browse mode" -msgstr "閲覧モードの詳細設定" +msgstr "表示モードの詳細設定" #: libraries/config/messages.inc.php:157 libraries/config/messages.inc.php:159 #: libraries/config/messages.inc.php:176 libraries/config/messages.inc.php:187 @@ -3232,11 +3226,11 @@ msgstr "空の行はインポートしない" #: libraries/config/messages.inc.php:256 msgid "Import currencies ($5.00 to 5.00)" -msgstr "金額は単位を取り除く（例えば、$5.00 を 5.00）" +msgstr "金額は単位を取り除く（例：$5.00 を 5.00）" #: libraries/config/messages.inc.php:257 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "パーセントは適切な小数に変換する（例えば、12.00% を .12）" +msgstr "パーセントは適切な小数に変換する（例：12.00% を .12）" #: libraries/config/messages.inc.php:258 msgid "Number of queries to skip from start" @@ -3354,16 +3348,14 @@ msgid "Enable highlighting" msgstr "強調表示を有効" #: libraries/config/messages.inc.php:288 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of recently used tables; set 0 to disable" -msgstr "テーブルのリストに表示されるテーブルの最大数" +msgstr "最近使用したテーブルの最大数。0 で無効になります。" #: libraries/config/messages.inc.php:289 -#, fuzzy #| msgid "Currently opened table" msgid "Recently used tables" -msgstr "現在開いているテーブル" +msgstr "最近使用したテーブル" #: libraries/config/messages.inc.php:290 msgid "Use less graphically intense tabs" @@ -3491,9 +3483,7 @@ msgstr "テーブルの最大数" msgid "" "Disable the default warning that is displayed if mcrypt is missing for " "cookie authentication" -msgstr "" -"cookie 認証で mcrypt 拡張がなかった場合、警告を表示します。チェックを入れると" -"このメッセージを表示しないようにします。" +msgstr "cookie 認証で mcrypt 拡張がなかった場合、警告を表示します。チェックを入れるとこのメッセージは表示されません。" #: libraries/config/messages.inc.php:316 msgid "mcrypt warning" @@ -3517,7 +3507,7 @@ msgstr "編集、インライン編集、コピー、削除のリンクことで #: libraries/config/messages.inc.php:320 msgid "Where to show the table row links" -msgstr "" +msgstr "テーブルの行リンクを表示する場所" #: libraries/config/messages.inc.php:321 msgid "Use natural order for sorting table and database names" @@ -3644,13 +3634,12 @@ msgstr "コード変換エンジン" #: libraries/config/messages.inc.php:350 msgid "When browsing tables, the sorting of each table is remembered" -msgstr "" +msgstr "表示している各テーブルのソートが記憶されます。" #: libraries/config/messages.inc.php:351 -#, fuzzy #| msgid "Rename table to" msgid "Remember table's sorting" -msgstr "リネーム後のテーブル名" +msgstr "テーブルのソートを記憶する" #: libraries/config/messages.inc.php:352 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" @@ -3931,7 +3920,6 @@ msgid "Server port" msgstr "サーバのポート" #: libraries/config/messages.inc.php:409 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma_config[/kbd]" @@ -3939,14 +3927,13 @@ msgid "" "Leave blank for no \"persistent\" recently used tables across sessions, " "suggested: [kbd]pma_recent[/kbd]" msgstr "" -"データベースにユーザ設定の保存しない場合は空欄にします。[kbd]pma_config[/" -"kbd] としておくのがいいでしょう。" +"最近使用したテーブルをセッションを跨いで「永続的に」記憶しない場合は空欄にします。[kbd]pma_recent[/kbd] " +"としておくのがいいでしょう。" #: libraries/config/messages.inc.php:410 -#, fuzzy #| msgid "Currently opened table" msgid "Recently used table" -msgstr "現在開いているテーブル" +msgstr "最近使用したテーブル" #: libraries/config/messages.inc.php:411 msgid "" @@ -4047,9 +4034,7 @@ msgstr "ユーザ設定保存テーブル" msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." -msgstr "" -"データベースを作成するときにログの最初の行に DROP DATABASE IF EXISTS コマンド" -"を追加するかどうか。" +msgstr "データベースを作成するときにログの最初の行に DROP DATABASE IF EXISTS 文を追加するかどうか。" #: libraries/config/messages.inc.php:429 msgid "Add DROP DATABASE" @@ -4059,9 +4044,7 @@ msgstr "DROP DATABASE を追加" msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table." -msgstr "" -"テーブルを作成するときにログの最初の行に DROP TABLE IF EXISTS コマンドを追加" -"するかどうか。" +msgstr "テーブルを作成するときにログの最初の行に DROP TABLE IF EXISTS 文を追加するかどうか。" #: libraries/config/messages.inc.php:431 msgid "Add DROP TABLE" @@ -4071,9 +4054,7 @@ msgstr "DROP TABLE を追加" msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view." -msgstr "" -"ビューを作成するときにログの最初の行に DROP VIEW IF EXISTS コマンドを追加する" -"かどうか。" +msgstr "ビューを作成するときにログの最初の行に DROP VIEW IF EXISTS 文を追加するかどうか。" #: libraries/config/messages.inc.php:433 msgid "Add DROP VIEW" @@ -4247,10 +4228,8 @@ msgid "" "['LeftFrameTableSeparator'] directive, so only the folder is called like the " "alias, the table name itself stays unchanged" msgstr "" -"[kbd]nested[/kbd] に設定した場合、テーブル名のエイリアスは、$cfg" -"['LeftFrameTableSeparator']の指示に応じてテーブルを分割/入れ子するために使用" -"されます。そのフォルダはエイリアスのように呼び出されるだけで、テーブル名自体" -"はそのまま変わることありません。" +"[kbd]nested[/kbd] に設定した場合、テーブル名のエイリアスは、$cfg['LeftFrameTableSeparator'] の指示に応" +"じてテーブルを分割/入れ子するために使用されます。そのフォルダはエイリアスのように呼び出されるだけで、テーブル名自体はそのまま変わることありません。" #: libraries/config/messages.inc.php:467 msgid "Display table comment instead of its name" @@ -4324,9 +4303,7 @@ msgstr "新しいデータベース名の提案" #: libraries/config/messages.inc.php:484 msgid "A warning is displayed on the main page if Suhosin is detected" -msgstr "" -"Suhosin が検出された場合、警告をメインページに表示します。チェックを入れると" -"このメッセージを表示しないようにします。" +msgstr "Suhosin が検出された場合、警告をメインページに表示します。チェックを入れるとこのメッセージは表示されません。" #: libraries/config/messages.inc.php:485 msgid "Suhosin warning" @@ -4336,9 +4313,7 @@ msgstr "Suhosin 警告" msgid "" "Textarea size (columns) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" -msgstr "" -"編集モードでの textarea の1行の文字数。SQL クエリ用のでは 2 倍、クエリウィン" -"ドウに対しては 1.25 倍になります。" +msgstr "編集モードでの textarea の 1 行の文字数。SQL クエリ用のでは 2 倍、クエリウィンドウに対しては 1.25 倍になります。" #: libraries/config/messages.inc.php:487 msgid "Textarea columns" @@ -4897,9 +4872,7 @@ msgstr "ファイルは圧縮されていないもの、もしくは、%s で圧 msgid "" "A compressed file's name must end in .[format].[compression]. " "Example: .sql.zip" -msgstr "" -"圧縮ファイルの名前は.[フォーマット].[圧縮形式]で終わっていること。例え" -"ば、.sql.zip。" +msgstr "圧縮ファイルの名前は.[フォーマット].[圧縮形式]で終わっていること。例：.sql.zip" #: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." @@ -5642,7 +5615,7 @@ msgstr "PDF" #: libraries/export/pdf.php:23 msgid "(Generates a report containing the data of a single table)" -msgstr "(ひとつのテーブルのデータを含むレポートを生成します)" +msgstr "(1 つのテーブルのデータを含むレポートを生成します)" #: libraries/export/pdf.php:24 msgid "Report title:" @@ -5695,15 +5668,15 @@ msgstr "" #: libraries/export/sql.php:216 msgid "Instead of <code>INSERT</code> statements, use:" -msgstr "<code>INSERT</code> コマンドの代わりに以下を使う：" +msgstr "<code>INSERT</code> 文の代わりに以下を使う：" #: libraries/export/sql.php:221 msgid "<code>INSERT DELAYED</code> statements" -msgstr "<code>INSERT DELAYED</code> コマンド" +msgstr "<code>INSERT DELAYED</code> 文" #: libraries/export/sql.php:227 msgid "<code>INSERT IGNORE</code> statements" -msgstr "<code>INSERT IGNORE</code> コマンド" +msgstr "<code>INSERT IGNORE</code> 文" #: libraries/export/sql.php:237 msgid "Function to use when dumping data:" @@ -5719,9 +5692,8 @@ msgid "" "    Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES " "(1,2,3)</code>" msgstr "" -"全ての <code>INSERT</code> コマンドにカラム名を含める     " -"  例: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3)</" -"code>" +"全ての <code>INSERT</code> 文にカラム名を含める       例: " +"<code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3)</code>" #: libraries/export/sql.php:257 msgid "" @@ -5729,8 +5701,8 @@ msgid "" "    Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " "(7,8,9)</code>" msgstr "" -"全ての <code>INSERT</code> コマンドを複数行挿入で行う     " -"  例: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)</code>" +"全ての <code>INSERT</code> 文を複数行挿入で行う       例: " +"<code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)</code>" #: libraries/export/sql.php:258 msgid "" @@ -5752,8 +5724,7 @@ msgstr "" msgid "" "Dump binary columns in hexadecimal notation (for example, \"abc\" becomes " "0x616263)" -msgstr "" -"16進表記でバイナリカラムをダンプする(例えば、\"abc\" を 0x616263)" +msgstr "16 進表記でバイナリカラムをダンプする(例：\"abc\" を 0x616263)" #: libraries/export/sql.php:281 msgid "" @@ -5937,11 +5908,11 @@ msgstr "このプラグインでは圧縮されたファイルのインポート #: libraries/import/ods.php:28 msgid "Import percentages as proper decimals (ex. 12.00% to .12)" -msgstr "パーセントは適切な小数に変換する（例えば、12.00% を .12）" +msgstr "パーセントは適切な小数に変換する（例：12.00% を .12）" #: libraries/import/ods.php:29 msgid "Import currencies (ex. $5.00 to 5.00)" -msgstr "金額は単位を取り除く（例えば、$5.00 を 5.00）" +msgstr "金額は単位を取り除く（例：$5.00 を 5.00）" #: libraries/import/sql.php:32 msgid "SQL compatibility mode:" @@ -6246,10 +6217,9 @@ msgid "SQL history" msgstr "SQL 履歴" #: libraries/relation.lib.php:143 -#, fuzzy #| msgid "Persistent connections" msgid "Persistent recently used tables" -msgstr "永続的な接続" +msgstr "最近使用したテーブルの永続的な記憶" #: libraries/relation.lib.php:147 msgid "Persistent tables' UI preferences" @@ -7047,7 +7017,7 @@ msgstr "MySQL の文字セット" #: main.php:181 msgid "Web server" -msgstr "Web サーバ" +msgstr "ウェブサーバ" #: main.php:187 msgid "MySQL client version" @@ -7225,7 +7195,7 @@ msgstr "リレーションを作成" #: pmd_general.php:90 msgid "Reload" -msgstr "リロード" +msgstr "再読み込み" #: pmd_general.php:93 msgid "Help" @@ -7645,7 +7615,7 @@ msgstr "データのインポート、エクスポートを許可する" #: server_privileges.php:47 server_privileges.php:554 msgid "" "Allows adding users and privileges without reloading the privilege tables." -msgstr "特権テーブルのリロードなしのユーザ・特権の追加を許可する" +msgstr "特権テーブルの再読み込みなしでユーザ・特権の追加を許可する" #: server_privileges.php:48 server_privileges.php:201 #: server_privileges.php:530 @@ -7698,7 +7668,7 @@ msgstr "このバージョンの MySQL では無効です" #: server_privileges.php:57 server_privileges.php:196 #: server_privileges.php:559 msgid "Allows reloading server settings and flushing the server's caches." -msgstr "サーバ設定のリロード、サーバキャッシュのフラッシュを許可する" +msgstr "サーバ設定の再読み込み、サーバキャッシュのフラッシュを許可する" #: server_privileges.php:58 server_privileges.php:208 #: server_privileges.php:566 @@ -7837,7 +7807,7 @@ msgstr "削除するユーザが選択されていません!" #: server_privileges.php:1273 msgid "Reloading the privileges" -msgstr "特権をリロードしています" +msgstr "特権を再読み込みしています" #: server_privileges.php:1291 msgid "The selected users have been deleted successfully." @@ -7845,7 +7815,7 @@ msgstr "選択したユーザを正しく削除しました" #: server_privileges.php:1326 msgid "The privileges were reloaded successfully." -msgstr "特権を正常にリロードしました" +msgstr "特権を正常に再読み込みしました" #: server_privileges.php:1337 server_privileges.php:1729 msgid "Edit Privileges" @@ -7890,10 +7860,8 @@ msgid "" "server uses, if they have been changed manually. In this case, you should %" "sreload the privileges%s before you continue." msgstr "" -"注意: phpMyAdmin は MySQL の特権テーブルから直接ユーザ特権を取得しますが、手" -"作業で特権を更新した場合は phpMyAdmin が利用しているテーブルの内容とサーバの" -"特権の内容が一致しなくなることがありますので、作業を続ける前に %s特権リロー" -"ド%s をしてください" +"注意: phpMyAdmin は MySQL の特権テーブルから直接ユーザ特権を取得しますが、手作業で特権を更新した場合は phpMyAdmin " +"が利用しているテーブルの内容とサーバの特権の内容が一致しなくなることがありますので、作業を続ける前に %s特権の再読み込み%s をしてください" #: server_privileges.php:1764 msgid "The selected user was not found in the privilege table." @@ -7942,7 +7910,7 @@ msgstr "元のユーザの特権をすべて無効にしてから削除する" msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." -msgstr "ユーザテーブルから元のユーザを削除し、特権をリロードする" +msgstr "ユーザテーブルから元のユーザを削除し、特権の再読み込みをする" #: server_privileges.php:2114 msgid "Database for user" @@ -7984,7 +7952,6 @@ msgid "wildcard" msgstr "ワイルドカード" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "User has been added." msgstr "ビュー %s を破棄しました" @@ -8352,9 +8319,8 @@ msgid "" "being read or written or that can't be flushed or removed for some other " "reason." msgstr "" -"InnoDBバッファプールでラッチされているページ数。これは現在読み込んでいる、あ" -"るいは書き込んでいるページ、あるいは他の何らかの理由でフラッシュしたり削除し" -"たりできなくなっているページの数です" +"InnoDB バッファプールでラッチされているページ数。これは現在読み込んでいる、あるいは書き込んでいるページ、あるいは他の何らかの理由でフラッシュした" +"り削除したりできなくなっているページの数です" #: server_status.php:72 msgid "" @@ -8363,10 +8329,9 @@ msgid "" "be calculated as Innodb_buffer_pool_pages_total - " "Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data." msgstr "" -"行ロックやアダプティブハッシュインデックスといった管理オーバヘッドのせいでビ" -"ジーになっているページ数。この値はInnodb_buffer_pool_pages_total - " -"Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_dataという式でも計算" -"できます" +"行ロックやアダプティブハッシュインデックスといった管理オーバヘッドのせいでビジーになっているページ数。この値は " +"Innodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - " +"Innodb_buffer_pool_pages_data という式でも計算できます" #: server_status.php:73 msgid "Total size of buffer pool, in pages." @@ -8376,17 +8341,13 @@ msgstr "ページのバッファプールサイズの合計" msgid "" "The number of \"random\" read-aheads InnoDB initiated. This happens when a " "query is to scan a large portion of a table but in random order." -msgstr "" -"InnoDBが開始したランダム読み込みの回数。これはクエリがテーブルの大部分をラン" -"ダムな順番でスキャンするときに発生します" +msgstr "InnoDB が開始したランダム読み込みの回数。これはクエリがテーブルの大部分をランダムな順番でスキャンするときに発生します" #: server_status.php:75 msgid "" "The number of sequential read-aheads InnoDB initiated. This happens when " "InnoDB does a sequential full table scan." -msgstr "" -"InnoDBが開始したシーケンシャル読み込みの回数。これはInnoDBがシーケンシャルな" -"フルテーブルスキャンを行うときに発生します" +msgstr "InnoDB が開始したシーケンシャル読み込みの回数。これは InnoDB がシーケンシャルなフルテーブルスキャンを行うときに発生します" #: server_status.php:76 msgid "The number of logical read requests InnoDB has done." @@ -9209,7 +9170,7 @@ msgstr "読み込む" #: setup/frames/index.inc.php:239 msgid "phpMyAdmin homepage" -msgstr "phpMyAdmin のホームページ" +msgstr "phpMyAdmin のオフィシャルサイト" #: setup/frames/index.inc.php:240 msgid "Donate" @@ -9740,7 +9701,7 @@ msgstr "コピーしたテーブルに切り替える" #: tbl_operations.php:590 msgid "Table maintenance" -msgstr "テーブル管理" +msgstr "テーブルメンテナンス" #: tbl_operations.php:614 msgid "Defragment table" @@ -10009,9 +9970,7 @@ msgstr "" #: tbl_tracking.php:224 msgid "SQL statements exported. Please copy the dump or execute it." -msgstr "" -"SQL コマンドをエクスポートしました。ダンプしたものをコピーするか実行するかし" -"てください。" +msgstr "SQL 文をエクスポートしました。ダンプしたものをコピーするか実行するかしてください。" #: tbl_tracking.php:255 #, php-format @@ -10061,11 +10020,11 @@ msgstr "データ操作コマンド" #: tbl_tracking.php:558 msgid "SQL dump (file download)" -msgstr "SQL文のダンプ（ファイルでダウンロード）" +msgstr "SQL 文のダンプ（ファイルでダウンロード）" #: tbl_tracking.php:559 msgid "SQL dump" -msgstr "SQL文のダンプ" +msgstr "SQL 文のダンプ" #: tbl_tracking.php:560 msgid "This option will replace your table and contained data." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3181-gca78ac3
by Marc Delisle 07 Jun '11

07 Jun '11

The branch, master has been updated via ca78ac3dc5fe7fe6c35f650430af2c192d666e10 (commit) from b6190ddb0992460255f4dd53cc00b8a5f99f9a3c (commit) - Log ----------------------------------------------------------------- commit ca78ac3dc5fe7fe6c35f650430af2c192d666e10 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 06:45:37 2011 -0400 Refresh .po files ----------------------------------------------------------------------- Summary of changes: po/af.po | 4 ++-- po/ar.po | 4 ++-- po/az.po | 4 ++-- po/be.po | 4 ++-- po/be(a)latin.po | 4 ++-- po/bg.po | 6 ++++-- po/bn.po | 4 ++-- po/bs.po | 4 ++-- po/ca.po | 4 ++-- po/cs.po | 4 ++-- po/cy.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/el.po | 4 ++-- po/en_GB.po | 4 ++-- po/es.po | 4 ++-- po/et.po | 4 ++-- po/eu.po | 4 ++-- po/fa.po | 4 ++-- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/gl.po | 4 ++-- po/he.po | 4 ++-- po/hi.po | 4 ++-- po/hr.po | 4 ++-- po/hu.po | 4 ++-- po/id.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 4 ++-- po/ka.po | 4 ++-- po/ko.po | 4 ++-- po/lt.po | 4 ++-- po/lv.po | 4 ++-- po/mk.po | 4 ++-- po/ml.po | 4 ++-- po/mn.po | 4 ++-- po/ms.po | 4 ++-- po/nb.po | 4 ++-- po/nl.po | 4 ++-- po/phpmyadmin.pot | 4 ++-- po/pl.po | 4 ++-- po/pt.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ro.po | 4 ++-- po/ru.po | 4 ++-- po/si.po | 4 ++-- po/sk.po | 4 ++-- po/sl.po | 4 ++-- po/sq.po | 4 ++-- po/sr.po | 4 ++-- po/sr(a)latin.po | 4 ++-- po/sv.po | 4 ++-- po/ta.po | 4 ++-- po/te.po | 4 ++-- po/th.po | 4 ++-- po/tr.po | 6 ++++-- po/tt.po | 4 ++-- po/ug.po | 4 ++-- po/uk.po | 4 ++-- po/ur.po | 4 ++-- po/uz.po | 4 ++-- po/uz(a)latin.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- 64 files changed, 132 insertions(+), 128 deletions(-) diff --git a/po/af.po b/po/af.po index 7a52868..6c104f1 100644 --- a/po/af.po +++ b/po/af.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: afrikaans <af(a)li.org>\n" @@ -7910,7 +7910,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "Veld %s is verwyder" #: server_processlist.php:29 diff --git a/po/ar.po b/po/ar.po index ed90632..43f0e55 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" "Last-Translator: <u4504712(a)anu.edu.au>\n" "Language-Team: arabic <ar(a)li.org>\n" @@ -8008,7 +8008,7 @@ msgstr "حرف شامل" #: server_privileges.php:2295 #, fuzzy #| msgid "The row has been deleted" -msgid "New user has been added." +msgid "User has been added." msgstr "لقد تم حذف الصف" #: server_processlist.php:29 diff --git a/po/az.po b/po/az.po index d57a713..ca74620 100644 --- a/po/az.po +++ b/po/az.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani <az(a)li.org>\n" @@ -8075,7 +8075,7 @@ msgstr "xüsusi işare" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "%s sahesi leğv edildi" #: server_processlist.php:29 diff --git a/po/be.po b/po/be.po index fc49ea9..02f3545 100644 --- a/po/be.po +++ b/po/be.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: belarusian_cyrillic <be(a)li.org>\n" @@ -8318,7 +8318,7 @@ msgstr "шаблён" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Выгляд %s быў выдалены" #: server_processlist.php:29 diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 5c4c49e..c505085 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: belarusian_latin <be@latin@li.org>\n" @@ -8293,7 +8293,7 @@ msgstr "šablon" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Vyhlad %s byŭ vydaleny" #: server_processlist.php:29 diff --git a/po/bg.po b/po/bg.po index e9ed0aa..e1ca5ce 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-07 08:14+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" @@ -7645,7 +7645,9 @@ msgid "wildcard" msgstr "знак за заместване" #: server_privileges.php:2295 -msgid "New user has been added." +#, fuzzy +#| msgid "New user has been added." +msgid "User has been added." msgstr "Нов потребител беше създаден." #: server_processlist.php:29 diff --git a/po/bn.po b/po/bn.po index d6d7f69..4ae5611 100644 --- a/po/bn.po +++ b/po/bn.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" "Last-Translator: Nobin নবীন <nobin(a)cyberbogra.com>\n" "Language-Team: bangla <bn(a)li.org>\n" @@ -8226,7 +8226,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "View %s has been dropped" #: server_processlist.php:29 diff --git a/po/bs.po b/po/bs.po index d843fc3..cbf1a35 100644 --- a/po/bs.po +++ b/po/bs.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bosnian <bs(a)li.org>\n" @@ -8056,7 +8056,7 @@ msgstr "Džoker" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "Polje %s je obrisano" #: server_processlist.php:29 diff --git a/po/ca.po b/po/ca.po index 760aa85..e4500b1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" "Last-Translator: Xavier Navarro <xvnavarro(a)gmail.com>\n" "Language-Team: catalan <ca(a)li.org>\n" @@ -8093,7 +8093,7 @@ msgstr "comodins" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Vista %s esborrada" #: server_processlist.php:29 diff --git a/po/cs.po b/po/cs.po index a9ab29d..694f5b8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-03 11:59+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" @@ -7976,7 +7976,7 @@ msgstr "maska" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Pohled %s byl odstraněn" #: server_processlist.php:29 diff --git a/po/cy.po b/po/cy.po index 3f24ad3..872baca 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-19 21:21+0200\n" "Last-Translator: <ardavies(a)tiscali.co.uk>\n" "Language-Team: Welsh <cy(a)li.org>\n" @@ -7866,7 +7866,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Cafodd golwg %s ei ollwng" #: server_processlist.php:29 diff --git a/po/da.po b/po/da.po index 920fd33..ea1f650 100644 --- a/po/da.po +++ b/po/da.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" "Last-Translator: <hjortholm(a)gmail.com>\n" "Language-Team: danish <da(a)li.org>\n" @@ -8169,7 +8169,7 @@ msgstr "jokertegn" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Visning %s er blevet droppet" #: server_processlist.php:29 diff --git a/po/de.po b/po/de.po index 1f776d5..b45fd3e 100644 --- a/po/de.po +++ b/po/de.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" "Last-Translator: Dominik Geyer <dominik.geyer(a)gmx.de>\n" "Language-Team: german <de(a)li.org>\n" @@ -8118,7 +8118,7 @@ msgstr "Platzhalter" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Die Ansicht %s wurde gelöscht" #: server_processlist.php:29 diff --git a/po/el.po b/po/el.po index dbf8119..17bc05c 100644 --- a/po/el.po +++ b/po/el.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-06 09:50+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" @@ -8096,7 +8096,7 @@ msgstr "μπαλαντέρ" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Η προβολή %s διαγράφτηκε" #: server_processlist.php:29 diff --git a/po/en_GB.po b/po/en_GB.po index 1d9b10a..e2f49e2 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-04 12:04+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" @@ -7967,7 +7967,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "View %s has been dropped" #: server_processlist.php:29 diff --git a/po/es.po b/po/es.po index 5df48fd..fb8f5de 100644 --- a/po/es.po +++ b/po/es.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-03 21:27+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" @@ -8150,7 +8150,7 @@ msgstr "comodín" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Se descartó el modo de visualización %s" #: server_processlist.php:29 diff --git a/po/et.po b/po/et.po index 7319941..c64c5a3 100644 --- a/po/et.po +++ b/po/et.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: estonian <et(a)li.org>\n" @@ -8217,7 +8217,7 @@ msgstr "metamärk" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Vaade %s on kustutatud" #: server_processlist.php:29 diff --git a/po/eu.po b/po/eu.po index 49c0923..ad5491f 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: basque <eu(a)li.org>\n" @@ -8085,7 +8085,7 @@ msgstr "komodina" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "%s eremua ezabatu da" #: server_processlist.php:29 diff --git a/po/fa.po b/po/fa.po index a8cfe37..06fca3c 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" "Last-Translator: <ahmad_usa2007(a)yahoo.com>\n" "Language-Team: persian <fa(a)li.org>\n" @@ -7876,7 +7876,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "نمای %s حذف گرديد." #: server_processlist.php:29 diff --git a/po/fi.po b/po/fi.po index 89600e3..0c7647a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" "Last-Translator: <asdfsdf(a)asdfasdfasdf.com>\n" "Language-Team: finnish <fi(a)li.org>\n" @@ -8387,7 +8387,7 @@ msgstr "korvausmerkki" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Näkymä %s on poistettu" #: server_processlist.php:29 diff --git a/po/fr.po b/po/fr.po index 52675ef..fd8e5fd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-04 12:20+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" @@ -8080,7 +8080,7 @@ msgstr "passepartout" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "La vue %s a été supprimée" #: server_processlist.php:29 diff --git a/po/gl.po b/po/gl.po index 56acf77..01c5104 100644 --- a/po/gl.po +++ b/po/gl.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: galician <gl(a)li.org>\n" @@ -8579,7 +8579,7 @@ msgstr "comodín" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Deixouse a vista %s" #: server_processlist.php:29 diff --git a/po/he.po b/po/he.po index a4fdc35..56efd42 100644 --- a/po/he.po +++ b/po/he.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" "Last-Translator: <zippoxer(a)gmail.com>\n" "Language-Team: hebrew <he(a)li.org>\n" @@ -7994,7 +7994,7 @@ msgstr "תו כללי" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "שדה %s נמחק" #: server_processlist.php:29 diff --git a/po/hi.po b/po/hi.po index 3f9e41d..942d495 100644 --- a/po/hi.po +++ b/po/hi.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-06 09:13+0200\n" "Last-Translator: <manojonemail(a)gmail.com>\n" "Language-Team: hindi <hi(a)li.org>\n" @@ -7754,7 +7754,7 @@ msgstr "वाइल्डकार्ड" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "द्रश्य %s रद्द दिया गया है." #: server_processlist.php:29 diff --git a/po/hr.po b/po/hr.po index 107dbb9..3bc9360 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: croatian <hr(a)li.org>\n" @@ -8284,7 +8284,7 @@ msgstr "džoker" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Index %s je ispušten" #: server_processlist.php:29 diff --git a/po/hu.po b/po/hu.po index a8c234d..788823a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-27 18:52+0200\n" "Last-Translator: <slygyor(a)gmail.com>\n" "Language-Team: hungarian <hu(a)li.org>\n" @@ -8240,7 +8240,7 @@ msgstr "karakterhelyettesítő" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "A(z) %s nézet eldobása kész" #: server_processlist.php:29 diff --git a/po/id.po b/po/id.po index 6ad458b..1e8fffa 100644 --- a/po/id.po +++ b/po/id.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" "Last-Translator: <aris_feryanto(a)yahoo.com>\n" "Language-Team: indonesian <id(a)li.org>\n" @@ -8069,7 +8069,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Pandangan %s telah dibubarkan" #: server_processlist.php:29 diff --git a/po/it.po b/po/it.po index b531fa6..ab648e5 100644 --- a/po/it.po +++ b/po/it.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-25 22:43+0200\n" "Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n" "Language-Team: italian <it(a)li.org>\n" @@ -8117,7 +8117,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "La vista %s è stata eliminata" #: server_processlist.php:29 diff --git a/po/ja.po b/po/ja.po index bbfd0ad..fd257be 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-31 12:04+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" @@ -7986,7 +7986,7 @@ msgstr "ワイルドカード" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "ビュー %s を破棄しました" #: server_processlist.php:29 diff --git a/po/ka.po b/po/ka.po index 277d67c..5146795 100644 --- a/po/ka.po +++ b/po/ka.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: georgian <ka(a)li.org>\n" @@ -8495,7 +8495,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "View %s has been dropped" #: server_processlist.php:29 diff --git a/po/ko.po b/po/ko.po index 6cd8321..1150ed5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" "Last-Translator: <cihar(a)nvyu.net>\n" "Language-Team: korean <ko(a)li.org>\n" @@ -7905,7 +7905,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "뷰 %s가 제거되었습니다." #: server_processlist.php:29 diff --git a/po/lt.po b/po/lt.po index b904ec2..a1b3ad2 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" @@ -7997,7 +7997,7 @@ msgstr "pakaitos simbolis" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Rodinys %s buvo panaikintas" #: server_processlist.php:29 diff --git a/po/lv.po b/po/lv.po index d876ebb..55f2f0d 100644 --- a/po/lv.po +++ b/po/lv.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: latvian <lv(a)li.org>\n" @@ -8093,7 +8093,7 @@ msgstr "aizstājējzīme" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "Lauks %s tika izdzēsts" #: server_processlist.php:29 diff --git a/po/mk.po b/po/mk.po index 8f69e55..9627b02 100644 --- a/po/mk.po +++ b/po/mk.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-19 17:04+0200\n" "Last-Translator: <sjanevski(a)gmail.com>\n" "Language-Team: macedonian_cyrillic <mk(a)li.org>\n" @@ -8160,7 +8160,7 @@ msgstr "џокер" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Прегледот %s е избришан" #: server_processlist.php:29 diff --git a/po/ml.po b/po/ml.po index 7fcc608..e9194d0 100644 --- a/po/ml.po +++ b/po/ml.po @@ -5,7 +5,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: Malayalam <ml(a)li.org>\n" @@ -7496,7 +7496,7 @@ msgid "wildcard" msgstr "" #: server_privileges.php:2295 -msgid "New user has been added." +msgid "User has been added." msgstr "" #: server_processlist.php:29 diff --git a/po/mn.po b/po/mn.po index a37c8e0..8465033 100644 --- a/po/mn.po +++ b/po/mn.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: mongolian <mn(a)li.org>\n" @@ -8111,7 +8111,7 @@ msgstr "загвар" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Харц %s нь устгагдсан" #: server_processlist.php:29 diff --git a/po/ms.po b/po/ms.po index 10a2084..bd4393f 100644 --- a/po/ms.po +++ b/po/ms.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: malay <ms(a)li.org>\n" @@ -7938,7 +7938,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy -msgid "New user has been added." +msgid "User has been added." msgstr "Medan %s telah digugurkan" #: server_processlist.php:29 diff --git a/po/nb.po b/po/nb.po index 33f33f7..64aaa45 100644 --- a/po/nb.po +++ b/po/nb.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: norwegian <no(a)li.org>\n" @@ -8111,7 +8111,7 @@ msgstr "jokertegn" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Visningen %s har blitt slettet" #: server_processlist.php:29 diff --git a/po/nl.po b/po/nl.po index fd7bd40..dcad582 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-04 15:19+0200\n" "Last-Translator: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>\n" "Language-Team: dutch <nl(a)li.org>\n" @@ -8089,7 +8089,7 @@ msgstr "jokerteken" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "View %s is verwijderd" #: server_processlist.php:29 diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot index 7713c66..8046590 100644 --- a/po/phpmyadmin.pot +++ b/po/phpmyadmin.pot @@ -8,7 +8,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -7498,7 +7498,7 @@ msgid "wildcard" msgstr "" #: server_privileges.php:2295 -msgid "New user has been added." +msgid "User has been added." msgstr "" #: server_processlist.php:29 diff --git a/po/pl.po b/po/pl.po index f829929..0de02aa 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: polish <pl(a)li.org>\n" @@ -8378,7 +8378,7 @@ msgstr "znak wieloznaczny" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Widok %s został usunięty" #: server_processlist.php:29 diff --git a/po/pt.po b/po/pt.po index aa8cffa..8b5bb57 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" "Last-Translator: <efgpinto(a)gmail.com>\n" "Language-Team: portuguese <pt(a)li.org>\n" @@ -8017,7 +8017,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "A Vista %s foi eliminada" #: server_processlist.php:29 diff --git a/po/pt_BR.po b/po/pt_BR.po index 2b1009d..a4f9c91 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" "Last-Translator: <vitorpc.18(a)gmail.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" @@ -8138,7 +8138,7 @@ msgstr "coringa" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Visão %s foi apagada" #: server_processlist.php:29 diff --git a/po/ro.po b/po/ro.po index e66f056..323fb5f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: romanian <ro(a)li.org>\n" @@ -8293,7 +8293,7 @@ msgstr "Metacaracter" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Vizualizarea %s a fost eliminată" #: server_processlist.php:29 diff --git a/po/ru.po b/po/ru.po index e65e5ba..42830b7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-01 22:34+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" @@ -8077,7 +8077,7 @@ msgstr "Групповой символ" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Представление %s было удалено" #: server_processlist.php:29 diff --git a/po/si.po b/po/si.po index e417b33..f641ca6 100644 --- a/po/si.po +++ b/po/si.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-04 15:35+0200\n" "Last-Translator: Madhura Jayaratne <madhura.cj(a)gmail.com>\n" "Language-Team: sinhala <si(a)li.org>\n" @@ -7847,7 +7847,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "%s දසුන හලන ලදි" #: server_processlist.php:29 diff --git a/po/sk.po b/po/sk.po index 6c15b8a..ef4db5b 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-03 14:53+0200\n" "Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" "Language-Team: slovak <sk(a)li.org>\n" @@ -7892,7 +7892,7 @@ msgstr "nahradzujúci znak" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Pohľad %s bol odstránený" #: server_processlist.php:29 diff --git a/po/sl.po b/po/sl.po index 3c96873..852b6f9 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-05 21:27+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" @@ -8014,7 +8014,7 @@ msgstr "nadomestni znak" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Pogled %s je zavržen" #: server_processlist.php:29 diff --git a/po/sq.po b/po/sq.po index 22885e8..4877f2b 100644 --- a/po/sq.po +++ b/po/sq.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: albanian <sq(a)li.org>\n" @@ -8101,7 +8101,7 @@ msgstr "wildcard" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Paraqitja %s u eleminua" #: server_processlist.php:29 diff --git a/po/sr.po b/po/sr.po index 33e8d56..b9b8f01 100644 --- a/po/sr.po +++ b/po/sr.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" "Last-Translator: <theranchcowboy(a)googlemail.com>\n" "Language-Team: serbian_cyrillic <sr(a)li.org>\n" @@ -8224,7 +8224,7 @@ msgstr "џокер" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Поглед %s је одбачен" #: server_processlist.php:29 diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 088944e..4dcdcc8 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" "Last-Translator: Sasa Kostic <sasha.kostic(a)gmail.com>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" @@ -8213,7 +8213,7 @@ msgstr "džoker" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Pogled %s je odbačen" #: server_processlist.php:29 diff --git a/po/sv.po b/po/sv.po index bc4b445..1d5635c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-30 20:24+0200\n" "Last-Translator: <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" @@ -8004,7 +8004,7 @@ msgstr "jokertecken" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "Vyn %s har tagits bort" #: server_processlist.php:29 diff --git a/po/ta.po b/po/ta.po index 40880c4..ec2c9f7 100644 --- a/po/ta.po +++ b/po/ta.po @@ -6,7 +6,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" "Last-Translator: Sutharshan <sutharshan02(a)gmail.com>\n" "Language-Team: Tamil <ta(a)li.org>\n" @@ -7588,7 +7588,7 @@ msgid "wildcard" msgstr "" #: server_privileges.php:2295 -msgid "New user has been added." +msgid "User has been added." msgstr "" #: server_processlist.php:29 diff --git a/po/te.po b/po/te.po index c537d30..326b4a3 100644 --- a/po/te.po +++ b/po/te.po @@ -6,7 +6,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" "Last-Translator: <veeven(a)gmail.com>\n" "Language-Team: Telugu <te(a)li.org>\n" @@ -7678,7 +7678,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "Database %s has been dropped." -msgid "New user has been added." +msgid "User has been added." msgstr "%s డేటాబేస్ తుడిచివేయడమైనది" #: server_processlist.php:29 diff --git a/po/th.po b/po/th.po index ed5f494..5319300 100644 --- a/po/th.po +++ b/po/th.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: thai <th(a)li.org>\n" @@ -7976,7 +7976,7 @@ msgstr "ไวล์การ์ด" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "โยนวิว %s ทิ้งไปเรียบร้อยแล้ว" #: server_processlist.php:29 diff --git a/po/tr.po b/po/tr.po index eacb95f..87b6ef2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-06 18:49+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" @@ -8023,7 +8023,9 @@ msgid "wildcard" msgstr "joker" #: server_privileges.php:2295 -msgid "New user has been added." +#, fuzzy +#| msgid "New user has been added." +msgid "User has been added." msgstr "Yeni kullanıcı eklendi." #: server_processlist.php:29 diff --git a/po/tt.po b/po/tt.po index b1e3e5b..0fa70f2 100644 --- a/po/tt.po +++ b/po/tt.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: tatarish <tt(a)li.org>\n" @@ -8152,7 +8152,7 @@ msgstr "almaşbilge" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "\"%s\" atlı Qaraş beterelgän buldı" #: server_processlist.php:29 diff --git a/po/ug.po b/po/ug.po index d980ab8..2d69bab 100644 --- a/po/ug.po +++ b/po/ug.po @@ -6,7 +6,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" @@ -7773,7 +7773,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "%s كۆرۈنمە ئۆچۈرۈلدى" #: server_processlist.php:29 diff --git a/po/uk.po b/po/uk.po index 465cdc9..f6ae5ff 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" "Last-Translator: Olexiy Zagorskyi <zalex_ua(a)i.ua>\n" "Language-Team: ukrainian <uk(a)li.org>\n" @@ -7785,7 +7785,7 @@ msgstr "шаблон" #: server_privileges.php:2295 #, fuzzy #| msgid "The row has been deleted" -msgid "New user has been added." +msgid "User has been added." msgstr "Рядок видалено" #: server_processlist.php:29 diff --git a/po/ur.po b/po/ur.po index 542eb1d..283c71e 100644 --- a/po/ur.po +++ b/po/ur.po @@ -6,7 +6,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" "Last-Translator: Mehbooob Khan <mehboobbugti(a)gmail.com>\n" "Language-Team: Urdu <ur(a)li.org>\n" @@ -7761,7 +7761,7 @@ msgstr "" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "جدول نقل %s چھوڑا جاچکا ہے۔" #: server_processlist.php:29 diff --git a/po/uz.po b/po/uz.po index 695846a..38c05d1 100644 --- a/po/uz.po +++ b/po/uz.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_cyrillic <uz(a)li.org>\n" @@ -8602,7 +8602,7 @@ msgstr "Гуруҳлаш белгиси" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr " \"%s\" намойиши ўчирилди" #: server_processlist.php:29 diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 293eb1e..89cfff4 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_latin <uz@latin@li.org>\n" @@ -8647,7 +8647,7 @@ msgstr "Guruhlash belgisi" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr " \"%s\" namoyishi o‘chirildi" #: server_processlist.php:29 diff --git a/po/zh_CN.po b/po/zh_CN.po index d7fd2f6..c419710 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-05-30 05:47+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" @@ -7738,7 +7738,7 @@ msgstr "通配符" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "已删除视图 %s" #: server_processlist.php:29 diff --git a/po/zh_TW.po b/po/zh_TW.po index 9dc25b5..75fe710 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2,7 +2,7 @@ msgid "" 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-06-07 06:29-0400\n" +"POT-Creation-Date: 2011-06-07 06:41-0400\n" "PO-Revision-Date: 2011-06-03 09:09+0200\n" "Last-Translator: <kiange(a)gmail.com>\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" @@ -7804,7 +7804,7 @@ msgstr "萬用字元" #: server_privileges.php:2295 #, fuzzy #| msgid "View %s has been dropped" -msgid "New user has been added." +msgid "User has been added." msgstr "已刪除 view %s" #: server_processlist.php:29 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3180-gb6190dd
by Marc Delisle 07 Jun '11

07 Jun '11

The branch, master has been updated via b6190ddb0992460255f4dd53cc00b8a5f99f9a3c (commit) from dbf52be46e0f670542f017632c87a7593f89ffa0 (commit) - Log ----------------------------------------------------------------- commit b6190ddb0992460255f4dd53cc00b8a5f99f9a3c Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 06:38:05 2011 -0400 Reword redundant message ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 29ef94e..b5f7031 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2292,7 +2292,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs if($GLOBALS['is_ajax_request'] == true){ $extra_data['user_form'] = $user_form; - $message = PMA_Message::success(__('New user has been added.')); + $message = PMA_Message::success(__('User has been added.')); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); }else{ // Offer to create a new user for the current database hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3177-g3d3739a
by Michal Čihař 07 Jun '11

07 Jun '11

The branch, master has been updated via 3d3739a24be4b22896239dcc3ae67e5f52477d0b (commit) via 1b3a134d17f27fb69724c78f983adca1222587c2 (commit) via 16d377fa9b53e48000c4d2c2251aa3fc2f37726e (commit) via 246be4620da5c70e9a201e3c11dbe17f191255e8 (commit) via 720ea23813ff7d6088ab2e925ab17a3fad6cc3c6 (commit) via f749098cb4328dab4a3b9184aa2ce499f1058cc1 (commit) via b0d5360006d67ca32c9db54b942335f9e5b1c360 (commit) via 5a0f28a3c3248a45034e0a85e7f3b39ae1ba8396 (commit) via a07cf749f82248f306fc9dc7d83986858bcc77be (commit) from cf6312f5278f922ab420d501200b175eba987c5e (commit) - Log ----------------------------------------------------------------- commit 3d3739a24be4b22896239dcc3ae67e5f52477d0b Author: stoyanster <stoyanster(a)gmail.com> Date: Tue Jun 7 08:14:40 2011 +0200 Translation update done using Pootle. commit 1b3a134d17f27fb69724c78f983adca1222587c2 Author: stoyanster <stoyanster(a)gmail.com> Date: Tue Jun 7 08:13:47 2011 +0200 Translation update done using Pootle. commit 16d377fa9b53e48000c4d2c2251aa3fc2f37726e Author: stoyanster <stoyanster(a)gmail.com> Date: Tue Jun 7 08:13:19 2011 +0200 Translation update done using Pootle. commit 246be4620da5c70e9a201e3c11dbe17f191255e8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jun 6 18:49:58 2011 +0200 Translation update done using Pootle. commit 720ea23813ff7d6088ab2e925ab17a3fad6cc3c6 Merge: f749098cb4328dab4a3b9184aa2ce499f1058cc1 cf6312f5278f922ab420d501200b175eba987c5e Author: Pootle server <pootle(a)cihar.com> Date: Mon Jun 6 18:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit f749098cb4328dab4a3b9184aa2ce499f1058cc1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jun 6 18:33:34 2011 +0200 Translation update done using Pootle. commit b0d5360006d67ca32c9db54b942335f9e5b1c360 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jun 6 18:07:19 2011 +0200 Translation update done using Pootle. commit 5a0f28a3c3248a45034e0a85e7f3b39ae1ba8396 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jun 6 18:06:56 2011 +0200 Translation update done using Pootle. commit a07cf749f82248f306fc9dc7d83986858bcc77be Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jun 6 18:06:33 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/bg.po | 10 ++++------ po/tr.po | 13 ++++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/po/bg.po b/po/bg.po index 8afde8a..794aab7 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(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-06 11:35+0200\n" -"PO-Revision-Date: 2011-06-06 10:24+0200\n" +"PO-Revision-Date: 2011-06-07 08:14+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" "Language: bg\n" @@ -1101,10 +1101,9 @@ msgid "Create Table" msgstr "Създаване таблица" #: js/messages.php:83 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Използване таблиците" +msgstr "Вмъкване на таблица" #: js/messages.php:86 msgid "Searching" @@ -6711,7 +6710,7 @@ msgstr "Визуални настройки" #: main.php:146 prefs_manage.php:274 msgid "More settings" -msgstr "Още настройки" +msgstr "Още" #: main.php:163 msgid "Protocol version" @@ -7649,10 +7648,9 @@ msgid "wildcard" msgstr "знак за заместване" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "New user has been added." -msgstr "Изглед %s беше изтрит" +msgstr "Нов потребител беше създаден." #: server_processlist.php:29 #, php-format diff --git a/po/tr.po b/po/tr.po index 3801ea7..34b954f 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-06-06 11:35+0200\n" -"PO-Revision-Date: 2011-06-02 21:51+0200\n" +"PO-Revision-Date: 2011-06-06 18:49+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -1100,10 +1100,9 @@ msgid "Create Table" msgstr "Tablo Oluştur" #: js/messages.php:83 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Tabloları kullan" +msgstr "Tablo Ekle" #: js/messages.php:86 msgid "Searching" @@ -2582,12 +2581,13 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Bir veritabanının seçili tablolarını uyarlama ya da onarma gibi toplu tablo " +"bakımı işlemlerini etkisizleştirir." #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Tablo bakımı" +msgstr "Çoklu tablo bakımı etkisiz" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -8025,10 +8025,9 @@ msgid "wildcard" msgstr "joker" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "New user has been added." -msgstr "%s görünümü kaldırıldı" +msgstr "Yeni kullanıcı eklendi." #: server_processlist.php:29 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3168-gcf6312f
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via cf6312f5278f922ab420d501200b175eba987c5e (commit) via 72886c3c8a6cf2a01ea40f01c7d7c4c981a3a4e7 (commit) from db07b65c657162ce04c50ec1164390f0fb68b905 (commit) - Log ----------------------------------------------------------------- commit cf6312f5278f922ab420d501200b175eba987c5e Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 17:08:35 2011 +0200 Clarify documentation commit 72886c3c8a6cf2a01ea40f01c7d7c4c981a3a4e7 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 17:08:02 2011 +0200 Add option to call extenal script from signon method ----------------------------------------------------------------------- Summary of changes: Documentation.html | 28 +++++++++++++++++++++------- libraries/auth/signon.auth.lib.php | 14 +++++++++++++- libraries/config.default.php | 7 +++++++ scripts/signon.php | 6 +++--- 4 files changed, 44 insertions(+), 11 deletions(-) diff --git a/Documentation.html b/Documentation.html index 6e98747..6f66b64 100644 --- a/Documentation.html +++ b/Documentation.html @@ -759,13 +759,17 @@ since this link provides funding for phpMyAdmin. <li>'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as introduced in 2.10.0 allows you to log in from prepared PHP - session data. This is useful for implementing single signon - from another application. Sample way how to seed session is in - signon example: <code>scripts/signon.php</code>. There is also - alternative example using OpenID - - <code>scripts/openid.php</code>. You need to + session data or using supplied PHP script. This is useful for implementing single signon + from another application. + + Sample way how to seed session is in signon example: <code>scripts/signon.php</code>. + There is also alternative example using OpenID - <code>scripts/openid.php</code> and + example for scripts based solution - <code>scripts/signon-script.php</code>. + + You need to configure <a href="#cfg_Servers_SignonSession" - class="configrule">session name</a> and <a + class="configrule">session name</a> or <a href="#cfg_Servers_SignonScript" + class="configrule">script to be executed</a> and <a href="#cfg_Servers_SignonURL" class="configrule">signon URL</a> to use this authentication method.</li> </ul> @@ -1320,10 +1324,20 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dt>$cfg['Servers'][$i]['CountTables'] boolean</dt> <dd>Whether to count the number of tables for each database when preparing the list of databases for the navigation frame. </dd> + <dt>$cfg['Servers'][$i]['SignonScript'] string</dt> + <dd>Name of PHP script to be sourced and executed to obtain + login credentials. This is alternative approach to session based single + signon. The script needs to provide function + <code>get_login_credentials</code> which returns list of username and + pasword, accepting single parameter of existing username (can be empty). + See <code>scripts/signon-script.php</code> for an example. + </dd> <dt>$cfg['Servers'][$i]['SignonSession'] string</dt> <dd>Name of session which will be used for signon authentication method. You should use something different than <code>phpMyAdmin</code>, because - this is session which phpMyAdmin uses internally. + this is session which phpMyAdmin uses internally. Takes effect only if + <a href="#cfg_Servers_SignonScript" class="configrule">SignonScript</a> + is not configured. </dd> <dt>$cfg['Servers'][$i]['SignonURL'] string</dt> <dd>URL where user will be redirected to log in for signon authentication method. Should be absolute including protocol. diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index 0735020..e095829 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -60,6 +60,9 @@ function PMA_auth_check() return false; } + /* Script name */ + $script_name = $GLOBALS['cfg']['Server']['SignonScript']; + /* Session name */ $session_name = $GLOBALS['cfg']['Server']['SignonSession']; @@ -78,8 +81,17 @@ function PMA_auth_check() /* Are we requested to do logout? */ $do_logout = !empty($_REQUEST['old_usr']); + /* Handle script based auth */ + if (!empty($script_name)) { + if (! file_exists($script_name)) { + PMA_fatalError(__('Can not find signon authentication script:') . ' ' . $script_name); + } + require $script_name; + + list ($PHP_AUTH_USER, $PHP_AUTH_PW) = get_login_credentials($cfg['Server']['user']); + /* Does session exist? */ - if (isset($_COOKIE[$session_name])) { + } elseif (isset($_COOKIE[$session_name])) { /* End current session */ $old_session = session_name(); $old_id = session_id(); diff --git a/libraries/config.default.php b/libraries/config.default.php index d6e47c2..1a478b7 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -213,6 +213,13 @@ $cfg['Servers'][$i]['password'] = ''; $cfg['Servers'][$i]['SignonSession'] = ''; /** + * PHP script to use for 'signon' authentication method + * + * @global string $cfg['Servers'][$i]['SignonScript'] + */ +$cfg['Servers'][$i]['SignonScript'] = ''; + +/** * URL where to redirect user to login for 'signon' authentication method * * @global string $cfg['Servers'][$i]['SignonURL'] diff --git a/scripts/signon.php b/scripts/signon.php index e585625..d80c1cf 100644 --- a/scripts/signon.php +++ b/scripts/signon.php @@ -3,9 +3,9 @@ /** * Single signon for phpMyAdmin * - * This is just example how to use single signon with phpMyAdmin, it is - * not intended to be perfect code and look, only shows how you can - * integrate this functionality in your application. + * This is just example how to use session based single signon with + * phpMyAdmin, it is not intended to be perfect code and look, only + * shows how you can integrate this functionality in your application. * * @package phpMyAdmin * @subpackage Example hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3166-gdb07b65
by Piotr Przybylski 06 Jun '11

06 Jun '11

The branch, master has been updated via db07b65c657162ce04c50ec1164390f0fb68b905 (commit) from 41376df2b088a83778067d1f4f6e7c7669ab3561 (commit) - Log ----------------------------------------------------------------- commit db07b65c657162ce04c50ec1164390f0fb68b905 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Mon Jun 6 16:40:43 2011 +0200 Add missing 'server' argument to PMA_reloadRecentTable Was causing token regeneration on non-default servers, if the next action required valid token it would fail ----------------------------------------------------------------------- Summary of changes: js/navigation.js | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 7f9a013..20aea18 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -171,13 +171,16 @@ function clear_fast_filter() { * Reloads the recent tables list. */ function PMA_reloadRecentTable() { - $.get('navigation.php', - { 'token' : window.parent.token, 'ajax_request' : true, 'recent_table' : true }, - function (data) { - if (data.success == true) { - $('#recentTable').html(data.options); - } - }); + $.get('navigation.php', { + 'token': window.parent.token, + 'server': window.parent.server, + 'ajax_request': true, + 'recent_table': true}, + function (data) { + if (data.success == true) { + $('#recentTable').html(data.options); + } + }); } /* Performed on load */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3165-g41376df
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via 41376df2b088a83778067d1f4f6e7c7669ab3561 (commit) via 91c16608f8afa5d51975bd5e7aa54a828662da83 (commit) via 55d8b1efa04851fc1572154dead2d77820cb596d (commit) via 9b0b9b0b59311aa3274e5ed2060d47240504bfd0 (commit) via 0c964ca10ba0f7b2181332517bd8c62149626500 (commit) via c13e64468b9afed3f5963debbf01533f07bce444 (commit) via 4b3b0c616cc34f9f68da24553741a5e4096e1370 (commit) via cbd0b7d8f7a4887365170251fdd26fb6d44e9af5 (commit) via 6c6ae1c1cc8fec669749f9fbcbdb862b81d206d5 (commit) from d147fd26db0cf8a5965c640c3047494acc2b9d44 (commit) - Log ----------------------------------------------------------------- commit 41376df2b088a83778067d1f4f6e7c7669ab3561 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:36:57 2011 +0200 Properly end multi word links commit 91c16608f8afa5d51975bd5e7aa54a828662da83 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:33:22 2011 +0200 Documentation for other reserved words commit 55d8b1efa04851fc1572154dead2d77820cb596d Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:21:23 2011 +0200 Add documentation links to function names commit 9b0b9b0b59311aa3274e5ed2060d47240504bfd0 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:13:33 2011 +0200 Move doc back to correct place commit 0c964ca10ba0f7b2181332517bd8c62149626500 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:12:33 2011 +0200 Provide doc links for operators commit c13e64468b9afed3f5963debbf01533f07bce444 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 15:58:06 2011 +0200 Coding style commit 4b3b0c616cc34f9f68da24553741a5e4096e1370 Author: Mateusz Lewandowski <gandalfml(a)users.sourceforge.net> Date: Mon Jun 6 15:56:58 2011 +0200 Add data for documentation links. commit cbd0b7d8f7a4887365170251fdd26fb6d44e9af5 Merge: d147fd26db0cf8a5965c640c3047494acc2b9d44 6c6ae1c1cc8fec669749f9fbcbdb862b81d206d5 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 15:54:29 2011 +0200 Merge branch 'integration' Conflicts: libraries/sqlparser.lib.php commit 6c6ae1c1cc8fec669749f9fbcbdb862b81d206d5 Author: Mateusz Lewandowski <gandalfml(a)users.sourceforge.net> Date: Tue Apr 5 21:30:20 2011 +0200 Better names for some variables ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.data.php | 266 ++++++++++++++++++++++++++++++++++++++++++ libraries/sqlparser.lib.php | 55 +++++++-- 2 files changed, 312 insertions(+), 9 deletions(-) diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 5011ca7..d1c4b16 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -1222,4 +1222,270 @@ $PMA_SQPdata_column_type = array ( 'YEAR' ); +/** + * Documentation links for operators. + */ +$PMA_SQPdata_operators_docs = array( + '!=' => array('link' => 'comparison-operators','anchor' => 'operator_not-equal'), + '<>' => array('link' => 'comparison-operators','anchor' => 'operator_not-equal'), + '!' => array('link' => 'logical-operators','anchor' => 'operator_not'), + '||' => array('link' => 'logical-operators','anchor' => 'operator_or'), + '+' => array('link' => 'arithmetic-functions','anchor' => 'operator_plus'), + '>>' => array('link' => 'bit-functions','anchor' => 'operator_right-shift'), + '-' => array('link' => 'arithmetic-functions','anchor' => 'operator_minus'), + '*' => array('link' => 'arithmetic-functions','anchor' => 'operator_times'), + '&&' => array('link' => 'logical-operators','anchor' => 'operator_and'), + '&' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-and'), + '~' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-invert'), + '|' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-or'), + '^' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-xor'), + '=' => array('link' => 'assignment-operators','anchor' => 'operator_assign-equal'), + ':=' => array('link' => 'assignment-operators','anchor' => 'operator_assign-value'), + '/' => array('link' => 'arithmetic-functions','anchor' => 'operator_divide'), + '<=>' => array('link' => 'comparison-operators','anchor' => 'operator_equal-to'), + '=' => array('link' => 'comparison-operators','anchor' => 'operator_equal'), + '>=' => array('link' => 'comparison-operators','anchor' => 'operator_greater-than-or-equal'), + '>' => array('link' => 'comparison-operators','anchor' => 'operator_greater-than'), + '<<' => array('link' => 'bit-functions','anchor' => 'operator_left-shift'), + '<=' => array('link' => 'comparison-operators','anchor' => 'operator_less-than-or-equal'), + '<' => array('link' => 'comparison-operators','anchor' => 'operator_less-than'), + '%' => array('link' => 'arithmetic-functions','anchor' => 'operator_mod') +); + +/** + * Documentation links for functions. + */ +$PMA_SQPdata_functions_docs = array( + 'ABS' => array('link' => 'mathematical-functions','anchor' => 'function_abs'), + 'ACOS' => array('link' => 'mathematical-functions','anchor' => 'function_acos'), + 'ADDDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_adddate'), + 'ADDTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_addtime'), + 'AES_DECRYPT' => array('link' => 'encryption-functions','anchor' => 'function_aes_decrypt'), + 'AES_ENCRYPT' => array('link' => 'encryption-functions','anchor' => 'function_aes_encrypt'), + 'AND' => array('link' => 'logical-operators','anchor' => 'operator_and'), + 'ASCII' => array('link' => 'string-functions','anchor' => 'function_ascii'), + 'ASIN' => array('link' => 'mathematical-functions','anchor' => 'function_asin'), + 'ATAN2' => array('link' => 'mathematical-functions','anchor' => 'function_atan2'), + 'ATAN' => array('link' => 'mathematical-functions','anchor' => 'function_atan2'), + 'ATAN' => array('link' => 'mathematical-functions','anchor' => 'function_atan'), + 'AVG' => array('link' => 'group-by-functions','anchor' => 'function_avg'), + 'BENCHMARK' => array('link' => 'information-functions','anchor' => 'function_benchmark'), + 'BIN' => array('link' => 'string-functions','anchor' => 'function_bin'), + 'BINARY' => array('link' => 'cast-functions','anchor' => 'operator_binary'), + 'BIT_AND' => array('link' => 'group-by-functions','anchor' => 'function_bit_and'), + 'BIT_COUNT' => array('link' => 'bit-functions','anchor' => 'function_bit_count'), + 'BIT_LENGTH' => array('link' => 'string-functions','anchor' => 'function_bit_length'), + 'BIT_OR' => array('link' => 'group-by-functions','anchor' => 'function_bit_or'), + 'BIT_XOR' => array('link' => 'group-by-functions','anchor' => 'function_bit_xor'), + 'CASE' => array('link' => 'control-flow-functions','anchor' => 'operator_case'), + 'CAST' => array('link' => 'cast-functions','anchor' => 'function_cast'), + 'CEIL' => array('link' => 'mathematical-functions','anchor' => 'function_ceil'), + 'CEILING' => array('link' => 'mathematical-functions','anchor' => 'function_ceiling'), + 'CHAR_LENGTH' => array('link' => 'string-functions','anchor' => 'function_char_length'), + 'CHAR' => array('link' => 'string-functions','anchor' => 'function_char'), + 'CHARACTER_LENGTH' => array('link' => 'string-functions','anchor' => 'function_character_length'), + 'CHARSET' => array('link' => 'information-functions','anchor' => 'function_charset'), + 'COALESCE' => array('link' => 'comparison-operators','anchor' => 'function_coalesce'), + 'COERCIBILITY' => array('link' => 'information-functions','anchor' => 'function_coercibility'), + 'COLLATION' => array('link' => 'information-functions','anchor' => 'function_collation'), + 'COMPRESS' => array('link' => 'encryption-functions','anchor' => 'function_compress'), + 'CONCAT_WS' => array('link' => 'string-functions','anchor' => 'function_concat_ws'), + 'CONCAT' => array('link' => 'string-functions','anchor' => 'function_concat'), + 'CONNECTION_ID' => array('link' => 'information-functions','anchor' => 'function_connection_id'), + 'CONV' => array('link' => 'mathematical-functions','anchor' => 'function_conv'), + 'CONVERT_TZ' => array('link' => 'date-and-time-functions','anchor' => 'function_convert_tz'), + 'Convert' => array('link' => 'cast-functions','anchor' => 'function_convert'), + 'COS' => array('link' => 'mathematical-functions','anchor' => 'function_cos'), + 'COT' => array('link' => 'mathematical-functions','anchor' => 'function_cot'), + 'COUNT' => array('link' => 'group-by-functions','anchor' => 'function_count'), + 'CRC32' => array('link' => 'mathematical-functions','anchor' => 'function_crc32'), + 'CURDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_curdate'), + 'CURRENT_DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_current_date'), + 'CURRENT_TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_current_time'), + 'CURRENT_TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_current_timestamp'), + 'CURRENT_USER' => array('link' => 'information-functions','anchor' => 'function_current_user'), + 'CURTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_curtime'), + 'DATABASE' => array('link' => 'information-functions','anchor' => 'function_database'), + 'DATE_ADD' => array('link' => 'date-and-time-functions','anchor' => 'function_date_add'), + 'DATE_FORMAT' => array('link' => 'date-and-time-functions','anchor' => 'function_date_format'), + 'DATE_SUB' => array('link' => 'date-and-time-functions','anchor' => 'function_date_sub'), + 'DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_date'), + 'DATEDIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_datediff'), + 'DAY' => array('link' => 'date-and-time-functions','anchor' => 'function_day'), + 'DAYNAME' => array('link' => 'date-and-time-functions','anchor' => 'function_dayname'), + 'DAYOFMONTH' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofmonth'), + 'DAYOFWEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofweek'), + 'DAYOFYEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofyear'), + 'DECODE' => array('link' => 'encryption-functions','anchor' => 'function_decode'), + 'DEFAULT' => array('link' => 'miscellaneous-functions','anchor' => 'function_default'), + 'DEGREES' => array('link' => 'mathematical-functions','anchor' => 'function_degrees'), + 'DES_DECRYPT' => array('link' => 'encryption-functions','anchor' => 'function_des_decrypt'), + 'DES_ENCRYPT' => array('link' => 'encryption-functions','anchor' => 'function_des_encrypt'), + 'DIV' => array('link' => 'arithmetic-functions','anchor' => 'operator_div'), + 'ELT' => array('link' => 'string-functions','anchor' => 'function_elt'), + 'ENCODE' => array('link' => 'encryption-functions','anchor' => 'function_encode'), + 'ENCRYPT' => array('link' => 'encryption-functions','anchor' => 'function_encrypt'), + 'EXP' => array('link' => 'mathematical-functions','anchor' => 'function_exp'), + 'EXPORT_SET' => array('link' => 'string-functions','anchor' => 'function_export_set'), + 'EXTRACT' => array('link' => 'date-and-time-functions','anchor' => 'function_extract'), + 'ExtractValue' => array('link' => 'xml-functions','anchor' => 'function_extractvalue'), + 'FIELD' => array('link' => 'string-functions','anchor' => 'function_field'), + 'FIND_IN_SET' => array('link' => 'string-functions','anchor' => 'function_find_in_set'), + 'FLOOR' => array('link' => 'mathematical-functions','anchor' => 'function_floor'), + 'FORMAT' => array('link' => 'string-functions','anchor' => 'function_format'), + 'FOUND_ROWS' => array('link' => 'information-functions','anchor' => 'function_found_rows'), + 'FROM_DAYS' => array('link' => 'date-and-time-functions','anchor' => 'function_from_days'), + 'FROM_UNIXTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_from_unixtime'), + 'GET_FORMAT' => array('link' => 'date-and-time-functions','anchor' => 'function_get_format'), + 'GET_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_get_lock'), + 'GREATEST' => array('link' => 'comparison-operators','anchor' => 'function_greatest'), + 'GROUP_CONCAT' => array('link' => 'group-by-functions','anchor' => 'function_group_concat'), + 'HEX' => array('link' => 'string-functions','anchor' => 'function_hex'), + 'HOUR' => array('link' => 'date-and-time-functions','anchor' => 'function_hour'), + 'IF' => array('link' => 'control-flow-functions','anchor' => 'function_if'), + 'IFNULL' => array('link' => 'control-flow-functions','anchor' => 'function_ifnull'), + 'IN' => array('link' => 'comparison-operators','anchor' => 'function_in'), + 'INET_ATON' => array('link' => 'miscellaneous-functions','anchor' => 'function_inet_aton'), + 'INET_NTOA' => array('link' => 'miscellaneous-functions','anchor' => 'function_inet_ntoa'), + 'INSERT' => array('link' => 'string-functions','anchor' => 'function_insert'), + 'INSTR' => array('link' => 'string-functions','anchor' => 'function_instr'), + 'INTERVAL' => array('link' => 'comparison-operators','anchor' => 'function_interval'), + 'IS_FREE_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_is_free_lock'), + 'IS_USED_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_is_used_lock'), + 'IS' => array('link' => 'comparison-operators','anchor' => 'operator_is'), + 'ISNULL' => array('link' => 'comparison-operators','anchor' => 'function_isnull'), + 'LAST_DAY' => array('link' => 'date-and-time-functions','anchor' => 'function_last_day'), + 'LAST_INSERT_ID' => array('link' => 'information-functions','anchor' => 'function_last_insert_id'), + 'LCASE' => array('link' => 'string-functions','anchor' => 'function_lcase'), + 'LEAST' => array('link' => 'comparison-operators','anchor' => 'function_least'), + 'LEFT' => array('link' => 'string-functions','anchor' => 'function_left'), + 'LENGTH' => array('link' => 'string-functions','anchor' => 'function_length'), + 'LIKE' => array('link' => 'string-comparison-functions','anchor' => 'operator_like'), + 'LN' => array('link' => 'mathematical-functions','anchor' => 'function_ln'), + 'LOAD_FILE' => array('link' => 'string-functions','anchor' => 'function_load_file'), + 'LOCALTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_localtime'), + 'LOCALTIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_localtimestamp'), + 'LOCATE' => array('link' => 'string-functions','anchor' => 'function_locate'), + 'LOG10' => array('link' => 'mathematical-functions','anchor' => 'function_log10'), + 'LOG2' => array('link' => 'mathematical-functions','anchor' => 'function_log2'), + 'LOG' => array('link' => 'mathematical-functions','anchor' => 'function_log'), + 'LOWER' => array('link' => 'string-functions','anchor' => 'function_lower'), + 'LPAD' => array('link' => 'string-functions','anchor' => 'function_lpad'), + 'LTRIM' => array('link' => 'string-functions','anchor' => 'function_ltrim'), + 'MAKE_SET' => array('link' => 'string-functions','anchor' => 'function_make_set'), + 'MAKEDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_makedate'), + 'MAKETIME' => array('link' => 'date-and-time-functions','anchor' => 'function_maketime'), + 'MASTER_POS_WAIT' => array('link' => 'miscellaneous-functions','anchor' => 'function_master_pos_wait'), + 'MATCH' => array('link' => 'fulltext-search','anchor' => 'function_match'), + 'MAX' => array('link' => 'group-by-functions','anchor' => 'function_max'), + 'MD5' => array('link' => 'encryption-functions','anchor' => 'function_md5'), + 'MICROSECOND' => array('link' => 'date-and-time-functions','anchor' => 'function_microsecond'), + 'MID' => array('link' => 'string-functions','anchor' => 'function_mid'), + 'MIN' => array('link' => 'group-by-functions','anchor' => 'function_min'), + 'MINUTE' => array('link' => 'date-and-time-functions','anchor' => 'function_minute'), + 'MOD' => array('link' => 'mathematical-functions','anchor' => 'function_mod'), + 'MONTH' => array('link' => 'date-and-time-functions','anchor' => 'function_month'), + 'MONTHNAME' => array('link' => 'date-and-time-functions','anchor' => 'function_monthname'), + 'NAME_CONST' => array('link' => 'miscellaneous-functions','anchor' => 'function_name_const'), + 'NOT' => array('link' => 'logical-operators','anchor' => 'operator_not'), + 'NOW' => array('link' => 'date-and-time-functions','anchor' => 'function_now'), + 'NULLIF' => array('link' => 'control-flow-functions','anchor' => 'function_nullif'), + 'OCT' => array('link' => 'mathematical-functions','anchor' => 'function_oct'), + 'OCTET_LENGTH' => array('link' => 'string-functions','anchor' => 'function_octet_length'), + 'OLD_PASSWORD' => array('link' => 'encryption-functions','anchor' => 'function_old_password'), + 'OR' => array('link' => 'logical-operators','anchor' => 'operator_or'), + 'ORD' => array('link' => 'string-functions','anchor' => 'function_ord'), + 'PASSWORD' => array('link' => 'encryption-functions','anchor' => 'function_password'), + 'PERIOD_ADD' => array('link' => 'date-and-time-functions','anchor' => 'function_period_add'), + 'PERIOD_DIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_period_diff'), + 'PI' => array('link' => 'mathematical-functions','anchor' => 'function_pi'), + 'POSITION' => array('link' => 'string-functions','anchor' => 'function_position'), + 'POW' => array('link' => 'mathematical-functions','anchor' => 'function_pow'), + 'POWER' => array('link' => 'mathematical-functions','anchor' => 'function_power'), + 'QUARTER' => array('link' => 'date-and-time-functions','anchor' => 'function_quarter'), + 'QUOTE' => array('link' => 'string-functions','anchor' => 'function_quote'), + 'RADIANS' => array('link' => 'mathematical-functions','anchor' => 'function_radians'), + 'RAND' => array('link' => 'mathematical-functions','anchor' => 'function_rand'), + 'REGEXP' => array('link' => 'regexp','anchor' => 'operator_regexp'), + 'RELEASE_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_release_lock'), + 'REPEAT' => array('link' => 'string-functions','anchor' => 'function_repeat'), + 'REPLACE' => array('link' => 'string-functions','anchor' => 'function_replace'), + 'REVERSE' => array('link' => 'string-functions','anchor' => 'function_reverse'), + 'RIGHT' => array('link' => 'string-functions','anchor' => 'function_right'), + 'RLIKE' => array('link' => 'regexp','anchor' => 'operator_rlike'), + 'ROUND' => array('link' => 'mathematical-functions','anchor' => 'function_round'), + 'ROW_COUNT' => array('link' => 'information-functions','anchor' => 'function_row_count'), + 'RPAD' => array('link' => 'string-functions','anchor' => 'function_rpad'), + 'RTRIM' => array('link' => 'string-functions','anchor' => 'function_rtrim'), + 'SCHEMA' => array('link' => 'information-functions','anchor' => 'function_schema'), + 'SEC_TO_TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_sec_to_time'), + 'SECOND' => array('link' => 'date-and-time-functions','anchor' => 'function_second'), + 'SESSION_USER' => array('link' => 'information-functions','anchor' => 'function_session_user'), + 'SHA' => array('link' => 'encryption-functions','anchor' => 'function_sha1'), + 'SHA1' => array('link' => 'encryption-functions','anchor' => 'function_sha1'), + 'SIGN' => array('link' => 'mathematical-functions','anchor' => 'function_sign'), + 'SIN' => array('link' => 'mathematical-functions','anchor' => 'function_sin'), + 'SLEEP' => array('link' => 'miscellaneous-functions','anchor' => 'function_sleep'), + 'SOUNDEX' => array('link' => 'string-functions','anchor' => 'function_soundex'), + 'SPACE' => array('link' => 'string-functions','anchor' => 'function_space'), + 'SQRT' => array('link' => 'mathematical-functions','anchor' => 'function_sqrt'), + 'STD' => array('link' => 'group-by-functions','anchor' => 'function_std'), + 'STDDEV_POP' => array('link' => 'group-by-functions','anchor' => 'function_stddev_pop'), + 'STDDEV_SAMP' => array('link' => 'group-by-functions','anchor' => 'function_stddev_samp'), + 'STDDEV' => array('link' => 'group-by-functions','anchor' => 'function_stddev'), + 'STR_TO_DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_str_to_date'), + 'STRCMP' => array('link' => 'string-comparison-functions','anchor' => 'function_strcmp'), + 'SUBDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_subdate'), + 'SUBSTR' => array('link' => 'string-functions','anchor' => 'function_substr'), + 'SUBSTRING_INDEX' => array('link' => 'string-functions','anchor' => 'function_substring_index'), + 'SUBSTRING' => array('link' => 'string-functions','anchor' => 'function_substring'), + 'SUBTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_subtime'), + 'SUM' => array('link' => 'group-by-functions','anchor' => 'function_sum'), + 'SYSDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_sysdate'), + 'SYSTEM_USER' => array('link' => 'information-functions','anchor' => 'function_system_user'), + 'TAN' => array('link' => 'mathematical-functions','anchor' => 'function_tan'), + 'TIME_FORMAT' => array('link' => 'date-and-time-functions','anchor' => 'function_time_format'), + 'TIME_TO_SEC' => array('link' => 'date-and-time-functions','anchor' => 'function_time_to_sec'), + 'TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_time'), + 'TIMEDIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_timediff'), + 'TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_timestamp'), + 'TIMESTAMPADD' => array('link' => 'date-and-time-functions','anchor' => 'function_timestampadd'), + 'TIMESTAMPDIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_timestampdiff'), + 'TO_DAYS' => array('link' => 'date-and-time-functions','anchor' => 'function_to_days'), + 'TRIM' => array('link' => 'string-functions','anchor' => 'function_trim'), + 'TRUNCATE' => array('link' => 'mathematical-functions','anchor' => 'function_truncate'), + 'UCASE' => array('link' => 'string-functions','anchor' => 'function_ucase'), + 'UNCOMPRESS' => array('link' => 'encryption-functions','anchor' => 'function_uncompress'), + 'UNCOMPRESSED_LENGTH' => array('link' => 'encryption-functions','anchor' => 'function_uncompressed_length'), + 'UNHEX' => array('link' => 'string-functions','anchor' => 'function_unhex'), + 'UNIX_TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_unix_timestamp'), + 'UpdateXML' => array('link' => 'xml-functions','anchor' => 'function_updatexml'), + 'UPPER' => array('link' => 'string-functions','anchor' => 'function_upper'), + 'USER' => array('link' => 'information-functions','anchor' => 'function_user'), + 'UTC_DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_utc_date'), + 'UTC_TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_utc_time'), + 'UTC_TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_utc_timestamp'), + 'UUID_SHORT' => array('link' => 'miscellaneous-functions','anchor' => 'function_uuid_short'), + 'UUID' => array('link' => 'miscellaneous-functions','anchor' => 'function_uuid'), + 'VALUES' => array('link' => 'miscellaneous-functions','anchor' => 'function_values'), + 'VAR_POP' => array('link' => 'group-by-functions','anchor' => 'function_var_pop'), + 'VAR_SAMP' => array('link' => 'group-by-functions','anchor' => 'function_var_samp'), + 'VARIANCE' => array('link' => 'group-by-functions','anchor' => 'function_variance'), + 'VERSION' => array('link' => 'information-functions','anchor' => 'function_version'), + 'WEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_week'), + 'WEEKDAY' => array('link' => 'date-and-time-functions','anchor' => 'function_weekday'), + 'WEEKOFYEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_weekofyear'), + 'XOR' => array('link' => 'logical-operators','anchor' => 'operator_xor'), + 'YEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_year'), + 'YEARWEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_yearweek'), + 'SOUNDS_LIKE' => array('link' => 'string-functions','anchor' => 'operator_sounds-like'), + 'IS_NOT_NULL' => array('link' => 'comparison-operators','anchor' => 'operator_is-not-null'), + 'IS_NOT' => array('link' => 'comparison-operators','anchor' => 'operator_is-not'), + 'IS_NULL' => array('link' => 'comparison-operators','anchor' => 'operator_is-null'), + 'NOT_LIKE' => array('link' => 'string-comparison-functions','anchor' => 'operator_not-like'), + 'NOT_REGEXP' => array('link' => 'regexp','anchor' => 'operator_not-regexp'), + 'COUNT_DISTINCT' => array('link' => 'group-by-functions','anchor' => 'function_count-distinct'), + 'NOT_IN' => array('link' => 'comparison-operators','anchor' => 'function_not-in') +); + ?> diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index e05d011..46ae2b2 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2089,6 +2089,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatHtml($arr, $mode='color', $start_token=0, $number_of_tokens=-1) { + global $PMA_SQPdata_operators_docs, $PMA_SQPdata_functions_docs; //DEBUG echo 'in Format<pre>'; print_r($arr); echo '</pre>'; // then check for an array if (! is_array($arr)) { @@ -2180,21 +2181,18 @@ if (! defined('PMA_MINIMUM_COMMON')) { $keywords_priv_list_cnt = 2; if ($number_of_tokens == -1) { - $arraysize = $arr['len']; - } else { - $arraysize = $number_of_tokens; + $number_of_tokens = $arr['len']; } $typearr = array(); - if ($arraysize >= 0) { + if ($number_of_tokens >= 0) { $typearr[0] = ''; $typearr[1] = ''; $typearr[2] = ''; - //$typearr[3] = $arr[0]['type']; $typearr[3] = $arr[$start_token]['type']; } $in_priv_list = false; - for ($i = $start_token; $i < $arraysize; $i++) { + for ($i = $start_token; $i < $number_of_tokens; $i++) { // DEBUG echo "Loop format " . $arr[$i]['data'] . " " . $arr[$i]['type'] . " "; $before = ''; $after = ''; @@ -2205,11 +2203,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { 2 current 3 next */ - if (($i + 1) < $arraysize) { - // array_push($typearr, $arr[$i + 1]['type']); + if (($i + 1) < $number_of_tokens) { $typearr[4] = $arr[$i + 1]['type']; } else { - //array_push($typearr, null); $typearr[4] = ''; } @@ -2285,6 +2281,17 @@ if (! defined('PMA_MINIMUM_COMMON')) { break; case 'punct': $before .= ' '; + if ($docu && isset($PMA_SQPdata_operators_docs[$arr[$i]['data']]) && + ($arr[$i]['data'] != '*' || in_array($arr[$i]['type'], array('digit_integer','digit_float','digit_hex')))) { + $before .= PMA_showMySQLDocu( + 'functions', + $PMA_SQPdata_operators_docs[$arr[$i]['data']]['link'], + false, + $PMA_SQPdata_operators_docs[$arr[$i]['data']]['anchor'], + true); + $after .= '</a>'; + } + // workaround for // select * from mytable limit 0,-1 // (a side effect of this workaround is that @@ -2388,6 +2395,18 @@ if (! defined('PMA_MINIMUM_COMMON')) { $after .= ' '; } break; + case 'alpha_functionName': + $funcname = strtoupper($arr[$i]['data']); + if ($docu && isset($PMA_SQPdata_functions_docs[$funcname])) { + $before .= PMA_showMySQLDocu( + 'functions', + $PMA_SQPdata_functions_docs[$funcname]['link'], + false, + $PMA_SQPdata_functions_docs[$funcname]['anchor'], + true); + $after .= '</a>'; + } + break; case 'alpha_reservedWord': // do not uppercase the reserved word if we are calling // this function in query_only mode, because we need @@ -2544,6 +2563,24 @@ if (! defined('PMA_MINIMUM_COMMON')) { } break; default: + if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))){ + $after .= '</a>'; + $close_docu_link = false; + } else if ($docu && isset($PMA_SQPdata_functions_docs[$arr[$i]['data']])) { + /* Handle multi word statements first */ + if (isset($typearr[4]) && $typearr[4] == 'alpha_reservedWord' && $typearr[3] == 'alpha_reservedWord' && isset($PMA_SQPdata_functions_docs[strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'] . '_' . $arr[$i + 2]['data'])])) { + $tempname = strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'] . '_' . $arr[$i + 2]['data']); + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$tempname]['link'], false, $PMA_SQPdata_functions_docs[$tempname]['anchor'], true); + $close_docu_link = true; + } else if (isset($typearr[3]) && $typearr[3] == 'alpha_reservedWord' && isset($PMA_SQPdata_functions_docs[strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'])])) { + $tempname = strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data']); + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$tempname]['link'], false, $PMA_SQPdata_functions_docs[$tempname]['anchor'], true); + $close_docu_link = true; + } else { + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$arr[$i]['data']]['link'], false, $PMA_SQPdata_functions_docs[$arr[$i]['data']]['anchor'], true); + $after .= '</a>'; + } + } break; } // end switch ($arr[$i]['data']) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3156-gd147fd2
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via d147fd26db0cf8a5965c640c3047494acc2b9d44 (commit) from f2fe4db5f1d100f29152445e4367789707007800 (commit) - Log ----------------------------------------------------------------- commit d147fd26db0cf8a5965c640c3047494acc2b9d44 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 15:01:50 2011 +0200 Update keywords to list from http://dev.mysql.com/doc/refman/5.5/en/reserved-words.html ----------------------------------------------------------------------- Summary of changes: js/codemirror/mode/mysql/mysql.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/codemirror/mode/mysql/mysql.js b/js/codemirror/mode/mysql/mysql.js index 704825e..fd53d6c 100644 --- a/js/codemirror/mode/mysql/mysql.js +++ b/js/codemirror/mode/mysql/mysql.js @@ -127,7 +127,7 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { for (var i = 0; i < words.length; ++i) obj[words[i]] = true; return obj; } - var cKeywords = "accessible action add after against aggregate algorithm all alter analyse analyze and as asc autocommit auto_increment avg_row_length backup begin between binlog both by cascade case change changed charset check checksum collate collation column columns comment commit committed compressed concurrent constraint contains convert create cross current_timestamp database databases day day_hour day_minute day_second definer delayed delay_key_write delete desc describe deterministic distinct distinctrow div do drop dumpfile duplicate dynamic else enclosed end engine engines escape escaped events execute exists explain extended fast fields file first fixed flush for force foreign from full fulltext function gemini gemini_spin_retries global grant grants group having heap high_priority hosts hour hour_minute hour_second identified if ignore in index indexes infile inner insert insert_id insert_method interval into invoker is isolation join key keys kill last_insert_id leading left like limit linear lines load local lock locks logs low_priority maria master master_connect_retry master_host master_log_file master_log_pos master_password master_port master_user match max_connections_per_hour max_queries_per_hour max_rows max_updates_per_hour max_user_connections medium merge minute minute_second min_rows mode modify month mrg_myisam myisam names natural no not null offset on open optimize option optionally or order outer outfile pack_keys page page_checksum partial partition partitions password primary privileges procedure process processlist purge quick raid0 raid_chunks raid_chunksize raid_type range read read_only read_write references regexp reload rename repair repeatable replace replication reset restore restrict return returns revoke right rlike rollback row rows row_format second security select separator serializable session share show shutdown slave soname sounds sql sql_auto_is_null sql_big_result sql_big_selects sql_big_tables sql_buffer_result sql_cache sql_calc_found_rows sql_log_bin sql_log_off sql_log_update sql_low_priority_updates sql_max_join_size sql_no_cache sql_quote_show_create sql_safe_updates sql_select_limit sql_slave_skip_counter sql_small_result sql_warnings start starting status stop storage straight_join string striped super table tables temporary terminated then to trailing transactional truncate type types uncommitted union unique unlock update usage use using values variables view when where with work write xor year_month"; + 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 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"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3155-gf2fe4db
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via f2fe4db5f1d100f29152445e4367789707007800 (commit) from 4603ca7001b1d39389f622671e53ee957b2adf66 (commit) - Log ----------------------------------------------------------------- commit f2fe4db5f1d100f29152445e4367789707007800 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 14:11:11 2011 +0200 Remove not used code ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 432aa78..b1bd457 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -681,8 +681,6 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a { global $sql_drop_table; global $sql_backquotes; - global $cfgRelation; - global $sql_constraints; global $sql_constraints_query; // just the text of the query global $sql_drop_foreign_keys; @@ -1044,7 +1042,6 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { global $sql_backquotes; - global $rows_cnt; global $current_row; $formatted_table_name = (isset($GLOBALS['sql_backquotes'])) @@ -1067,9 +1064,6 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) return true; } - // it's not a VIEW - $buffer = ''; - // analyze the query to get the true column names, not the aliases // (this fixes an undefined index, also if Complete inserts // are used, we did not get the true column name in case of aliases) hooks/post-receive -- phpMyAdmin

1 0