[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14109-g96d503c - Git

10 Aug 2011

The branch, master has been updated
       via  96d503c775106b4ed39d64572312fba0e02b0293 (commit)
       via  c8c9b7501c29cc7c65f17c7de7ef07470843112c (commit)
       via  58aa9b732485106e383d43c7975e107ae2de461a (commit)
       via  96a6a78e43ffe46cf8dbc43308245f587538504c (commit)
       via  667c709946ceabd53047a867c3baa6d674f8a97d (commit)
       via  e473730c3d4cfef3267226ca92cfa62ac3bc319a (commit)
       via  ef5ce9dbd5bab05ceebafaaadbc2a986a63e4e80 (commit)
       via  d2d73dafef4847d70bf75603ab015690150d9df9 (commit)
       via  8a0a14e84d4dc666b41ec7e1f2c539fe242f5ede (commit)
       via  f7a3d3e9e6ae936763219f18fad0682a6374d74c (commit)
       via  1e2aec6ecacfee872b8c02546353853b693b33b4 (commit)
       via  971d817e76f43c95b67d9f3702ca18db1b59e6f9 (commit)
       via  774a8652fe4dd1ba59ed53921c24ae2aa3898c55 (commit)
       via  8c82b777e15a265de0fcc1ec594dc243e820d22f (commit)
       via  b564440f469e3de8740a8d8cf5c3589b8d68fdbe (commit)
       via  9d5381ce928a037ba19a5ca7c4e496b5b1b673f2 (commit)
       via  37720ee5fa40505857214bce1047e81723a0ae8b (commit)
       via  cc17759230fa1fbb836985e15e45e13977cc203a (commit)
       via  aebd139982ab5378a11d31dc8bbe55e71d554394 (commit)
       via  054145f93180cf1d987f229b9e5185bd990fd0dd (commit)
       via  65ddddf9df742933d9b7c56c6c83c9e07b3c5ed5 (commit)
       via  dcc8ca292585f7e3d5812fb68af22e6a3d0fb09c (commit)
       via  37fc22603890402a1e39a1f674e01a94366379ec (commit)
       via  f8fd242ce6f8292c7185acb5c029822864b8d232 (commit)
       via  7ebfa8bb24bef0b2efc1b75c44a477eb1b2a02be (commit)
       via  a71904c09dca126ca6995da47156915d59db55ad (commit)
       via  3c49bce9052d9d0fdc99db41f7f92a03487cedde (commit)
       via  6b3339e90891cf19418f7c24b959a4d68cd78443 (commit)
       via  093fa099e826da41745135f029887458cdb92cbb (commit)
       via  e18b44c9f8a0a5f7b86c536f7542a502c69d9012 (commit)
       via  accebdcd01d367f747d85adf986c4d483263c770 (commit)
       via  03a27858b247c9da9954f119949bd373ba522aa0 (commit)
       via  4a7a4067f1f069688241880c25295e68311bf268 (commit)
       via  f74b4aea92267a903fb3f41c87bcad5e0adcde3a (commit)
       via  89552f79029924a9949bc4749c2291d66046be26 (commit)
       via  0cfdc8b56d516a7d138c23e486676544f81136b6 (commit)
       via  84c35cb585de33d7ede979fe3621fef121c77e94 (commit)
       via  82f17546d971e039f559881e8a53ea4ccabc72d0 (commit)
       via  e219dd542b5985b09433115040642e44cae1b18f (commit)
       via  45bd9586d26e28c1a3c0b65ce74b2081473a4f77 (commit)
       via  1d54719fb2ac4afffc67563d138b5b3cd9a6e734 (commit)
       via  7648ed32b039c8fd05ad6143db7edbe407abffbf (commit)
       via  1ed456315180ff74f3f4f8e5b6bd887816c2cbf4 (commit)
       via  f1616edffa0b3dd2404570d44c77cd5773942b39 (commit)
       via  75fb6b5e080eddb5d4d157c2f4e5bf78f8102e6a (commit)
       via  8f3bd588916c0ccd5db709558398e398ab97b307 (commit)
       via  635cc2ab64ec58b9791c2837bc778e8c4bed58f5 (commit)
       via  ad0ee2ce79025685458703731808c048596779fb (commit)
       via  dec84197710ab29ff0bdc1b65c8a9e36aea59c33 (commit)
       via  cf99f8717a7e0234e88c0aec00f24f3918963c9f (commit)
       via  a70bdcccd7aed863a10b021895f0f7da5afeae66 (commit)
       via  b9b86777428cd794d379ca951b70a86d811936b7 (commit)
       via  8e70f51153b512507ebf8ab420007979516648ce (commit)
       via  785f3668ce2112f1e5bf35ef0d8cbf27ecea19f6 (commit)
       via  00154442b362fbeabe2c70506127730b56e16b2a (commit)
       via  d593c120bc68e4db726502474a54010f4f8ef102 (commit)
       via  482a7f83384f9b3f2911e1492286f8fb3e532b39 (commit)
       via  87babc93944489ba7c1c223a775d7bc45d4d17fb (commit)
       via  846d3caa6cec7802864d95e6cd045900074d087d (commit)
       via  a855a6f6f8428fa5759ca8d6ceb50b84d8c0a659 (commit)
       via  99e0a074b8bee69e96a54a93e410a21d037c5bb4 (commit)
       via  83b56f1286be1edf57b7abb8b864ff890ddee67f (commit)
       via  bb1cb687aa721288186acb54058d127fc1544884 (commit)
       via  d2eeabb3c27e2b0e1f487bfbabf336867a7e1f6d (commit)
       via  c28c7c89b5c5a0d21660a7c4cb38f674dc523a45 (commit)
       via  b75514d3256da072ddad4c1306fbd44aaf6bdde2 (commit)
       via  6edfadebdecd5456715985328112c51f82a3221d (commit)
       via  e0c79924411571de714d86163eb065fd585bce64 (commit)
       via  d752f253e06e33ef530a51ce5f65234e37e59a53 (commit)
       via  b7033c9962b237e74c915d96256f17a9618ddb96 (commit)
       via  d6f232ced692c424e183ac1e9b8f4e3735bd3160 (commit)
       via  e375e8466a0c757f65a7fab96fd248ac4b8b3e37 (commit)
       via  e9f1b5a6312378bb27e50ab0f20fcd90b1ddaeed (commit)
       via  81e8f70bd8c8a25d593544120d67ffb7f2f62a67 (commit)
       via  1e51603ef8c69c2eac00879a51bc53b35cc68935 (commit)
       via  bfb4198e75dce937e0abf2cedeeacad7339726a9 (commit)
       via  fba8fd20480645a907a2105be8507b34cc5f78d8 (commit)
       via  c5f353cf999ba9c6f4f81e14269272ba1f4f2872 (commit)
       via  653a123cbbf3bd4891eb12833798ff2aca02f3e3 (commit)
       via  d39ab82890015db10bdcd677a8111ead4c6136d1 (commit)
       via  fb0681f26d0ba0859eaa2b708558a2161a05def4 (commit)
       via  990ad5cd71270c18c89983878de519771a91cca1 (commit)
       via  9054a1d4d85d87733acc29fceccd44f73f751cd9 (commit)
       via  0b74a19396de20bb347668432723e300489cdc2e (commit)
       via  de8c0a1bf34c51f768eefc4b7b2f0d9344ba2d4a (commit)
       via  4765a1c6f8e0322fdac8227021b4a7514364b561 (commit)
       via  5d87aba568f3894caf37c52d173e85bb4dbdc343 (commit)
       via  042ceba6f3f565398d63a6aa9f0a3ed13bd3f30d (commit)
       via  67a3c6784c7b57e73544afa80a229db0c721326a (commit)
       via  40cba060046555803061e90ff34de3950ff59947 (commit)
       via  a1cb3932e00ae45384092226506350148c08330e (commit)
       via  d400d86a3f02571fa1cf6567653d019375632923 (commit)
       via  d5eadae7837e92c5e00ee2d47d274f237245d23a (commit)
       via  884d5a467ad2c719eccb059d4824e20967ad13d8 (commit)
      from  20b688f43f3aaac50379e120d9dcf9d2e087c26e (commit)
- Log -----------------------------------------------------------------
commit 96d503c775106b4ed39d64572312fba0e02b0293
Merge: c8c9b75 58aa9b7
Author: Michal Čihař mcihar@suse.cz
Date:   Wed Aug 10 13:09:39 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit c8c9b7501c29cc7c65f17c7de7ef07470843112c
Author: Michal Čihař mcihar@suse.cz
Date:   Wed Aug 10 13:09:31 2011 +0200
Use pgettext for Next/Prev as it is needed for some translations (eg. Chinese)
commit 58aa9b732485106e383d43c7975e107ae2de461a
Merge: 96a6a78 20b688f
Author: Pootle server pootle@cihar.com
Date:   Wed Aug 10 12:40:09 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 96a6a78e43ffe46cf8dbc43308245f587538504c
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:19:06 2011 +0200
Translation update done using Pootle.
commit 667c709946ceabd53047a867c3baa6d674f8a97d
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:18:56 2011 +0200
Translation update done using Pootle.
commit e473730c3d4cfef3267226ca92cfa62ac3bc319a
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:18:47 2011 +0200
Translation update done using Pootle.
commit ef5ce9dbd5bab05ceebafaaadbc2a986a63e4e80
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:18:39 2011 +0200
Translation update done using Pootle.
commit d2d73dafef4847d70bf75603ab015690150d9df9
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:18:13 2011 +0200
Translation update done using Pootle.
commit 8a0a14e84d4dc666b41ec7e1f2c539fe242f5ede
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:17:53 2011 +0200
Translation update done using Pootle.
commit f7a3d3e9e6ae936763219f18fad0682a6374d74c
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:15:47 2011 +0200
Translation update done using Pootle.
commit 1e2aec6ecacfee872b8c02546353853b693b33b4
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:15:34 2011 +0200
Translation update done using Pootle.
commit 971d817e76f43c95b67d9f3702ca18db1b59e6f9
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:14:46 2011 +0200
Translation update done using Pootle.
commit 774a8652fe4dd1ba59ed53921c24ae2aa3898c55
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:14:14 2011 +0200
Translation update done using Pootle.
commit 8c82b777e15a265de0fcc1ec594dc243e820d22f
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:11:21 2011 +0200
Translation update done using Pootle.
commit b564440f469e3de8740a8d8cf5c3589b8d68fdbe
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:08:29 2011 +0200
Translation update done using Pootle.
commit 9d5381ce928a037ba19a5ca7c4e496b5b1b673f2
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:08:10 2011 +0200
Translation update done using Pootle.
commit 37720ee5fa40505857214bce1047e81723a0ae8b
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:04:44 2011 +0200
Translation update done using Pootle.
commit cc17759230fa1fbb836985e15e45e13977cc203a
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:04:34 2011 +0200
Translation update done using Pootle.
commit aebd139982ab5378a11d31dc8bbe55e71d554394
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:04:15 2011 +0200
Translation update done using Pootle.
commit 054145f93180cf1d987f229b9e5185bd990fd0dd
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:04:04 2011 +0200
Translation update done using Pootle.
commit 65ddddf9df742933d9b7c56c6c83c9e07b3c5ed5
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 12:03:51 2011 +0200
Translation update done using Pootle.
commit dcc8ca292585f7e3d5812fb68af22e6a3d0fb09c
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:58:28 2011 +0200
Translation update done using Pootle.
commit 37fc22603890402a1e39a1f674e01a94366379ec
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:58:16 2011 +0200
Translation update done using Pootle.
commit f8fd242ce6f8292c7185acb5c029822864b8d232
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:58:06 2011 +0200
Translation update done using Pootle.
commit 7ebfa8bb24bef0b2efc1b75c44a477eb1b2a02be
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:57:47 2011 +0200
Translation update done using Pootle.
commit a71904c09dca126ca6995da47156915d59db55ad
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:57:38 2011 +0200
Translation update done using Pootle.
commit 3c49bce9052d9d0fdc99db41f7f92a03487cedde
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:56:39 2011 +0200
Translation update done using Pootle.
commit 6b3339e90891cf19418f7c24b959a4d68cd78443
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:56:30 2011 +0200
Translation update done using Pootle.
commit 093fa099e826da41745135f029887458cdb92cbb
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:56:17 2011 +0200
Translation update done using Pootle.
commit e18b44c9f8a0a5f7b86c536f7542a502c69d9012
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:56:01 2011 +0200
Translation update done using Pootle.
commit accebdcd01d367f747d85adf986c4d483263c770
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:55:55 2011 +0200
Translation update done using Pootle.
commit 03a27858b247c9da9954f119949bd373ba522aa0
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:55:46 2011 +0200
Translation update done using Pootle.
commit 4a7a4067f1f069688241880c25295e68311bf268
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:55:32 2011 +0200
Translation update done using Pootle.
commit f74b4aea92267a903fb3f41c87bcad5e0adcde3a
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:55:23 2011 +0200
Translation update done using Pootle.
commit 89552f79029924a9949bc4749c2291d66046be26
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:55:14 2011 +0200
Translation update done using Pootle.
commit 0cfdc8b56d516a7d138c23e486676544f81136b6
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:54:57 2011 +0200
Translation update done using Pootle.
commit 84c35cb585de33d7ede979fe3621fef121c77e94
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:54:41 2011 +0200
Translation update done using Pootle.
commit 82f17546d971e039f559881e8a53ea4ccabc72d0
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:54:35 2011 +0200
Translation update done using Pootle.
commit e219dd542b5985b09433115040642e44cae1b18f
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:54:24 2011 +0200
Translation update done using Pootle.
commit 45bd9586d26e28c1a3c0b65ce74b2081473a4f77
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:54:16 2011 +0200
Translation update done using Pootle.
commit 1d54719fb2ac4afffc67563d138b5b3cd9a6e734
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:34:00 2011 +0200
Translation update done using Pootle.
commit 7648ed32b039c8fd05ad6143db7edbe407abffbf
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:33:32 2011 +0200
Translation update done using Pootle.
commit 1ed456315180ff74f3f4f8e5b6bd887816c2cbf4
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:33:10 2011 +0200
Translation update done using Pootle.
commit f1616edffa0b3dd2404570d44c77cd5773942b39
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:33:02 2011 +0200
Translation update done using Pootle.
commit 75fb6b5e080eddb5d4d157c2f4e5bf78f8102e6a
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:32:35 2011 +0200
Translation update done using Pootle.
commit 8f3bd588916c0ccd5db709558398e398ab97b307
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:22:19 2011 +0200
Translation update done using Pootle.
commit 635cc2ab64ec58b9791c2837bc778e8c4bed58f5
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:21:53 2011 +0200
Translation update done using Pootle.
commit ad0ee2ce79025685458703731808c048596779fb
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:21:25 2011 +0200
Translation update done using Pootle.
commit dec84197710ab29ff0bdc1b65c8a9e36aea59c33
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:21:15 2011 +0200
Translation update done using Pootle.
commit cf99f8717a7e0234e88c0aec00f24f3918963c9f
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:19:03 2011 +0200
Translation update done using Pootle.
commit a70bdcccd7aed863a10b021895f0f7da5afeae66
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:18:47 2011 +0200
Translation update done using Pootle.
commit b9b86777428cd794d379ca951b70a86d811936b7
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:18:41 2011 +0200
Translation update done using Pootle.
commit 8e70f51153b512507ebf8ab420007979516648ce
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:17:26 2011 +0200
Translation update done using Pootle.
commit 785f3668ce2112f1e5bf35ef0d8cbf27ecea19f6
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:17:07 2011 +0200
Translation update done using Pootle.
commit 00154442b362fbeabe2c70506127730b56e16b2a
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:16:49 2011 +0200
Translation update done using Pootle.
commit d593c120bc68e4db726502474a54010f4f8ef102
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:16:23 2011 +0200
Translation update done using Pootle.
commit 482a7f83384f9b3f2911e1492286f8fb3e532b39
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:16:15 2011 +0200
Translation update done using Pootle.
commit 87babc93944489ba7c1c223a775d7bc45d4d17fb
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:16:04 2011 +0200
Translation update done using Pootle.
commit 846d3caa6cec7802864d95e6cd045900074d087d
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:15:46 2011 +0200
Translation update done using Pootle.
commit a855a6f6f8428fa5759ca8d6ceb50b84d8c0a659
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:15:09 2011 +0200
Translation update done using Pootle.
commit 99e0a074b8bee69e96a54a93e410a21d037c5bb4
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:14:47 2011 +0200
Translation update done using Pootle.
commit 83b56f1286be1edf57b7abb8b864ff890ddee67f
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:14:04 2011 +0200
Translation update done using Pootle.
commit bb1cb687aa721288186acb54058d127fc1544884
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:13:20 2011 +0200
Translation update done using Pootle.
commit d2eeabb3c27e2b0e1f487bfbabf336867a7e1f6d
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:13:16 2011 +0200
Translation update done using Pootle.
commit c28c7c89b5c5a0d21660a7c4cb38f674dc523a45
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:12:22 2011 +0200
Translation update done using Pootle.
commit b75514d3256da072ddad4c1306fbd44aaf6bdde2
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:12:18 2011 +0200
Translation update done using Pootle.
commit 6edfadebdecd5456715985328112c51f82a3221d
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:11:36 2011 +0200
Translation update done using Pootle.
commit e0c79924411571de714d86163eb065fd585bce64
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:09:36 2011 +0200
Translation update done using Pootle.
commit d752f253e06e33ef530a51ce5f65234e37e59a53
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:09:27 2011 +0200
Translation update done using Pootle.
commit b7033c9962b237e74c915d96256f17a9618ddb96
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:09:19 2011 +0200
Translation update done using Pootle.
commit d6f232ced692c424e183ac1e9b8f4e3735bd3160
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:05:48 2011 +0200
Translation update done using Pootle.
commit e375e8466a0c757f65a7fab96fd248ac4b8b3e37
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:05:26 2011 +0200
Translation update done using Pootle.
commit e9f1b5a6312378bb27e50ab0f20fcd90b1ddaeed
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:04:51 2011 +0200
Translation update done using Pootle.
commit 81e8f70bd8c8a25d593544120d67ffb7f2f62a67
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:04:43 2011 +0200
Translation update done using Pootle.
commit 1e51603ef8c69c2eac00879a51bc53b35cc68935
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:04:32 2011 +0200
Translation update done using Pootle.
commit bfb4198e75dce937e0abf2cedeeacad7339726a9
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:03:07 2011 +0200
Translation update done using Pootle.
commit fba8fd20480645a907a2105be8507b34cc5f78d8
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:01:11 2011 +0200
Translation update done using Pootle.
commit c5f353cf999ba9c6f4f81e14269272ba1f4f2872
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:01:01 2011 +0200
Translation update done using Pootle.
commit 653a123cbbf3bd4891eb12833798ff2aca02f3e3
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:00:52 2011 +0200
Translation update done using Pootle.
commit d39ab82890015db10bdcd677a8111ead4c6136d1
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:00:46 2011 +0200
Translation update done using Pootle.
commit fb0681f26d0ba0859eaa2b708558a2161a05def4
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:00:33 2011 +0200
Translation update done using Pootle.
commit 990ad5cd71270c18c89983878de519771a91cca1
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:00:11 2011 +0200
Translation update done using Pootle.
commit 9054a1d4d85d87733acc29fceccd44f73f751cd9
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 11:00:01 2011 +0200
Translation update done using Pootle.
commit 0b74a19396de20bb347668432723e300489cdc2e
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:59:22 2011 +0200
Translation update done using Pootle.
commit de8c0a1bf34c51f768eefc4b7b2f0d9344ba2d4a
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:53:49 2011 +0200
Translation update done using Pootle.
commit 4765a1c6f8e0322fdac8227021b4a7514364b561
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:53:36 2011 +0200
Translation update done using Pootle.
commit 5d87aba568f3894caf37c52d173e85bb4dbdc343
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:50:06 2011 +0200
Translation update done using Pootle.
commit 042ceba6f3f565398d63a6aa9f0a3ed13bd3f30d
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:49:42 2011 +0200
Translation update done using Pootle.
commit 67a3c6784c7b57e73544afa80a229db0c721326a
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:49:20 2011 +0200
Translation update done using Pootle.
commit 40cba060046555803061e90ff34de3950ff59947
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:48:47 2011 +0200
Translation update done using Pootle.
commit a1cb3932e00ae45384092226506350148c08330e
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:47:48 2011 +0200
Translation update done using Pootle.
commit d400d86a3f02571fa1cf6567653d019375632923
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:46:55 2011 +0200
Translation update done using Pootle.
commit d5eadae7837e92c5e00ee2d47d274f237245d23a
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:46:01 2011 +0200
Translation update done using Pootle.
commit 884d5a467ad2c719eccb059d4824e20967ad13d8
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed Aug 10 10:42:37 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 js/messages.php          |    4 +-
 libraries/common.lib.php |   16 ++--
 po/zh_CN.po              |  243 +++++++++++++++++++---------------------------
 server_binlog.php        |    8 +-
 4 files changed, 116 insertions(+), 155 deletions(-)

diff --git a/js/messages.php b/js/messages.php
index 72d5f04..f75c866 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -293,9 +293,9 @@ echo "if ($.datepicker) {\n";
 /* l10n: Display text for calendar close link */
 PMA_printJsValue("$.datepicker.regional['']['closeText']", __('Done'));
 /* l10n: Display text for previous month link in calendar */
-PMA_printJsValue("$.datepicker.regional['']['prevText']", __('Prev'));
+PMA_printJsValue("$.datepicker.regional['']['prevText']", _pgettext('Previous month', 'Prev'));
 /* l10n: Display text for next month link in calendar */
-PMA_printJsValue("$.datepicker.regional['']['nextText']", __('Next'));
+PMA_printJsValue("$.datepicker.regional['']['nextText']", _pgettext('Next month', 'Next'));
 /* l10n: Display text for current month link in calendar */
 PMA_printJsValue("$.datepicker.regional['']['currentText']", __('Today'));
 PMA_printJsValue("$.datepicker.regional['']['monthNames']",
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 6912e38..12917ed 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2250,11 +2250,11 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
             if ($GLOBALS['cfg']['NavigationBarIconic']) {
                 $caption1 = '&lt;&lt;';
                 $caption2 = ' &lt; ';
-                $title1   = ' title="' . __('Begin') . '"';
-                $title2   = ' title="' . __('Previous') . '"';
+                $title1   = ' title="' . _pgettext('First page', 'Begin') . '"';
+                $title2   = ' title="' . _pgettext('Previous page', 'Previous') . '"';
             } else {
-                $caption1 = __('Begin') . ' &lt;&lt;';
-                $caption2 = __('Previous') . ' &lt;';
+                $caption1 = _pgettext('First page', 'Begin') . ' &lt;&lt;';
+                $caption2 = _pgettext('Previous page', 'Previous') . ' &lt;';
                 $title1   = '';
                 $title2   = '';
             } // end if... else...
@@ -2280,11 +2280,11 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
             if ($GLOBALS['cfg']['NavigationBarIconic']) {
                 $caption3 = ' &gt; ';
                 $caption4 = '&gt;&gt;';
-                $title3   = ' title="' . __('Next') . '"';
-                $title4   = ' title="' . __('End') . '"';
+                $title3   = ' title="' . _pgettext('Next page', 'Next') . '"';
+                $title4   = ' title="' . _pgettext('Last page', 'End') . '"';
             } else {
-                $caption3 = '&gt; ' . __('Next');
-                $caption4 = '&gt;&gt; ' . __('End');
+                $caption3 = '&gt; ' . _pgettext('Next page', 'Next');
+                $caption4 = '&gt;&gt; ' . _pgettext('Last page', 'End');
                 $title3   = '';
                 $title4   = '';
             } // end if... else...
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fc3a41a..e71f1b9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-08-09 16:45+0100\n"
-"PO-Revision-Date: 2011-08-10 10:38+0200\n"
+"PO-Revision-Date: 2011-08-10 12:19+0200\n"
 "Last-Translator: shanyan baishui Siramizu@gmail.com\n"
 "Language-Team: chinese_simplified zh_CN@li.org\n"
 "Language: zh_CN\n"
@@ -1136,51 +1136,47 @@ msgstr "内存总数"
#: js/messages.php:102
 msgid "Cached memory"
-msgstr ""
+msgstr "已缓存的内存"
#: js/messages.php:103
-#, fuzzy
 #| msgid "Buffer Pool"
 msgid "Buffered memory"
-msgstr "缓冲池"
+msgstr "已缓冲的内存"
#: js/messages.php:104
 msgid "Free memory"
-msgstr ""
+msgstr "空闲内存"
#: js/messages.php:105
 msgid "Used memory"
-msgstr ""
+msgstr "已用内存"
#: js/messages.php:107
-#, fuzzy
 #| msgid "Total"
 msgid "Total Swap"
-msgstr "总计"
+msgstr "交换空间总数"
#: js/messages.php:108
 msgid "Cached Swap"
-msgstr ""
+msgstr "已缓存的交换空间"
#: js/messages.php:109
 msgid "Used Swap"
-msgstr ""
+msgstr "已用交换空间"
#: js/messages.php:110
-#, fuzzy
 #| msgid "Free pages"
 msgid "Free Swap"
-msgstr "空闲页"
+msgstr "空闲交换空间"
#: js/messages.php:112
 msgid "Bytes sent"
-msgstr ""
+msgstr "已发送字节数"
#: js/messages.php:113
-#, fuzzy
 #| msgid "Received"
 msgid "Bytes received"
-msgstr "已接收"
+msgstr "已接收字节数"
#: js/messages.php:114 server_status.php:994
 msgid "Connections"
@@ -1844,7 +1840,6 @@ msgstr "星期六"
#. l10n: Short week day name
 #: js/messages.php:353
-#, fuzzy
 #| msgctxt "Short week day name"
 #| msgid "Sun"
 msgid "Sun"
@@ -1941,10 +1936,9 @@ msgid "File was not an uploaded file."
 msgstr "文件不是上传的文件。"
#: libraries/File.class.php:259 libraries/File.class.php:388
-#, fuzzy
 #| msgid "Unknown error in file upload."
 msgid "Unknown error while uploading."
-msgstr "上传文件时发生未知错误。"
+msgstr "上传时发生未知错误。"
#: libraries/File.class.php:277
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -2071,17 +2065,17 @@ msgstr[0] "插入了 %1$d 行。"
 #: libraries/RecentTable.class.php:107
 #| msgid "Could not save configuration"
 msgid "Could not save recent table"
-msgstr "无法保存最近访问的表"
+msgstr "无法保存最近使用的表"
#: libraries/RecentTable.class.php:142
 #| msgid "Count tables"
 msgid "Recent tables"
-msgstr "最近访问的表"
+msgstr "最近使用的表"
#: libraries/RecentTable.class.php:148
 #| msgid "There are no configured servers"
 msgid "There are no recent tables"
-msgstr "没有最近访问的表"
+msgstr "没有最近使用的表"
#: libraries/StorageEngine.class.php:180
 msgid ""
@@ -2249,10 +2243,9 @@ msgid "Wrong username/password. Access denied."
 msgstr "用户名/密码错误。拒绝访问。"
#: libraries/auth/signon.auth.lib.php:88
-#, fuzzy
 #| msgid "Config authentication"
 msgid "Can not find signon authentication script:"
-msgstr "Config 认证"
+msgstr "找不到 signon 认证脚本:"
#: libraries/auth/swekey/swekey.auth.lib.php:118
 #, php-format
@@ -2285,10 +2278,9 @@ msgid "PBMS get BLOB info failed:"
 msgstr "PBMS 获取 BLOB 信息失败："
#: libraries/blobstreaming.lib.php:332
-#, fuzzy
 #| msgid "get BLOB Content-Type failed"
 msgid "PBMS get BLOB Content-Type failed"
-msgstr "获取 BLOB 内容类型失败"
+msgstr "PBMS 获取 BLOB 内容类型失败"
#: libraries/blobstreaming.lib.php:358
 msgid "View image"
@@ -3758,10 +3750,9 @@ msgid "Maximum number of recently used tables; set 0 to disable"
 msgstr "在数据表列表中最多显示的数据表个数"
#: 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"
@@ -4030,13 +4021,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"
@@ -4311,10 +4301,9 @@ msgid ""
 msgstr "不在数据库中保存用户偏好请留空，默认：[kbd]pma_config[/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 ""
@@ -4940,7 +4929,7 @@ msgstr "权限"
#: libraries/db_links.inc.php:97 libraries/rte/rte_words.lib.php:25
 msgid "Routines"
-msgstr "常规"
+msgstr "程序"
#: libraries/db_links.inc.php:101 libraries/export/sql.php:622
 #: libraries/rte/rte_words.lib.php:49
@@ -5263,10 +5252,9 @@ msgid "Language"
 msgstr "Language"
#: libraries/display_tbl.lib.php:401
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Restore column order"
-msgstr "文本框列"
+msgstr "恢复字段顺序"
#: libraries/display_tbl.lib.php:431
 #, php-format
@@ -5416,7 +5404,7 @@ msgstr "显示图表"
#: libraries/display_tbl.lib.php:2525
 msgid "Visualize GIS data"
-msgstr ""
+msgstr "可视化 GIS 数据"
#: libraries/display_tbl.lib.php:2545
 msgid "Create view"
@@ -6114,10 +6102,9 @@ msgid "Stand-in structure for view"
 msgstr "替换视图以便查看"
#: libraries/export/sql.php:1071
-#, fuzzy
 #| msgid "Allows reading data."
 msgid "Error reading data:"
-msgstr "允许读取数据。"
+msgstr "读取数据时发生错误:"
#: libraries/export/xml.php:19 libraries/import/xml.php:21
 msgid "XML"
@@ -6141,10 +6128,9 @@ msgid "Open new phpMyAdmin window"
 msgstr "打开新 phpMyAdmin 窗口"
#: libraries/gis_visualization.lib.php:129
-#, fuzzy
 #| msgid "No data found for the chart."
 msgid "No data found for GIS visualization."
-msgstr "未找到图表所需数据。"
+msgstr "未找到用于 GIS 可视化的数据。"
#: libraries/header_printview.inc.php:49 libraries/header_printview.inc.php:54
 msgid "SQL result"
@@ -6165,10 +6151,9 @@ msgid ""
 msgstr "下列结构被创建或修改。你可以:"
#: libraries/import.lib.php:1077
-#, fuzzy
 #| msgid "View a structure`s contents by clicking on its name"
 msgid "View a structure's contents by clicking on its name"
-msgstr "点击它的名字查看内容"
+msgstr "请通过点击结构的名称来查看它的内容"
#: libraries/import.lib.php:1078
 msgid ""
@@ -6176,30 +6161,29 @@ msgid ""
 msgstr "点击相应的“选项”链接修改它的设置"
#: libraries/import.lib.php:1079
-#, fuzzy
 #| msgid "Edit its structure by following the "Structure" link"
 msgid "Edit structure by following the "Structure" link"
-msgstr "点击“结构”链接编辑它的结构"
+msgstr "请通过点击 "结构" 链接来编辑结构"
#: libraries/import.lib.php:1082
 msgid "Go to database"
 msgstr "转到数据库"
#: libraries/import.lib.php:1085 libraries/import.lib.php:1109
-#, fuzzy, php-format
+#, php-format
 #| msgid "Missing data for %s"
 msgid "Edit settings for %s"
-msgstr "在 %s 中丢失数据"
+msgstr "编辑 %s 的设置"
#: libraries/import.lib.php:1104
 msgid "Go to table"
 msgstr "转到数据表"
#: libraries/import.lib.php:1107
-#, fuzzy, php-format
+#, php-format
 #| msgid "Structure only"
 msgid "Structure of %s"
-msgstr "仅结构"
+msgstr "%s 的结构"
#: libraries/import.lib.php:1113
 msgid "Go to view"
@@ -6577,14 +6561,13 @@ msgid "SQL history"
 msgstr "SQL 历史"
#: libraries/relation.lib.php:132
-#, fuzzy
 #| msgid "Persistent connections"
 msgid "Persistent recently used tables"
-msgstr "持久连接"
+msgstr "持久最近使用的表"
#: libraries/relation.lib.php:136
 msgid "Persistent tables' UI preferences"
-msgstr ""
+msgstr "持久表界面设置"
#: libraries/relation.lib.php:144
 msgid "User preferences"
@@ -6729,7 +6712,7 @@ msgstr "下列查询失败了: "%s""
#: libraries/rte/rte_events.lib.php:116
 msgid "Sorry, we failed to restore the dropped event."
-msgstr "抱歉，恢复删除的事件失败。"
+msgstr "抱歉，恢复已删除的事件失败。"
#: libraries/rte/rte_events.lib.php:117 libraries/rte/rte_routines.lib.php:269
 #: libraries/rte/rte_triggers.lib.php:90
@@ -6828,11 +6811,11 @@ msgstr "请输入事件名称"
#: libraries/rte/rte_events.lib.php:537
 msgid "You must provide a valid interval value for the event."
-msgstr "请设置有效的运行周期。"
+msgstr "请设置一个有效的运行周期。"
#: libraries/rte/rte_events.lib.php:549
 msgid "You must provide a valid execution time for the event."
-msgstr "请设置有效的运行时间。"
+msgstr "请设置一个有效的运行时间。"
#: libraries/rte/rte_events.lib.php:553
 msgid "You must provide a valid type for the event."
@@ -6879,149 +6862,142 @@ msgid ""
 "handling multi queries. <b>The execution of some stored routines may fail!</"
 "b> Please use the improved 'mysqli' extension to avoid any problems."
 msgstr ""
+"你正在使用 PHP 所不推荐的 'mysql' 扩展，不支持多语句查询。<b>运行部分存储程序时可能会失败！</b>请使用改进的 'mysqli' "
+"扩展避免此类问题发生。"
#: libraries/rte/rte_routines.lib.php:247
 #: libraries/rte/rte_routines.lib.php:994
-#, fuzzy, php-format
+#, php-format
 #| msgid "Invalid server index: %s"
 msgid "Invalid routine type: "%s""
-msgstr "无效的服务器索引: %s"
+msgstr "无效的程序类型: "%s""
#: libraries/rte/rte_routines.lib.php:268
 msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
+msgstr "抱歉，恢复已删除的程序失败。"
#: libraries/rte/rte_routines.lib.php:273
-#, fuzzy, php-format
+#, php-format
 #| msgid "Column %s has been dropped"
 msgid "Routine %1$s has been modified."
-msgstr "已删除字段 %s "
+msgstr "已修改程序 %1$s 。"
#: libraries/rte/rte_routines.lib.php:286
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %1$s has been created."
 msgid "Routine %1$s has been created."
-msgstr "创建数据表 %1$s 成功。"
+msgstr "已创建程序 %1$s 。"
#: libraries/rte/rte_routines.lib.php:344
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
-msgstr "编辑模式"
+msgstr "编辑程序"
#: libraries/rte/rte_routines.lib.php:820
-#, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
-msgstr "常规"
+msgstr "程序名称"
#: libraries/rte/rte_routines.lib.php:843
 msgid "Parameters"
-msgstr ""
+msgstr "参数"
#: libraries/rte/rte_routines.lib.php:848
-#, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
-msgstr "直接连接"
+msgstr "方向"
#: libraries/rte/rte_routines.lib.php:851 libraries/tbl_properties.inc.php:108
 msgid "Length/Values"
 msgstr "长度/值"
#: libraries/rte/rte_routines.lib.php:866
-#, fuzzy
 #| msgid "Add prefix"
 msgid "Add parameter"
-msgstr "添加前缀"
+msgstr "添加参数"
#: libraries/rte/rte_routines.lib.php:870
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
-msgstr "删除数据库"
+msgstr "删除最后一个参数"
#: libraries/rte/rte_routines.lib.php:875
 msgid "Return type"
 msgstr "返回类型"
#: libraries/rte/rte_routines.lib.php:881
-#, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
-msgstr "长度/值"
+msgstr "返回长度/值"
#: libraries/rte/rte_routines.lib.php:887
-#, fuzzy
 #| msgid "Table options"
 msgid "Return options"
-msgstr "表选项"
+msgstr "返回选项"
#: libraries/rte/rte_routines.lib.php:918
 msgid "Is deterministic"
-msgstr ""
+msgstr "是否固定"
#: libraries/rte/rte_routines.lib.php:927
-#, fuzzy
 #| msgid "Security"
 msgid "Security type"
-msgstr "安全"
+msgstr "安全类型"
#: libraries/rte/rte_routines.lib.php:934
 msgid "SQL data access"
-msgstr ""
+msgstr "SQL 数据访问"
#: libraries/rte/rte_routines.lib.php:999
 msgid "You must provide a routine name"
-msgstr ""
+msgstr "请输入程序名称"
#: libraries/rte/rte_routines.lib.php:1025
 #, php-format
 msgid "Invalid direction "%s" given for parameter."
-msgstr ""
+msgstr "参数方向 "%s" 无效。"
#: libraries/rte/rte_routines.lib.php:1037
 #: libraries/rte/rte_routines.lib.php:1075
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
-msgstr ""
+msgstr "请设置 ENUM、SET、VARCHAR 和 VARBINARY 类型参数的长度/值。"
#: libraries/rte/rte_routines.lib.php:1055
 msgid "You must provide a name and a type for each routine parameter."
-msgstr ""
+msgstr "请输入每一个参数的名称并设置其类型。"
#: libraries/rte/rte_routines.lib.php:1065
 msgid "You must provide a valid return type for the routine."
-msgstr ""
+msgstr "请设置一个有效的返回类型。"
#: libraries/rte/rte_routines.lib.php:1109
 msgid "You must provide a routine definition."
-msgstr ""
+msgstr "请输入程序定义。"
#: libraries/rte/rte_routines.lib.php:1198
 #, php-format
 msgid "%d row affected by the last statement inside the procedure"
 msgid_plural "%d rows affected by the last statement inside the procedure"
-msgstr[0] ""
+msgstr[0] "存储过程中最后一条语句影响了 %d 行"
#: libraries/rte/rte_routines.lib.php:1214
-#, fuzzy, php-format
+#, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
-msgstr "允许运行存储过程。"
+msgstr "程序 %s 的运行结果"
#: libraries/rte/rte_routines.lib.php:1288
 #: libraries/rte/rte_routines.lib.php:1294
 msgid "Execute routine"
-msgstr ""
+msgstr "运行程序"
#: libraries/rte/rte_routines.lib.php:1345
 #: libraries/rte/rte_routines.lib.php:1348
-#, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
-msgstr "常规"
+msgstr "程序参数"
#: libraries/rte/rte_routines.lib.php:1355 tbl_change.php:287
 #: tbl_change.php:325
@@ -7030,161 +7006,146 @@ msgstr "函数"
#: libraries/rte/rte_triggers.lib.php:89
 msgid "Sorry, we failed to restore the dropped trigger."
-msgstr ""
+msgstr "抱歉，恢复已删除的触发器失败。"
#: libraries/rte/rte_triggers.lib.php:94
-#, fuzzy, php-format
+#, php-format
 #| msgid "Column %s has been dropped"
 msgid "Trigger %1$s has been modified."
-msgstr "已删除字段 %s "
+msgstr "已修改触发器 %1$s 。"
#: libraries/rte/rte_triggers.lib.php:106
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %1$s has been created."
 msgid "Trigger %1$s has been created."
-msgstr "创建数据表 %1$s 成功。"
+msgstr "已创建触发器 %1$s 。"
#: libraries/rte/rte_triggers.lib.php:161
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Edit trigger"
-msgstr "添加服务器"
+msgstr "编辑触发器"
#: libraries/rte/rte_triggers.lib.php:301
-#, fuzzy
 #| msgid "Triggers"
 msgid "Trigger name"
-msgstr "触发器"
+msgstr "触发器名称"
#: libraries/rte/rte_triggers.lib.php:403
 msgid "You must provide a trigger name"
-msgstr ""
+msgstr "请输入触发器名称"
#: libraries/rte/rte_triggers.lib.php:408
 msgid "You must provide a valid timing for the trigger"
-msgstr ""
+msgstr "请选择一个有效的触发时机"
#: libraries/rte/rte_triggers.lib.php:413
 msgid "You must provide a valid event for the trigger"
-msgstr ""
+msgstr "请选择一个有效的触发事件"
#: libraries/rte/rte_triggers.lib.php:419
-#, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a valid table name"
-msgstr "无效的数据表名"
+msgstr "请选择一个有效的表"
#: libraries/rte/rte_triggers.lib.php:425
 msgid "You must provide a trigger definition."
-msgstr ""
+msgstr "请输入触发器定义。"
#: libraries/rte/rte_words.lib.php:18
-#, fuzzy
 #| msgid "Add index"
 msgid "Add routine"
-msgstr "添加索引"
+msgstr "添加程序"
#: libraries/rte/rte_words.lib.php:20
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export defaults"
 msgid "Export of routine %s"
-msgstr "导出选项"
+msgstr "导出程序 %s"
#: libraries/rte/rte_words.lib.php:21
-#, fuzzy
 #| msgid "Routines"
 msgid "routine"
-msgstr "常规"
+msgstr "程序"
#: libraries/rte/rte_words.lib.php:22
-#, fuzzy
 #| msgid "You don't have sufficient privileges to be here right now!"
 msgid "You do not have the necessary privileges to create a routine"
-msgstr "权限不足！"
+msgstr "你不具有创建程序的必要权限"
#: libraries/rte/rte_words.lib.php:23
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No routine with name %1$s found in database %2$s"
-msgstr "没有在数据库中找到表"
+msgstr "在数据库 %2$s 中找不到名为 %1$s 的程序"
#: libraries/rte/rte_words.lib.php:24
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no routines to display."
-msgstr "没有可上传的文件"
+msgstr "没有程序。"
#: libraries/rte/rte_words.lib.php:30
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add trigger"
-msgstr "添加服务器"
+msgstr "添加触发器"
#: libraries/rte/rte_words.lib.php:32
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export contents"
 msgid "Export of trigger %s"
-msgstr "导出内容"
+msgstr "导出触发器 %s"
#: libraries/rte/rte_words.lib.php:33
-#, fuzzy
 #| msgid "Triggers"
 msgid "trigger"
 msgstr "触发器"
#: libraries/rte/rte_words.lib.php:34
-#, fuzzy
 #| msgid "You don't have sufficient privileges to be here right now!"
 msgid "You do not have the necessary privileges to create a trigger"
-msgstr "权限不足！"
+msgstr "你不具有创建触发器的必要权限"
#: libraries/rte/rte_words.lib.php:35
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No trigger with name %1$s found in database %2$s"
-msgstr "没有在数据库中找到表"
+msgstr "在数据库 %2$s 中找不到名为 %1$s 的触发器 "
#: libraries/rte/rte_words.lib.php:36
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no triggers to display."
-msgstr "没有可上传的文件"
+msgstr "没有触发器。"
#: libraries/rte/rte_words.lib.php:42
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add event"
-msgstr "添加服务器"
+msgstr "添加事件"
#: libraries/rte/rte_words.lib.php:44
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export contents"
 msgid "Export of event %s"
-msgstr "导出内容"
+msgstr "导出事件 %s"
#: libraries/rte/rte_words.lib.php:45
-#, fuzzy
 #| msgid "Event"
 msgid "event"
 msgstr "事件"
#: libraries/rte/rte_words.lib.php:46
-#, fuzzy
 #| msgid "You don't have sufficient privileges to be here right now!"
 msgid "You do not have the necessary privileges to create an event"
-msgstr "权限不足！"
+msgstr "你不具有创建事件的必要权限"
#: libraries/rte/rte_words.lib.php:47
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No event with name %1$s found in database %2$s"
-msgstr "没有在数据库中找到表"
+msgstr "在数据库 %2$s 中找不到名为 %1$s 的事件"
#: libraries/rte/rte_words.lib.php:48
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no events to display."
-msgstr "没有可上传的文件"
+msgstr "没有事件。"
#: libraries/schema/Dia_Relation_Schema.class.php:221
 #: libraries/schema/Eps_Relation_Schema.class.php:394
diff --git a/server_binlog.php b/server_binlog.php
index 1b55452..e3ac8f4 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -132,9 +132,9 @@ if ($pos > 0) {
echo '<a href="./server_binlog.php' . PMA_generate_common_url($this_url_params) . '"';
     if ($GLOBALS['cfg']['NavigationBarIconic']) {
-        echo ' title="' . __('Previous') . '">';
+        echo ' title="' . _pgettext('Previous page', 'Previous') . '">';
     } else {
-        echo '>' . __('Previous');
+        echo '>' . _pgettext('Previous page', 'Previous');
     } // end if... else...
     echo ' &lt; </a> - ';
 }
@@ -167,9 +167,9 @@ if ($num_rows >= $GLOBALS['cfg']['MaxRows']) {
     $this_url_params['pos'] = $pos + $GLOBALS['cfg']['MaxRows'];
     echo ' - <a href="./server_binlog.php' . PMA_generate_common_url($this_url_params) . '"';
     if ($GLOBALS['cfg']['NavigationBarIconic']) {
-        echo ' title="' . __('Next') . '">';
+        echo ' title="' . _pgettext('Next page', 'Next') . '">';
     } else {
-        echo '>' . __('Next');
+        echo '>' . _pgettext('Next page', 'Next');
     } // end if... else...
     echo ' &gt; </a>';
 }
hooks/post-receive
-- 
phpMyAdmin


    