- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8947-g6eaab03
by Michal Čihař 17 Jul '11

17 Jul '11

The branch, master has been updated via 6eaab03eaa38da1211846b590f56aa71b3164ee4 (commit) via 17cf7c86944824adb8098d03803dc8f377cdf48c (commit) via 63a74021a02d719fceed749420af71e01d2bb000 (commit) via eb30db42dc87a94c71521f9011d05d161b635d65 (commit) via df99e165965219806fc5bfa30929f3dcace0c586 (commit) via b9b39f361f583b4db38fab0ef8aee45879f8ce74 (commit) via 0c5df58330f1276a5076956d9e1599051ccd7253 (commit) via 22969d042a6cf74fd83c88dd75bd971acb67a081 (commit) via 74b47675cb40b502eadd85814bb81516fd7261cf (commit) via 168f71ae2b89a865f91903dc548c8b72f88c474b (commit) via 44ae0cc22af296694e834ed9e7722339a37779f3 (commit) via 3a12adf85edcf7a0d494d656e068a06050b915ea (commit) via 8deb6c97a90a81118e75aba5739811254d81ee65 (commit) via 0071b31be9c0bab48658128c2abfd45676d2f320 (commit) via c22ade73e93ef6e2e0a50b96309442e1e3a00141 (commit) via 2cc37b73198c0c109256ce2b78dc9f8405a86398 (commit) via c2a02754d19b1b6c35687dbb90ca6bf2d95095e3 (commit) via db2a077a824ee252db6e372ad4fd720b1b5fe0f0 (commit) via cdf246020051617db589f129c9998ffa05f0cf6a (commit) via 61db08028426749d2ec370e688937223ab205afd (commit) via 287416e64792087d7f44c4d6006626ac4d955d44 (commit) via 74ca6e2db9f559ac4015b0a70f24052fe0a1911f (commit) via a1249e3a74f85486c9aab4c55931ea9b7da4d2c0 (commit) via 683d0e6660e1bcc3dad149875b2f8978da5c387a (commit) via 9d405c22aee5017968ab9a3ef25f1c9291c99f6f (commit) via 4f8449b4b78232f44f0eba2ce1dd4650382b29c7 (commit) via 4dd050a5f2064f7d343ce2638ca1593fa91c6a9f (commit) via a2084fc25d0637b8eca575f10ed65511769246bc (commit) via 86e58f9d283aea55bade99c1df012fbecfdb89dd (commit) via 7d33e7bfbe826e3013855ffcd0a0c9c366041913 (commit) via 5a0a422dd75c9a67b7e1f2a28f60fe80c5acf26f (commit) via a5d7e08c000f60387da7836c96ae282b5c507229 (commit) via fc775eb2366a96167a3c76bf1b48f32751a1a492 (commit) via 376a34a9848ac994c309bdfa8e364e9d7b09acb7 (commit) via e93799cf013f835edd8a2d6153dd749db98bfa12 (commit) via e5ff867119619c186a18606229133c08d6159d38 (commit) via fc53ccf21b0c5903941a79d9df0a355ebd986d90 (commit) via 2083bae184dfb1c511d87d7b629f0d581e905b12 (commit) via a8ff5fc0c8b08e8bc7c1e186d9cf7e66c03e5b3a (commit) via fe0b2844c0a9b35cbbdb80ef50e511f4b2b31cad (commit) via d0283101f74cc36bf8c38db090c72e957e8ad60e (commit) via 4c83fc53f67360c14f632976a9f4f9f91d07b349 (commit) via 8181de44f8b9748d18aba01b7c39912b37bae676 (commit) via 7a59118804850053fbbbd056ae5a09eccc0d3383 (commit) via 034c3a00794c0ba5382e6218aa5d7c2b7b1f6e69 (commit) via 9a8ca99d57b3f62d424c6e9d910004e93be3a9cb (commit) via a357c769c29eceb17b49f4c01dd04eefaf785281 (commit) via 1a5a5dc8105c52f9c08854b82c3598952d99073c (commit) via 70017b6c6b282bd780a3ced60dceb197ca9ebfb8 (commit) via dde5bd0a9e80d6e474568adc0f322414af89f0a8 (commit) via 80e20bd7efb09581201f8012e3e786d97809e7dd (commit) via b49e49108777bda5ff31699411566752fefb65b3 (commit) via 57e0ded511b5657477f551e5983c73dc5c7fa3d4 (commit) via f0851eff259aff9743324bbe8b29fdcb82699688 (commit) via 1271319afc1e5996c9327da0a6a42c327483f79c (commit) via 9de05c5bb63885d7e9c872a7d55bda3f777c6ff6 (commit) via b7db3717009480124846eb8b5bcd7fda271fb60c (commit) via 74d89a18911c0da2a37dede86904d8f89f3a3594 (commit) via 63712b634b8a4b48f38043b3d45f267d2a5b4558 (commit) via 0f58c9c4a09d1448ad514c8a06a759228ca23545 (commit) via 9b53cbe52364d5c0b5c674682b95af004b2cf147 (commit) via 7994afd834f964c445701499a61a26277acf7e72 (commit) via e27b94c58d8fcdb9777ac765b3894a443bbca7d7 (commit) via 0f795970211828b28f2ed4a833db828a02e00881 (commit) via dafcdef89bd562058ea0d241a66109214662ba41 (commit) via d40189094474d3df18665f3a78006f5c398285b3 (commit) via a4a6dd1c1240ea8370984c84bb19602431b5b0b2 (commit) via 27239ff659fd01140be51538ea70d9de331c2ffd (commit) via c8929e0d80c4fb0bb0fa60f481ae4bc8836e90c1 (commit) via c06a2761c6cab7e74a8561d0571c9f009862a1ef (commit) via 24b0c392d4c5725b56422632e75e62dd2e43dddf (commit) via a6a3017a110fe6bfa96e8691d0de5f66fe9eda98 (commit) via 1d580e90a8e23d51369ff1c5b1e3ea081a27e7f7 (commit) via 74e9e846aa10347e42eb809ce2df8228e063ffcf (commit) via 0709d94db016b0fd82e98fb6247f2004f8aa3133 (commit) via dab116ee8f366908bf72c9271859113b434fb0d1 (commit) via 3063421dc42d709eb2db34db332fc709ef3d97bd (commit) via 12841a9751fa314b9d9de39c8b57f0263df3c050 (commit) via 92b2528cc23836fedf64753a9bd287db9a1fac33 (commit) via f59eda53fbec7972992dcdaed05de212be5bc61f (commit) via b979167b0ac4f8c005149c71e9338fadef084780 (commit) via c877ceb9e47856f819b22c6415d31e096ab1cfd0 (commit) via 72ed4eaf9461ab0c01b445568550274734affa48 (commit) via 1b90d67b1b2114880e224da0e40f912cd9b9f160 (commit) via 3bdf1e5fe51f17b1400c49f83126545ebe7747b2 (commit) via b20bac8cc452db47d519a5ee48ddcc0dde617f86 (commit) via d10fe004dc28f7c3e6c83b73e14db935f9da27d3 (commit) via fa629d6b66c44e2a676030e8eb69f320d4738439 (commit) via 4a2126247c55930d7b757adcd30ac7b71d03695c (commit) via f11fb63377523252d73f1e474ff5f4bec3aed8f7 (commit) via 6ea9ab5d24741f5445c56bb570e32b7f89c04dcb (commit) via 79ab5706fd13516c6b99f09d2e7a087a9320df70 (commit) from 8a2d7fbc22bdc58aa4f4bb488b724c1bab6a3c52 (commit) - Log ----------------------------------------------------------------- commit 6eaab03eaa38da1211846b590f56aa71b3164ee4 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:34:32 2011 +0200 Translation update done using Pootle. commit 17cf7c86944824adb8098d03803dc8f377cdf48c Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:33:13 2011 +0200 Translation update done using Pootle. commit 63a74021a02d719fceed749420af71e01d2bb000 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:31:43 2011 +0200 Translation update done using Pootle. commit eb30db42dc87a94c71521f9011d05d161b635d65 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:28:30 2011 +0200 Translation update done using Pootle. commit df99e165965219806fc5bfa30929f3dcace0c586 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:23:13 2011 +0200 Translation update done using Pootle. commit b9b39f361f583b4db38fab0ef8aee45879f8ce74 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:21:18 2011 +0200 Translation update done using Pootle. commit 0c5df58330f1276a5076956d9e1599051ccd7253 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:20:59 2011 +0200 Translation update done using Pootle. commit 22969d042a6cf74fd83c88dd75bd971acb67a081 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:20:52 2011 +0200 Translation update done using Pootle. commit 74b47675cb40b502eadd85814bb81516fd7261cf Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:20:39 2011 +0200 Translation update done using Pootle. commit 168f71ae2b89a865f91903dc548c8b72f88c474b Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:20:26 2011 +0200 Translation update done using Pootle. commit 44ae0cc22af296694e834ed9e7722339a37779f3 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:20:10 2011 +0200 Translation update done using Pootle. commit 3a12adf85edcf7a0d494d656e068a06050b915ea Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:19:10 2011 +0200 Translation update done using Pootle. commit 8deb6c97a90a81118e75aba5739811254d81ee65 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:18:56 2011 +0200 Translation update done using Pootle. commit 0071b31be9c0bab48658128c2abfd45676d2f320 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:18:34 2011 +0200 Translation update done using Pootle. commit c22ade73e93ef6e2e0a50b96309442e1e3a00141 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:18:22 2011 +0200 Translation update done using Pootle. commit 2cc37b73198c0c109256ce2b78dc9f8405a86398 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:00:32 2011 +0200 Translation update done using Pootle. commit c2a02754d19b1b6c35687dbb90ca6bf2d95095e3 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 19:00:02 2011 +0200 Translation update done using Pootle. commit db2a077a824ee252db6e372ad4fd720b1b5fe0f0 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 18:59:30 2011 +0200 Translation update done using Pootle. commit cdf246020051617db589f129c9998ffa05f0cf6a Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 18:59:20 2011 +0200 Translation update done using Pootle. commit 61db08028426749d2ec370e688937223ab205afd Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 18:59:07 2011 +0200 Translation update done using Pootle. commit 287416e64792087d7f44c4d6006626ac4d955d44 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 18:58:54 2011 +0200 Translation update done using Pootle. commit 74ca6e2db9f559ac4015b0a70f24052fe0a1911f Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 18:57:58 2011 +0200 Translation update done using Pootle. commit a1249e3a74f85486c9aab4c55931ea9b7da4d2c0 Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 18:57:20 2011 +0200 Translation update done using Pootle. commit 683d0e6660e1bcc3dad149875b2f8978da5c387a Author: rds_ralison <rds_ralison(a)yahoo.com.br> Date: Sun Jul 17 18:56:41 2011 +0200 Translation update done using Pootle. commit 9d405c22aee5017968ab9a3ef25f1c9291c99f6f Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:34:31 2011 +0200 Translation update done using Pootle. commit 4f8449b4b78232f44f0eba2ce1dd4650382b29c7 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:34:24 2011 +0200 Translation update done using Pootle. commit 4dd050a5f2064f7d343ce2638ca1593fa91c6a9f Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:33:47 2011 +0200 Translation update done using Pootle. commit a2084fc25d0637b8eca575f10ed65511769246bc Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:33:29 2011 +0200 Translation update done using Pootle. commit 86e58f9d283aea55bade99c1df012fbecfdb89dd Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:33:05 2011 +0200 Translation update done using Pootle. commit 7d33e7bfbe826e3013855ffcd0a0c9c366041913 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:31:42 2011 +0200 Translation update done using Pootle. commit 5a0a422dd75c9a67b7e1f2a28f60fe80c5acf26f Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:31:01 2011 +0200 Translation update done using Pootle. commit a5d7e08c000f60387da7836c96ae282b5c507229 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:30:41 2011 +0200 Translation update done using Pootle. commit fc775eb2366a96167a3c76bf1b48f32751a1a492 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:30:22 2011 +0200 Translation update done using Pootle. commit 376a34a9848ac994c309bdfa8e364e9d7b09acb7 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:30:04 2011 +0200 Translation update done using Pootle. commit e93799cf013f835edd8a2d6153dd749db98bfa12 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:29:46 2011 +0200 Translation update done using Pootle. commit e5ff867119619c186a18606229133c08d6159d38 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:28:24 2011 +0200 Translation update done using Pootle. commit fc53ccf21b0c5903941a79d9df0a355ebd986d90 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:28:13 2011 +0200 Translation update done using Pootle. commit 2083bae184dfb1c511d87d7b629f0d581e905b12 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Sat Jul 16 21:27:43 2011 +0200 Translation update done using Pootle. commit a8ff5fc0c8b08e8bc7c1e186d9cf7e66c03e5b3a Merge: fe0b2844c0a9b35cbbdb80ef50e511f4b2b31cad 8a2d7fbc22bdc58aa4f4bb488b724c1bab6a3c52 Author: Pootle server <pootle(a)cihar.com> Date: Sat Jul 16 20:40:11 2011 +0200 Merge remote-tracking branch 'origin/master' commit fe0b2844c0a9b35cbbdb80ef50e511f4b2b31cad Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:57:45 2011 +0200 Translation update done using Pootle. commit d0283101f74cc36bf8c38db090c72e957e8ad60e Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:57:35 2011 +0200 Translation update done using Pootle. commit 4c83fc53f67360c14f632976a9f4f9f91d07b349 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:57:19 2011 +0200 Translation update done using Pootle. commit 8181de44f8b9748d18aba01b7c39912b37bae676 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:57:00 2011 +0200 Translation update done using Pootle. commit 7a59118804850053fbbbd056ae5a09eccc0d3383 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:56:23 2011 +0200 Translation update done using Pootle. commit 034c3a00794c0ba5382e6218aa5d7c2b7b1f6e69 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:56:09 2011 +0200 Translation update done using Pootle. commit 9a8ca99d57b3f62d424c6e9d910004e93be3a9cb Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:55:56 2011 +0200 Translation update done using Pootle. commit a357c769c29eceb17b49f4c01dd04eefaf785281 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:55:47 2011 +0200 Translation update done using Pootle. commit 1a5a5dc8105c52f9c08854b82c3598952d99073c Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:55:35 2011 +0200 Translation update done using Pootle. commit 70017b6c6b282bd780a3ced60dceb197ca9ebfb8 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:55:18 2011 +0200 Translation update done using Pootle. commit dde5bd0a9e80d6e474568adc0f322414af89f0a8 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:54:59 2011 +0200 Translation update done using Pootle. commit 80e20bd7efb09581201f8012e3e786d97809e7dd Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:54:48 2011 +0200 Translation update done using Pootle. commit b49e49108777bda5ff31699411566752fefb65b3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:54:19 2011 +0200 Translation update done using Pootle. commit 57e0ded511b5657477f551e5983c73dc5c7fa3d4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:54:05 2011 +0200 Translation update done using Pootle. commit f0851eff259aff9743324bbe8b29fdcb82699688 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:53:56 2011 +0200 Translation update done using Pootle. commit 1271319afc1e5996c9327da0a6a42c327483f79c Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:53:48 2011 +0200 Translation update done using Pootle. commit 9de05c5bb63885d7e9c872a7d55bda3f777c6ff6 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:53:23 2011 +0200 Translation update done using Pootle. commit b7db3717009480124846eb8b5bcd7fda271fb60c Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:53:14 2011 +0200 Translation update done using Pootle. commit 74d89a18911c0da2a37dede86904d8f89f3a3594 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:52:45 2011 +0200 Translation update done using Pootle. commit 63712b634b8a4b48f38043b3d45f267d2a5b4558 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:52:36 2011 +0200 Translation update done using Pootle. commit 0f58c9c4a09d1448ad514c8a06a759228ca23545 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:52:28 2011 +0200 Translation update done using Pootle. commit 9b53cbe52364d5c0b5c674682b95af004b2cf147 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:52:09 2011 +0200 Translation update done using Pootle. commit 7994afd834f964c445701499a61a26277acf7e72 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:52:04 2011 +0200 Translation update done using Pootle. commit e27b94c58d8fcdb9777ac765b3894a443bbca7d7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:51:51 2011 +0200 Translation update done using Pootle. commit 0f795970211828b28f2ed4a833db828a02e00881 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:47:30 2011 +0200 Translation update done using Pootle. commit dafcdef89bd562058ea0d241a66109214662ba41 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:47:17 2011 +0200 Translation update done using Pootle. commit d40189094474d3df18665f3a78006f5c398285b3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:47:06 2011 +0200 Translation update done using Pootle. commit a4a6dd1c1240ea8370984c84bb19602431b5b0b2 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:46:44 2011 +0200 Translation update done using Pootle. commit 27239ff659fd01140be51538ea70d9de331c2ffd Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:46:17 2011 +0200 Translation update done using Pootle. commit c8929e0d80c4fb0bb0fa60f481ae4bc8836e90c1 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:45:30 2011 +0200 Translation update done using Pootle. commit c06a2761c6cab7e74a8561d0571c9f009862a1ef Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:45:19 2011 +0200 Translation update done using Pootle. commit 24b0c392d4c5725b56422632e75e62dd2e43dddf Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:43:43 2011 +0200 Translation update done using Pootle. commit a6a3017a110fe6bfa96e8691d0de5f66fe9eda98 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:42:47 2011 +0200 Translation update done using Pootle. commit 1d580e90a8e23d51369ff1c5b1e3ea081a27e7f7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:42:34 2011 +0200 Translation update done using Pootle. commit 74e9e846aa10347e42eb809ce2df8228e063ffcf Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:42:04 2011 +0200 Translation update done using Pootle. commit 0709d94db016b0fd82e98fb6247f2004f8aa3133 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:41:54 2011 +0200 Translation update done using Pootle. commit dab116ee8f366908bf72c9271859113b434fb0d1 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:41:39 2011 +0200 Translation update done using Pootle. commit 3063421dc42d709eb2db34db332fc709ef3d97bd Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:41:23 2011 +0200 Translation update done using Pootle. commit 12841a9751fa314b9d9de39c8b57f0263df3c050 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:41:13 2011 +0200 Translation update done using Pootle. commit 92b2528cc23836fedf64753a9bd287db9a1fac33 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:40:51 2011 +0200 Translation update done using Pootle. commit f59eda53fbec7972992dcdaed05de212be5bc61f Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:40:29 2011 +0200 Translation update done using Pootle. commit b979167b0ac4f8c005149c71e9338fadef084780 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:40:12 2011 +0200 Translation update done using Pootle. commit c877ceb9e47856f819b22c6415d31e096ab1cfd0 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:39:40 2011 +0200 Translation update done using Pootle. commit 72ed4eaf9461ab0c01b445568550274734affa48 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:39:22 2011 +0200 Translation update done using Pootle. commit 1b90d67b1b2114880e224da0e40f912cd9b9f160 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:38:56 2011 +0200 Translation update done using Pootle. commit 3bdf1e5fe51f17b1400c49f83126545ebe7747b2 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:38:31 2011 +0200 Translation update done using Pootle. commit b20bac8cc452db47d519a5ee48ddcc0dde617f86 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:38:24 2011 +0200 Translation update done using Pootle. commit d10fe004dc28f7c3e6c83b73e14db935f9da27d3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:33:49 2011 +0200 Translation update done using Pootle. commit fa629d6b66c44e2a676030e8eb69f320d4738439 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:33:39 2011 +0200 Translation update done using Pootle. commit 4a2126247c55930d7b757adcd30ac7b71d03695c Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 16 14:33:26 2011 +0200 Translation update done using Pootle. commit f11fb63377523252d73f1e474ff5f4bec3aed8f7 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jul 16 12:12:26 2011 +0200 Translation update done using Pootle. commit 6ea9ab5d24741f5445c56bb570e32b7f89c04dcb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jul 16 12:12:19 2011 +0200 Translation update done using Pootle. commit 79ab5706fd13516c6b99f09d2e7a087a9320df70 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jul 16 12:12:07 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/br.po | 30 +++++++------- po/en_GB.po | 11 ++--- po/fr.po | 135 ++++++++++++++++++++++------------------------------------- po/pt_BR.po | 55 +++++++++++------------- po/tr.po | 11 ++--- 5 files changed, 98 insertions(+), 144 deletions(-) diff --git a/po/br.po b/po/br.po index a752ffb..7988c4d 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-07-15 15:27+0200\n" +"PO-Revision-Date: 2011-07-16 21:34+0200\n" "Last-Translator: Fulup <fulup.jakez(a)ofis-bzh.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: br\n" @@ -3148,15 +3148,15 @@ msgstr "" #: libraries/config/messages.inc.php:208 msgid "Customize export options" -msgstr "" +msgstr "Personelaat an dibarzhioù ezporzhiañ" #: libraries/config/messages.inc.php:210 msgid "Customize import defaults" -msgstr "" +msgstr "Personelaat an arventennoù enporzhiañ dre ziouer" #: libraries/config/messages.inc.php:211 msgid "Customize navigation frame" -msgstr "" +msgstr "Personelaat ar framm merdeiñ" #: libraries/config/messages.inc.php:212 msgid "Customize main frame" @@ -3249,7 +3249,7 @@ msgstr "" #: libraries/config/messages.inc.php:236 msgid "Ignore multiple statement errors" -msgstr "" +msgstr "Na ober van ouzh ar fazioù er rekedoù liesfrazennek" #: libraries/config/messages.inc.php:237 msgid "" @@ -3280,32 +3280,32 @@ msgstr "" #: libraries/config/messages.inc.php:247 msgid "Format of imported file" -msgstr "" +msgstr "Furmad ar restr enporzhiañ" #: libraries/config/messages.inc.php:251 libraries/import/ldi.php:46 msgid "Use LOCAL keyword" -msgstr "" +msgstr "Ober gant ar ger-alc'hwez LOCAL" #: libraries/config/messages.inc.php:254 libraries/config/messages.inc.php:262 #: libraries/config/messages.inc.php:263 msgid "Column names in first row" -msgstr "" +msgstr "Anvioù bannoù el linenn gentañ" #: libraries/config/messages.inc.php:255 libraries/import/ods.php:27 msgid "Do not import empty rows" -msgstr "" +msgstr "Arabat enporzhiañ linennoù goullo" #: libraries/config/messages.inc.php:256 msgid "Import currencies ($5.00 to 5.00)" -msgstr "" +msgstr "Enporzhiañ moneizioù ($5.00 a zeu da vezañ 5.00)" #: libraries/config/messages.inc.php:257 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "" +msgstr "Enporzhiañ an dregantadoù evel degelennoù (12.00% a zeu da vezañ .12)" #: libraries/config/messages.inc.php:258 msgid "Number of queries to skip from start" -msgstr "" +msgstr "Niver a rekedoù da lezel a-gostez adalek ar penn-kentañ" #: libraries/config/messages.inc.php:259 msgid "Partial import: skip queries" @@ -3325,7 +3325,7 @@ msgstr "" #: libraries/config/messages.inc.php:266 msgid "Number of inserted rows" -msgstr "" +msgstr "Niver a linennoù da ensoc'hañ" #: libraries/config/messages.inc.php:267 msgid "Target for quick access icon" @@ -3333,11 +3333,11 @@ msgstr "" #: libraries/config/messages.inc.php:268 msgid "Show logo in left frame" -msgstr "" +msgstr "Diskouez al logo er banell verdeiñ gleiz" #: libraries/config/messages.inc.php:269 msgid "Display logo" -msgstr "" +msgstr "Diskouez al logo" #: libraries/config/messages.inc.php:270 msgid "Display server choice at the top of the left frame" diff --git a/po/en_GB.po b/po/en_GB.po index a5cb009..c6e146c 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-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-07-14 15:16+0200\n" +"PO-Revision-Date: 2011-07-16 14:33+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" "Language: en_GB\n" @@ -6503,10 +6503,9 @@ msgid "event" msgstr "event" #: libraries/rte/rte_events.lib.php:62 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create an event" -msgstr "You do not have the necessary privileges to create a new event" +msgstr "You do not have the necessary privileges to create an event" #: libraries/rte/rte_events.lib.php:63 #, php-format @@ -6681,10 +6680,9 @@ msgid "routine" msgstr "routine" #: libraries/rte/rte_routines.lib.php:47 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create a routine" -msgstr "You do not have the necessary privileges to create a new routine" +msgstr "You do not have the necessary privileges to create a routine" #: libraries/rte/rte_routines.lib.php:48 #, php-format @@ -6852,10 +6850,9 @@ msgid "trigger" msgstr "trigger" #: libraries/rte/rte_triggers.lib.php:43 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create a trigger" -msgstr "You do not have the necessary privileges to create a new trigger" +msgstr "You do not have the necessary privileges to create a trigger" #: libraries/rte/rte_triggers.lib.php:44 #, php-format diff --git a/po/fr.po b/po/fr.po index 1d91086..d693a45 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-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-07-09 20:07+0200\n" +"PO-Revision-Date: 2011-07-16 14:57+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -2233,10 +2233,9 @@ msgid "The %s functionality is affected by a known bug, see %s" msgstr "La fonctionnalité %s est affectée par une anomalie connue, voir %s" #: libraries/common.lib.php:2447 -#, fuzzy #| msgid "Click to select" msgid "Click to toggle" -msgstr "Cliquer pour sélectionner" +msgstr "Cliquer pour basculer" #: libraries/common.lib.php:2718 libraries/common.lib.php:2725 #: libraries/common.lib.php:2912 libraries/config/setup.forms.php:296 @@ -6572,10 +6571,9 @@ msgid "Generate Password" msgstr "Générer un mot de passe" #: libraries/rte/rte_events.lib.php:58 -#, fuzzy #| msgid "Add an event" msgid "Add event" -msgstr "Ajouter un évènement." +msgstr "Ajouter un événement." #: libraries/rte/rte_events.lib.php:60 #, php-format @@ -6583,22 +6581,20 @@ msgid "Export of event %s" msgstr "Exporter l'évènement %s" #: libraries/rte/rte_events.lib.php:61 -#, fuzzy #| msgid "Event" msgid "event" -msgstr "Événement" +msgstr "événement" #: libraries/rte/rte_events.lib.php:62 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create an event" -msgstr "Vous n'avez pas les privilèges nécessaires pour créer une procédure" +msgstr "Vous n'avez pas les privilèges nécessaires pour créer un événement" #: libraries/rte/rte_events.lib.php:63 -#, fuzzy, php-format +#, php-format #| msgid "No event with name %s found in database %s" msgid "No event with name %1$s found in database %2$s" -msgstr "Aucun évènement nommé %s n'a été trouvé dans la base de données %s" +msgstr "Aucun événement nommé %1$s n'a été trouvé dans la base de données %2$s" #: libraries/rte/rte_events.lib.php:64 msgid "There are no events to display." @@ -6617,10 +6613,9 @@ msgid "The following query has failed: \"%s\"" msgstr "La requête «%s» a échoué" #: libraries/rte/rte_events.lib.php:140 -#, fuzzy #| msgid "Sorry, we failed to restore the dropped routine." msgid "Sorry, we failed to restore the dropped event." -msgstr "Désolé, il a été impossible de restaurer la procédure." +msgstr "Désolé, il a été impossible de restaurer l'événement." #: libraries/rte/rte_events.lib.php:141 libraries/rte/rte_routines.lib.php:294 #: libraries/rte/rte_triggers.lib.php:114 @@ -6628,16 +6623,16 @@ msgid "The backed up query was:" msgstr "La requête conservée est :" #: libraries/rte/rte_events.lib.php:145 -#, fuzzy, php-format +#, php-format #| msgid "Routine %1$s has been modified." msgid "Event %1$s has been modified." -msgstr "La procédure %1$s a été modifiée." +msgstr "L'événement %1$s a été modifié." #: libraries/rte/rte_events.lib.php:157 -#, fuzzy, php-format +#, php-format #| msgid "Table %1$s has been created." msgid "Event %1$s has been created." -msgstr "La table %1$s a été créée." +msgstr "L'événement %1$s a été créé." #: libraries/rte/rte_events.lib.php:165 libraries/rte/rte_routines.lib.php:319 #: libraries/rte/rte_triggers.lib.php:138 @@ -6646,16 +6641,14 @@ msgstr "" "<b>Au moins une erreur s'est produite lors du traitement de la requête :</b>" #: libraries/rte/rte_events.lib.php:205 -#, fuzzy #| msgid "Create view" msgid "Create event" -msgstr "Créer une vue" +msgstr "Créer un événement" #: libraries/rte/rte_events.lib.php:209 -#, fuzzy #| msgid "Edit server" msgid "Edit event" -msgstr "Modifier serveur" +msgstr "Modifier l'événement" #: libraries/rte/rte_events.lib.php:236 libraries/rte/rte_routines.lib.php:395 #: libraries/rte/rte_routines.lib.php:1331 @@ -6670,10 +6663,9 @@ msgid "Details" msgstr "Détails" #: libraries/rte/rte_events.lib.php:398 -#, fuzzy #| msgid "Event type" msgid "Event name" -msgstr "Type d'évènement" +msgstr "Nom de l'événement" #: libraries/rte/rte_events.lib.php:419 server_binlog.php:182 msgid "Event type" @@ -6685,22 +6677,19 @@ msgid "Change to %s" msgstr "Changer pour %s" #: libraries/rte/rte_events.lib.php:446 -#, fuzzy #| msgid "Execute" msgid "Execute at" -msgstr "Exécuter" +msgstr "Exécuter à" #: libraries/rte/rte_events.lib.php:454 -#, fuzzy #| msgid "Execute" msgid "Execute every" -msgstr "Exécuter" +msgstr "Exécuter chaque" #: libraries/rte/rte_events.lib.php:473 -#, fuzzy #| msgid "Startup" msgid "Start" -msgstr "Page de départ" +msgstr "Départ" #: libraries/rte/rte_events.lib.php:489 libraries/rte/rte_routines.lib.php:972 #: libraries/rte/rte_triggers.lib.php:372 @@ -6708,10 +6697,9 @@ msgid "Definition" msgstr "Définition" #: libraries/rte/rte_events.lib.php:495 -#, fuzzy #| msgid "complete inserts" msgid "On completion preserve" -msgstr "Insertions complètes" +msgstr "À la fin, préserver" #: libraries/rte/rte_events.lib.php:499 libraries/rte/rte_routines.lib.php:982 #: libraries/rte/rte_triggers.lib.php:378 @@ -6722,66 +6710,59 @@ msgstr "Créateur" #: libraries/rte/rte_routines.lib.php:1044 #: libraries/rte/rte_triggers.lib.php:416 msgid "The definer must be in the \"username@hostname\" format" -msgstr "" +msgstr "Le définisseur doit suivre le format «utilisateur@machine»" #: libraries/rte/rte_events.lib.php:549 -#, fuzzy #| msgid "You must provide a routine name" msgid "You must provide an event name" -msgstr "Vous devez fournir un nom pour la procédure" +msgstr "Vous devez fournir un nom pour l'événement" #: libraries/rte/rte_events.lib.php:561 -#, fuzzy #| msgid "You must provide a name and a type for each routine parameter." msgid "You must provide a valid interval value for the event." -msgstr "Vous devez fournir un nom et un type pour chacun des paramètres." +msgstr "Vous devez fournir un intervalle valable pour l'événement." #: libraries/rte/rte_events.lib.php:573 -#, fuzzy #| msgid "You must provide a routine definition." msgid "You must provide a valid execution time for the event." -msgstr "Vous devez fournir une définition pour la procédure." +msgstr "Vous devez fournir un moment d'exécution valable pour l'événement." #: libraries/rte/rte_events.lib.php:577 -#, fuzzy #| msgid "You must provide a name and a type for each routine parameter." msgid "You must provide a valid type for the event." -msgstr "Vous devez fournir un nom et un type pour chacun des paramètres." +msgstr "Vous devez fournir un type valable pour l'événement." #: libraries/rte/rte_events.lib.php:596 -#, fuzzy #| msgid "You must provide a routine definition." msgid "You must provide an event definition." -msgstr "Vous devez fournir une définition pour la procédure." +msgstr "Vous devez fournir une définition pour l'événement." #: libraries/rte/rte_footer.lib.php:29 msgid "New" -msgstr "" +msgstr "Nouveau" #: libraries/rte/rte_footer.lib.php:91 msgid "OFF" -msgstr "" +msgstr "Désactivé" #: libraries/rte/rte_footer.lib.php:96 msgid "ON" -msgstr "" +msgstr "Activé" #: libraries/rte/rte_footer.lib.php:108 -#, fuzzy #| msgid "The event scheduler is enabled" msgid "Event scheduler status" -msgstr "Le planificateur d'évènements est activé" +msgstr "État du planificateur d'événements" #: libraries/rte/rte_list.lib.php:52 -#, fuzzy #| msgid "Return type" msgid "Returns" -msgstr "Type retourné" +msgstr "Retourne" #: libraries/rte/rte_list.lib.php:58 libraries/rte/rte_triggers.lib.php:344 #: server_status.php:800 sql.php:943 msgid "Time" -msgstr "Durée" +msgstr "Moment" #: libraries/rte/rte_list.lib.php:59 libraries/rte/rte_triggers.lib.php:358 msgid "Event" @@ -6797,13 +6778,11 @@ msgid "Export of routine %s" msgstr "Exporter la procédure %s" #: libraries/rte/rte_routines.lib.php:46 -#, fuzzy #| msgid "Routines" msgid "routine" -msgstr "Procédures stockées" +msgstr "Procédure stockée" #: libraries/rte/rte_routines.lib.php:47 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create a routine" msgstr "Vous n'avez pas les privilèges nécessaires pour créer une procédure" @@ -6928,10 +6907,9 @@ msgid "You must provide a name and a type for each routine parameter." msgstr "Vous devez fournir un nom et un type pour chacun des paramètres." #: libraries/rte/rte_routines.lib.php:1126 -#, fuzzy #| msgid "You must provide a name and a type for each routine parameter." msgid "You must provide a valid return type for the routine." -msgstr "Vous devez fournir un nom et un type pour chacun des paramètres." +msgstr "Vous devez fournir un type de retour valable pour la procédure." #: libraries/rte/rte_routines.lib.php:1176 msgid "You must provide a routine definition." @@ -6965,7 +6943,6 @@ msgid "Function" msgstr "Fonction" #: libraries/rte/rte_triggers.lib.php:39 -#, fuzzy #| msgid "Add a trigger" msgid "Add trigger" msgstr "Ajouter un déclencheur" @@ -6976,94 +6953,82 @@ msgid "Export of trigger %s" msgstr "Exporter le déclencheur %s" #: libraries/rte/rte_triggers.lib.php:42 -#, fuzzy #| msgid "Triggers" msgid "trigger" -msgstr "Déclencheurs" +msgstr "déclencheur" #: libraries/rte/rte_triggers.lib.php:43 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create a trigger" -msgstr "Vous n'avez pas les privilèges nécessaires pour créer une procédure" +msgstr "Vous n'avez pas les privilèges nécessaires pour créer un déclencheur" #: libraries/rte/rte_triggers.lib.php:44 -#, fuzzy, php-format +#, php-format #| msgid "No routine with name %1$s found in database %2$s" msgid "No trigger with name %1$s found in database %2$s" msgstr "" -"Aucune procédure portant le nom %1$s n'a été trouvée dans la base de données " -"%2$s" +"Aucun déclencheur nommé %1$s n'a été trouvé dans la base de données %2$s" #: libraries/rte/rte_triggers.lib.php:45 msgid "There are no triggers to display." msgstr "Aucun déclencheur à afficher." #: libraries/rte/rte_triggers.lib.php:113 -#, fuzzy #| msgid "Sorry, we failed to restore the dropped routine." msgid "Sorry, we failed to restore the dropped trigger." -msgstr "Désolé, il a été impossible de restaurer la procédure." +msgstr "Désolé, il a été impossible de restaurer le déclencheur." #: libraries/rte/rte_triggers.lib.php:118 -#, fuzzy, php-format +#, php-format #| msgid "Routine %1$s has been modified." msgid "Trigger %1$s has been modified." -msgstr "La procédure %1$s a été modifiée." +msgstr "Le déclencheur %1$s a été modifié." #: libraries/rte/rte_triggers.lib.php:130 -#, fuzzy, php-format +#, php-format #| msgid "Table %1$s has been created." msgid "Trigger %1$s has been created." -msgstr "La table %1$s a été créée." +msgstr "Le déclencheur %1$s a été créé." #: libraries/rte/rte_triggers.lib.php:181 -#, fuzzy #| msgid "Create view" msgid "Create trigger" -msgstr "Créer une vue" +msgstr "Créer un déclencheur" #: libraries/rte/rte_triggers.lib.php:185 -#, fuzzy #| msgid "Add a trigger" msgid "Edit trigger" -msgstr "Ajouter un déclencheur" +msgstr "Modifier le déclencheur" #: libraries/rte/rte_triggers.lib.php:325 -#, fuzzy #| msgid "Triggers" msgid "Trigger name" -msgstr "Déclencheurs" +msgstr "Nom du déclencheur" #: libraries/rte/rte_triggers.lib.php:423 -#, fuzzy #| msgid "You must provide a routine name" msgid "You must provide a trigger name" -msgstr "Vous devez fournir un nom pour la procédure" +msgstr "Vous devez fournir un nom valable pour le déclencheur" #: libraries/rte/rte_triggers.lib.php:428 -#, fuzzy #| msgid "You must provide a routine name" msgid "You must provide a valid timing for the trigger" -msgstr "Vous devez fournir un nom pour la procédure" +msgstr "Vous devez fournir une temporisation valable pour le déclencheur" #: libraries/rte/rte_triggers.lib.php:433 -#, fuzzy #| msgid "You must provide a name and a type for each routine parameter." msgid "You must provide a valid event for the trigger" -msgstr "Vous devez fournir un nom et un type pour chacun des paramètres." +msgstr "Vous devez fournir un événement valable pour le déclencheur" #: libraries/rte/rte_triggers.lib.php:439 -#, fuzzy #| msgid "You must provide a routine name" msgid "You must provide a valid table name" -msgstr "Vous devez fournir un nom pour la procédure" +msgstr "Vous devez fournir un nom de table valable" #: libraries/rte/rte_triggers.lib.php:445 -#, fuzzy #| msgid "You must provide a routine definition." msgid "You must provide a trigger definition." -msgstr "Vous devez fournir une définition pour la procédure." +msgstr "Vous devez fournir une définition pour le déclencheur." #: libraries/schema/Dia_Relation_Schema.class.php:222 #: libraries/schema/Eps_Relation_Schema.class.php:395 diff --git a/po/pt_BR.po b/po/pt_BR.po index c14deee..9191096 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ 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-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-07-11 04:42+0200\n" -"Last-Translator: <erickdeoliveiraleal(a)gmail.com>\n" +"PO-Revision-Date: 2011-07-17 19:34+0200\n" +"Last-Translator: <rds_ralison(a)yahoo.com.br>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -251,9 +251,8 @@ msgstr "Ver o esquema do Banco de Dados" #: db_export.php:30 db_printview.php:94 db_qbe.php:101 db_tracking.php:48 #: export.php:370 navigation.php:299 -#, fuzzy msgid "No tables found in database." -msgstr "Nenhuma tabela encontrada no Banco de Dados" +msgstr "Nenhuma tabela encontrada no banco de dados." #: db_export.php:40 db_search.php:317 server_export.php:26 msgid "Select All" @@ -1132,7 +1131,6 @@ msgid "Issued queries since last refresh" msgstr "Consultas emitidas desde a última atualização" #: js/messages.php:85 -#, fuzzy #| msgid "SQL queries" msgid "Issued queries" msgstr "Consultas SQL" @@ -1203,16 +1201,14 @@ msgid "Insert Table" msgstr "Inserir tabela" #: js/messages.php:113 -#, fuzzy #| msgid "Add index" msgid "Hide indexes" -msgstr "Adicionar índice" +msgstr "Ocultar índices" #: js/messages.php:114 -#, fuzzy #| msgid "Show grid" msgid "Show indexes" -msgstr "Mostrar grade" +msgstr "Mostrar índices" #: js/messages.php:117 msgid "Searching" @@ -1321,10 +1317,9 @@ msgid "Add an option for column " msgstr "Adicionar uma opção para a coluna" #: js/messages.php:157 -#, fuzzy #| msgid "Generate Password" msgid "Generate password" -msgstr "Gerar Senha" +msgstr "Gerar senha" #: js/messages.php:158 libraries/replication_gui.lib.php:364 msgid "Generate" @@ -1363,7 +1358,6 @@ msgstr "Concluído" #. l10n: Display text for previous month link in calendar #: js/messages.php:188 -#, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Anterior" @@ -1451,7 +1445,6 @@ msgstr "Abr" #. l10n: Short month name #: js/messages.php:218 libraries/common.lib.php:1458 -#, fuzzy #| msgid "May" msgctxt "Short month name" msgid "May" @@ -2034,10 +2027,9 @@ msgid "Check Privileges" msgstr "Verificar privilégios" #: libraries/common.inc.php:588 -#, fuzzy #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Failed to read configuration file" -msgstr "Não foi possível carregar configuração padrão de: \"%1$s\"" +msgstr "Falhou ao ler o arquivo de configuração" #: libraries/common.inc.php:589 msgid "" @@ -2048,7 +2040,7 @@ msgstr "" "qualquer erro mostrado abaixo." #: libraries/common.inc.php:596 -#, fuzzy, php-format +#, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Não foi possível carregar configuração padrão de: \"%1$s\"" @@ -2062,7 +2054,7 @@ msgstr "" "arquivo de configuração!" #: libraries/common.inc.php:631 -#, fuzzy, php-format +#, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Índice de servidor inválido: \"%s\"" @@ -2252,10 +2244,9 @@ msgid "The %s functionality is affected by a known bug, see %s" msgstr "A funcionalidade %s é afetada por um bug conhecido, veja %s" #: libraries/common.lib.php:2447 -#, fuzzy #| msgid "Click to select" msgid "Click to toggle" -msgstr "Clique para selecionar" +msgstr "Clique para alternar" #: libraries/common.lib.php:2718 libraries/common.lib.php:2725 #: libraries/common.lib.php:2912 libraries/config/setup.forms.php:296 @@ -2342,9 +2333,8 @@ msgstr "Fechado" #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:122 libraries/export/texytext.php:24 #: libraries/import.lib.php:1107 -#, fuzzy msgid "structure" -msgstr "Estrutura" +msgstr "estrutura" #: libraries/config.values.php:97 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 @@ -2355,10 +2345,9 @@ msgstr "dados" #: libraries/config.values.php:98 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:124 libraries/export/texytext.php:24 -#, fuzzy #| msgid "Structure and data" msgid "structure and data" -msgstr "Estrutura e dados" +msgstr "estrutura e dados" #: libraries/config.values.php:100 msgid "Quick - display only the minimal options to configure" @@ -2373,16 +2362,14 @@ msgid "Custom - like above, but without the quick/custom choice" msgstr "Personalizada - como acima, mas sem a escolha rápida/personalizada" #: libraries/config.values.php:120 -#, fuzzy #| msgid "Complete inserts" msgid "complete inserts" -msgstr "Inserções completas" +msgstr "inserções completas" #: libraries/config.values.php:121 -#, fuzzy #| msgid "Extended inserts" msgid "extended inserts" -msgstr "Inserções extendidas" +msgstr "inserções extendidas" #: libraries/config.values.php:122 msgid "both of the above" @@ -2558,6 +2545,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"Habilitar compressão [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] para " +"operações de importar e exportar" #: libraries/config/messages.inc.php:31 msgid "Bzip2" @@ -2587,7 +2576,7 @@ msgstr "" #: libraries/config/messages.inc.php:36 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Número de linhas para caixas de texto CHAR/VARCHAR" #: libraries/config/messages.inc.php:37 msgid "CHAR textarea rows" @@ -2602,6 +2591,9 @@ msgid "" "Compress gzip/bzip2 exports on the fly without the need for much memory; if " "you encounter problems with created gzip/bzip2 files disable this feature" msgstr "" +"Comprime exportações gzip/bzip2 imediatamente sem a necessidade de muita " +"memória; se você encontrar problemas com arquivos gzip/bzip2 criados " +"desabilite este recurso" #: libraries/config/messages.inc.php:40 msgid "Compress on the fly" @@ -2617,6 +2609,8 @@ msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" msgstr "" +"Exibir aviso ("Você tem certeza...") quando estiver prestes a " +"perder dados" #: libraries/config/messages.inc.php:43 msgid "Confirm DROP queries" @@ -2627,15 +2621,16 @@ msgid "Debug SQL" msgstr "Depurar SQL" #: libraries/config/messages.inc.php:45 -#, fuzzy msgid "Default display direction" -msgstr "Opções de exportação do Banco de Dados" +msgstr "Direção de exibição padrão" #: libraries/config/messages.inc.php:46 msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]horizontal[/kbd], [kbd]vertical[/kbd] ou um número que indica o número " +"máximo para o qual o modelo vertical é usado" #: libraries/config/messages.inc.php:47 msgid "Display direction for altering/creating columns" diff --git a/po/tr.po b/po/tr.po index a2e228a..ce9d76f 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-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-07-13 18:06+0200\n" +"PO-Revision-Date: 2011-07-16 12:12+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -6553,10 +6553,9 @@ msgid "event" msgstr "olay" #: libraries/rte/rte_events.lib.php:62 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create an event" -msgstr "Yeni bir olay oluşturmak için gerekli izinlere sahip değilsiniz" +msgstr "Bir olay oluşturmak için gerekli izinlere sahip değilsiniz" #: libraries/rte/rte_events.lib.php:63 #, php-format @@ -6731,10 +6730,9 @@ msgid "routine" msgstr "yordam" #: libraries/rte/rte_routines.lib.php:47 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create a routine" -msgstr "Yeni bir yordam oluşturmak için gerekli izinlere sahip değilsiniz" +msgstr "Bir yordam oluşturmak için gerekli izinlere sahip değilsiniz" #: libraries/rte/rte_routines.lib.php:48 #, php-format @@ -6902,10 +6900,9 @@ msgid "trigger" msgstr "tetikleyici" #: libraries/rte/rte_triggers.lib.php:43 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create a trigger" -msgstr "Yeni bir tetikleyici oluşturmak için gerekli izinlere sahip değilsiniz" +msgstr "Bir tetikleyici oluşturmak için gerekli izinlere sahip değilsiniz" #: libraries/rte/rte_triggers.lib.php:44 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8855-g8a2d7fb
by Rouslan Placella 16 Jul '11

16 Jul '11

The branch, master has been updated via 8a2d7fbc22bdc58aa4f4bb488b724c1bab6a3c52 (commit) via 47f4e0772d4de3880bd8fbfb7f547771b968b270 (commit) via bdb3423bc9f11ecf6d893dd749891aabbe85bd3c (commit) via d8b14b5dc745d7bc0bc79740887a3790c85f08dc (commit) via 6d714e5d7da833217a05a10598dca0a88a08ad39 (commit) via 28881e4f4a66adea4d5efd5acb97027810b23d45 (commit) via 62859c653e7cb1a6a13b90e7b8f6ca1fa557b3a0 (commit) via 526419d1a127ff0784df634eaf0ee2f4f73a6474 (commit) from 10fa6c5e255f3b631c7d64950baa5005236e45e3 (commit) - Log ----------------------------------------------------------------- commit 8a2d7fbc22bdc58aa4f4bb488b724c1bab6a3c52 Merge: 10fa6c5e255f3b631c7d64950baa5005236e45e3 47f4e0772d4de3880bd8fbfb7f547771b968b270 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Jul 16 19:35:45 2011 +0100 Merge branch 'rte' commit 47f4e0772d4de3880bd8fbfb7f547771b968b270 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Jul 16 19:35:02 2011 +0100 Better validation of parameter types when generating a CREATE ROUTINE query commit bdb3423bc9f11ecf6d893dd749891aabbe85bd3c Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Jul 16 19:34:17 2011 +0100 Validate parameter direction when generating a CREATE PROCEDURE query commit d8b14b5dc745d7bc0bc79740887a3790c85f08dc Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Jul 16 19:33:08 2011 +0100 Removed redundant whitespaces from CREATE ROUTINE query commit 6d714e5d7da833217a05a10598dca0a88a08ad39 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Jul 16 19:32:29 2011 +0100 E_ALL fix when generating CREATE ROUTINE query from empty request commit 28881e4f4a66adea4d5efd5acb97027810b23d45 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Jul 16 19:31:36 2011 +0100 Simplified check for maximum number of routine parameters commit 62859c653e7cb1a6a13b90e7b8f6ca1fa557b3a0 Merge: 526419d1a127ff0784df634eaf0ee2f4f73a6474 10cbf3bd6051838e4e10f0b80d6be6fb35e562ab Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Jul 15 20:41:58 2011 +0100 Merge branch 'master' into rte Conflicts: libraries/rte/rte_events.lib.php libraries/rte/rte_routines.lib.php libraries/rte/rte_triggers.lib.php commit 526419d1a127ff0784df634eaf0ee2f4f73a6474 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 14 13:57:05 2011 +0100 Renamed some functions to avoid conflicts of redefinition in unit tests ----------------------------------------------------------------------- Summary of changes: db_events.php | 1 + db_routines.php | 1 + db_triggers.php | 1 + libraries/rte/rte_events.lib.php | 28 +------- libraries/rte/rte_main.inc.php | 20 ++++-- libraries/rte/rte_routines.lib.php | 127 +++++++++--------------------------- libraries/rte/rte_triggers.lib.php | 28 +------- libraries/rte/rte_words.lib.php | 60 +++++++++++++++++ 8 files changed, 111 insertions(+), 155 deletions(-) create mode 100644 libraries/rte/rte_words.lib.php diff --git a/db_events.php b/db_events.php index f659607..c4397e7 100644 --- a/db_events.php +++ b/db_events.php @@ -28,6 +28,7 @@ require_once './libraries/rte/rte_events.lib.php'; /** * Do the magic */ +$_PMA_RTE = 'EVN'; require_once './libraries/rte/rte_main.inc.php'; ?> diff --git a/db_routines.php b/db_routines.php index efac9ea..739e69a 100644 --- a/db_routines.php +++ b/db_routines.php @@ -30,6 +30,7 @@ require_once './libraries/rte/rte_routines.lib.php'; /** * Do the magic */ +$_PMA_RTE = 'RTN'; require_once './libraries/rte/rte_main.inc.php'; ?> diff --git a/db_triggers.php b/db_triggers.php index 1bd792e..aef1642 100644 --- a/db_triggers.php +++ b/db_triggers.php @@ -27,6 +27,7 @@ require_once './libraries/rte/rte_triggers.lib.php'; /** * Do the magic */ +$_PMA_RTE = 'TRI'; require_once './libraries/rte/rte_main.inc.php'; ?> diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index 97ebcdd..a449ff2 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -44,33 +44,9 @@ function PMA_EVN_setGlobals() } /** - * This function is defined in: rte_routines.lib.php, rte_triggers.lib.php and - * rte_events.lib.php. It is used to retreive some language strings that are - * used in functionalities that are common to routines, triggers and events. - * - * @param string $index The index of the string to get - * - * @return string The requested string or an empty string, if not available - */ -function PMA_RTE_getWord($index) -{ - $words = array( - 'add' => __('Add event'), - 'docu' => 'EVENTS', - 'export' => __('Export of event %s'), - 'human' => __('event'), - 'no_create' => __('You do not have the necessary privileges to create an event'), - 'not_found' => __('No event with name %1$s found in database %2$s'), - 'nothing' => __('There are no events to display.'), - 'title' => __('Events'), - ); - return isset($words[$index]) ? $words[$index] : ''; -} // end PMA_RTE_getWord() - -/** * Main function for the events functionality */ -function PMA_RTE_main() +function PMA_EVN_main() { global $db; @@ -95,7 +71,7 @@ function PMA_RTE_main() * toggle the state of the event scheduler. */ echo PMA_EVN_getFooterLinks(); -} // end PMA_RTE_main() +} // end PMA_EVN_main() /** * Handles editor requests for adding or editing an item diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index dd3e4c0..d2950bf 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -13,6 +13,7 @@ if (! defined('PHPMYADMIN')) { * Include all other files that are common * to routines, triggers and events. */ +require_once './libraries/rte/rte_words.lib.php'; require_once './libraries/rte/rte_export.lib.php'; require_once './libraries/rte/rte_list.lib.php'; require_once './libraries/rte/rte_footer.lib.php'; @@ -71,14 +72,21 @@ $titles = PMA_buildActionTitles(); */ $errors = array(); + /** - * The below function is defined in rte_routines.lib.php, - * rte_triggers.lib.php and rte_events.lib.php - * - * The appropriate function will now be called based on which one - * of these files was included earlier in the top-level folder + * Call the appropriate main function */ -PMA_RTE_main(); +switch ($_PMA_RTE) { +case 'RTN': + PMA_RTN_main(); + break; +case 'TRI': + PMA_TRI_main(); + break; +case 'EVN': + PMA_EVN_main(); + break; +} /** * Display the footer, if necessary diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 8c04d85..9a99b8c 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -29,33 +29,9 @@ function PMA_RTN_setGlobals() } /** - * This function is defined in: rte_routines.lib.php, rte_triggers.lib.php and - * rte_events.lib.php. It is used to retreive some language strings that are - * used in functionalities that are common to routines, triggers and events. - * - * @param string $index The index of the string to get - * - * @return string The requested string or an empty string, if not available - */ -function PMA_RTE_getWord($index) -{ - $words = array( - 'add' => __('Add routine'), - 'docu' => 'STORED_ROUTINES', - 'export' => __('Export of routine %s'), - 'human' => __('routine'), - 'no_create' => __('You do not have the necessary privileges to create a routine'), - 'not_found' => __('No routine with name %1$s found in database %2$s'), - 'nothing' => __('There are no routines to display.'), - 'title' => __('Routines'), - ); - return isset($words[$index]) ? $words[$index] : ''; -} // end PMA_RTE_getWord() - -/** * Main function for the routines functionality */ -function PMA_RTE_main() +function PMA_RTN_main() { global $db; @@ -93,7 +69,7 @@ function PMA_RTE_main() E_USER_WARNING ); } -} // end PMA_RTE_main() +} // end PMA_RTN_main() /** * This function parses a string containing one parameter of a routine, @@ -130,8 +106,7 @@ function PMA_RTN_parseOneParameter($value) $param_opts = array(); for ($i=$pos; $i<$parsed_param['len']; $i++) { if (($parsed_param[$i]['type'] == 'alpha_columnType' - || $parsed_param[$i]['type'] == 'alpha_functionName') // "CHAR" seems to be mistaken for a function by the parser - && $depth == 0 + || $parsed_param[$i]['type'] == 'alpha_functionName') && $depth == 0 // "CHAR" seems to be mistaken for a function by the parser ) { $retval[2] = strtoupper($parsed_param[$i]['data']); } else if ($parsed_param[$i]['type'] == 'punct_bracket_open_round' && $depth == 0) { @@ -452,7 +427,7 @@ function PMA_RTN_getDataFromRequest() $retval['item_param_length'] = array(); $retval['item_param_opts_num'] = array(); $retval['item_param_opts_text'] = array(); - if (isset($_REQUEST['item_param_name']) + if ( isset($_REQUEST['item_param_name']) && isset($_REQUEST['item_param_type']) && isset($_REQUEST['item_param_length']) && isset($_REQUEST['item_param_opts_num']) @@ -464,65 +439,30 @@ function PMA_RTN_getDataFromRequest() && is_array($_REQUEST['item_param_opts_text']) ) { if ($_REQUEST['item_type'] == 'PROCEDURE') { - $temp_num_params = 0; $retval['item_param_dir'] = $_REQUEST['item_param_dir']; foreach ($retval['item_param_dir'] as $key => $value) { if (! in_array($value, $param_directions, true)) { $retval['item_param_dir'][$key] = ''; } - $retval['item_num_params']++; - } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; } } - $temp_num_params = 0; $retval['item_param_name'] = $_REQUEST['item_param_name']; - foreach ($retval['item_param_name'] as $key => $value) { - $retval['item_param_name'][$key] = $value; - $temp_num_params++; - } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; - } - $temp_num_params = 0; $retval['item_param_type'] = $_REQUEST['item_param_type']; foreach ($retval['item_param_type'] as $key => $value) { if (! in_array($value, PMA_getSupportedDatatypes(), true)) { $retval['item_param_type'][$key] = ''; } - $temp_num_params++; - } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; - } - $temp_num_params = 0; - $retval['item_param_length'] = $_REQUEST['item_param_length']; - foreach ($retval['item_param_length'] as $key => $value) { - $retval['item_param_length'][$key] = $value; - $temp_num_params++; } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; - } - $temp_num_params = 0; - $retval['item_param_opts_num'] = $_REQUEST['item_param_opts_num']; - foreach ($retval['item_param_opts_num'] as $key => $value) { - $retval['item_param_opts_num'][$key] = $value; - $temp_num_params++; - } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; - } - $temp_num_params = 0; + $retval['item_param_length'] = $_REQUEST['item_param_length']; + $retval['item_param_opts_num'] = $_REQUEST['item_param_opts_num']; $retval['item_param_opts_text'] = $_REQUEST['item_param_opts_text']; - foreach ($retval['item_param_opts_text'] as $key => $value) { - $retval['item_param_opts_text'][$key] = $value; - $temp_num_params++; - } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; - } + $retval['item_num_params'] = max( + count($retval['item_param_name']), + count($retval['item_param_type']), + count($retval['item_param_length']), + count($retval['item_param_opts_num']), + count($retval['item_param_opts_text']) + ); } $retval['item_returntype'] = ''; if (isset($_REQUEST['item_returntype']) @@ -1032,7 +972,9 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine) */ function PMA_RTN_getQueryFromRequest() { - global $_REQUEST, $cfg, $errors, $param_sqldataaccess, $param_opts_num; + global $_REQUEST, $cfg, $errors, $param_sqldataaccess, $param_opts_num, $param_directions; + + $_REQUEST['item_type'] = isset($_REQUEST['item_type']) ? $_REQUEST['item_type'] : ''; $query = 'CREATE '; if (! empty($_REQUEST['item_definer'])) { @@ -1052,7 +994,7 @@ function PMA_RTN_getQueryFromRequest() $errors[] = sprintf(__('Invalid routine type: "%s"'), htmlspecialchars($_REQUEST['item_type'])); } if (! empty($_REQUEST['item_name'])) { - $query .= PMA_backquote($_REQUEST['item_name']) . ' '; + $query .= PMA_backquote($_REQUEST['item_name']); } else { $errors[] = __('You must provide a routine name'); } @@ -1069,7 +1011,10 @@ function PMA_RTN_getQueryFromRequest() ) { for ($i=0; $i<count($_REQUEST['item_param_name']); $i++) { if (! empty($_REQUEST['item_param_name'][$i]) && ! empty($_REQUEST['item_param_type'][$i])) { - if ($_REQUEST['item_type'] == 'PROCEDURE' && ! empty($_REQUEST['item_param_dir'][$i])) { + if ($_REQUEST['item_type'] == 'PROCEDURE' + && ! empty($_REQUEST['item_param_dir'][$i]) + && in_array($_REQUEST['item_param_dir'][$i], $param_directions) + ) { $params .= $_REQUEST['item_param_dir'][$i] . " " . PMA_backquote($_REQUEST['item_param_name'][$i]) . " " . $_REQUEST['item_param_type'][$i]; } else if ($_REQUEST['item_type'] == 'FUNCTION') { @@ -1093,19 +1038,13 @@ function PMA_RTN_getQueryFromRequest() } } if (! empty($_REQUEST['item_param_opts_text'][$i])) { - if (isset($cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_param_type'][$i])])) { - $group = $cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_param_type'][$i])]; - if ($group == 'FUNC_CHAR') { - $params .= ' CHARSET ' . strtolower($_REQUEST['item_param_opts_text'][$i]); - } + if (in_array($_REQUEST['item_param_type'][$i], $cfg['ColumnTypes']['STRING'])) { + $params .= ' CHARSET ' . strtolower($_REQUEST['item_param_opts_text'][$i]); } } if (! empty($_REQUEST['item_param_opts_num'][$i])) { - if (isset($cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_param_type'][$i])])) { - $group = $cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_param_type'][$i])]; - if ($group == 'FUNC_NUMBER' && in_array($_REQUEST['item_param_opts_num'][$i], $param_opts_num)) { - $params .= ' ' . strtoupper($_REQUEST['item_param_opts_num'][$i]); - } + if (in_array($_REQUEST['item_param_type'][$i], $cfg['ColumnTypes']['NUMERIC'])) { + $params .= ' ' . strtoupper($_REQUEST['item_param_opts_num'][$i]); } } if ($i != count($_REQUEST['item_param_name'])-1) { @@ -1118,7 +1057,7 @@ function PMA_RTN_getQueryFromRequest() } } } - $query .= " (" . $params . ") "; + $query .= "(" . $params . ") "; if ($_REQUEST['item_type'] == 'FUNCTION') { if (! empty($_REQUEST['item_returntype']) && in_array($_REQUEST['item_returntype'], PMA_getSupportedDatatypes())) { $query .= "RETURNS {$_REQUEST['item_returntype']}"; @@ -1137,19 +1076,13 @@ function PMA_RTN_getQueryFromRequest() } } if (! empty($_REQUEST['item_returnopts_text'])) { - if (isset($cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_returntype'])])) { - $group = $cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_returntype'])]; - if ($group == 'FUNC_CHAR') { - $query .= ' CHARSET ' . strtolower($_REQUEST['item_returnopts_text']); - } + if (in_array($_REQUEST['item_returntype'], $cfg['ColumnTypes']['STRING'])) { + $query .= ' CHARSET ' . strtolower($_REQUEST['item_returnopts_text']); } } if (! empty($_REQUEST['item_returnopts_num'])) { - if (isset($cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_returntype'])])) { - $group = $cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_returntype'])]; - if ($group == 'FUNC_NUMBER' && in_array($_REQUEST['item_returnopts_num'], $param_opts_num)) { - $query .= ' ' . strtoupper($_REQUEST['item_returnopts_num']); - } + if (in_array($_REQUEST['item_returntype'], $cfg['ColumnTypes']['NUMERIC'])) { + $query .= ' ' . strtoupper($_REQUEST['item_returnopts_num']); } } $query .= ' '; diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 66aebcf..8c65a67 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -25,33 +25,9 @@ function PMA_TRI_setGlobals() } /** - * This function is defined in: rte_routines.lib.php, rte_triggers.lib.php and - * rte_events.lib.php. It is used to retreive some language strings that are - * used in functionalities that are common to routines, triggers and events. - * - * @param string $index The index of the string to get - * - * @return string The requested string or an empty string, if not available - */ -function PMA_RTE_getWord($index) -{ - $words = array( - 'add' => __('Add trigger'), - 'docu' => 'TRIGGERS', - 'export' => __('Export of trigger %s'), - 'human' => __('trigger'), - 'no_create' => __('You do not have the necessary privileges to create a trigger'), - 'not_found' => __('No trigger with name %1$s found in database %2$s'), - 'nothing' => __('There are no triggers to display.'), - 'title' => __('Triggers'), - ); - return isset($words[$index]) ? $words[$index] : ''; -} // end PMA_RTE_getWord() - -/** * Main function for the triggers functionality */ -function PMA_RTE_main() +function PMA_TRI_main() { global $db, $table; @@ -71,7 +47,7 @@ function PMA_RTE_main() * if the user has the necessary privileges */ echo PMA_TRI_getFooterLinks(); -} // end PMA_RTE_main() +} // end PMA_TRI_main() /** * Handles editor requests for adding or editing an item diff --git a/libraries/rte/rte_words.lib.php b/libraries/rte/rte_words.lib.php new file mode 100644 index 0000000..6e7836a --- /dev/null +++ b/libraries/rte/rte_words.lib.php @@ -0,0 +1,60 @@ +<?php + +/** + * This function is used to retreive some language strings that are used + * in functionalities that are common to routines, triggers and events. + * + * @param string $index The index of the string to get + * + * @return string The requested string or an empty string, if not available + */ +function PMA_RTE_getWord($index) +{ + global $_PMA_RTE; + + switch ($_PMA_RTE) { + case 'RTN': + $words = array( + 'add' => __('Add routine'), + 'docu' => 'STORED_ROUTINES', + 'export' => __('Export of routine %s'), + 'human' => __('routine'), + 'no_create' => __('You do not have the necessary privileges to create a routine'), + 'not_found' => __('No routine with name %1$s found in database %2$s'), + 'nothing' => __('There are no routines to display.'), + 'title' => __('Routines'), + ); + break; + case 'TRI': + $words = array( + 'add' => __('Add trigger'), + 'docu' => 'TRIGGERS', + 'export' => __('Export of trigger %s'), + 'human' => __('trigger'), + 'no_create' => __('You do not have the necessary privileges to create a trigger'), + 'not_found' => __('No trigger with name %1$s found in database %2$s'), + 'nothing' => __('There are no triggers to display.'), + 'title' => __('Triggers'), + ); + break; + case 'EVN': + $words = array( + 'add' => __('Add event'), + 'docu' => 'EVENTS', + 'export' => __('Export of event %s'), + 'human' => __('event'), + 'no_create' => __('You do not have the necessary privileges to create an event'), + 'not_found' => __('No event with name %1$s found in database %2$s'), + 'nothing' => __('There are no events to display.'), + 'title' => __('Events'), + ); + break; + default: + $words = array(); + break; + } + + return isset($words[$index]) ? $words[$index] : ''; +} // end PMA_RTE_getWord() + +?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8847-g10fa6c5
by Michal Čihař 16 Jul '11

16 Jul '11

The branch, master has been updated via 10fa6c5e255f3b631c7d64950baa5005236e45e3 (commit) via c38c0f1488492958f323d8011214a0fd912ead43 (commit) via 1b5e5efd9c12509d5fc3ee0fb003dc0595ff9c3c (commit) via a08345017abee32241d4c54c984aa18ab410b523 (commit) via 8df328367c19c066076ca0bb285854d15b841e74 (commit) via a394fafb79cc7aef77234911b7f944fa7063aaa3 (commit) via 31472e9f6ab35d1be8a032af642882aa8dd75d1a (commit) via 2d3ed93ee6083a70d7d57561453b92b5e568dc95 (commit) via 0a849dd71cde15c35c398138139d8bcd07c0d199 (commit) via 62a756d3e2cc661928237425faf929448572060b (commit) via 71106e2b42315b8a816a4955114ffcd855541d9a (commit) via e9319a782eb5d01a92e8a399cdc9c028f5c16a92 (commit) via d82c665c6469411a4af0cc2fc0c6a3cdf262aa44 (commit) via 4db7c9dc64ec939a8703fd895345a486edfa8e52 (commit) via 152f418b5a21ce42590c92b3757e667a16202fa3 (commit) via 57e385227c7f994f44e8ff0c8a37f690843465fb (commit) via 0b007d6e89e88f565df435ea24152f0166a00e36 (commit) via 3a60318fa1b6f93073b48b67f388c87b5c8bad67 (commit) via a9afa36dff675cdebe514e5b4d2658504f9a2a35 (commit) via d4df14ae20a3ab8e00e0a9d84f7f7c555d15d678 (commit) via 10538361d2ac825f7ed12bbf5155152946dacdd5 (commit) via a4dc5875004cf50cd34505916647bc64928ff3d7 (commit) via eda739cb38bfaed1fd4cf0149e15c845e302adf1 (commit) via 7baf545df1339bd870823c35099ad714f9b9c671 (commit) via b6823671fe90e20ca7a09b79659471d85e96b8c7 (commit) via f7612765b514162dc4bc0c8ab7ba5a63fbac6d5a (commit) via 591e8deddbcb2ff304ff40a93e9fe76418803bf2 (commit) via 10e2ecf71d08625446238eb435306fe2b4c1ccdc (commit) via ee151d1d174af4a87b5c6e164fa633cf70499d27 (commit) via d3d879d3e7ec1807de2898469f8e7131b2d7781e (commit) via 0d758ef9a964b6058fad3cd81bdaa7cb8a71719a (commit) via 129054c917b0ab9c4131010d5d28820a56da22f7 (commit) via 1e9de583e2934d7c89cee48b3607b660c5f4087c (commit) via 57fb3a579eabc2f845ca4a03d0527bb8110b7123 (commit) via fb90e02949069b0b0eeda60a1052fed59dea6343 (commit) via 3f2e057d3c72cefa2658f58ac35a90cf73700f6f (commit) via 16d2098efc8ef7ccc9d00f1624b817c869479b7d (commit) via d4fd5a34ee0b2e1620691c2852b2c642b75da26c (commit) via ae731480d8442a0aaebbf9d74f323b54b03ee55f (commit) via f2e338c34280960d162fc4f1718cf05fcec54db7 (commit) via 126bb4ec9c05d5cbb83dc709787ce63915315adc (commit) via bdc06cb1cd8c2cd8265332be6de09bd74c5583cb (commit) via d7f9814339223dc9e8cba04e0b30d1fd820e179a (commit) via 191f34cdeb4d1f9145a47b6e9c6ada7197218ad9 (commit) via c604a0a53f3c71ca2e0cd7eb5596c31f5230f83a (commit) via 0512a200030642d2829194b35a6beee436435349 (commit) via 0c8592eeb9b6b839445b208e5bdda35a830cfe03 (commit) via 63b24dc7ab9b53f8038f31f2d2bcb49efe9c9e65 (commit) via a2e9138228e87f1d76b2fa669b69ea906dc7ab1a (commit) via cd725e88b21cd067770340182ad69c7857ec5dc0 (commit) via 64ed0fdecb8108eaf184face56c9935df5472b56 (commit) via 126ac80917acf1121264954806ee37be829a73d7 (commit) via 2eb56ed9202c76b37eae88f64b9bca8089453a07 (commit) via 6a9db08373b467cfddfdf3faa7dee33ef8b01d9b (commit) via 81152773d492aa595ac72701b1da649c48f94ba4 (commit) via 915d78223e52d3fd824c419e7a1d56049db80f58 (commit) via 5bbbb80b728b71637969c01053990f14efc7f6c2 (commit) via c888f4d92cac9bc614753b40696924d258bc21c5 (commit) via 500493add14b0806b3bd39a3cd4bdda095d9adc1 (commit) via bc1e6e024debb012db9d621862dae8f67dd53821 (commit) via f0b8445ab4044a6fafa6c850d4200903b5ac907a (commit) via 4bc781f6415e32497cc82821eaf19354ef963df7 (commit) via 038faa0ef93277099ab74b177c25319a3bdce5b0 (commit) via f5aaf89d6c359bba5e793e1a6b72c8765bc8b453 (commit) via 4e23579541eb5db7094e69398dfc784b3d633e2f (commit) via 6302bdbc6cd38c69c2f161dfc215e419ba501b43 (commit) via fd4ba5fdf780be49b15af72c099eea4da898ec02 (commit) via 1252fd8ee9dc35453648bd23a1804bac31382b91 (commit) via ba3a04de67ff2abbc0472134672c18d127498135 (commit) via 640044124c5485f90a207b3f4508f67c4c698e39 (commit) via 03a8bdceba39112f783071204ecea89fab56902f (commit) via 0d6cffe4bfa6c131a4908b824c1d4cffa5896d82 (commit) via 42231cebae20c945924ea2c87a7801d47166d6f0 (commit) via 34f021061cbb1675a67918ba0f3038039577e307 (commit) via 17a92e16defd79251eade0da04dfb9347b0cdf1e (commit) via 00f777451bb90a25a0d790f9357836d9b79e3d17 (commit) via daeb5734a90a569cd39963f4aa424d223d54d051 (commit) via ed3e11edcd268599c3028683b4a1a75e59a8aec1 (commit) via 98607ed55f08a392212529eb13ec7500ae17cfa8 (commit) via d0c2cc1bd283ddbcd69518ff7644078fb3ad8f9b (commit) via fa09ac9d2676b6035bb05ef4e62d036cf9c50096 (commit) via de28305020cdfbeb67e408c68504cbd37e989b4f (commit) via 846f63e4f94a0c3bd5fdc44f2550fe9652c8f53b (commit) via cf15c7923f462365f96bf034f85c2b9c56a18636 (commit) via 4978c4604f4ddcbd563f9ac445ce9a8d12365399 (commit) via 4fac6f371961d371dc998b2f7de9b1a436ce4279 (commit) via 56b50f524020ba66e00cd15cc6dc4d669bf61be8 (commit) via cf846cfce7935043b1d33386a3f28f67800538a2 (commit) via 33942d88f59d53e5d27fe2179e98b50e1b2ddb89 (commit) via 1edf185eac90b1010b13cc341ceb79f5c04c74a7 (commit) via 62b52ed01eab21c679832fbb36be01f3d09aeddb (commit) via 2fed0440688e2d22140268fdf5014e3e45f30a5f (commit) via d30d5b7d21be60dd99b00e84b256fe867dc652d5 (commit) via 8c44848518bdfb6020d9b16319b7d1671bb69c9e (commit) via 34572b99e62ba646bc3b64aa694f6524b6772a79 (commit) via da7f6304bc52cb21f450eab0e56dfc3bb25b00a4 (commit) from 10cbf3bd6051838e4e10f0b80d6be6fb35e562ab (commit) - Log ----------------------------------------------------------------- commit 10fa6c5e255f3b631c7d64950baa5005236e45e3 Author: mrbendig <mrbendig(a)mrbendig.com> Date: Sat Jul 16 02:40:06 2011 +0200 Translation update done using Pootle. commit c38c0f1488492958f323d8011214a0fd912ead43 Author: mrbendig <mrbendig(a)mrbendig.com> Date: Sat Jul 16 02:39:51 2011 +0200 Translation update done using Pootle. commit 1b5e5efd9c12509d5fc3ee0fb003dc0595ff9c3c Author: mrbendig <mrbendig(a)mrbendig.com> Date: Sat Jul 16 02:39:14 2011 +0200 Translation update done using Pootle. commit a08345017abee32241d4c54c984aa18ab410b523 Author: mrbendig <mrbendig(a)mrbendig.com> Date: Sat Jul 16 02:39:08 2011 +0200 Translation update done using Pootle. commit 8df328367c19c066076ca0bb285854d15b841e74 Author: mrbendig <mrbendig(a)mrbendig.com> Date: Sat Jul 16 02:38:58 2011 +0200 Translation update done using Pootle. commit a394fafb79cc7aef77234911b7f944fa7063aaa3 Merge: 31472e9f6ab35d1be8a032af642882aa8dd75d1a 10cbf3bd6051838e4e10f0b80d6be6fb35e562ab Author: Pootle server <pootle(a)cihar.com> Date: Fri Jul 15 20:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit 31472e9f6ab35d1be8a032af642882aa8dd75d1a Merge: 2d3ed93ee6083a70d7d57561453b92b5e568dc95 1a82ae1f11eb37012b041fcfe46fc06ecdbd779a Author: Pootle server <pootle(a)cihar.com> Date: Fri Jul 15 18:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' commit 2d3ed93ee6083a70d7d57561453b92b5e568dc95 Merge: 0a849dd71cde15c35c398138139d8bcd07c0d199 108f73842355a942314f93b8b4bbfa75199564a2 Author: Pootle server <pootle(a)cihar.com> Date: Fri Jul 15 16:40:04 2011 +0200 Merge remote-tracking branch 'origin/master' commit 0a849dd71cde15c35c398138139d8bcd07c0d199 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:27:20 2011 +0200 Translation update done using Pootle. commit 62a756d3e2cc661928237425faf929448572060b Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:26:49 2011 +0200 Translation update done using Pootle. commit 71106e2b42315b8a816a4955114ffcd855541d9a Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:26:35 2011 +0200 Translation update done using Pootle. commit e9319a782eb5d01a92e8a399cdc9c028f5c16a92 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:15:39 2011 +0200 Translation update done using Pootle. commit d82c665c6469411a4af0cc2fc0c6a3cdf262aa44 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:03:05 2011 +0200 Translation update done using Pootle. commit 4db7c9dc64ec939a8703fd895345a486edfa8e52 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:02:54 2011 +0200 Translation update done using Pootle. commit 152f418b5a21ce42590c92b3757e667a16202fa3 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:02:38 2011 +0200 Translation update done using Pootle. commit 57e385227c7f994f44e8ff0c8a37f690843465fb Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:02:30 2011 +0200 Translation update done using Pootle. commit 0b007d6e89e88f565df435ea24152f0166a00e36 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:02:18 2011 +0200 Translation update done using Pootle. commit 3a60318fa1b6f93073b48b67f388c87b5c8bad67 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:01:44 2011 +0200 Translation update done using Pootle. commit a9afa36dff675cdebe514e5b4d2658504f9a2a35 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:01:07 2011 +0200 Translation update done using Pootle. commit d4df14ae20a3ab8e00e0a9d84f7f7c555d15d678 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 15:00:32 2011 +0200 Translation update done using Pootle. commit 10538361d2ac825f7ed12bbf5155152946dacdd5 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 14:58:43 2011 +0200 Translation update done using Pootle. commit a4dc5875004cf50cd34505916647bc64928ff3d7 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 14:58:28 2011 +0200 Translation update done using Pootle. commit eda739cb38bfaed1fd4cf0149e15c845e302adf1 Author: stoyanster <stoyanster(a)gmail.com> Date: Fri Jul 15 14:57:28 2011 +0200 Translation update done using Pootle. commit 7baf545df1339bd870823c35099ad714f9b9c671 Merge: b6823671fe90e20ca7a09b79659471d85e96b8c7 87306f13778197dfed2a3b85bcd127aa0412ecbe Author: Pootle server <pootle(a)cihar.com> Date: Fri Jul 15 14:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' commit b6823671fe90e20ca7a09b79659471d85e96b8c7 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Jul 15 14:09:20 2011 +0200 Translation update done using Pootle. commit f7612765b514162dc4bc0c8ab7ba5a63fbac6d5a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Jul 15 14:09:13 2011 +0200 Translation update done using Pootle. commit 591e8deddbcb2ff304ff40a93e9fe76418803bf2 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Jul 15 14:09:05 2011 +0200 Translation update done using Pootle. commit 10e2ecf71d08625446238eb435306fe2b4c1ccdc Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 00:34:21 2011 +0200 Translation update done using Pootle. commit ee151d1d174af4a87b5c6e164fa633cf70499d27 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 00:33:49 2011 +0200 Translation update done using Pootle. commit d3d879d3e7ec1807de2898469f8e7131b2d7781e Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 00:32:42 2011 +0200 Translation update done using Pootle. commit 0d758ef9a964b6058fad3cd81bdaa7cb8a71719a Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 00:32:30 2011 +0200 Translation update done using Pootle. commit 129054c917b0ab9c4131010d5d28820a56da22f7 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 00:32:10 2011 +0200 Translation update done using Pootle. commit 1e9de583e2934d7c89cee48b3607b660c5f4087c Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 00:31:45 2011 +0200 Translation update done using Pootle. commit 57fb3a579eabc2f845ca4a03d0527bb8110b7123 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 00:31:06 2011 +0200 Translation update done using Pootle. commit fb90e02949069b0b0eeda60a1052fed59dea6343 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Fri Jul 15 00:29:15 2011 +0200 Translation update done using Pootle. commit 3f2e057d3c72cefa2658f58ac35a90cf73700f6f Merge: 16d2098efc8ef7ccc9d00f1624b817c869479b7d 291e3b6a9f1024b05306d1c06782a7ef76e5827a Author: Pootle server <pootle(a)cihar.com> Date: Thu Jul 14 22:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit 16d2098efc8ef7ccc9d00f1624b817c869479b7d Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:29:50 2011 +0200 Translation update done using Pootle. commit d4fd5a34ee0b2e1620691c2852b2c642b75da26c Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:28:02 2011 +0200 Translation update done using Pootle. commit ae731480d8442a0aaebbf9d74f323b54b03ee55f Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:27:08 2011 +0200 Translation update done using Pootle. commit f2e338c34280960d162fc4f1718cf05fcec54db7 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:26:35 2011 +0200 Translation update done using Pootle. commit 126bb4ec9c05d5cbb83dc709787ce63915315adc Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:26:10 2011 +0200 Translation update done using Pootle. commit bdc06cb1cd8c2cd8265332be6de09bd74c5583cb Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:25:45 2011 +0200 Translation update done using Pootle. commit d7f9814339223dc9e8cba04e0b30d1fd820e179a Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:25:01 2011 +0200 Translation update done using Pootle. commit 191f34cdeb4d1f9145a47b6e9c6ada7197218ad9 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:24:02 2011 +0200 Translation update done using Pootle. commit c604a0a53f3c71ca2e0cd7eb5596c31f5230f83a Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:23:17 2011 +0200 Translation update done using Pootle. commit 0512a200030642d2829194b35a6beee436435349 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:22:35 2011 +0200 Translation update done using Pootle. commit 0c8592eeb9b6b839445b208e5bdda35a830cfe03 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:22:03 2011 +0200 Translation update done using Pootle. commit 63b24dc7ab9b53f8038f31f2d2bcb49efe9c9e65 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:21:51 2011 +0200 Translation update done using Pootle. commit a2e9138228e87f1d76b2fa669b69ea906dc7ab1a Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:21:31 2011 +0200 Translation update done using Pootle. commit cd725e88b21cd067770340182ad69c7857ec5dc0 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:21:21 2011 +0200 Translation update done using Pootle. commit 64ed0fdecb8108eaf184face56c9935df5472b56 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:20:42 2011 +0200 Translation update done using Pootle. commit 126ac80917acf1121264954806ee37be829a73d7 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:20:01 2011 +0200 Translation update done using Pootle. commit 2eb56ed9202c76b37eae88f64b9bca8089453a07 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:19:08 2011 +0200 Translation update done using Pootle. commit 6a9db08373b467cfddfdf3faa7dee33ef8b01d9b Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:18:30 2011 +0200 Translation update done using Pootle. commit 81152773d492aa595ac72701b1da649c48f94ba4 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:17:29 2011 +0200 Translation update done using Pootle. commit 915d78223e52d3fd824c419e7a1d56049db80f58 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:17:08 2011 +0200 Translation update done using Pootle. commit 5bbbb80b728b71637969c01053990f14efc7f6c2 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:16:06 2011 +0200 Translation update done using Pootle. commit c888f4d92cac9bc614753b40696924d258bc21c5 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:15:02 2011 +0200 Translation update done using Pootle. commit 500493add14b0806b3bd39a3cd4bdda095d9adc1 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:14:45 2011 +0200 Translation update done using Pootle. commit bc1e6e024debb012db9d621862dae8f67dd53821 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:14:00 2011 +0200 Translation update done using Pootle. commit f0b8445ab4044a6fafa6c850d4200903b5ac907a Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:13:08 2011 +0200 Translation update done using Pootle. commit 4bc781f6415e32497cc82821eaf19354ef963df7 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:12:33 2011 +0200 Translation update done using Pootle. commit 038faa0ef93277099ab74b177c25319a3bdce5b0 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:12:03 2011 +0200 Translation update done using Pootle. commit f5aaf89d6c359bba5e793e1a6b72c8765bc8b453 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:11:42 2011 +0200 Translation update done using Pootle. commit 4e23579541eb5db7094e69398dfc784b3d633e2f Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:11:00 2011 +0200 Translation update done using Pootle. commit 6302bdbc6cd38c69c2f161dfc215e419ba501b43 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:09:07 2011 +0200 Translation update done using Pootle. commit fd4ba5fdf780be49b15af72c099eea4da898ec02 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:08:06 2011 +0200 Translation update done using Pootle. commit 1252fd8ee9dc35453648bd23a1804bac31382b91 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:07:59 2011 +0200 Translation update done using Pootle. commit ba3a04de67ff2abbc0472134672c18d127498135 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:07:13 2011 +0200 Translation update done using Pootle. commit 640044124c5485f90a207b3f4508f67c4c698e39 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:06:37 2011 +0200 Translation update done using Pootle. commit 03a8bdceba39112f783071204ecea89fab56902f Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:06:10 2011 +0200 Translation update done using Pootle. commit 0d6cffe4bfa6c131a4908b824c1d4cffa5896d82 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:05:14 2011 +0200 Translation update done using Pootle. commit 42231cebae20c945924ea2c87a7801d47166d6f0 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:04:58 2011 +0200 Translation update done using Pootle. commit 34f021061cbb1675a67918ba0f3038039577e307 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:03:45 2011 +0200 Translation update done using Pootle. commit 17a92e16defd79251eade0da04dfb9347b0cdf1e Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:00:44 2011 +0200 Translation update done using Pootle. commit 00f777451bb90a25a0d790f9357836d9b79e3d17 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 21:00:09 2011 +0200 Translation update done using Pootle. commit daeb5734a90a569cd39963f4aa424d223d54d051 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:59:32 2011 +0200 Translation update done using Pootle. commit ed3e11edcd268599c3028683b4a1a75e59a8aec1 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:58:22 2011 +0200 Translation update done using Pootle. commit 98607ed55f08a392212529eb13ec7500ae17cfa8 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:56:04 2011 +0200 Translation update done using Pootle. commit d0c2cc1bd283ddbcd69518ff7644078fb3ad8f9b Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:55:20 2011 +0200 Translation update done using Pootle. commit fa09ac9d2676b6035bb05ef4e62d036cf9c50096 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:54:51 2011 +0200 Translation update done using Pootle. commit de28305020cdfbeb67e408c68504cbd37e989b4f Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:51:20 2011 +0200 Translation update done using Pootle. commit 846f63e4f94a0c3bd5fdc44f2550fe9652c8f53b Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:44:25 2011 +0200 Translation update done using Pootle. commit cf15c7923f462365f96bf034f85c2b9c56a18636 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:43:39 2011 +0200 Translation update done using Pootle. commit 4978c4604f4ddcbd563f9ac445ce9a8d12365399 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:42:22 2011 +0200 Translation update done using Pootle. commit 4fac6f371961d371dc998b2f7de9b1a436ce4279 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:42:00 2011 +0200 Translation update done using Pootle. commit 56b50f524020ba66e00cd15cc6dc4d669bf61be8 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:41:51 2011 +0200 Translation update done using Pootle. commit cf846cfce7935043b1d33386a3f28f67800538a2 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:41:41 2011 +0200 Translation update done using Pootle. commit 33942d88f59d53e5d27fe2179e98b50e1b2ddb89 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:19:02 2011 +0200 Translation update done using Pootle. commit 1edf185eac90b1010b13cc341ceb79f5c04c74a7 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:18:05 2011 +0200 Translation update done using Pootle. commit 62b52ed01eab21c679832fbb36be01f3d09aeddb Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:17:10 2011 +0200 Translation update done using Pootle. commit 2fed0440688e2d22140268fdf5014e3e45f30a5f Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:15:06 2011 +0200 Translation update done using Pootle. commit d30d5b7d21be60dd99b00e84b256fe867dc652d5 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 20:14:04 2011 +0200 Translation update done using Pootle. commit 8c44848518bdfb6020d9b16319b7d1671bb69c9e Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 19:57:04 2011 +0200 Translation update done using Pootle. commit 34572b99e62ba646bc3b64aa694f6524b6772a79 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 19:56:07 2011 +0200 Translation update done using Pootle. commit da7f6304bc52cb21f450eab0e56dfc3bb25b00a4 Author: deadefy <deadefy(a)nepalimail.com> Date: Thu Jul 14 19:55:45 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/bg.po | 4 +- po/br.po | 48 +++++++++++++++++------------- po/de.po | 16 +++++---- po/es.po | 11 ++---- po/hi.po | 99 ++++++++++++++++++++++++++++++-------------------------------- 5 files changed, 90 insertions(+), 88 deletions(-) diff --git a/po/bg.po b/po/bg.po index bccd879..3dd6cbf 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-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-07-07 16:45+0200\n" +"PO-Revision-Date: 2011-07-15 14:57+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" "Language: bg\n" @@ -4783,7 +4783,7 @@ msgstr "Файл за импортиране:" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "Файлът може да е компресиран (%s) или некомпресиран" #: libraries/display_import.lib.php:158 msgid "" diff --git a/po/br.po b/po/br.po index d74c86a..a752ffb 100644 --- a/po/br.po +++ b/po/br.po @@ -8,8 +8,8 @@ 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-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-07-13 19:47+0200\n" -"Last-Translator: <fulup.jakez(a)ofis-bzh.org>\n" +"PO-Revision-Date: 2011-07-15 15:27+0200\n" +"Last-Translator: Fulup <fulup.jakez(a)ofis-bzh.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: br\n" "MIME-Version: 1.0\n" @@ -2870,76 +2870,79 @@ msgstr "Ensoc'hadennoù gant dale" #: libraries/config/messages.inc.php:125 libraries/export/sql.php:79 msgid "Disable foreign key checks" -msgstr "" +msgstr "Diweredekaat ar gwiriañ alc'hwezioù estren" #: libraries/config/messages.inc.php:128 msgid "Use hexadecimal for BLOB" -msgstr "" +msgstr "Implijout an eizhdekvedennad evit BLOB" #: libraries/config/messages.inc.php:130 msgid "Use ignore inserts" -msgstr "" +msgstr "Arabat ensoc'hañ ul linenn a dalvez kement hag un alc'hwez nemetañ" #: libraries/config/messages.inc.php:132 msgid "Syntax to use when inserting data" -msgstr "" +msgstr "Ereadur d'ober gantañ pa vez ensoc'het roadennoù" #: libraries/config/messages.inc.php:133 libraries/export/sql.php:268 msgid "Maximal length of created query" -msgstr "" +msgstr "Ment vrasañ ar reked krouet" #: libraries/config/messages.inc.php:138 msgid "Export type" -msgstr "" +msgstr "Seurt ezporzhiadenn" #: libraries/config/messages.inc.php:139 libraries/export/sql.php:71 msgid "Enclose export in a transaction" -msgstr "" +msgstr "Enklozañ an ezporzhiadenn en un treuzgread" #: libraries/config/messages.inc.php:140 msgid "Export time in UTC" -msgstr "" +msgstr "Ezporzhiañ an eur er furmad UTC" #: libraries/config/messages.inc.php:148 msgid "Force secured connection while using phpMyAdmin" -msgstr "" +msgstr "Rediañ a ra kevreadennoù https etre ar servijer ha phpMyAdmin" #: libraries/config/messages.inc.php:149 msgid "Force SSL connection" -msgstr "" +msgstr "Rediañ ar c'hevreadennoù SSL" #: libraries/config/messages.inc.php:150 msgid "" "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "the referenced data, [kbd]id[/kbd] is the key value" msgstr "" +"Urzh renkañ evit an elfennoù en ur voest desachañ alc'hwezioù estren; " +"[kbd]content[/kbd] zo evit an roadenn a zaveer dezhi, [kbd]id[/kbd] zo evit " +"talvout an alc'hwez" #: libraries/config/messages.inc.php:151 msgid "Foreign key dropdown order" -msgstr "" +msgstr "Urzh dispakañ an alc'hwezioù estren" #: libraries/config/messages.inc.php:152 msgid "A dropdown will be used if fewer items are present" -msgstr "" +msgstr "Ul lañser desachañ a vo implijet ma vez nebeutoc'h a elfennoù" #: libraries/config/messages.inc.php:153 msgid "Foreign key limit" -msgstr "" +msgstr "Bevenn evit an alc'hwezioù estren" #: libraries/config/messages.inc.php:154 msgid "Browse mode" -msgstr "" +msgstr "Mod merdeiñ" #: libraries/config/messages.inc.php:155 msgid "Customize browse mode" -msgstr "" +msgstr "Personelaat ar mod merdeiñ" #: libraries/config/messages.inc.php:157 libraries/config/messages.inc.php:159 #: libraries/config/messages.inc.php:176 libraries/config/messages.inc.php:187 #: libraries/config/messages.inc.php:189 libraries/config/messages.inc.php:217 #: libraries/config/messages.inc.php:229 msgid "Customize default options" -msgstr "" +msgstr "Personelaat an dibarzhioù dre ziouer" #: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:237 #: libraries/config/setup.forms.php:316 @@ -2947,7 +2950,7 @@ msgstr "" #: libraries/config/user_preferences.forms.php:216 libraries/export/csv.php:19 #: libraries/import/csv.php:22 msgid "CSV" -msgstr "Diweredekaat ar gwiriañ alc'hwezioù estren" +msgstr "CSV" #: libraries/config/messages.inc.php:160 msgid "Developer" @@ -3067,6 +3070,9 @@ msgid "" "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." msgstr "" +"Spisaat testenn barrenn ditl ar merdeer. En em zaveiñ d'an " +"[a(a)Documentation.html#cfg_TitleTable]teuliadur[/a] evit an neudennadoù hud a " +"c'haller ober ganto." #: libraries/config/messages.inc.php:194 #: libraries/navigation_header.inc.php:83 @@ -3097,11 +3103,11 @@ msgstr "Arventennoù diazez" #: libraries/config/messages.inc.php:199 msgid "Authentication" -msgstr "" +msgstr "Dilesadur" #: libraries/config/messages.inc.php:200 msgid "Authentication settings" -msgstr "" +msgstr "Arventennoù dilesañ" #: libraries/config/messages.inc.php:201 msgid "Server configuration" diff --git a/po/de.po b/po/de.po index 620c75b..9188cf5 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-07-14 13:46+0200\n" +"PO-Revision-Date: 2011-07-16 02:40+0200\n" "Last-Translator: <mrbendig(a)mrbendig.com>\n" "Language-Team: german <de(a)li.org>\n" "Language: de\n" @@ -6589,10 +6589,11 @@ msgid "event" msgstr "Ereignis" #: libraries/rte/rte_events.lib.php:62 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create an event" -msgstr "Sie haben nicht genug Rechte um ein neues Ereignis zu erstellen" +msgstr "" +"Sie haben nicht die erforderlichen Rechte, um ein neues Ereignis zu " +"erstellen" #: libraries/rte/rte_events.lib.php:63 #, php-format @@ -6769,10 +6770,11 @@ msgid "routine" msgstr "Prozedur" #: libraries/rte/rte_routines.lib.php:47 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create a routine" -msgstr "Sie haben nicht genug Rechte um eine neue Prozedur zu erstellen" +msgstr "" +"Sie haben nicht die erforderlichen Rechte, um eine neue Prozedur zu " +"erstellen" #: libraries/rte/rte_routines.lib.php:48 #, php-format @@ -6946,10 +6948,10 @@ msgid "trigger" msgstr "Trigger" #: libraries/rte/rte_triggers.lib.php:43 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create a trigger" -msgstr "Sie haben nicht genug Rechte um einen neuen Trigger zu erstellen" +msgstr "" +"Sie haben nicht die notwendigen Rechte um einen neuen Trigger zu erstellen" #: libraries/rte/rte_triggers.lib.php:44 #, php-format diff --git a/po/es.po b/po/es.po index d88a6e4..7f63fe8 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-07-14 02:15+0200\n" +"PO-Revision-Date: 2011-07-15 14:09+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" "Language: es\n" @@ -6643,10 +6643,9 @@ msgid "event" msgstr "evento" #: libraries/rte/rte_events.lib.php:62 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create an event" -msgstr "No posee los privilegios necesarios para crear un nuevo evento" +msgstr "No posee los privilegios necesarios para crear un evento" #: libraries/rte/rte_events.lib.php:63 #, php-format @@ -6821,10 +6820,9 @@ msgid "routine" msgstr "rutina" #: libraries/rte/rte_routines.lib.php:47 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create a routine" -msgstr "No posee los privilegios necesarios para crear una nueva rutina" +msgstr "No posee los privilegios necesarios para crear una rutina" #: libraries/rte/rte_routines.lib.php:48 #, php-format @@ -6993,10 +6991,9 @@ msgid "trigger" msgstr "disparador" #: libraries/rte/rte_triggers.lib.php:43 -#, fuzzy #| msgid "You do not have the necessary privileges to create a new routine" msgid "You do not have the necessary privileges to create a trigger" -msgstr "No posee los privilegios necesarios para crear un nuevo disparador" +msgstr "No posee los privilegios necesarios para crear un disparador" #: libraries/rte/rte_triggers.lib.php:44 #, php-format diff --git a/po/hi.po b/po/hi.po index 9274c99..2894228 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4,8 +4,8 @@ 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-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-05-06 09:13+0200\n" -"Last-Translator: <manojonemail(a)gmail.com>\n" +"PO-Revision-Date: 2011-07-14 21:29+0200\n" +"Last-Translator: <deadefy(a)nepalimail.com>\n" "Language-Team: hindi <hi(a)li.org>\n" "Language: hi\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" #: libraries/display_tbl.lib.php:354 libraries/display_tbl.lib.php:421 #: server_privileges.php:1583 msgid "Show all" -msgstr "सभी दिखाओ" +msgstr "सभी दिखाएँ" #: browse_foreigners.php:70 libraries/common.lib.php:2173 #: libraries/export/pdf.php:135 @@ -35,8 +35,9 @@ msgid "" "parent window, or your browser's security settings are configured to block " "cross-window updates." msgstr "" -"लक्ष्य ब्राउज़र विंडो को अद्यतन नहीं किया जा सकता है. शायद आपने मूल विंडो बंद कर दिया है," -"या अपनी ब्राउसर की सिक्यूरिटी सेट्टिंग को क्रोस-विंडो अद्यतन के लिए कांफिगुर कर रखा है." +"लक्ष्य ब्राउज़र विंडो को अद्यतन नहीं किया जा सकता है. शायद आपने मूल विंडो " +"बंद कर दिया है,या अपनी ब्राउसर की सिक्यूरिटी सेट्टिंग को क्रोस-विंडो अद्यतन " +"के लिए कांफिगुर कर रखा है." #: browse_foreigners.php:151 libraries/common.lib.php:2720 #: libraries/common.lib.php:2727 libraries/common.lib.php:2908 @@ -96,7 +97,7 @@ msgstr "वर्णन" #: browse_foreigners.php:248 browse_foreigners.php:257 #: browse_foreigners.php:269 browse_foreigners.php:277 msgid "Use this value" -msgstr "इस मूल्य का उपयोग करें" +msgstr "इस मान का उपयोग करें" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:326 @@ -117,8 +118,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" -"ये %s फ़ाइल तंत्र में उपलब्ध नहीं है, कृपया अधिक जानकारी के लिए www.phpmyadmin.net " -"वेबसाईट पर जाएँ " +"ये %s फ़ाइल तंत्र में उपलब्ध नहीं है, कृपया अधिक जानकारी के लिए " +"www.phpmyadmin.net वेबसाईट पर जाएँ " #: db_create.php:58 #, php-format @@ -159,6 +160,7 @@ msgstr "कोलम" #: tbl_change.php:292 tbl_change.php:319 tbl_printview.php:140 #: tbl_printview.php:310 tbl_select.php:114 tbl_structure.php:205 #: tbl_structure.php:792 tbl_tracking.php:267 tbl_tracking.php:314 +#, fuzzy msgid "Type" msgstr "टाइप" @@ -170,6 +172,7 @@ msgstr "टाइप" #: libraries/tbl_properties.inc.php:112 tbl_change.php:328 #: tbl_printview.php:142 tbl_structure.php:208 tbl_tracking.php:269 #: tbl_tracking.php:320 +#, fuzzy msgid "Null" msgstr "अशक्त" @@ -181,7 +184,7 @@ msgstr "अशक्त" #: libraries/tbl_properties.inc.php:109 tbl_printview.php:143 #: tbl_structure.php:209 tbl_tracking.php:270 msgid "Default" -msgstr "डिफ़ॉल्ट" +msgstr "तयशुदा" #: db_datadict.php:174 libraries/export/htmlword.php:259 #: libraries/export/latex.php:366 libraries/export/odt.php:304 @@ -246,7 +249,7 @@ msgstr "छापें" #: db_export.php:26 msgid "View dump (schema) of database" -msgstr "डेटाबेस का डंप (स्कीमा) दिखाएं" +msgstr "डेटाबेस का डंप (स्कीमा) नजारा" #: db_export.php:30 db_printview.php:94 db_qbe.php:101 db_tracking.php:48 #: export.php:370 navigation.php:299 @@ -263,12 +266,12 @@ msgstr "सभी को रद्द करें" #: db_operations.php:41 tbl_create.php:22 msgid "The database name is empty!" -msgstr "डेटाबेस नाम खाली है" +msgstr "डेटाबेस का नाम खाली है" #: db_operations.php:272 #, php-format msgid "Database %s has been renamed to %s" -msgstr " डेटाबेस का नाम %s बदल कर %s रखा गया है" +msgstr " डेटाबेस %s का नाम बदल कर %s रखा गया है" #: db_operations.php:276 #, php-format @@ -290,11 +293,11 @@ msgstr "डेटाबेस को हटा दे" #: db_operations.php:452 #, php-format msgid "Database %s has been dropped." -msgstr "डाटाबेस %s को ड्रोप कर दिया ।" +msgstr "डाटाबेस %s को ड्रोप कर दिया गया है।" #: db_operations.php:457 msgid "Drop the database (DROP)" -msgstr "ड्रॉप डेटाबेस (छोड़ें)" +msgstr "डेटाबेस को ड्रप करे " #: db_operations.php:487 msgid "Copy database to" @@ -352,8 +355,8 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"phpMyAdmin विन्यास भंडारण को निष्क्रिय किया गया हैक्यों ये किया गया है, जानने के लिए " -"%shere%s पर क्लिक करें." +"phpMyAdmin विन्यास भंडारण को निष्क्रिय किया गया हैक्यों ये किया गया है, " +"जानने के लिए %sयहाँ%s पर क्लिक करें." #: db_operations.php:600 msgid "Edit or export relational schema" @@ -385,7 +388,7 @@ msgstr "आकार" #: db_printview.php:160 db_structure.php:410 libraries/export/sql.php:743 #: libraries/export/sql.php:1058 msgid "in use" -msgstr "उपयोग में" +msgstr "उपयोग में है" #: db_printview.php:185 libraries/db_info.inc.php:61 #: libraries/export/sql.php:698 @@ -412,8 +415,8 @@ msgstr "पिछली जाँच" #, php-format msgid "%s table" msgid_plural "%s tables" -msgstr[0] " %s टेबल(s)" -msgstr[1] " %s टेबल(s)" +msgstr[0] " %s टेबलें" +msgstr[1] " %s टेबल" #: db_qbe.php:41 msgid "You have to choose at least one column to display" @@ -421,11 +424,11 @@ msgstr "आपको कम से कम एक स्तंभ प्रदर #: db_qbe.php:186 msgid "Switch to" -msgstr "के लिए स्विच" +msgstr "में चले" #: db_qbe.php:186 msgid "visual builder" -msgstr "दृश्य बिल्डर" +msgstr "दृश्य निर्माता" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:937 @@ -457,7 +460,7 @@ msgstr "मापदंड" #: db_qbe.php:375 db_qbe.php:457 db_qbe.php:549 db_qbe.php:580 msgid "Ins" -msgstr "इन्सर्ट" +msgstr "घुसाएं" #: db_qbe.php:379 db_qbe.php:461 db_qbe.php:546 db_qbe.php:577 msgid "And" @@ -475,7 +478,7 @@ msgstr "अथवा" #: db_qbe.php:529 msgid "Modify" -msgstr "संशोधित" +msgstr "संशोधन" #: db_qbe.php:606 msgid "Add/Delete criteria rows" @@ -500,14 +503,14 @@ msgstr "डेटाबेस <b>%s<b> पर SQL क्वरी:" #: db_qbe.php:955 libraries/common.lib.php:1116 msgid "Submit Query" -msgstr "क्वरी प्रस्तुत करें" +msgstr "क्वरी भेजें" #: db_search.php:30 libraries/auth/config.auth.lib.php:83 #: libraries/auth/config.auth.lib.php:102 #: libraries/auth/cookie.auth.lib.php:566 libraries/auth/http.auth.lib.php:51 #: libraries/auth/signon.auth.lib.php:236 msgid "Access denied" -msgstr "प्रवेश निषेध" +msgstr "पहुँच निषेधित" #: db_search.php:42 db_search.php:284 msgid "at least one of the words" @@ -572,7 +575,6 @@ msgid "Search in database" msgstr "डाटाबेस में खोजें" #: db_search.php:275 -#, fuzzy #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgid "Words or values to search for (wildcard: \"%\"):" msgstr "शब्द अथवा वेल्यु जिसे सर्च करना है (wildcard: \"%\"):" @@ -586,7 +588,6 @@ msgid "Words are separated by a space character (\" \")." msgstr "शब्द स्पेस(\" \") करक्टेर से अलग किये गए हैं." #: db_search.php:298 -#, fuzzy #| msgid "Inside table(s):" msgid "Inside tables:" msgstr " टेबल में:" @@ -607,7 +608,7 @@ msgstr " टेबल %s को खाली किया गया है." #: db_structure.php:280 tbl_operations.php:705 #, php-format msgid "View %s has been dropped" -msgstr "द्रश्य %s रद्द दिया गया है." +msgstr "द्रश्य %s रद्द किया गया है." #: db_structure.php:280 tbl_operations.php:705 #, php-format @@ -627,7 +628,8 @@ msgstr "ट्रैकिंग सक्रिय नहीं है." msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." -msgstr "इस द्रश्य में कम से कम इतनी रो हैं. और जानने के लिए %s दोक्युमेंताशन%s पढ़ें." +msgstr "" +"इस द्रश्य में कम से कम इतनी रो हैं. और जानने के लिए %s दस्तावेज़%s पढ़ें." #: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:152 #: libraries/tbl_info.inc.php:60 tbl_structure.php:212 @@ -647,7 +649,7 @@ msgstr "जोड" #: db_structure.php:449 libraries/StorageEngine.class.php:313 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "%s इस MySQL सर्वर पर डिफ़ॉल्ट भंडारण इंजन है." +msgstr "%s इस MySQL सर्वर पर तयशुदा भंडारण इंजन है." #: db_structure.php:477 db_structure.php:494 db_structure.php:495 #: libraries/display_tbl.lib.php:2339 libraries/display_tbl.lib.php:2344 @@ -667,7 +669,7 @@ msgstr "सभी को चेक करें" #: libraries/replication_gui.lib.php:35 server_databases.php:264 #: server_privileges.php:586 server_privileges.php:1673 tbl_structure.php:594 msgid "Uncheck All" -msgstr " सभी को अनचेक करें" +msgstr "सभी को अनचेक करें" #: db_structure.php:489 msgid "Check tables having overhead" @@ -686,23 +688,23 @@ msgstr "निर्यात" #: libraries/display_tbl.lib.php:2439 tbl_structure.php:628 #: tbl_structure.php:630 msgid "Print view" -msgstr "छापने वाला द्रश्य." +msgstr "छपाई द्रश्य." #: db_structure.php:503 libraries/common.lib.php:2915 #: libraries/common.lib.php:2916 msgid "Empty" -msgstr "खाली करें" +msgstr "खाली" #: db_structure.php:505 db_tracking.php:104 libraries/Index.class.php:482 #: libraries/common.lib.php:2913 libraries/common.lib.php:2914 #: server_databases.php:266 tbl_structure.php:153 tbl_structure.php:154 #: tbl_structure.php:603 msgid "Drop" -msgstr "छोड़ें" +msgstr "रद्द" #: db_structure.php:507 tbl_operations.php:604 msgid "Check table" -msgstr " टेबल को चेक करें" +msgstr "टेबल को चेक करें" #: db_structure.php:509 tbl_operations.php:653 tbl_structure.php:842 #: tbl_structure.php:844 @@ -711,29 +713,26 @@ msgstr "टेबल को अनुकूलित करें" #: db_structure.php:511 tbl_operations.php:640 msgid "Repair table" -msgstr "टेबल को टीक करें" +msgstr "टेबल को मरम्मत करें" #: db_structure.php:513 tbl_operations.php:627 msgid "Analyze table" msgstr "टेबल का विश्लेषण करें" #: db_structure.php:515 -#, fuzzy #| msgid "Go to table" msgid "Add prefix to table" -msgstr "टेबल पर जायें" +msgstr "टेबल पर उपसर्ग जोड़ें" #: db_structure.php:517 libraries/mult_submits.inc.php:251 -#, fuzzy #| msgid "Replace table data with file" msgid "Replace table prefix" -msgstr "फाइल, टेबल डेटा की जगह" +msgstr "टेबल के उपसर्ग को पुनर्स्थापना करें" #: db_structure.php:519 libraries/mult_submits.inc.php:251 -#, fuzzy #| msgid "Replace table data with file" msgid "Copy table with prefix" -msgstr "फाइल, टेबल डेटा की जगह" +msgstr "टेबल को इस उपसर्ग के साथ प्रतिलिपि बनाएँ" #: db_structure.php:561 libraries/schema/User_Schema.class.php:383 msgid "Data Dictionary" @@ -804,7 +803,7 @@ msgstr "ट्रैकिंग रिपोर्ट" #: db_tracking.php:136 tbl_tracking.php:244 tbl_tracking.php:676 msgid "Structure snapshot" -msgstr "संरचना स्नैपशॉट" +msgstr "संरचना क्षणचित्र" #: db_tracking.php:181 msgid "Untracked tables" @@ -817,7 +816,7 @@ msgstr "टेबलओं को ट्रैक करें" #: db_tracking.php:229 msgid "Database Log" -msgstr "डेटाबेस लॉग" +msgstr "डेटाबेस का रोजनामचा" #: enum_editor.php:21 libraries/tbl_properties.inc.php:776 #, php-format @@ -826,7 +825,7 @@ msgstr "\"%s\" काँलम के लिए मान " #: enum_editor.php:22 libraries/tbl_properties.inc.php:777 msgid "Enter each value in a separate field." -msgstr "एक मान अलग क्षेत्र में दर्ज करें." +msgstr "हर एक मान अलग क्षेत्र में दर्ज करें." #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" @@ -838,11 +837,11 @@ msgstr "उत्पादन" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "\"लंबाई / मूल्य\" क्षेत्र में शामिल हो गए मान कॉपी और पेस्ट" +msgstr "\"लंबाई / मान\" क्षेत्र में शामिल हो गए मान कॉपी और पेस्ट" #: export.php:73 msgid "Selected export type has to be saved in file!" -msgstr "चयनित निर्यात टाइप को फाइल में सेव करने की आवश्यकता है!" +msgstr "चयनित निर्यात प्रकार को फाइल में संचित करने की आवश्यकता है!" #: export.php:163 export.php:188 export.php:670 #, php-format @@ -978,10 +977,9 @@ msgid "You are about to DESTROY a complete database!" msgstr "आप एक पूरा डेटाबेस नष्ट कर रहे हैं! " #: js/messages.php:32 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to DESTROY a complete table!" -msgstr "आप एक पूरा डेटाबेस नष्ट कर रहे हैं! " +msgstr "आप एक पूराटेबल नष्ट कर रहे हैं! " #: js/messages.php:33 #, fuzzy @@ -1020,10 +1018,9 @@ msgstr "यह नंबर नहीं है!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:49 -#, fuzzy #| msgid "Total" msgid "Total count" -msgstr "कुल" +msgstr "कुल गिनती" #: js/messages.php:52 msgid "The host name is empty!" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8751-g10cbf3b
by Rouslan Placella 15 Jul '11

15 Jul '11

The branch, master has been updated via 10cbf3bd6051838e4e10f0b80d6be6fb35e562ab (commit) via 9eba5726bd809ab874fc29360ac6ff351d86335b (commit) from 1a82ae1f11eb37012b041fcfe46fc06ecdbd779a (commit) - Log ----------------------------------------------------------------- commit 10cbf3bd6051838e4e10f0b80d6be6fb35e562ab Merge: 1a82ae1f11eb37012b041fcfe46fc06ecdbd779a 9eba5726bd809ab874fc29360ac6ff351d86335b Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Jul 15 19:31:43 2011 +0100 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55ab190..5c4a01f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ phpMyAdmin - ChangeLog - bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL - remove version number in /setup - bug #3367993 [usability] Missing "Generate Password" button +- bug #3363221 [display] Missing Server Parameter on inline sql query 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/js/functions.js b/js/functions.js index 30f15d6..aa639e2 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1217,6 +1217,7 @@ function changeMIMEType(db, table, reference, mime_type) */ $(document).ready(function(){ $(".inline_edit_sql").live('click', function(){ + var server = $(this).prev().find("input[name='server']").val(); var db = $(this).prev().find("input[name='db']").val(); var table = $(this).prev().find("input[name='table']").val(); var token = $(this).prev().find("input[name='token']").val(); @@ -1232,7 +1233,8 @@ $(document).ready(function(){ $(this).click(function(){ sql_query = $(this).prev().val(); window.location.replace("import.php" - + "?db=" + encodeURIComponent(db) + + "?server=" + encodeURIComponent(server) + + "&db=" + encodeURIComponent(db) + "&table=" + encodeURIComponent(table) + "&sql_query=" + encodeURIComponent(sql_query) + "&show_query=1" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-33-g9eba572
by Rouslan Placella 15 Jul '11

15 Jul '11

The branch, QA_3_4 has been updated via 9eba5726bd809ab874fc29360ac6ff351d86335b (commit) from 3ec3c7ee1766331a25899483ff78ff468516fc2e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index eecc5b9..d3e081a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog - bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL - remove version number in /setup - bug #3367993 [usability] Missing "Generate Password" button +- bug #3363221 [display] Missing Server Parameter on inline sql query 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/js/functions.js b/js/functions.js index eea8573..75fd677 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1117,6 +1117,7 @@ function changeMIMEType(db, table, reference, mime_type) */ $(document).ready(function(){ $(".inline_edit_sql").live('click', function(){ + var server = $(this).prev().find("input[name='server']").val(); var db = $(this).prev().find("input[name='db']").val(); var table = $(this).prev().find("input[name='table']").val(); var token = $(this).prev().find("input[name='token']").val(); @@ -1132,7 +1133,8 @@ $(document).ready(function(){ $(this).click(function(){ sql_query = $(this).prev().val(); window.location.replace("import.php" - + "?db=" + encodeURIComponent(db) + + "?server=" + encodeURIComponent(server) + + "&db=" + encodeURIComponent(db) + "&table=" + encodeURIComponent(table) + "&sql_query=" + encodeURIComponent(sql_query) + "&show_query=1" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8749-g1a82ae1
by Rouslan Placella 15 Jul '11

15 Jul '11

The branch, master has been updated via 1a82ae1f11eb37012b041fcfe46fc06ecdbd779a (commit) via 3ec3c7ee1766331a25899483ff78ff468516fc2e (commit) from 7a31e75eb6b2e1d243e31eec953db22b46a0627c (commit) - Log ----------------------------------------------------------------- commit 1a82ae1f11eb37012b041fcfe46fc06ecdbd779a Merge: 7a31e75eb6b2e1d243e31eec953db22b46a0627c 3ec3c7ee1766331a25899483ff78ff468516fc2e Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Jul 15 16:32:30 2011 +0100 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/server_privileges.js | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b12d534..55ab190 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ phpMyAdmin - ChangeLog - bug #3353811 [interface] Info message has "error" class - bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL - remove version number in /setup +- bug #3367993 [usability] Missing "Generate Password" button 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/js/server_privileges.js b/js/server_privileges.js index 10c3797..d5729d9 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -527,6 +527,7 @@ $(document).ready(function() { } }); + displayPasswordGenerateButton(); }, 'top.frame_content'); //end $(document).ready() /**#@- */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-32-g3ec3c7e
by Rouslan Placella 15 Jul '11

15 Jul '11

The branch, QA_3_4 has been updated via 3ec3c7ee1766331a25899483ff78ff468516fc2e (commit) from 40d7c3b8baa84c474af5f710e60351b05330f3c6 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/server_privileges.js | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90e2b24..eecc5b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug #3353811 [interface] Info message has "error" class - bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL - remove version number in /setup +- bug #3367993 [usability] Missing "Generate Password" button 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/js/server_privileges.js b/js/server_privileges.js index 8b9c5e9..f178c6c 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -489,6 +489,7 @@ $(document).ready(function() { } }); + displayPasswordGenerateButton(); }, 'top.frame_content'); //end $(document).ready() /**#@- */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8747-g7a31e75
by Rouslan Placella 15 Jul '11

15 Jul '11

The branch, master has been updated via 7a31e75eb6b2e1d243e31eec953db22b46a0627c (commit) via 40d7c3b8baa84c474af5f710e60351b05330f3c6 (commit) via b185ca88f7c8241804cff13a2b315fc3d1222a38 (commit) via 2cc22c8aba33ad12b3d98905d6dfc29f7c878837 (commit) via 70083ad58346ff7190bcd8e56b63ab92f6abfa40 (commit) via 65d962d39703b412dc482be47e092f97933eb8e0 (commit) via 6d0f28b425dc9f975543301c4b194dd6fbdd494d (commit) from 108f73842355a942314f93b8b4bbfa75199564a2 (commit) - Log ----------------------------------------------------------------- commit 7a31e75eb6b2e1d243e31eec953db22b46a0627c Merge: 108f73842355a942314f93b8b4bbfa75199564a2 40d7c3b8baa84c474af5f710e60351b05330f3c6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Jul 15 16:10:24 2011 +0100 Merge branch 'QA_3_4' Conflicts: libraries/export/codegen.php libraries/export/xml.php ----------------------------------------------------------------------- Summary of changes: libraries/export/codegen.php | 44 +++++++++++++++++++++--------------------- libraries/export/xml.php | 23 +++++++++++---------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index ffed7d1..5ee114d 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -254,32 +254,32 @@ class TableProperty $lines[] = "using System.Text;"; $lines[] = "namespace ".cgMakeIdentifier($db); $lines[] = "{"; - $lines[] = " #region ".cgMakeIdentifier($table); - $lines[] = " public class ".cgMakeIdentifier($table); - $lines[] = " {"; - $lines[] = " #region Member Variables"; + $lines[] = " #region ".cgMakeIdentifier($table); + $lines[] = " public class ".cgMakeIdentifier($table); + $lines[] = " {"; + $lines[] = " #region Member Variables"; foreach ($tableProperties as $tablePropertie) - $lines[] = $tablePropertie->formatCs(" protected #dotNetPrimitiveType# _#name#;"); - $lines[] = " #endregion"; - $lines[] = " #region Constructors"; - $lines[] = " public ".cgMakeIdentifier($table)."() { }"; + $lines[] = $tablePropertie->formatCs(" protected #dotNetPrimitiveType# _#name#;"); + $lines[] = " #endregion"; + $lines[] = " #region Constructors"; + $lines[] = " public ".cgMakeIdentifier($table)."() { }"; $temp = array(); foreach ($tableProperties as $tablePropertie) if (! $tablePropertie->isPK()) $temp[] = $tablePropertie->formatCs("#dotNetPrimitiveType# #name#"); - $lines[] = " public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")"; - $lines[] = " {"; + $lines[] = " public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")"; + $lines[] = " {"; foreach ($tableProperties as $tablePropertie) if (! $tablePropertie->isPK()) - $lines[] = $tablePropertie->formatCs(" this._#name#=#name#;"); - $lines[] = " }"; - $lines[] = " #endregion"; - $lines[] = " #region Public Properties"; + $lines[] = $tablePropertie->formatCs(" this._#name#=#name#;"); + $lines[] = " }"; + $lines[] = " #endregion"; + $lines[] = " #region Public Properties"; foreach ($tableProperties as $tablePropertie) - $lines[] = $tablePropertie->formatCs(" public virtual #dotNetPrimitiveType# #ucfirstName#\n {\n get {return _#name#;}\n set {_#name#=value;}\n }"); - $lines[] = " #endregion"; - $lines[] = " }"; - $lines[] = " #endregion"; + $lines[] = $tablePropertie->formatCs(" public virtual #dotNetPrimitiveType# #ucfirstName#\n {\n get {return _#name#;}\n set {_#name#=value;}\n }"); + $lines[] = " #endregion"; + $lines[] = " }"; + $lines[] = " #endregion"; $lines[] = "}"; PMA_DBI_free_result($result); } @@ -291,7 +291,7 @@ class TableProperty $lines=array(); $lines[] = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"; $lines[] = "<hibernate-mapping xmlns=\"urn:nhibernate-mapping-2.2\" namespace=\"".cgMakeIdentifier($db)."\" assembly=\"".cgMakeIdentifier($db)."\">"; - $lines[] = " <class name=\"".cgMakeIdentifier($table)."\" table=\"".cgMakeIdentifier($table)."\">"; + $lines[] = " <class name=\"".cgMakeIdentifier($table)."\" table=\"".cgMakeIdentifier($table)."\">"; $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); if ($result) { @@ -301,13 +301,13 @@ class TableProperty foreach ($tableProperties as $tablePropertie) { if ($tablePropertie->isPK()) - $lines[] = $tablePropertie->formatXml(" <id name=\"#ucfirstName#\" type=\"#dotNetObjectType#\" unsaved-value=\"0\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" unique=\"#unique#\" index=\"PRIMARY\"/>\n <generator class=\"native\" />\n </id>"); + $lines[] = $tablePropertie->formatXml(" <id name=\"#ucfirstName#\" type=\"#dotNetObjectType#\" unsaved-value=\"0\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" unique=\"#unique#\" index=\"PRIMARY\"/>\n <generator class=\"native\" />\n </id>"); else - $lines[] = $tablePropertie->formatXml(" <property name=\"#ucfirstName#\" type=\"#dotNetObjectType#\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" #indexName#/>\n </property>"); + $lines[] = $tablePropertie->formatXml(" <property name=\"#ucfirstName#\" type=\"#dotNetObjectType#\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" #indexName#/>\n </property>"); } PMA_DBI_free_result($result); } - $lines[]=" </class>"; + $lines[]=" </class>"; $lines[]="</hibernate-mapping>"; return implode("\n", $lines); } diff --git a/libraries/export/xml.php b/libraries/export/xml.php index cfa07f5..9247e22 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -74,7 +74,7 @@ function PMA_exportHeader() { global $db; global $table; global $tables; - + $export_struct = isset($GLOBALS['xml_export_functions']) || isset($GLOBALS['xml_export_procedures']) || isset($GLOBALS['xml_export_tables']) || isset($GLOBALS['xml_export_triggers']) || isset($GLOBALS['xml_export_views']); @@ -114,7 +114,7 @@ function PMA_exportHeader() { $head .= ' -->' . $crlf; $head .= ' <pma:structure_schemas>' . $crlf; $head .= ' <pma:database name="' . htmlspecialchars($db) . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf; - + if (count($tables) == 0) { $tables[] = $table; } @@ -131,23 +131,23 @@ function PMA_exportHeader() { } else { $type = 'table'; } - + if ($is_view && ! isset($GLOBALS['xml_export_views'])) { continue; } - + if (! $is_view && ! isset($GLOBALS['xml_export_tables'])) { continue; } $head .= ' <pma:' . $type . ' name="' . $table . '">' . $crlf; - + $tbl = " " . htmlspecialchars($tbl); $tbl = str_replace("\n", "\n ", $tbl); $head .= $tbl . ';' . $crlf; $head .= ' </pma:' . $type . '>' . $crlf; - + if (isset($GLOBALS['xml_export_triggers']) && $GLOBALS['xml_export_triggers']) { // Export triggers $triggers = PMA_DBI_get_triggers($db, $table); @@ -170,7 +170,7 @@ function PMA_exportHeader() { } } } - + if (isset($GLOBALS['xml_export_functions']) && $GLOBALS['xml_export_functions']) { // Export functions $functions = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION'); @@ -193,7 +193,7 @@ function PMA_exportHeader() { unset($functions); } } - + if (isset($GLOBALS['xml_export_procedures']) && $GLOBALS['xml_export_procedures']) { // Export procedures $procedures = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE'); @@ -240,13 +240,13 @@ function PMA_exportHeader() { */ function PMA_exportDBHeader($db) { global $crlf; - + if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) { $head = ' ' . $crlf . ' <database name="' . htmlspecialchars($db) . '">' . $crlf; - + return PMA_exportOutputHandler($head); } else @@ -265,7 +265,7 @@ function PMA_exportDBHeader($db) { */ function PMA_exportDBFooter($db) { global $crlf; - + if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) { return PMA_exportOutputHandler(' </database>' . $crlf); } @@ -300,6 +300,7 @@ function PMA_exportDBCreate($db) { * @access public */ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { + if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) { $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-31-g40d7c3b
by Rouslan Placella 15 Jul '11

15 Jul '11

The branch, QA_3_4 has been updated via 40d7c3b8baa84c474af5f710e60351b05330f3c6 (commit) from b185ca88f7c8241804cff13a2b315fc3d1222a38 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/export/codegen.php | 294 +++++++++++++++++++++--------------------- 1 files changed, 147 insertions(+), 147 deletions(-) diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 7160122..7c06d79 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -152,70 +152,70 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) */ class TableProperty { - public $name; - public $type; - public $nullable; - public $key; - public $defaultValue; - public $ext; - function __construct($row) - { - $this->name = trim($row[0]); - $this->type = trim($row[1]); - $this->nullable = trim($row[2]); - $this->key = trim($row[3]); - $this->defaultValue = trim($row[4]); - $this->ext = trim($row[5]); - } - function getPureType() - { - $pos=strpos($this->type, "("); - if ($pos > 0) - return substr($this->type, 0, $pos); - return $this->type; - } - function isNotNull() - { - return $this->nullable == "NO" ? "true" : "false"; - } - function isUnique() - { - return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false"; - } - function getDotNetPrimitiveType() - { - if (strpos($this->type, "int") === 0) return "int"; - if (strpos($this->type, "long") === 0) return "long"; - if (strpos($this->type, "char") === 0) return "string"; - if (strpos($this->type, "varchar") === 0) return "string"; - if (strpos($this->type, "text") === 0) return "string"; - if (strpos($this->type, "longtext") === 0) return "string"; - if (strpos($this->type, "tinyint") === 0) return "bool"; - if (strpos($this->type, "datetime") === 0) return "DateTime"; - return "unknown"; - } - function getDotNetObjectType() - { - if (strpos($this->type, "int") === 0) return "Int32"; - if (strpos($this->type, "long") === 0) return "Long"; - if (strpos($this->type, "char") === 0) return "String"; - if (strpos($this->type, "varchar") === 0) return "String"; - if (strpos($this->type, "text") === 0) return "String"; - if (strpos($this->type, "longtext") === 0) return "String"; - if (strpos($this->type, "tinyint") === 0) return "Boolean"; - if (strpos($this->type, "datetime") === 0) return "DateTime"; - return "Unknown"; - } - function getIndexName() - { - if (strlen($this->key)>0) - return "index=\"" . htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8') . "\""; - return ""; - } - function isPK() - { - return $this->key=="PRI"; - } + public $name; + public $type; + public $nullable; + public $key; + public $defaultValue; + public $ext; + function __construct($row) + { + $this->name = trim($row[0]); + $this->type = trim($row[1]); + $this->nullable = trim($row[2]); + $this->key = trim($row[3]); + $this->defaultValue = trim($row[4]); + $this->ext = trim($row[5]); + } + function getPureType() + { + $pos=strpos($this->type, "("); + if ($pos > 0) + return substr($this->type, 0, $pos); + return $this->type; + } + function isNotNull() + { + return $this->nullable == "NO" ? "true" : "false"; + } + function isUnique() + { + return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false"; + } + function getDotNetPrimitiveType() + { + if (strpos($this->type, "int") === 0) return "int"; + if (strpos($this->type, "long") === 0) return "long"; + if (strpos($this->type, "char") === 0) return "string"; + if (strpos($this->type, "varchar") === 0) return "string"; + if (strpos($this->type, "text") === 0) return "string"; + if (strpos($this->type, "longtext") === 0) return "string"; + if (strpos($this->type, "tinyint") === 0) return "bool"; + if (strpos($this->type, "datetime") === 0) return "DateTime"; + return "unknown"; + } + function getDotNetObjectType() + { + if (strpos($this->type, "int") === 0) return "Int32"; + if (strpos($this->type, "long") === 0) return "Long"; + if (strpos($this->type, "char") === 0) return "String"; + if (strpos($this->type, "varchar") === 0) return "String"; + if (strpos($this->type, "text") === 0) return "String"; + if (strpos($this->type, "longtext") === 0) return "String"; + if (strpos($this->type, "tinyint") === 0) return "Boolean"; + if (strpos($this->type, "datetime") === 0) return "DateTime"; + return "Unknown"; + } + function getIndexName() + { + if (strlen($this->key)>0) + return "index=\"" . htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8') . "\""; + return ""; + } + function isPK() + { + return $this->key=="PRI"; + } function formatCs($text) { $text=str_replace("#name#", cgMakeIdentifier($this->name, false), $text); @@ -227,16 +227,16 @@ class TableProperty $text=str_replace("#indexName#", $this->getIndexName(), $text); return $this->format($text); } - function format($text) - { + function format($text) + { $text=str_replace("#ucfirstName#", cgMakeIdentifier($this->name), $text); $text=str_replace("#dotNetPrimitiveType#", $this->getDotNetPrimitiveType(), $text); $text=str_replace("#dotNetObjectType#", $this->getDotNetObjectType(), $text); - $text=str_replace("#type#", $this->getPureType(), $text); - $text=str_replace("#notNull#", $this->isNotNull(), $text); - $text=str_replace("#unique#", $this->isUnique(), $text); - return $text; - } + $text=str_replace("#type#", $this->getPureType(), $text); + $text=str_replace("#notNull#", $this->isNotNull(), $text); + $text=str_replace("#unique#", $this->isUnique(), $text); + return $text; + } } function cgMakeIdentifier($str, $ucfirst = true) @@ -253,83 +253,83 @@ class TableProperty return $str; } - function handleNHibernateCSBody($db, $table, $crlf) - { - $lines=array(); - $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); - if ($result) - { - $tableProperties=array(); - while ($row = PMA_DBI_fetch_row($result)) - $tableProperties[] = new TableProperty($row); - $lines[] = "using System;"; - $lines[] = "using System.Collections;"; - $lines[] = "using System.Collections.Generic;"; - $lines[] = "using System.Text;"; - $lines[] = "namespace ".cgMakeIdentifier($db); - $lines[] = "{"; - $lines[] = " #region ".cgMakeIdentifier($table); - $lines[] = " public class ".cgMakeIdentifier($table); - $lines[] = " {"; - $lines[] = " #region Member Variables"; - foreach ($tableProperties as $tablePropertie) - $lines[] = $tablePropertie->formatCs(" protected #dotNetPrimitiveType# _#name#;"); - $lines[] = " #endregion"; - $lines[] = " #region Constructors"; - $lines[] = " public ".cgMakeIdentifier($table)."() { }"; - $temp = array(); - foreach ($tableProperties as $tablePropertie) - if (! $tablePropertie->isPK()) - $temp[] = $tablePropertie->formatCs("#dotNetPrimitiveType# #name#"); - $lines[] = " public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")"; - $lines[] = " {"; - foreach ($tableProperties as $tablePropertie) - if (! $tablePropertie->isPK()) - $lines[] = $tablePropertie->formatCs(" this._#name#=#name#;"); - $lines[] = " }"; - $lines[] = " #endregion"; - $lines[] = " #region Public Properties"; - foreach ($tableProperties as $tablePropertie) - $lines[] = $tablePropertie->formatCs(" public virtual #dotNetPrimitiveType# #ucfirstName#\n {\n get {return _#name#;}\n set {_#name#=value;}\n }"); - $lines[] = " #endregion"; - $lines[] = " }"; - $lines[] = " #endregion"; - $lines[] = "}"; - PMA_DBI_free_result($result); - } - return implode("\n", $lines); - } + function handleNHibernateCSBody($db, $table, $crlf) + { + $lines=array(); + $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); + if ($result) + { + $tableProperties=array(); + while ($row = PMA_DBI_fetch_row($result)) + $tableProperties[] = new TableProperty($row); + $lines[] = "using System;"; + $lines[] = "using System.Collections;"; + $lines[] = "using System.Collections.Generic;"; + $lines[] = "using System.Text;"; + $lines[] = "namespace ".cgMakeIdentifier($db); + $lines[] = "{"; + $lines[] = " #region ".cgMakeIdentifier($table); + $lines[] = " public class ".cgMakeIdentifier($table); + $lines[] = " {"; + $lines[] = " #region Member Variables"; + foreach ($tableProperties as $tablePropertie) + $lines[] = $tablePropertie->formatCs(" protected #dotNetPrimitiveType# _#name#;"); + $lines[] = " #endregion"; + $lines[] = " #region Constructors"; + $lines[] = " public ".cgMakeIdentifier($table)."() { }"; + $temp = array(); + foreach ($tableProperties as $tablePropertie) + if (! $tablePropertie->isPK()) + $temp[] = $tablePropertie->formatCs("#dotNetPrimitiveType# #name#"); + $lines[] = " public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")"; + $lines[] = " {"; + foreach ($tableProperties as $tablePropertie) + if (! $tablePropertie->isPK()) + $lines[] = $tablePropertie->formatCs(" this._#name#=#name#;"); + $lines[] = " }"; + $lines[] = " #endregion"; + $lines[] = " #region Public Properties"; + foreach ($tableProperties as $tablePropertie) + $lines[] = $tablePropertie->formatCs(" public virtual #dotNetPrimitiveType# #ucfirstName#\n {\n get {return _#name#;}\n set {_#name#=value;}\n }"); + $lines[] = " #endregion"; + $lines[] = " }"; + $lines[] = " #endregion"; + $lines[] = "}"; + PMA_DBI_free_result($result); + } + return implode("\n", $lines); + } - function handleNHibernateXMLBody($db, $table, $crlf) - { - $lines=array(); - $lines[] = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"; - $lines[] = "<hibernate-mapping xmlns=\"urn:nhibernate-mapping-2.2\" namespace=\"".cgMakeIdentifier($db)."\" assembly=\"".cgMakeIdentifier($db)."\">"; - $lines[] = " <class name=\"".cgMakeIdentifier($table)."\" table=\"".cgMakeIdentifier($table)."\">"; - $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); - if ($result) - { - $tableProperties = array(); - while ($row = PMA_DBI_fetch_row($result)) - $tableProperties[] = new TableProperty($row); - foreach ($tableProperties as $tablePropertie) - { - if ($tablePropertie->isPK()) - $lines[] = $tablePropertie->formatXml(" <id name=\"#ucfirstName#\" type=\"#dotNetObjectType#\" unsaved-value=\"0\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" unique=\"#unique#\" index=\"PRIMARY\"/>\n <generator class=\"native\" />\n </id>"); - else - $lines[] = $tablePropertie->formatXml(" <property name=\"#ucfirstName#\" type=\"#dotNetObjectType#\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" #indexName#/>\n </property>"); - } - PMA_DBI_free_result($result); - } - $lines[]=" </class>"; - $lines[]="</hibernate-mapping>"; - return implode("\n", $lines); - } + function handleNHibernateXMLBody($db, $table, $crlf) + { + $lines=array(); + $lines[] = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"; + $lines[] = "<hibernate-mapping xmlns=\"urn:nhibernate-mapping-2.2\" namespace=\"".cgMakeIdentifier($db)."\" assembly=\"".cgMakeIdentifier($db)."\">"; + $lines[] = " <class name=\"".cgMakeIdentifier($table)."\" table=\"".cgMakeIdentifier($table)."\">"; + $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); + if ($result) + { + $tableProperties = array(); + while ($row = PMA_DBI_fetch_row($result)) + $tableProperties[] = new TableProperty($row); + foreach ($tableProperties as $tablePropertie) + { + if ($tablePropertie->isPK()) + $lines[] = $tablePropertie->formatXml(" <id name=\"#ucfirstName#\" type=\"#dotNetObjectType#\" unsaved-value=\"0\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" unique=\"#unique#\" index=\"PRIMARY\"/>\n <generator class=\"native\" />\n </id>"); + else + $lines[] = $tablePropertie->formatXml(" <property name=\"#ucfirstName#\" type=\"#dotNetObjectType#\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" #indexName#/>\n </property>"); + } + PMA_DBI_free_result($result); + } + $lines[]=" </class>"; + $lines[]="</hibernate-mapping>"; + return implode("\n", $lines); + } - function cgGetOption($optionName) - { - global $what; - return $GLOBALS[$what . "_" . $optionName]; - } + function cgGetOption($optionName) + { + global $what; + return $GLOBALS[$what . "_" . $optionName]; + } } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8740-g108f738
by Marc Delisle 15 Jul '11

15 Jul '11

The branch, master has been updated via 108f73842355a942314f93b8b4bbfa75199564a2 (commit) from 87306f13778197dfed2a3b85bcd127aa0412ecbe (commit) - Log ----------------------------------------------------------------- commit 108f73842355a942314f93b8b4bbfa75199564a2 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 15 08:53:20 2011 -0400 remove version number in /setup ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + setup/index.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0889f7b..b12d534 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ phpMyAdmin - ChangeLog - bug #3350790 [interface] JS error in Table->Structure->Index->Edit - bug #3353811 [interface] Info message has "error" class - bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL +- remove version number in /setup 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/setup/index.php b/setup/index.php index 9100f00..561679c 100644 --- a/setup/index.php +++ b/setup/index.php @@ -33,7 +33,7 @@ require './libraries/header_http.inc.php'; <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<title>phpMyAdmin <?php echo $GLOBALS['PMA_Config']->get('PMA_VERSION'); ?> setup</title> +<title>phpMyAdmin setup</title> <link href="../favicon.ico" rel="icon" type="image/x-icon" /> <link href="../favicon.ico" rel="shortcut icon" type="image/x-icon" /> <link href="styles.css" rel="stylesheet" type="text/css" /> @@ -44,7 +44,7 @@ require './libraries/header_http.inc.php'; <script type="text/javascript" src="scripts.js"></script> </head> <body> -<h1><span class="blue">php</span><span class="orange">MyAdmin</span> <?php echo $GLOBALS['PMA_Config']->get('PMA_VERSION'); ?> setup</h1> +<h1><span class="blue">php</span><span class="orange">MyAdmin</span> setup</h1> <div id="menu"> <?php require './setup/frames/menu.inc.php'; hooks/post-receive -- phpMyAdmin

1 0