August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15431-ga4305a2
by Michal Čihař 17 Aug '11

17 Aug '11

The branch, master has been updated via a4305a2672789deebba9d21a887796be47f31542 (commit) via ad4b3828297ed00c6612aa72113e5d373dd4d284 (commit) via 3f0fdbee7b83b6411556b1ad9a8cc78eee2115bc (commit) via 8f8c6932bf0fd5d843a931bb0249acca70d62466 (commit) via 3d4b6b982b793472522bfce456da58b004d69ed5 (commit) via 6629eb4cfe264829baca888fd40d3bf8bc6030dd (commit) via 6d67555456b9b23ac0c5fa3e61df4c94e45ddc2b (commit) via 583e481c54de26f2d0c6c76ee627186cc84ec1df (commit) via e1ccbf11bda3626851ee157a0ba70c081dc0ee61 (commit) via e94ac25f7cc391ac5f34236450dbac20da7a732a (commit) via fe272df4fedfe64a65ff80b5705283337c0833c4 (commit) via ab694b536101602b2590e0a227dae9e6f03564c6 (commit) via 97363bef3e01f25acdb17f0500d99b63d34d2bf1 (commit) via 7738694aed083b9624dda21f97d64453fbb9c18b (commit) via 9278bfe13cf74aee0409db846537287e08da04cc (commit) via a8e85b33987248cd42a0c0404a04870a45e567ab (commit) via 89233cb18fdedf91bd1f64da984c647bea4a629b (commit) via 26c5bd7ed005014ed2e1af87631a7fa4a8d2933b (commit) via 824fc366143ff9335fcec56bbb44ed9c0177420c (commit) via 180b46c5287ec8afa70d86dec3d5f2493ae937c1 (commit) via 45990fb8583fbf22f07cf433421820af0620dfee (commit) via 948b73df9fec2687f118681512a42e9e6b70efbf (commit) via 513507ed4956b77b6e1bcd657e68fdced9908c90 (commit) via 9493b87d59cea7585be976f15f9a6654e8ec4c2b (commit) via 4006a9eab7876a35dce996ac79cb7fa5002043db (commit) via 13dd17f84b7b1bbd5ce4ce4de68d9692546c9e1b (commit) via 6b23ab956be20880c52186268d47149e42d57497 (commit) via f7525485e395a4ec1ccd349986f64d5ceff50747 (commit) via 875e0af4f723ea5f4af88c3799f75bf191389833 (commit) via 4f3adc13ee50d751b12b7e1c49fa0268a408916b (commit) via badce6b613cd659ab5f7dd479b7b4626adee936c (commit) via 8fe866e9d85d69cb8008311647fc133797f31eb0 (commit) via 7b02db860e0399ed27cdb7606ab3e41360539b00 (commit) via b0922b58ae313272d2f7d36b941792bbdbce017e (commit) via e8254a2932113a3628a9f172697d04bdb88bf938 (commit) via fff29c89b623a8566345e31e18f27f6571ef2865 (commit) via d1f63483a546d6d6b23d71fd800ab112f893b618 (commit) via 81d2207215ddf5f5bde7199d180e6f59b8bb1579 (commit) via 4f15a261a6f865264128c3a9ff1abdda31f6b194 (commit) via f4755f3e7dc7f0168a0ea867674dc729bf4d276f (commit) via 981a292839821af7244133a6818a019d175ed873 (commit) via c6d27e6e342917542893df1c1bbaa339c32aa012 (commit) via b65916775cce961cb50bec869a543dd38df9fc1e (commit) via 592e6021b07502579d2c25e6eba3491b1f1aa29f (commit) via 10569a165b4cbd2e28d9987977adac53f1c0b955 (commit) via 364487023ec7ebf1ab9bb9a97454d9a784639956 (commit) via b1764e27b97bcff7c4661a2fc5dc257ee03ebad5 (commit) via a112d3f1560a1fc319ca861ed254a00605d9b532 (commit) via 8d10579dae62ee4a4ff4d02b91079c28e19b9a1d (commit) via c77ad3db179b41124f3d002956fc939101e4c324 (commit) via d8f469a1d24b1388af013ff1de1bddcee851abf3 (commit) via 2fbfbdeb7bf2d16ade3a749eafe898007e00b56a (commit) via 699acc288338f6300b582900f37685ee06bd9687 (commit) via 9a4e7b5f37df4238a0d0e06a0fbfdac31097b486 (commit) via 10399e1e56b51de190b6887809c57e3dba565e7b (commit) via c70565e97b79ae9bfd3b041f49e200e3f4d7d9ac (commit) via fb43dd48f398979cc40fddb7714c5534015ceb38 (commit) via 640b339478ca2201b5ddf477d12eb38945be1897 (commit) via 8dc7d2ce23cdd1e87cc0a9f7c5385c847ca9dd0a (commit) via da0357ae2d812216eec7baf6a589a15deccfbb96 (commit) via 4bc5b57786a1b66aa5a2a3409b5b8945ef05118b (commit) via fd173026ac8187df4451dc75515cc7c9b3c42811 (commit) via 3111ff84ba0a7bd3b1745fd2bdfb88ac4cd84bf3 (commit) via f4da63e8ab1fd6aff8ea0fcd88cada4e2f46b6bb (commit) via 258b4ed6a52a6d6ed7bfdc62a077d554a4495fe3 (commit) via aa99dce914d4e0d8a480db0f219ed7329a2e385f (commit) via 233e9df0bafb630aac420c9e2e88c95213603005 (commit) via 444019322060501f77b7dca689cd73329d186a6c (commit) via 3baed4d9931b7ea0be83abb2b493ef62367fb6d8 (commit) via a009f45c84021cfbcb8022277976c3c2acad9439 (commit) via 138218d58eaa56ab04409803388da0b84c541a11 (commit) via c70138eebf938e0155bcf5d257a5018369bb5534 (commit) via a12b48badbf4290a3f58166659a1884055e73d15 (commit) via d25b22500021a55d11599e6b8864633cecf7aae0 (commit) via 05e970b07054252b102879b749fed2690100b381 (commit) via 8b5c1b0c4cba6d4b5277c2a70d468529f8a64f1b (commit) via 375cde1db364e8184a72e881138974d79b40a8d4 (commit) via 5cb36b1c71799533956ea25b6b7bb554a7dcd17f (commit) via 477efbde024f755c1d089fb112a0db9235a03ac3 (commit) via 60068cbeacdd9638f60cffda856e199f51d3ddd3 (commit) via d5e3a000549464d9b107814e22e0c00a249115a2 (commit) via 4c547a47d83a37b01b66b981e21814baed314ed3 (commit) via 351c2ba207a26870f60a32cff6c1fe3f934903d3 (commit) via 558da46504f00a9b38e80d26bb8a8aeac5424ee3 (commit) via 20ea0a91305917620576803264d6fc0fadc0bbc7 (commit) via 9c6072a19d0778d6643e5ec32a203e83febec398 (commit) via 7bca0216e3f50b9f1bc1ec66844969691a66ad70 (commit) via 7be8a6e0c573514252c47577c0d723fffbad7123 (commit) via fced0c7f7e8e94c2a804b0388d07c95e45db8c7c (commit) via 77f7230505266458759b30a55ebcc3816d7358f7 (commit) via 3b85c80a40d71965cbd3e40dbcf640418bfedb74 (commit) via 2a0ec259adbecdd5e65b04ee3543f079abc44b05 (commit) via 27f313d08c212cfff3ba6ebca3a655a4867f9467 (commit) via 45921f47d4c68bc310d2c212507270c610a1319d (commit) via f3da67b16f8861876944dff1036d78742f7eb384 (commit) via acc4c251cd7480aee502af56aeb56aec9b824857 (commit) via d4e95defeaac9f81ab670e0d73438d83a3a2f1ae (commit) via db119c6ad7299544886309dffdab1a54451c6460 (commit) via a015cb73124021b59e768ca987b37c648692b85f (commit) via 412788085a820ae66d7ae12e9cd65298343e29ff (commit) via 4bc3589e8f86214d219cc93194f1b786e67f77cb (commit) via 30a88ea515e8615bdb5446e5269cbc01736082f3 (commit) via de6e79f277c15196d4e33d2c36d26b90c8cf3276 (commit) via 993a74a1d9731d2e96e0157691a6e0ff288bb33a (commit) via 90af2dd443c943303b8ae2c9600a1b823ab723c8 (commit) via 0df06f6e3610d0f5bac5c7ef163d9788b84d2c6e (commit) via 13981f7d6b521192a1814fb6409e617177b393af (commit) via 0c5075da4f448c3753e92669165e9a3d0e4fbde5 (commit) via 3d9183251d9083d339d2baac94e80b170a365552 (commit) via 61589c02b281b5f108932e63910b59b747850f0e (commit) via d0b10e1fc7fd15f6cdc1a2200c1a415b503a4045 (commit) via deb6f8f7243decf3aac875bd1b26327b4f2f0742 (commit) via 91894814f1ca20f3d74eca030ccd59345d30610a (commit) via 1b65b9118fad2a8b18db14df37e6b223323a3086 (commit) via 7cb7d69836ecaa3a29f096fce7787edf27f98652 (commit) via 2f7d7a1756243732f9f574a0d19dbbafcfc22cde (commit) via 88b72263d72f07aabc1cad8f864839cc0f1fdcfa (commit) via 27de1154c2ef5c656a24ee921eef678f523fac39 (commit) via 6c2e62aa2d8da10d6c4fba3791bddaaf7e3e93b9 (commit) via 0a67041c81727ba2ac565284ae87bd023f9ad574 (commit) via 32173500e22c4098f9ce94dcc036c1752948a137 (commit) via 75d0809e028318012229c42b4276e34e8c5e51a4 (commit) via 7eddbb5a176bc4f457cc32849f864a2fed033c23 (commit) via 9ded827505c2436c662cba4c5f028b7c1f1e8320 (commit) via 067b5549405338717f6da0226238bd65506d6141 (commit) via 0db0361306996f96b21fee67d8448d294ce80062 (commit) via faa7446e9a3d0938a248c4bc0be223c361421e33 (commit) via 98c8dc3143e512e7d8fdf906a1dc5d5424647453 (commit) via f1cead43abe343afaadb8cdff6293aa5282b69eb (commit) via 5ce8586e085ddf2bd5a934f17fa760f1c4321a00 (commit) via 1971b24a27263c21643fba996678c766cc7e8a4d (commit) via b002a0666b720ec97e895f43e756d0a84ef123e8 (commit) via 405fda9494443046a1c8cefc139c071501394cc2 (commit) via 01d709b34449467dd23c9edd544146564eb78ff0 (commit) via e55e5701fed3faf659cb290d8a74aea291290e88 (commit) via 27232d540123d2849315143fd95f288758edcdd0 (commit) via 039b27dc7a6f8e40508c17786700fc698ab5308d (commit) via 3e7eeb51c6219f62b780eb00f888c743189f6149 (commit) via df9548f6e3bf62a198e18036d8facea52deec30e (commit) via 10db0bda7662408cdcb1444d0cb9fa78a41e0bb3 (commit) via a4b7cb52b12ddf21d933e1155be42481b497c96d (commit) via 60c6132831d3154275e705a93adfad542333ec96 (commit) via e0b16a162a38293eaa4378fb3cd5f8477ee6ebfb (commit) via 3702f97189df7d6dc44a2e75552566ce28eb0f6a (commit) via 4d5b725c4fbbdedfa4ecbd0ee8c1739fb0820505 (commit) via c27e4c79799a1b19f3f932f32d99ef11b1132138 (commit) via e058fad5e1d4a5552d1a95af2df091b7c7e6c56a (commit) via 8e7d41610e488a6199b5a495c5f8c95fab81bd71 (commit) via 5dc54d025303a84d00c4463cb9a320d334374550 (commit) via 8912dd777a18fba302e7144776438006c262a326 (commit) via 4210bcf48507dac743da74733e2d4c7fad3dff0e (commit) via 3b42d9d373eef229d25c5aaa2b8d77414f20d476 (commit) via d228def368651be762ba596724c5633ec5da58fe (commit) via b9b4404df4c920ac8dc8012483b3b91a0c00a2c2 (commit) via 8cf49e54e3cff9df2f91d6adb7afca2ac60be283 (commit) via d88dd3b6cb0105855f79daff5607f41d2e959da5 (commit) via 6ba7c1485dc7e7f81134420b4ecfc60b5a214922 (commit) via aba273dd59d31481ca730f365e28c2f1da5647f8 (commit) via 1d4ab3a301a5290d9326807db59480b0bc8464da (commit) via 16a5ad1f2b683eccc3e8cc63fa347da9467ca926 (commit) via 828e354f7b83e2a206234acff808f11c0b3660c2 (commit) via 6f244f622d026a7877f6a61b63b2d4f4feb66290 (commit) via b81427dbbf0035e17112b17dae21a82b93493559 (commit) via 9b6750328df775d9955738038bb04dd305bf4c90 (commit) via 331c86231682ed12597dbe6445a9d75d6b749ba9 (commit) via 6d0fa8a2445f4939365f41944d3d8bd14dbee0b6 (commit) via b83a9ca751211f8e01cb9c858a42c03814485ede (commit) via 56a33f05ae31146eba4db1b94b79c2fc6eecf5a6 (commit) via 95c3e830c0501627da2e6608939bc8cfa6213d18 (commit) via 18db9541e7bddd1af6f9b20b1fa74629182aba11 (commit) via 86ffda67dce367312e85184567646d04cfdf6a36 (commit) via 6ff8af84e847bfd89b52741d1c9a98c7cca04a7d (commit) via fe66ad931af14f21706bdd1aa8006c3ce67c5dd1 (commit) via 4376c4adb13e8764b43d5a2a4d0cc02c94964893 (commit) via 7c9e0ca3747d90538275ce8478806f0b8f274144 (commit) via c9e6b92e5cd0fee2de76d0d66f965d72154a3e17 (commit) via accd77a02676d681e9d88c642e32b2f2fc2ab8e0 (commit) via 1e7473e30c68f4932e960561bbfb1122e7a5f07a (commit) via 2f21a6594964dcb4525c7f6a9938c753d127e5cb (commit) via 908ebf5eb6af572ef248293022a195a8c2a46d7a (commit) via 305983be1fbca0972ed0a4a57060ef6f11100f16 (commit) via 0738310cbd343aaa851a7d5c908282455bb6d7a7 (commit) via fa2a2597c2040c45cb69fecaada795e083bac725 (commit) via ed838667925d080646931200e3d7b2233da7fca3 (commit) via 2b3dd06429944a6f5be895935a5a229bcb5f324e (commit) via bc7cfb4b3a3746f2415d49c355ca7920a30d69e1 (commit) via 01a6e148a2b73bc5bbf9f09258a542375911dca3 (commit) via 311704607137a247b64e351a49c91c31609f2249 (commit) via c6cb5a5996d7413ecdf6e87cdfb91559bc7490c9 (commit) via 2e75b652e2ffe76ebd75fb2245da7d4ecfe47d54 (commit) via 8518010c97c5545383e060f121f0fe44a019b77a (commit) via 32cb70b8d99d39b3c7d5c5ff3b666081aec22979 (commit) via 3119ec828930cc172882a19d5e5f835dfb36c936 (commit) via 1cdd8f3c2f5c82e880a943c56e79701078278d63 (commit) via 9ea5e92291ff08824ea02a10c6ebbbf7b48e705e (commit) via 77be9ff388f57200bf4fd3f777cbfc46e8bcae41 (commit) via 1ab07c7f31b3a1088b2f3e13a9287adde8ef9d53 (commit) via 3f5e17f17e71a01b62d9b9537c67092257a94d79 (commit) via 215abb745533077bb139784a183562fa103118e6 (commit) via 9a0dcf9a93241b160ab548c0611928f19e0af17d (commit) from cbca7757387adb91e77a61c3bf673b3d0692d482 (commit) - Log ----------------------------------------------------------------- commit a4305a2672789deebba9d21a887796be47f31542 Merge: cbca775 ad4b382 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Aug 17 08:31:08 2011 +0200 Merge remote-tracking branch 'pootle/master' Conflicts: po/es.po po/ja.po po/sl.po po/tr.po commit ad4b3828297ed00c6612aa72113e5d373dd4d284 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 17 02:56:22 2011 +0200 Translation update done using Pootle. commit 3f0fdbee7b83b6411556b1ad9a8cc78eee2115bc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 17 02:41:54 2011 +0200 Translation update done using Pootle. commit 8f8c6932bf0fd5d843a931bb0249acca70d62466 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:58:51 2011 +0200 Translation update done using Pootle. commit 3d4b6b982b793472522bfce456da58b004d69ed5 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:58:45 2011 +0200 Translation update done using Pootle. commit 6629eb4cfe264829baca888fd40d3bf8bc6030dd Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:58:33 2011 +0200 Translation update done using Pootle. commit 6d67555456b9b23ac0c5fa3e61df4c94e45ddc2b Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:58:17 2011 +0200 Translation update done using Pootle. commit 583e481c54de26f2d0c6c76ee627186cc84ec1df Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:58:03 2011 +0200 Translation update done using Pootle. commit e1ccbf11bda3626851ee157a0ba70c081dc0ee61 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:57:55 2011 +0200 Translation update done using Pootle. commit e94ac25f7cc391ac5f34236450dbac20da7a732a Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:57:29 2011 +0200 Translation update done using Pootle. commit fe272df4fedfe64a65ff80b5705283337c0833c4 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:57:02 2011 +0200 Translation update done using Pootle. commit ab694b536101602b2590e0a227dae9e6f03564c6 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:56:52 2011 +0200 Translation update done using Pootle. commit 97363bef3e01f25acdb17f0500d99b63d34d2bf1 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:56:44 2011 +0200 Translation update done using Pootle. commit 7738694aed083b9624dda21f97d64453fbb9c18b Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:56:22 2011 +0200 Translation update done using Pootle. commit 9278bfe13cf74aee0409db846537287e08da04cc Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:56:03 2011 +0200 Translation update done using Pootle. commit a8e85b33987248cd42a0c0404a04870a45e567ab Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:55:52 2011 +0200 Translation update done using Pootle. commit 89233cb18fdedf91bd1f64da984c647bea4a629b Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:55:41 2011 +0200 Translation update done using Pootle. commit 26c5bd7ed005014ed2e1af87631a7fa4a8d2933b Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:55:32 2011 +0200 Translation update done using Pootle. commit 824fc366143ff9335fcec56bbb44ed9c0177420c Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:55:22 2011 +0200 Translation update done using Pootle. commit 180b46c5287ec8afa70d86dec3d5f2493ae937c1 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:54:57 2011 +0200 Translation update done using Pootle. commit 45990fb8583fbf22f07cf433421820af0620dfee Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:54:44 2011 +0200 Translation update done using Pootle. commit 948b73df9fec2687f118681512a42e9e6b70efbf Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:54:35 2011 +0200 Translation update done using Pootle. commit 513507ed4956b77b6e1bcd657e68fdced9908c90 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:54:02 2011 +0200 Translation update done using Pootle. commit 9493b87d59cea7585be976f15f9a6654e8ec4c2b Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:53:45 2011 +0200 Translation update done using Pootle. commit 4006a9eab7876a35dce996ac79cb7fa5002043db Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:53:31 2011 +0200 Translation update done using Pootle. commit 13dd17f84b7b1bbd5ce4ce4de68d9692546c9e1b Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:53:23 2011 +0200 Translation update done using Pootle. commit 6b23ab956be20880c52186268d47149e42d57497 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:52:49 2011 +0200 Translation update done using Pootle. commit f7525485e395a4ec1ccd349986f64d5ceff50747 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:52:32 2011 +0200 Translation update done using Pootle. commit 875e0af4f723ea5f4af88c3799f75bf191389833 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:52:27 2011 +0200 Translation update done using Pootle. commit 4f3adc13ee50d751b12b7e1c49fa0268a408916b Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:52:02 2011 +0200 Translation update done using Pootle. commit badce6b613cd659ab5f7dd479b7b4626adee936c Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:51:20 2011 +0200 Translation update done using Pootle. commit 8fe866e9d85d69cb8008311647fc133797f31eb0 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:40:07 2011 +0200 Translation update done using Pootle. commit 7b02db860e0399ed27cdb7606ab3e41360539b00 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:39:02 2011 +0200 Translation update done using Pootle. commit b0922b58ae313272d2f7d36b941792bbdbce017e Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:38:53 2011 +0200 Translation update done using Pootle. commit e8254a2932113a3628a9f172697d04bdb88bf938 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:38:38 2011 +0200 Translation update done using Pootle. commit fff29c89b623a8566345e31e18f27f6571ef2865 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:38:20 2011 +0200 Translation update done using Pootle. commit d1f63483a546d6d6b23d71fd800ab112f893b618 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:37:55 2011 +0200 Translation update done using Pootle. commit 81d2207215ddf5f5bde7199d180e6f59b8bb1579 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:37:38 2011 +0200 Translation update done using Pootle. commit 4f15a261a6f865264128c3a9ff1abdda31f6b194 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:37:20 2011 +0200 Translation update done using Pootle. commit f4755f3e7dc7f0168a0ea867674dc729bf4d276f Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:36:30 2011 +0200 Translation update done using Pootle. commit 981a292839821af7244133a6818a019d175ed873 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:36:07 2011 +0200 Translation update done using Pootle. commit c6d27e6e342917542893df1c1bbaa339c32aa012 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:35:58 2011 +0200 Translation update done using Pootle. commit b65916775cce961cb50bec869a543dd38df9fc1e Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:35:34 2011 +0200 Translation update done using Pootle. commit 592e6021b07502579d2c25e6eba3491b1f1aa29f Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:34:27 2011 +0200 Translation update done using Pootle. commit 10569a165b4cbd2e28d9987977adac53f1c0b955 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:33:59 2011 +0200 Translation update done using Pootle. commit 364487023ec7ebf1ab9bb9a97454d9a784639956 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:33:48 2011 +0200 Translation update done using Pootle. commit b1764e27b97bcff7c4661a2fc5dc257ee03ebad5 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:33:35 2011 +0200 Translation update done using Pootle. commit a112d3f1560a1fc319ca861ed254a00605d9b532 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:33:27 2011 +0200 Translation update done using Pootle. commit 8d10579dae62ee4a4ff4d02b91079c28e19b9a1d Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:33:17 2011 +0200 Translation update done using Pootle. commit c77ad3db179b41124f3d002956fc939101e4c324 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:33:12 2011 +0200 Translation update done using Pootle. commit d8f469a1d24b1388af013ff1de1bddcee851abf3 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:32:45 2011 +0200 Translation update done using Pootle. commit 2fbfbdeb7bf2d16ade3a749eafe898007e00b56a Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:32:16 2011 +0200 Translation update done using Pootle. commit 699acc288338f6300b582900f37685ee06bd9687 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:31:59 2011 +0200 Translation update done using Pootle. commit 9a4e7b5f37df4238a0d0e06a0fbfdac31097b486 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:31:38 2011 +0200 Translation update done using Pootle. commit 10399e1e56b51de190b6887809c57e3dba565e7b Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:31:15 2011 +0200 Translation update done using Pootle. commit c70565e97b79ae9bfd3b041f49e200e3f4d7d9ac Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:30:58 2011 +0200 Translation update done using Pootle. commit fb43dd48f398979cc40fddb7714c5534015ceb38 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:30:37 2011 +0200 Translation update done using Pootle. commit 640b339478ca2201b5ddf477d12eb38945be1897 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:30:15 2011 +0200 Translation update done using Pootle. commit 8dc7d2ce23cdd1e87cc0a9f7c5385c847ca9dd0a Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:29:59 2011 +0200 Translation update done using Pootle. commit da0357ae2d812216eec7baf6a589a15deccfbb96 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:29:33 2011 +0200 Translation update done using Pootle. commit 4bc5b57786a1b66aa5a2a3409b5b8945ef05118b Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:28:51 2011 +0200 Translation update done using Pootle. commit fd173026ac8187df4451dc75515cc7c9b3c42811 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:28:35 2011 +0200 Translation update done using Pootle. commit 3111ff84ba0a7bd3b1745fd2bdfb88ac4cd84bf3 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:28:09 2011 +0200 Translation update done using Pootle. commit f4da63e8ab1fd6aff8ea0fcd88cada4e2f46b6bb Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:27:52 2011 +0200 Translation update done using Pootle. commit 258b4ed6a52a6d6ed7bfdc62a077d554a4495fe3 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:27:31 2011 +0200 Translation update done using Pootle. commit aa99dce914d4e0d8a480db0f219ed7329a2e385f Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:27:11 2011 +0200 Translation update done using Pootle. commit 233e9df0bafb630aac420c9e2e88c95213603005 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:26:43 2011 +0200 Translation update done using Pootle. commit 444019322060501f77b7dca689cd73329d186a6c Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:26:06 2011 +0200 Translation update done using Pootle. commit 3baed4d9931b7ea0be83abb2b493ef62367fb6d8 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:25:42 2011 +0200 Translation update done using Pootle. commit a009f45c84021cfbcb8022277976c3c2acad9439 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:25:06 2011 +0200 Translation update done using Pootle. commit 138218d58eaa56ab04409803388da0b84c541a11 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:24:57 2011 +0200 Translation update done using Pootle. commit c70138eebf938e0155bcf5d257a5018369bb5534 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:24:39 2011 +0200 Translation update done using Pootle. commit a12b48badbf4290a3f58166659a1884055e73d15 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:23:52 2011 +0200 Translation update done using Pootle. commit d25b22500021a55d11599e6b8864633cecf7aae0 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:23:37 2011 +0200 Translation update done using Pootle. commit 05e970b07054252b102879b749fed2690100b381 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:23:18 2011 +0200 Translation update done using Pootle. commit 8b5c1b0c4cba6d4b5277c2a70d468529f8a64f1b Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:22:41 2011 +0200 Translation update done using Pootle. commit 375cde1db364e8184a72e881138974d79b40a8d4 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:22:17 2011 +0200 Translation update done using Pootle. commit 5cb36b1c71799533956ea25b6b7bb554a7dcd17f Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:22:09 2011 +0200 Translation update done using Pootle. commit 477efbde024f755c1d089fb112a0db9235a03ac3 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:22:00 2011 +0200 Translation update done using Pootle. commit 60068cbeacdd9638f60cffda856e199f51d3ddd3 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:21:41 2011 +0200 Translation update done using Pootle. commit d5e3a000549464d9b107814e22e0c00a249115a2 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:21:22 2011 +0200 Translation update done using Pootle. commit 4c547a47d83a37b01b66b981e21814baed314ed3 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:21:08 2011 +0200 Translation update done using Pootle. commit 351c2ba207a26870f60a32cff6c1fe3f934903d3 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:20:23 2011 +0200 Translation update done using Pootle. commit 558da46504f00a9b38e80d26bb8a8aeac5424ee3 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:19:22 2011 +0200 Translation update done using Pootle. commit 20ea0a91305917620576803264d6fc0fadc0bbc7 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:19:10 2011 +0200 Translation update done using Pootle. commit 9c6072a19d0778d6643e5ec32a203e83febec398 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:18:49 2011 +0200 Translation update done using Pootle. commit 7bca0216e3f50b9f1bc1ec66844969691a66ad70 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:18:36 2011 +0200 Translation update done using Pootle. commit 7be8a6e0c573514252c47577c0d723fffbad7123 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:18:06 2011 +0200 Translation update done using Pootle. commit fced0c7f7e8e94c2a804b0388d07c95e45db8c7c Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:17:50 2011 +0200 Translation update done using Pootle. commit 77f7230505266458759b30a55ebcc3816d7358f7 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:17:37 2011 +0200 Translation update done using Pootle. commit 3b85c80a40d71965cbd3e40dbcf640418bfedb74 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:17:31 2011 +0200 Translation update done using Pootle. commit 2a0ec259adbecdd5e65b04ee3543f079abc44b05 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:16:52 2011 +0200 Translation update done using Pootle. commit 27f313d08c212cfff3ba6ebca3a655a4867f9467 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:16:29 2011 +0200 Translation update done using Pootle. commit 45921f47d4c68bc310d2c212507270c610a1319d Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:16:18 2011 +0200 Translation update done using Pootle. commit f3da67b16f8861876944dff1036d78742f7eb384 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:16:05 2011 +0200 Translation update done using Pootle. commit acc4c251cd7480aee502af56aeb56aec9b824857 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:15:46 2011 +0200 Translation update done using Pootle. commit d4e95defeaac9f81ab670e0d73438d83a3a2f1ae Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:15:18 2011 +0200 Translation update done using Pootle. commit db119c6ad7299544886309dffdab1a54451c6460 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:14:45 2011 +0200 Translation update done using Pootle. commit a015cb73124021b59e768ca987b37c648692b85f Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:14:13 2011 +0200 Translation update done using Pootle. commit 412788085a820ae66d7ae12e9cd65298343e29ff Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:13:45 2011 +0200 Translation update done using Pootle. commit 4bc3589e8f86214d219cc93194f1b786e67f77cb Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:13:19 2011 +0200 Translation update done using Pootle. commit 30a88ea515e8615bdb5446e5269cbc01736082f3 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:13:06 2011 +0200 Translation update done using Pootle. commit de6e79f277c15196d4e33d2c36d26b90c8cf3276 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:13:01 2011 +0200 Translation update done using Pootle. commit 993a74a1d9731d2e96e0157691a6e0ff288bb33a Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:12:47 2011 +0200 Translation update done using Pootle. commit 90af2dd443c943303b8ae2c9600a1b823ab723c8 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:11:54 2011 +0200 Translation update done using Pootle. commit 0df06f6e3610d0f5bac5c7ef163d9788b84d2c6e Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:11:48 2011 +0200 Translation update done using Pootle. commit 13981f7d6b521192a1814fb6409e617177b393af Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:11:19 2011 +0200 Translation update done using Pootle. commit 0c5075da4f448c3753e92669165e9a3d0e4fbde5 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:11:09 2011 +0200 Translation update done using Pootle. commit 3d9183251d9083d339d2baac94e80b170a365552 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:10:56 2011 +0200 Translation update done using Pootle. commit 61589c02b281b5f108932e63910b59b747850f0e Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:10:46 2011 +0200 Translation update done using Pootle. commit d0b10e1fc7fd15f6cdc1a2200c1a415b503a4045 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:10:38 2011 +0200 Translation update done using Pootle. commit deb6f8f7243decf3aac875bd1b26327b4f2f0742 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:09:58 2011 +0200 Translation update done using Pootle. commit 91894814f1ca20f3d74eca030ccd59345d30610a Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:09:12 2011 +0200 Translation update done using Pootle. commit 1b65b9118fad2a8b18db14df37e6b223323a3086 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:08:35 2011 +0200 Translation update done using Pootle. commit 7cb7d69836ecaa3a29f096fce7787edf27f98652 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:08:24 2011 +0200 Translation update done using Pootle. commit 2f7d7a1756243732f9f574a0d19dbbafcfc22cde Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:06:29 2011 +0200 Translation update done using Pootle. commit 88b72263d72f07aabc1cad8f864839cc0f1fdcfa Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:06:17 2011 +0200 Translation update done using Pootle. commit 27de1154c2ef5c656a24ee921eef678f523fac39 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:05:41 2011 +0200 Translation update done using Pootle. commit 6c2e62aa2d8da10d6c4fba3791bddaaf7e3e93b9 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:05:16 2011 +0200 Translation update done using Pootle. commit 0a67041c81727ba2ac565284ae87bd023f9ad574 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:05:11 2011 +0200 Translation update done using Pootle. commit 32173500e22c4098f9ce94dcc036c1752948a137 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:04:29 2011 +0200 Translation update done using Pootle. commit 75d0809e028318012229c42b4276e34e8c5e51a4 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:04:05 2011 +0200 Translation update done using Pootle. commit 7eddbb5a176bc4f457cc32849f864a2fed033c23 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:03:54 2011 +0200 Translation update done using Pootle. commit 9ded827505c2436c662cba4c5f028b7c1f1e8320 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:03:34 2011 +0200 Translation update done using Pootle. commit 067b5549405338717f6da0226238bd65506d6141 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:03:16 2011 +0200 Translation update done using Pootle. commit 0db0361306996f96b21fee67d8448d294ce80062 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:02:46 2011 +0200 Translation update done using Pootle. commit faa7446e9a3d0938a248c4bc0be223c361421e33 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:02:04 2011 +0200 Translation update done using Pootle. commit 98c8dc3143e512e7d8fdf906a1dc5d5424647453 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:01:16 2011 +0200 Translation update done using Pootle. commit f1cead43abe343afaadb8cdff6293aa5282b69eb Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 22:01:00 2011 +0200 Translation update done using Pootle. commit 5ce8586e085ddf2bd5a934f17fa760f1c4321a00 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:59:45 2011 +0200 Translation update done using Pootle. commit 1971b24a27263c21643fba996678c766cc7e8a4d Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:59:37 2011 +0200 Translation update done using Pootle. commit b002a0666b720ec97e895f43e756d0a84ef123e8 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:59:17 2011 +0200 Translation update done using Pootle. commit 405fda9494443046a1c8cefc139c071501394cc2 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:58:09 2011 +0200 Translation update done using Pootle. commit 01d709b34449467dd23c9edd544146564eb78ff0 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:57:27 2011 +0200 Translation update done using Pootle. commit e55e5701fed3faf659cb290d8a74aea291290e88 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:57:23 2011 +0200 Translation update done using Pootle. commit 27232d540123d2849315143fd95f288758edcdd0 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:56:33 2011 +0200 Translation update done using Pootle. commit 039b27dc7a6f8e40508c17786700fc698ab5308d Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:56:21 2011 +0200 Translation update done using Pootle. commit 3e7eeb51c6219f62b780eb00f888c743189f6149 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:56:01 2011 +0200 Translation update done using Pootle. commit df9548f6e3bf62a198e18036d8facea52deec30e Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:55:36 2011 +0200 Translation update done using Pootle. commit 10db0bda7662408cdcb1444d0cb9fa78a41e0bb3 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:55:23 2011 +0200 Translation update done using Pootle. commit a4b7cb52b12ddf21d933e1155be42481b497c96d Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:54:39 2011 +0200 Translation update done using Pootle. commit 60c6132831d3154275e705a93adfad542333ec96 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:54:17 2011 +0200 Translation update done using Pootle. commit e0b16a162a38293eaa4378fb3cd5f8477ee6ebfb Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:53:43 2011 +0200 Translation update done using Pootle. commit 3702f97189df7d6dc44a2e75552566ce28eb0f6a Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:53:01 2011 +0200 Translation update done using Pootle. commit 4d5b725c4fbbdedfa4ecbd0ee8c1739fb0820505 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:51:26 2011 +0200 Translation update done using Pootle. commit c27e4c79799a1b19f3f932f32d99ef11b1132138 Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:51:10 2011 +0200 Translation update done using Pootle. commit e058fad5e1d4a5552d1a95af2df091b7c7e6c56a Author: Domen <dbc334(a)gmail.com> Date: Tue Aug 16 21:51:03 2011 +0200 Translation update done using Pootle. commit 8e7d41610e488a6199b5a495c5f8c95fab81bd71 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:46:37 2011 +0200 Translation update done using Pootle. commit 5dc54d025303a84d00c4463cb9a320d334374550 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:46:10 2011 +0200 Translation update done using Pootle. commit 8912dd777a18fba302e7144776438006c262a326 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:44:58 2011 +0200 Translation update done using Pootle. commit 4210bcf48507dac743da74733e2d4c7fad3dff0e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:40:37 2011 +0200 Translation update done using Pootle. commit 3b42d9d373eef229d25c5aaa2b8d77414f20d476 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:40:17 2011 +0200 Translation update done using Pootle. commit d228def368651be762ba596724c5633ec5da58fe Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:40:13 2011 +0200 Translation update done using Pootle. commit b9b4404df4c920ac8dc8012483b3b91a0c00a2c2 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:40:00 2011 +0200 Translation update done using Pootle. commit 8cf49e54e3cff9df2f91d6adb7afca2ac60be283 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:39:10 2011 +0200 Translation update done using Pootle. commit d88dd3b6cb0105855f79daff5607f41d2e959da5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:37:42 2011 +0200 Translation update done using Pootle. commit 6ba7c1485dc7e7f81134420b4ecfc60b5a214922 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:37:15 2011 +0200 Translation update done using Pootle. commit aba273dd59d31481ca730f365e28c2f1da5647f8 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:37:07 2011 +0200 Translation update done using Pootle. commit 1d4ab3a301a5290d9326807db59480b0bc8464da Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:36:35 2011 +0200 Translation update done using Pootle. commit 16a5ad1f2b683eccc3e8cc63fa347da9467ca926 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:36:18 2011 +0200 Translation update done using Pootle. commit 828e354f7b83e2a206234acff808f11c0b3660c2 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:35:20 2011 +0200 Translation update done using Pootle. commit 6f244f622d026a7877f6a61b63b2d4f4feb66290 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:33:57 2011 +0200 Translation update done using Pootle. commit b81427dbbf0035e17112b17dae21a82b93493559 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:33:25 2011 +0200 Translation update done using Pootle. commit 9b6750328df775d9955738038bb04dd305bf4c90 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:32:26 2011 +0200 Translation update done using Pootle. commit 331c86231682ed12597dbe6445a9d75d6b749ba9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:31:43 2011 +0200 Translation update done using Pootle. commit 6d0fa8a2445f4939365f41944d3d8bd14dbee0b6 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:31:16 2011 +0200 Translation update done using Pootle. commit b83a9ca751211f8e01cb9c858a42c03814485ede Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:29:47 2011 +0200 Translation update done using Pootle. commit 56a33f05ae31146eba4db1b94b79c2fc6eecf5a6 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:29:25 2011 +0200 Translation update done using Pootle. commit 95c3e830c0501627da2e6608939bc8cfa6213d18 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:29:16 2011 +0200 Translation update done using Pootle. commit 18db9541e7bddd1af6f9b20b1fa74629182aba11 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:29:04 2011 +0200 Translation update done using Pootle. commit 86ffda67dce367312e85184567646d04cfdf6a36 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:27:39 2011 +0200 Translation update done using Pootle. commit 6ff8af84e847bfd89b52741d1c9a98c7cca04a7d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:27:21 2011 +0200 Translation update done using Pootle. commit fe66ad931af14f21706bdd1aa8006c3ce67c5dd1 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:27:11 2011 +0200 Translation update done using Pootle. commit 4376c4adb13e8764b43d5a2a4d0cc02c94964893 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:25:22 2011 +0200 Translation update done using Pootle. commit 7c9e0ca3747d90538275ce8478806f0b8f274144 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:23:57 2011 +0200 Translation update done using Pootle. commit c9e6b92e5cd0fee2de76d0d66f965d72154a3e17 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:23:23 2011 +0200 Translation update done using Pootle. commit accd77a02676d681e9d88c642e32b2f2fc2ab8e0 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:22:46 2011 +0200 Translation update done using Pootle. commit 1e7473e30c68f4932e960561bbfb1122e7a5f07a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:22:37 2011 +0200 Translation update done using Pootle. commit 2f21a6594964dcb4525c7f6a9938c753d127e5cb Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:21:22 2011 +0200 Translation update done using Pootle. commit 908ebf5eb6af572ef248293022a195a8c2a46d7a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:20:38 2011 +0200 Translation update done using Pootle. commit 305983be1fbca0972ed0a4a57060ef6f11100f16 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:20:19 2011 +0200 Translation update done using Pootle. commit 0738310cbd343aaa851a7d5c908282455bb6d7a7 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:20:00 2011 +0200 Translation update done using Pootle. commit fa2a2597c2040c45cb69fecaada795e083bac725 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:19:52 2011 +0200 Translation update done using Pootle. commit ed838667925d080646931200e3d7b2233da7fca3 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:19:28 2011 +0200 Translation update done using Pootle. commit 2b3dd06429944a6f5be895935a5a229bcb5f324e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:19:24 2011 +0200 Translation update done using Pootle. commit bc7cfb4b3a3746f2415d49c355ca7920a30d69e1 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:18:44 2011 +0200 Translation update done using Pootle. commit 01a6e148a2b73bc5bbf9f09258a542375911dca3 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:16:48 2011 +0200 Translation update done using Pootle. commit 311704607137a247b64e351a49c91c31609f2249 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:16:41 2011 +0200 Translation update done using Pootle. commit c6cb5a5996d7413ecdf6e87cdfb91559bc7490c9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:16:33 2011 +0200 Translation update done using Pootle. commit 2e75b652e2ffe76ebd75fb2245da7d4ecfe47d54 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:16:00 2011 +0200 Translation update done using Pootle. commit 8518010c97c5545383e060f121f0fe44a019b77a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:15:51 2011 +0200 Translation update done using Pootle. commit 32cb70b8d99d39b3c7d5c5ff3b666081aec22979 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:15:14 2011 +0200 Translation update done using Pootle. commit 3119ec828930cc172882a19d5e5f835dfb36c936 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:15:02 2011 +0200 Translation update done using Pootle. commit 1cdd8f3c2f5c82e880a943c56e79701078278d63 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:14:30 2011 +0200 Translation update done using Pootle. commit 9ea5e92291ff08824ea02a10c6ebbbf7b48e705e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:13:41 2011 +0200 Translation update done using Pootle. commit 77be9ff388f57200bf4fd3f777cbfc46e8bcae41 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:13:29 2011 +0200 Translation update done using Pootle. commit 1ab07c7f31b3a1088b2f3e13a9287adde8ef9d53 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:13:21 2011 +0200 Translation update done using Pootle. commit 3f5e17f17e71a01b62d9b9537c67092257a94d79 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:13:09 2011 +0200 Translation update done using Pootle. commit 215abb745533077bb139784a183562fa103118e6 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Aug 16 21:12:29 2011 +0200 Translation update done using Pootle. commit 9a0dcf9a93241b160ab548c0611928f19e0af17d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 16:49:32 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 127 +++++++++++++------- po/ja.po | 6 +- po/sl.po | 417 +++++++++++++++++++++++++++----------------------------------- po/tr.po | 4 +- 4 files changed, 277 insertions(+), 277 deletions(-) diff --git a/po/es.po b/po/es.po index f163eff..4c9b205 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-08-16 19:11+0200\n" -"PO-Revision-Date: 2011-08-16 00:04+0200\n" +"PO-Revision-Date: 2011-08-16 21:46+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" "Language: es\n" @@ -10468,10 +10468,9 @@ msgstr "" "que ya no se necesite monitorizar. " #: server_status.php:1533 -#, fuzzy #| msgid "Remove chart" msgid "Preset chart" -msgstr "Eliminar gráfico" +msgstr "Gráfico predefinido" #: server_status.php:1537 msgid "Status variable(s)" @@ -11872,92 +11871,96 @@ msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." msgstr "" +"Se sugiere configurar «long_query_time» a un valor menor dependiendo de su " +"entorno. Usualmente, un valor entre 1 y 5 segundos es el sugerido." #: po/advisory_rules.php:28 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "long_query_time is currently set to %ds." -msgstr "«long_query_time» está configurado a %d segundo(s)." +msgstr "«long_query_time» está configurado a %ds." #: po/advisory_rules.php:30 -#, fuzzy #| msgid "Show query box" msgid "Slow query logging" -msgstr "Mostrar ventana de consultas SQL" +msgstr "Registros de consultas lentas" #: po/advisory_rules.php:31 -#, fuzzy #| msgid "slow_query_log is enabled." msgid "The slow query log is disabled." -msgstr "«slow_query_log» activo." +msgstr "El registro de consultas lentas está desactivado." #: po/advisory_rules.php:32 msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"Active el registro de consultas lenta configurando «log_slow_queries» a " +"'ON'. Esto ayudará a analizar consultas con mala performance." #: po/advisory_rules.php:33 msgid "log_slow_queries is set to 'OFF'" -msgstr "" +msgstr "«slow_query_log» está definido como 'OFF'" #: po/advisory_rules.php:35 -#, fuzzy #| msgid "Clear series" msgid "Release Series" -msgstr "Vaciar serie" +msgstr "Serie de versiones" #: po/advisory_rules.php:36 msgid "The MySQL server version less then 5.1." -msgstr "" +msgstr "La versión del servidor MySQL es menor a 5.1." #: po/advisory_rules.php:37 msgid "" "You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 " "even more so." msgstr "" +"Debería actualizar ya que MySQL 5.1 tiene mejor performance, y ésta es aún " +"mejor en MySQL 5.5." #: po/advisory_rules.php:38 po/advisory_rules.php:43 po/advisory_rules.php:48 -#, fuzzy, php-format +#, php-format #| msgid "Create version" msgid "Current version: %s" -msgstr "Crear versión" +msgstr "Versión actual: %s" #: po/advisory_rules.php:40 po/advisory_rules.php:45 -#, fuzzy #| msgid "Version" msgid "Minor Version" -msgstr "Versión" +msgstr "Versión menor:" #: po/advisory_rules.php:41 msgid "Version less than 5.1.30 (the first GA release of 5.1)." msgstr "" +"Versión menor a 5.1.30 (la primer versión de 5.1 disponible públicamente)." #: po/advisory_rules.php:42 msgid "" "You should upgrade, as recent versions of MySQL 5.1 have improved " "performance and MySQL 5.5 even more so." msgstr "" +"Debería actualizar ya que versiones más recientes de MySQL 5.1 tienen mejor " +"performance, y ésta es aún mejor en MySQL 5.5." #: po/advisory_rules.php:46 msgid "Version less than 5.5.8 (the first GA release of 5.5)." msgstr "" +"Versión menor a 5.5.8 (la primer versión de 5.5 disponible públicamente)." #: po/advisory_rules.php:47 -#, fuzzy #| msgid "You should upgrade to %s %s or later." msgid "You should upgrade, to a stable version of MySQL 5.5" -msgstr "Usted debería actualizar su %s a la versión %s o más reciente." +msgstr "Debería actualizar a una versión estable de MySQL 5.5" #: po/advisory_rules.php:50 po/advisory_rules.php:55 -#, fuzzy #| msgid "Description" msgid "Distribution" -msgstr "Descripción" +msgstr "Distribución" #: po/advisory_rules.php:51 msgid "Version is compiled from source, not a MySQL official binary." -msgstr "" +msgstr "Versión compilada de código fuente, no un ejecutable MySQL oficial." #: po/advisory_rules.php:52 msgid "" @@ -11965,32 +11968,40 @@ msgid "" "distribution. The MySQL manual only is accurate for official MySQL binaries, " "not any package distributions (such as RedHat, Debian/Ubuntu etc)." msgstr "" +"Si no compiló de código fuente puede estar utilizando un paquete modificado " +"por una distribución. El manual MySQL sólo es preciso para los ejecutables " +"MySQL oficiales, no para los paquetes de las distribuciones (como RedHat, " +"Debian/Ubuntu, etc.)." #: po/advisory_rules.php:53 msgid "'source' found in version_comment" msgstr "" +"se encontró 'fuente' («source») en el comentario de la versión " +"(«version_comment»)" #: po/advisory_rules.php:56 msgid "The MySQL manual only is accurate for official MySQL binaries." -msgstr "" +msgstr "El manual MySQL sólo es preciso para los ejecutables MySQL oficiales." #: po/advisory_rules.php:57 msgid "Percona documentation is at http://www.percona.com/docs/wiki/" msgstr "" +"La documentación de Percona se encuentra en " +"http://www.percona.com/docs/wiki/" #: po/advisory_rules.php:58 msgid "'percona' found in version_comment" msgstr "" +"se encontró 'percona' en el comentario de la versión («version_comment»)" #: po/advisory_rules.php:60 -#, fuzzy #| msgid "MySQL charset" msgid "MySQL Architecture" -msgstr "Juegos de caracteres de MySQL" +msgstr "Arquitectura MySQL" #: po/advisory_rules.php:61 msgid "MySQL is not compiled as a 64-bit package." -msgstr "" +msgstr "MySQL no fue compilado como un paquete de 64-bits." #: po/advisory_rules.php:62 msgid "" @@ -11998,23 +12009,25 @@ msgid "" "so MySQL might not be able to access all of your memory. You might want to " "consider installing the 64-bit version of MySQL." msgstr "" +"Tiene uan capacidad de memoria por sobre 3 GiB (asumiendo que el servidor " +"MySQL está en el mismo equipo que el servidor phpMyAdmin), es posible que " +"MySQL no pueda acceder a toda la memoria. Podría llegar a desear instalar la " +"versión de 64-bits de MySQL." #: po/advisory_rules.php:63 #, php-format msgid "Available memory on this host: %s" -msgstr "" +msgstr "Memoria disponible en este equipo: %s" #: po/advisory_rules.php:65 -#, fuzzy #| msgid "Query cache" msgid "Query cache disabled" -msgstr "Cache de consultas" +msgstr "Caché de consultas desactivado" #: po/advisory_rules.php:66 -#, fuzzy #| msgid "The server is not responding" msgid "The query cache is not enabled." -msgstr "El servidor no está respondiendo" +msgstr "El caché de consultas no está habilitado." #: po/advisory_rules.php:67 msgid "" @@ -12023,14 +12036,20 @@ msgid "" "and setting {query_cache_type} to 'ON'. <b>Note:</b> If you are using " "memcached, ignore this recommendation." msgstr "" +"Se sabe que el caché de consultas puede mejorar la performance enormemente " +"si está correctamente configurado. Actívelo definiendo «query_cache_size» a " +"un valor en MiB de 2 dígitos y definiendo «query_cache_type» a 'ON'. " +"<b>Notar que: </b> si está utilizando memcached ignore esta recomendación." #: po/advisory_rules.php:68 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" msgstr "" +"«query_cache_size» está definido como 0 o «query_cache_type» está definido " +"como 'OFF'" #: po/advisory_rules.php:71 msgid "Suboptimal caching method." -msgstr "" +msgstr "Método de cacheo sub-óptimo." #: po/advisory_rules.php:72 msgid "" @@ -12039,6 +12058,11 @@ msgid "" "refman/5.1/en/ha-memcached.html\\\">memcached</a> instead of the MySQL Query " "cache, especially if you have multiple slaves." msgstr "" +"Está utilizando el caché de consultas MySQL en una base de datos de bastante " +"tráfico. Probablemente quiera considerar utilizar <a " +"href=\\\"http://dev.mysql.com/doc/refman/5.1/en/ha-" +"memcached.html\\\">memcached</a> en lugar del caché de consultas de MySQL, " +"especialmente si tiene muchos esclavos." #: po/advisory_rules.php:73 #, php-format @@ -12046,40 +12070,45 @@ msgid "" "The query cache is enabled and the server receives %d queries per second. " "This rule fires if there is more than 100 queries per second." msgstr "" +"El caché de consultas está activado y el servidor recibe %d consultas por " +"segundo. Esta regla se dispara si hay más de 100 consultas por segundo." #: po/advisory_rules.php:75 msgid "Query cache efficiency (%)" -msgstr "" +msgstr "Eficiencia del caché de consultas (%)" #: po/advisory_rules.php:76 msgid "Query cache not running efficiently, it has a low hit rate." msgstr "" +"El caché de consultas no está ejecutando eficientemente, tiene una baja tasa " +"de aciertos." #: po/advisory_rules.php:77 msgid "Consider increasing {query_cache_limit}." -msgstr "" +msgstr "Considere aumentando «query_cache_limit»." #: po/advisory_rules.php:78 #, php-format msgid "The current query cache hit rate of %s%% is below 20%%" -msgstr "" +msgstr "La tasa de aciertos actual del caché de consultas %s%% es menor a 20%%" #: po/advisory_rules.php:80 -#, fuzzy #| msgid "Query cache" msgid "Query Cache usage" -msgstr "Cache de consultas" +msgstr "Uso del caché de consultas" #: po/advisory_rules.php:81 #, php-format msgid "Less than 80%% of the query cache is being utilized." -msgstr "" +msgstr "Menos del 80%% del caché de consultas está siendo utilizado." #: po/advisory_rules.php:82 msgid "" "This might be caused by {query_cache_limit} being too low. Flushing the " "query cache might help as well." msgstr "" +"Esto puede ser porque el valor de «query_cache_limit» es muy pequeño. Vaciar " +"el caché de consultas podría ayudar también." #: po/advisory_rules.php:83 #, php-format @@ -12087,16 +12116,17 @@ msgid "" "The current ratio of free query cache memory to total query cache size is %s" "%%. It should be above 80%%" msgstr "" +"La tasa actual de memoria libre del caché de consultas respecto del tamaño " +"total es %s%%. Debería ser mayor al 80%%" #: po/advisory_rules.php:85 -#, fuzzy #| msgid "Query cache" msgid "Query cache fragmentation" -msgstr "Cache de consultas" +msgstr "Fragmentación del caché de consultas" #: po/advisory_rules.php:86 msgid "The query cache is considerably fragmented." -msgstr "" +msgstr "El caché de consultas está fragmentado considerablemente." #: po/advisory_rules.php:87 msgid "" @@ -12109,6 +12139,16 @@ msgid "" "using this formula: (query_cache_size - qcache_free_memory) / " "qcache_queries_in_cache" msgstr "" +"Alta fragmentación probablemente aumente (más) «Qcache_lowmem_prunes». Esto " +"puede ser causado por la cantidad de reducciones realizadas al caché de " +"consultas por falta de memoria debido a que «query_cache_size» es muy " +"pequeño. Una solución inmediata pero a corto plazo debería de vaciar el " +"caché de consultas (puede bloquear el caché de consultas por un largo " +"tiempo). Ajustar cuidadosamente «query_cache_min_res_unit» a un valor menor " +"podría ayudar también; por ejemplo, podría definirlo como el tamaño promedio " +"de las consultas en el caché utilizando la siguiente fórmula: " +"(«query_cache_size» - «qcache_free_memory») / «qcache_queries_in_cache» " +"((tamaño_caché - memoria_libre_caché) / cantidad_consultas_en_caché)." #: po/advisory_rules.php:88 #, php-format @@ -12117,10 +12157,13 @@ msgid "" "that the query cache is an alternating pattern of free and used blocks. This " "value should be below 20%%." msgstr "" +"El caché está %s%% fragmentado actualmente. Una fragmentación del 100% " +"significa que el caché de consulta es un patrón alternante de bloques " +"utilizados y libres. Este valor debería ser menor al 20%%." #: po/advisory_rules.php:90 msgid "Query cache low memory prunes" -msgstr "" +msgstr "Reducciones al caché de consultas por falta de memoria" #: po/advisory_rules.php:91 #, fuzzy diff --git a/po/ja.po b/po/ja.po index 37202e9..fafac92 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-16 19:11+0200\n" -"PO-Revision-Date: 2011-08-16 16:10+0200\n" +"PO-Revision-Date: 2011-08-17 02:56+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -9356,6 +9356,8 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" +"設定を変更する前に、（ドキュメントを読んで）変更内容と変更箇所を元に戻す方法を確認しておいてください。間違ったチューニングは、パフォーマンスに非常に悪影" +"響を与える可能性があります。" #: server_status.php:814 msgid "" @@ -9363,6 +9365,8 @@ msgid "" "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." msgstr "" +"お使いのシステムをチューニングする最善の方法は、一度に行う変更は 1 " +"箇所のみにすることです。変更の度に、監視やベンチマークを行い、明確な改善が測定されなかった場合は変更を元に戻します。" #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:836 diff --git a/po/sl.po b/po/sl.po index 4f75e8f..92fbd46 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-16 19:11+0200\n" -"PO-Revision-Date: 2011-08-11 18:40+0200\n" +"PO-Revision-Date: 2011-08-16 22:58+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:304 @@ -1129,10 +1129,8 @@ msgid "Query statistics" msgstr "Statistika poizvedb" #: js/messages.php:93 -#, fuzzy -#| msgid "Failed to read configuration file" msgid "Local monitor configuration incompatible" -msgstr "Ne morem prebrati konfiguracijske datoteke" +msgstr "Konfiguracija lokalnega nadziranja ni združljiva" #: js/messages.php:94 msgid "" @@ -1143,22 +1141,19 @@ msgid "" msgstr "" #: js/messages.php:96 -#, fuzzy #| msgid "Query cache" msgid "Query cache efficiency" -msgstr "Predpomnilnik poizvedb" +msgstr "Učinkovitost predpomnilnika poizvedb" #: js/messages.php:97 po/advisory_rules.php:70 -#, fuzzy #| msgid "Query cache" msgid "Query cache usage" -msgstr "Predpomnilnik poizvedb" +msgstr "Uporaba predpomnilnika poizvedb" #: js/messages.php:98 -#, fuzzy #| msgid "Query cache" msgid "Query cache used" -msgstr "Predpomnilnik poizvedb" +msgstr "Uporabljenega predpomnilnika poizvedb" #: js/messages.php:100 msgid "System CPU Usage" @@ -1395,7 +1390,6 @@ msgid "Analysing & loading logs. This may take a while." msgstr "Analiziranje in nalaganje dnevnikov. To lahko traja nekaj časa." #: js/messages.php:165 -#, fuzzy #| msgid "" #| "This columns shows the amount of identical queries that are grouped " #| "together. However only the SQL Text is being compared, thus the queries " @@ -1405,9 +1399,9 @@ msgid "" "However only the SQL query itself has been used as a grouping criteria, so " "the other attributes of queries, such as start time, may differ." msgstr "" -"Stolpec prikazuje število identičnih poizvedb, ki so zbrane skupaj. " -"Primerjano je samo besedilo SQL, zato se lahko drugi atributi poizvedb, npr. " -"začetni čas, razlikujejo." +"Stolpec prikazuje število identičnih poizvedb, ki so zbrane skupaj. Kot " +"zbirni pogoj je bila uporabljena le sama poizvedba SQL, zato se lahko drugi " +"atributi poizvedb, npr. začetni čas, razlikujejo." #: js/messages.php:166 msgid "" @@ -1484,12 +1478,16 @@ msgstr "Spremenjene vrstice:" #: js/messages.php:188 msgid "Failed parsing config file. It doesn't seem to be valid JSON code" msgstr "" +"Razčlenjevalne konfiguracijske datoteke je spodletelo. Kot kaže, ni veljavna " +"koda JSON." #: js/messages.php:189 msgid "" "Failed building chart grid with imported config. Resetting to default " "config..." msgstr "" +"Gradnja grafikona z uvoženo konfiguracijo je spodletela. Ponastavljanje na " +"privzeto konfiguracijo ..." #: js/messages.php:190 libraries/config/messages.inc.php:170 #: libraries/db_links.inc.php:83 libraries/server_links.inc.php:69 @@ -1679,7 +1677,7 @@ msgstr "Iskanje" #: js/messages.php:264 msgid "Each point represents a data row." -msgstr "" +msgstr "Vsaka točka predstavlja podatkovno vrstico." #: js/messages.php:266 msgid "Hovering over a point will show its label." @@ -1692,10 +1690,12 @@ msgstr "" #: js/messages.php:270 msgid "Click reset zoom link to come back to original state." msgstr "" +"Kliknite povezavo za ponastavitev povečave za vrnitev na prvotno stanje." #: js/messages.php:272 msgid "Click a data point to view and possibly edit the data row." msgstr "" +"Kliknite podatkovno točko za ogled in morebitno urejanje podatkovne vrstice." #: js/messages.php:274 msgid "The plot can be resized by dragging it along the bottom right corner." @@ -1706,14 +1706,13 @@ msgid "Strings are converted into integer for plotting" msgstr "" #: js/messages.php:278 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "Dodaj/Odstrani stolpce" +msgstr "Izberite dva stolpca" #: js/messages.php:279 msgid "Select two different columns" -msgstr "" +msgstr "Izberite dva različna stolpca" #: js/messages.php:282 tbl_change.php:307 tbl_indexes.php:211 #: tbl_indexes.php:238 @@ -1790,12 +1789,12 @@ msgstr "" msgid "" "You can also edit most columns<br />by clicking directly on their content." msgstr "" +"Večino stolpcev lahko urejate<br />neposredno s klikom na njihovo vsebino." #: js/messages.php:307 -#, fuzzy #| msgid "Go to view" msgid "Go to link" -msgstr "Pojdi na pogled" +msgstr "Pojdi na povezavo" #: js/messages.php:310 msgid "Generate password" @@ -2291,6 +2290,8 @@ msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" msgstr "" +"Čiščenje nastavitev uporabniškega vmesnika tabel je spodletelo (glej " +"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)" #: libraries/Theme.class.php:145 #, php-format @@ -4470,12 +4471,13 @@ msgid "" "This configuration make sure that we only keep N (N = MaxTableUiprefs) " "newest record in \"table_uiprefs\" and automatically delete older records" msgstr "" +"Ta konfiguracija zagotavlja, da v \"table_uiprefs\" hranimo samo N (N = " +"MaxTableUiprefs) najnovejših zapisov in da samodejno brišemo starejše zapise" #: libraries/config/messages.inc.php:399 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of records saved in \"table_uiprefs\" table" -msgstr "Največje število tabel prikazanih na seznamu tabel" +msgstr "Največje število zapisov, shranjenih v tabeli \"table_uiprefs\"" #: libraries/config/messages.inc.php:400 msgid "Try to connect without password" @@ -7925,10 +7927,9 @@ msgid "Operator" msgstr "Operator" #: libraries/tbl_select.lib.php:131 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "Iskanje" +msgstr "Iskanje po tabeli" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" @@ -10182,29 +10183,28 @@ msgid "Chart columns" msgstr "Stolpci grafikona" #: server_status.php:1484 -#, fuzzy #| msgid "Error management:" msgid "Chart arrangement" -msgstr "Upravljanje napak:" +msgstr "Razvrstitev grafikonov" #: server_status.php:1484 msgid "" "The arrangement of the charts is stored to the browsers local storage. You " "may want to export it if you have a complicated set up." msgstr "" +"Razvrstitev grafikonov je shranjena v lokalni shrambi brskalnika. Če imate " +"zapleteno nastavitev, jo boste morda želeli izvoziti." #: server_status.php:1485 -#, fuzzy #| msgid "Restore default value" msgid "Reset to default" -msgstr "Povrni privzeto vrednost" +msgstr "Povrni na privzeto" #: server_status.php:1489 msgid "Monitor Instructions" msgstr "Navodila nadziranja" #: server_status.php:1490 -#, fuzzy #| msgid "" #| "The phpMyAdmin Monitor can assist you in optimizing the server " #| "configuration and track down time intensive\n" @@ -10221,11 +10221,10 @@ msgid "" "increases server load by up to 15%" msgstr "" "Nadziranje phpMyAdmin vam lahko pomaga pri optimiziranju konfiguracije " -"strežnika in izsleditvi časovno zahtevnih\n" -" poizvedb. Za slednje morate nastaviti log_output na 'TABLE' in imeti " -"ali slow_query_log ali general_log omogočeno. Vendar pomnite, da\n" -" general_log ustvari ogromno podatkov in poveča obremenitev strežnika " -"do 15 %." +"strežnika in izsleditvi časovno zahtevnih poizvedb. Za slednje morate " +"nastaviti log_output na 'TABLE' in imeti omogočeno ali slow_query_log ali " +"general_log. Vendar pomnite, da general_log ustvari ogromno podatkov in " +"poveča obremenitev strežnika do 15 %." #: server_status.php:1495 msgid "" @@ -10236,13 +10235,11 @@ msgid "" msgstr "" #: server_status.php:1508 -#, fuzzy #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "Postoj nadziranje" +msgstr "Uporaba monitorja:" #: server_status.php:1510 -#, fuzzy #| msgid "" #| "<b>Using the monitor:</b><br/>\n" #| " Ok, you are good to go! Once you click 'Start monitor' your " @@ -10261,21 +10258,13 @@ msgid "" "change the refresh rate under 'Settings', or remove any chart using the cog " "icon on each respective chart." msgstr "" -"<b>Uporaba nadziranja:</b><br/>\n" -" V redu, pripravljeni ste! Ko kliknete 'Začni nadziranje', se bo vaš " -"brskalnik osvežil in prikazal grafikone\n" -" v rednih razmikih. Dodajate lahko grafikone in spremenite pogostost " -"osveževanja pod 'Nastavitve' ali pa\n" -" odstranite kateri koli grafikon s klikom na ikono zobnika ob " -"ustreznem grafikonu.\n" -" <p>Ko opazite nenavadno povečanje dejavnosti, izberite ustrezno " -"časovno obdobje na katerem koli grafikonu tako, da pridržite\n" -" levi miškin gumb in kazalec povlečete čez grafikon. To bo naložilo " -"statistike iz dnevnikov, kar vam bo pomagalo odkriti vzrok\n" -" povečane dejavnosti.</p>" +"V redu, pripravljeni ste! Ko kliknete 'Začni nadziranje', se bo vaš " +"brskalnik osvežil in prikazal grafikone v rednih razmikih. Dodajate lahko " +"grafikone in spremenite pogostost osveževanja pod 'Nastavitve' ali pa " +"odstranite kateri koli grafikon s klikom na ikono zobnika ob ustreznem " +"grafikonu." #: server_status.php:1512 -#, fuzzy #| msgid "" #| "<b>Using the monitor:</b><br/>\n" #| " Ok, you are good to go! Once you click 'Start monitor' your " @@ -10294,25 +10283,17 @@ msgid "" "confirmed, this will load a table of grouped queries, there you may click on " "any occuring SELECT statements to further analyze them." msgstr "" -"<b>Uporaba nadziranja:</b><br/>\n" -" V redu, pripravljeni ste! Ko kliknete 'Začni nadziranje', se bo vaš " -"brskalnik osvežil in prikazal grafikone\n" -" v rednih razmikih. Dodajate lahko grafikone in spremenite pogostost " -"osveževanja pod 'Nastavitve' ali pa\n" -" odstranite kateri koli grafikon s klikom na ikono zobnika ob " -"ustreznem grafikonu.\n" -" <p>Ko opazite nenavadno povečanje dejavnosti, izberite ustrezno " -"časovno obdobje na katerem koli grafikonu tako, da pridržite\n" -" levi miškin gumb in kazalec povlečete čez grafikon. To bo naložilo " -"statistike iz dnevnikov, kar vam bo pomagalo odkriti vzrok\n" -" povečane dejavnosti.</p>" +"Za prikaz poizvedb iz dnevnikov izberite ustrezno časovno obdobje na katerem " +"koli grafikonu tako, da pridržite levi miškin gumb in kazalec povlečete čez " +"grafikon. Ko potrdite, bo to naložilo tabelo združenih poizvedb, kjer lahko " +"kliknete na katere koli ponavljajoče stavke SELECT in jih naprej " +"analizirate." #: server_status.php:1519 msgid "Please note:" -msgstr "" +msgstr "Prosimo, pomnite:" #: server_status.php:1521 -#, fuzzy #| msgid "" #| "<b>Please note:</b>\n" #| " Enabling the general_log may increase the server load by 5-15%. " @@ -10327,19 +10308,16 @@ msgid "" "it is advisable to select only a small time span and to disable the " "general_log and empty its table once monitoring is not required any more." msgstr "" -"<b>Pomnite:</b>\n" -" Omogočitev general_log lahko poveča obremenitev strežnika za 5–15 %. " -"Zavedajte se tudi, da je ustvarjanje statistik iz dnevnikov\n" -" zelo obremenjujoče opravilo, zato je priporočljivo, da izberete samo " -"majhen časovni razpon ter onemogočite general_log in počistite njene tabele, " -"ko nadziranja ne potrebujete več.\n" -" " +"Omogočitev general_log lahko poveča obremenitev strežnika za 5–15 %. " +"Zavedajte se tudi, da je ustvarjanje statistik iz dnevnikov zelo " +"obremenjujoče opravilo, zato je priporočljivo, da izberete samo majhen " +"časovni razpon ter onemogočite general_log in počistite njene tabele, ko " +"nadziranja ne potrebujete več. " #: server_status.php:1533 -#, fuzzy #| msgid "Remove chart" msgid "Preset chart" -msgstr "Odstrani grafikon" +msgstr "Prednastavljeni grafikon" #: server_status.php:1537 msgid "Status variable(s)" @@ -10391,31 +10369,27 @@ msgstr "Izbrano časovno območje:" #: server_status.php:1598 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Pridobi samo stavke SELECT, INSERT, UPDATE in DELETE" #: server_status.php:1603 msgid "Remove variable data in INSERT statements for better grouping" -msgstr "" +msgstr "Odstrani spremenljive podatke v stavkih INSERT za boljše združevanje" #: server_status.php:1608 -#, fuzzy #| msgid "" #| "<p>Choose from which log you want the statistics to be generated from.</" #| "p> Results are grouped by query text." msgid "Choose from which log you want the statistics to be generated from." -msgstr "" -"<p>Izberite dnevnike, iz katerih želite ustvariti statistiko.</p> Rezultati " -"so zbrani po besedilu poizvedbe." +msgstr "Izberite dnevnike, iz katerih želite ustvariti statistiko." #: server_status.php:1610 msgid "Results are grouped by query text." -msgstr "" +msgstr "Rezultati so združeni po besedilu poizvedbe." #: server_status.php:1615 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Vrsta poizvedbe" +msgstr "Analitik poizvedb" #: server_status.php:1652 #, php-format @@ -10519,10 +10493,9 @@ msgstr "" "Ciljna zbirka podatkov je bila sinhronizirana z izvorno zbirko podatkov" #: server_synchronize.php:951 -#, fuzzy #| msgid "Issued queries" msgid "Executed queries" -msgstr "Izdane poizvedbe" +msgstr "Izvedene poizvedbe" #: server_synchronize.php:1076 msgid "Enter manually" @@ -11277,11 +11250,11 @@ msgstr "Dolžina vrstice" #: tbl_printview.php:378 tbl_structure.php:892 msgid "Row size" -msgstr "Velikost vrstice " +msgstr "Velikost vrstice" #: tbl_printview.php:388 tbl_structure.php:900 msgid "Next autoindex" -msgstr "" +msgstr "Naslednji samodejni indeks" #: tbl_relation.php:276 #, php-format @@ -11378,10 +11351,9 @@ msgid "Show more actions" msgstr "Prikaži več dejanj" #: tbl_structure.php:603 -#, fuzzy #| msgid "Print view" msgid "Edit view" -msgstr "Pogled za tiskanje" +msgstr "Urejevalni pogled" #: tbl_structure.php:620 msgid "Relation view" @@ -11570,38 +11542,34 @@ msgid "Create version" msgstr "Ustvari različico" #: tbl_zoom_select.php:140 -#, fuzzy #| msgid "Do a \"query by example\" (wildcard: \"%\")" msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" -msgstr "Izvedi \"query by example\" (nadomestni znak: \"%\")" +msgstr "" +"Izvedi \"query by example\" (nadomestni znak: \"%\") za dva različna stolpca" #: tbl_zoom_select.php:151 -#, fuzzy #| msgid "Hide search criteria" msgid "Additional search criteria" -msgstr "Skrij iskalne pogoje" +msgstr "Dodatni iskalni pogoji" #: tbl_zoom_select.php:281 -#, fuzzy #| msgid "Label" msgid "Data Label" -msgstr "Oznaka" +msgstr "Podatkovna oznaka" #: tbl_zoom_select.php:297 -#, fuzzy #| msgid "Maximum number of rows to display" msgid "Maximum rows to plot" -msgstr "Največje število vrstic za prikaz" +msgstr "Največje število vrstic za izris" #: tbl_zoom_select.php:388 msgid "Browse/Edit the points" -msgstr "" +msgstr "Prebrskaj/Uredi točke" #: tbl_zoom_select.php:394 -#, fuzzy #| msgid "Control user" msgid "How to use" -msgstr "Krmilni uporabnik" +msgstr "Kako uporabljati" #: themes.php:28 msgid "Get more themes!" @@ -11643,7 +11611,7 @@ msgstr "Preimenuj pogled v" #: po/advisory_rules.php:5 msgid "Uptime below one day" -msgstr "" +msgstr "Neprekinjeno delovanje krajše od enega dneva" #: po/advisory_rules.php:6 msgid "Uptime is less than 1 day, performance tuning may not be accurate." @@ -11658,13 +11626,12 @@ msgstr "" #: po/advisory_rules.php:8 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "Neprekinjeno delovanje je samo %s" #: po/advisory_rules.php:10 -#, fuzzy #| msgid "Questions" msgid "Questions below 1,000" -msgstr "Vprašanja" +msgstr "Vprašanja pod 1.000" #: po/advisory_rules.php:11 msgid "" @@ -11679,38 +11646,38 @@ msgid "" msgstr "" #: po/advisory_rules.php:13 -#, fuzzy, php-format +#, php-format #| msgid "Current connection" msgid "Current amount of Questions: %s" -msgstr "Trenutna povezava" +msgstr "Trenutno število vprašanj: %s" #: po/advisory_rules.php:15 -#, fuzzy #| msgid "Show SQL queries" msgid "Percentage of slow queries" -msgstr "Pokaži poizvedbe SQL" +msgstr "Odstotek počasnih poizvedb" #: po/advisory_rules.php:16 msgid "" "There is a lot of slow queries compared to the overall amount of Queries." -msgstr "" +msgstr "V primerjavi s skupnim številom poizvedb je počasnih poizvedb veliko." #: po/advisory_rules.php:17 po/advisory_rules.php:22 msgid "" "You might want to increase {long_query_time} or optimize the queries listed " "in the slow query log" msgstr "" +"Morda boste želeli povečati {long_query_time} ali optimizirati poizvedbe, " +"navedene v dnevniku počasnih poizvedb" #: po/advisory_rules.php:18 #, php-format msgid "The slow query rate should be below 5%%, your value is %s%%." -msgstr "" +msgstr "Delež počasnih poizvedb bi moral biti pod 5 %%; vaša vrednost je %s %%." #: po/advisory_rules.php:20 -#, fuzzy #| msgid "Flush query cache" msgid "Slow query rate" -msgstr "Izplakni predpomnilnik poizvedb" +msgstr "Delež počasnih poizvedb" #: po/advisory_rules.php:21 msgid "" @@ -11725,10 +11692,9 @@ msgid "" msgstr "" #: po/advisory_rules.php:25 -#, fuzzy #| msgid "SQL queries" msgid "Long query time" -msgstr "Poizvedbe SQL" +msgstr "Čas dolgih poizvedb" #: po/advisory_rules.php:26 msgid "" @@ -11743,22 +11709,20 @@ msgid "" msgstr "" #: po/advisory_rules.php:28 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "long_query_time is currently set to %ds." -msgstr "long_query_time je nastavljen na %d sekund(o)." +msgstr "long_query_time je trenutno nastavljen na %d s." #: po/advisory_rules.php:30 -#, fuzzy #| msgid "Show query box" msgid "Slow query logging" -msgstr "Prikaži polje poizvedbe" +msgstr "Beleženje počasnih poizvedb" #: po/advisory_rules.php:31 -#, fuzzy #| msgid "slow_query_log is enabled." msgid "The slow query log is disabled." -msgstr "slow_query_log je omogočen." +msgstr "Dnevnik počasnih poizvedb je onemogočen." #: po/advisory_rules.php:32 msgid "" @@ -11768,7 +11732,7 @@ msgstr "" #: po/advisory_rules.php:33 msgid "log_slow_queries is set to 'OFF'" -msgstr "" +msgstr "log_slow_queries je nastavljen na 'OFF'" #: po/advisory_rules.php:35 #, fuzzy @@ -11778,55 +11742,56 @@ msgstr "Počisti serije" #: po/advisory_rules.php:36 msgid "The MySQL server version less then 5.1." -msgstr "" +msgstr "Strežnik MySQL različice nižje od 5.1." #: po/advisory_rules.php:37 msgid "" "You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 " "even more so." msgstr "" +"Morali bi posodobiti, saj ima MySQL 5.1 izboljšano učinkovitost, MySQL 5.5 " +"pa še bolj." #: po/advisory_rules.php:38 po/advisory_rules.php:43 po/advisory_rules.php:48 -#, fuzzy, php-format +#, php-format #| msgid "Create version" msgid "Current version: %s" -msgstr "Ustvari različico" +msgstr "Trenutna različica: %s" #: po/advisory_rules.php:40 po/advisory_rules.php:45 -#, fuzzy #| msgid "Version" msgid "Minor Version" -msgstr "Različica" +msgstr "Manjša različica" #: po/advisory_rules.php:41 msgid "Version less than 5.1.30 (the first GA release of 5.1)." -msgstr "" +msgstr "Različica nižja od 5.1.30 (prvi izid GA 5.1)." #: po/advisory_rules.php:42 msgid "" "You should upgrade, as recent versions of MySQL 5.1 have improved " "performance and MySQL 5.5 even more so." msgstr "" +"Morali bi posodobiti, saj imajo najnovejše različice MySQL 5.1 izboljšano " +"učinkovitost, MySQL 5.5 pa še bolj." #: po/advisory_rules.php:46 msgid "Version less than 5.5.8 (the first GA release of 5.5)." -msgstr "" +msgstr "Različica nižja od 5.5.8 (prvi izid GA 5.5)." #: po/advisory_rules.php:47 -#, fuzzy #| msgid "You should upgrade to %s %s or later." msgid "You should upgrade, to a stable version of MySQL 5.5" -msgstr "%s bi morali nadgraditi na različico %s ali novejšo." +msgstr "Morali bi nadgraditi, na ustaljeno različico MySQL 5.5" #: po/advisory_rules.php:50 po/advisory_rules.php:55 -#, fuzzy #| msgid "Description" msgid "Distribution" -msgstr "Opis" +msgstr "Distribucija" #: po/advisory_rules.php:51 msgid "Version is compiled from source, not a MySQL official binary." -msgstr "" +msgstr "Različica je prevedena iz izvorne kode, in ni uradna izdaja MySQL." #: po/advisory_rules.php:52 msgid "" @@ -11837,29 +11802,28 @@ msgstr "" #: po/advisory_rules.php:53 msgid "'source' found in version_comment" -msgstr "" +msgstr "našel sem 'source' v version_comment" #: po/advisory_rules.php:56 msgid "The MySQL manual only is accurate for official MySQL binaries." -msgstr "" +msgstr "Priročnik MySQL je točen samo za uradne izdaje MySQL." #: po/advisory_rules.php:57 msgid "Percona documentation is at http://www.percona.com/docs/wiki/" -msgstr "" +msgstr "Dokumentacija Percona se nahaja na http://www.percona.com/docs/wiki/" #: po/advisory_rules.php:58 msgid "'percona' found in version_comment" -msgstr "" +msgstr "našel sem 'percona' v version_comment" #: po/advisory_rules.php:60 -#, fuzzy #| msgid "MySQL charset" msgid "MySQL Architecture" -msgstr "Kodna tabela MySQL" +msgstr "Arhitektura MySQL" #: po/advisory_rules.php:61 msgid "MySQL is not compiled as a 64-bit package." -msgstr "" +msgstr "MySQL ni preveden kot 64-bitni paket." #: po/advisory_rules.php:62 msgid "" @@ -11871,19 +11835,17 @@ msgstr "" #: po/advisory_rules.php:63 #, php-format msgid "Available memory on this host: %s" -msgstr "" +msgstr "Razpoložljiv pomnilnik na tem gostitelju: %s" #: po/advisory_rules.php:65 -#, fuzzy #| msgid "Query cache" msgid "Query cache disabled" -msgstr "Predpomnilnik poizvedb" +msgstr "Predpomnjenje poizvedb je onemogočeno" #: po/advisory_rules.php:66 -#, fuzzy #| msgid "The server is not responding" msgid "The query cache is not enabled." -msgstr "Strežnik se ne odziva" +msgstr "Predpomnjenje poizvedb ni omogočeno." #: po/advisory_rules.php:67 msgid "" @@ -11926,7 +11888,7 @@ msgstr "" #: po/advisory_rules.php:77 msgid "Consider increasing {query_cache_limit}." -msgstr "" +msgstr "Razmislite o povečanju {query_cache_limit}." #: po/advisory_rules.php:78 #, php-format @@ -11934,10 +11896,9 @@ msgid "The current query cache hit rate of %s%% is below 20%%" msgstr "" #: po/advisory_rules.php:80 -#, fuzzy #| msgid "Query cache" msgid "Query Cache usage" -msgstr "Predpomnilnik poizvedb" +msgstr "Uporaba predpomnilnika poizvedb" #: po/advisory_rules.php:81 #, php-format @@ -11958,10 +11919,9 @@ msgid "" msgstr "" #: po/advisory_rules.php:85 -#, fuzzy #| msgid "Query cache" msgid "Query cache fragmentation" -msgstr "Predpomnilnik poizvedb" +msgstr "Razdrobljenost predpomnilnika poizvedb" #: po/advisory_rules.php:86 msgid "The query cache is considerably fragmented." @@ -12013,10 +11973,9 @@ msgid "" msgstr "" #: po/advisory_rules.php:95 -#, fuzzy #| msgid "Query cache" msgid "Query cache max size" -msgstr "Predpomnilnik poizvedb" +msgstr "Največja velikost predpomnilnika poizvedb" #: po/advisory_rules.php:96 msgid "" @@ -12033,13 +11992,12 @@ msgstr "" #: po/advisory_rules.php:98 #, php-format msgid "Current query cache size: %s" -msgstr "" +msgstr "Trenutna velikost predpomnilnika poizvedb: %s" #: po/advisory_rules.php:100 -#, fuzzy #| msgid "Query results" msgid "Query cache min result size" -msgstr "Rezultati poizvedbe" +msgstr "Velikost najmanjšega rezultata predpomnilnika poizvedb" #: po/advisory_rules.php:101 msgid "" @@ -12060,25 +12018,25 @@ msgstr "" #: po/advisory_rules.php:103 msgid "query_cache_limit is set to 1 MiB" -msgstr "" +msgstr "query_cache_limit je nastavljen na 1 MiB" #: po/advisory_rules.php:105 -#, fuzzy #| msgid "Allows creating temporary tables." msgid "Percentage of sorts that cause temporary tables" -msgstr "Omogoča ustvarjanje začasnih tabel." +msgstr "Odstotek razvrščanj, ki so povzročila začasne tabele" #: po/advisory_rules.php:106 po/advisory_rules.php:111 -#, fuzzy #| msgid "Allows creating temporary tables." msgid "Too many sorts are causing temporary tables." -msgstr "Omogoča ustvarjanje začasnih tabel." +msgstr "Preveč razvrščanj povzroča začasne tabele." #: po/advisory_rules.php:107 po/advisory_rules.php:112 msgid "" "Consider increasing sort_buffer_size and/or read_rnd_buffer_size, depending " "on your system memory limits" msgstr "" +"Razmislite o povečanju sort_buffer_size in/ali read_rnd_buffer_size, odvisno " +"od omejitev vašega sistemskega pomnilnika" #: po/advisory_rules.php:108 #, php-format @@ -12086,28 +12044,29 @@ msgid "" "%s%% of all sorts cause temporary tables, this value should be lower than " "10%%." msgstr "" +"%s %% vseh razvrščanj povzroča začasne tabele; ta vrednost bi morala biti " +"nižja od 10 %%." #: po/advisory_rules.php:110 -#, fuzzy #| msgid "Allows creating temporary tables." msgid "Rate of sorts that cause temporary tables" -msgstr "Omogoča ustvarjanje začasnih tabel." +msgstr "Delež razvrščanj, ki povzroča začasne tabele" #: po/advisory_rules.php:113 #, php-format msgid "" "Temporary tables average: %s, this value should be less than 1 per hour." msgstr "" +"Povprečje začasnih tabel: %s; ta vrednost bi morala biti manj kot 1 na uro." #: po/advisory_rules.php:115 -#, fuzzy #| msgid "Start row" msgid "Sort rows" -msgstr "Začetna vrstica" +msgstr "Razvrščanje vrstic" #: po/advisory_rules.php:116 msgid "There are lots of rows being sorted." -msgstr "" +msgstr "Veliko vrstic je razvrščanih." #: po/advisory_rules.php:117 msgid "" @@ -12120,19 +12079,17 @@ msgstr "" #: po/advisory_rules.php:118 #, php-format msgid "Sorted rows average: %s" -msgstr "" +msgstr "Povprečje razvrščenih vrstic: %s" #: po/advisory_rules.php:120 -#, fuzzy #| msgid "There are no routines to display." msgid "Rate of joins without indexes" -msgstr "Ni rutin za prikaz." +msgstr "Delež stikov brez indeksov" #: po/advisory_rules.php:121 -#, fuzzy #| msgid "There are no routines to display." msgid "There are too many joins without indexes." -msgstr "Ni rutin za prikaz." +msgstr "Obstaja preveč stikov brez indeksov." #: po/advisory_rules.php:122 msgid "" @@ -12144,6 +12101,7 @@ msgstr "" #, php-format msgid "Table joins average: %s, this value should be less than 1 per hour" msgstr "" +"Povprečje stikov tabel: %s; ta vrednost bi morala biti manj kot 1 na uro" #: po/advisory_rules.php:125 msgid "Rate of reading first index entry" @@ -12191,16 +12149,14 @@ msgid "" msgstr "" #: po/advisory_rules.php:135 -#, fuzzy #| msgid "Where to show the table row links" msgid "Rate of reading next table row" -msgstr "Kje naj prikažem povezave vrstic tabel" +msgstr "Delež branja naslednje vrstice v tabeli" #: po/advisory_rules.php:136 -#, fuzzy #| msgid "Where to show the table row links" msgid "The rate of reading the next table row is high." -msgstr "Kje naj prikažem povezave vrstic tabel" +msgstr "Delež branja naslednje vrstice v tabeli je visok." #: po/advisory_rules.php:137 msgid "" @@ -12216,11 +12172,11 @@ msgstr "" #: po/advisory_rules.php:140 msgid "tmp_table_size vs. max_heap_table_size" -msgstr "" +msgstr "tmp_table_size proti max_heap_table_size" #: po/advisory_rules.php:141 msgid "tmp_table_size and max_heap_table_size are not the same." -msgstr "" +msgstr "tmp_table_size in max_heap_table_size nista enaki." #: po/advisory_rules.php:142 msgid "" @@ -12233,19 +12189,19 @@ msgstr "" #: po/advisory_rules.php:143 #, php-format msgid "Current values are tmp_table_size: %s, max_heap_table_size: %s" -msgstr "" +msgstr "Trenutni vrednosti sta tmp_table_size: %s, max_heap_table_size: %s" #: po/advisory_rules.php:145 -#, fuzzy #| msgid "Where to show the table row links" msgid "Percentage of temp tables on disk" -msgstr "Kje naj prikažem povezave vrstic tabel" +msgstr "Odstotek začasnih tabel na disku" #: po/advisory_rules.php:146 po/advisory_rules.php:151 msgid "" "Many temporary tables are being written to disk instead of being kept in " "memory." msgstr "" +"Veliko začasnih tabel je zapisanih na disk, namesto shranjenih v pomnilniku." #: po/advisory_rules.php:147 msgid "" @@ -12264,13 +12220,14 @@ msgid "" "%s%% of all temporary tables are being written to disk, this value should be " "below 25%%" msgstr "" +"%s %% vseh začasnih tabel je zapisanih na disk; ta vrednost bi morala biti " +"pod 25 %%" #: po/advisory_rules.php:150 -#, fuzzy #| msgid "%s table" #| msgid_plural "%s tables" msgid "Temp disk rate" -msgstr "%s tabela" +msgstr "Delež začasnih tabel na disku" #: po/advisory_rules.php:152 msgid "" @@ -12291,10 +12248,9 @@ msgid "" msgstr "" #: po/advisory_rules.php:155 -#, fuzzy #| msgid "Sort buffer size" msgid "MyISAM key buffer size" -msgstr "Velikost medpomnilnika razvrščanja" +msgstr "Velikost medpomnilnika ključev MyISAM" #: po/advisory_rules.php:156 msgid "Key buffer is not initialized. No MyISAM indexes will be cached." @@ -12308,19 +12264,21 @@ msgstr "" #: po/advisory_rules.php:158 msgid "key_buffer_size is 0" -msgstr "" +msgstr "key_buffer_size je 0" #: po/advisory_rules.php:160 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "Max %% MyISAM key buffer ever used" -msgstr "Velikost medpomnilnika razvrščanja" +msgstr "Največji %% medpomnilnika ključev MyISAM kadar koli uporabljen" #: po/advisory_rules.php:161 po/advisory_rules.php:166 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "MyISAM key buffer (index cache) %% used is low." -msgstr "Velikost medpomnilnika razvrščanja" +msgstr "" +"%% uporabljenega medpomnilnika ključev MyISAM (predpomnilnika indeksov) je " +"nizek." #: po/advisory_rules.php:162 po/advisory_rules.php:167 msgid "" @@ -12335,19 +12293,20 @@ msgid "max %% MyISAM key buffer ever used: %s, this value should be above 95%%" msgstr "" #: po/advisory_rules.php:165 -#, fuzzy #| msgid "Sort buffer size" msgid "Percentage of MyISAM key buffer used" -msgstr "Velikost medpomnilnika razvrščanja" +msgstr "Odstotek uporabljenega medpomnilnika ključev MyISAM" #: po/advisory_rules.php:168 #, php-format msgid "%% MyISAM key buffer used: %s, this value should be above 95%%" msgstr "" +"%% uporabljenega medpomnilnika ključev MyISAM: %s; ta vrednost bi morala " +"biti nad 95 %%" #: po/advisory_rules.php:170 msgid "Percentage of index reads from memory" -msgstr "" +msgstr "Odstotek branj indeksov iz pomnilnika" #: po/advisory_rules.php:171 #, php-format @@ -12364,22 +12323,22 @@ msgid "Index reads from memory: %s%%, this value should be above 95%%" msgstr "" #: po/advisory_rules.php:175 -#, fuzzy #| msgid "Create table" msgid "Rate of table open" -msgstr "Ustvari tabelo" +msgstr "Delež odpiranj tabel" #: po/advisory_rules.php:176 -#, fuzzy #| msgid "The current number of pending writes." msgid "The rate of opening tables is high." -msgstr "Trenutno število čakajočih pisanj." +msgstr "Delež odpiranj tabel je visok." #: po/advisory_rules.php:177 msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" +"Odpiranje tabel zahteva branje/pisanje na disk, kar je potrošno. Povečanje " +"{table_open_cache} se bo temu morda izognilo." #: po/advisory_rules.php:178 #, php-format @@ -12411,16 +12370,14 @@ msgid "" msgstr "" #: po/advisory_rules.php:185 -#, fuzzy #| msgid "Format of imported file" msgid "Rate of open files" -msgstr "Oblika uvožene datoteke" +msgstr "Delež odprtih datotek" #: po/advisory_rules.php:186 -#, fuzzy #| msgid "The number of pending log file fsyncs." msgid "The rate of opening files is high." -msgstr "Število čakajoče dnevniške datoteke fsyncs." +msgstr "Delež odprtih datotek je visok." #: po/advisory_rules.php:188 #, php-format @@ -12428,16 +12385,15 @@ msgid "Opened files rate: %s, this value should be less than 5 per hour" msgstr "" #: po/advisory_rules.php:190 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Immediate table locks %%" -msgstr "Ustvari novo tabelo v podatkovni zbirki %s" +msgstr "%% takojšnjih zaklepov tabel" #: po/advisory_rules.php:191 po/advisory_rules.php:196 -#, fuzzy #| msgid "The number of times that a table lock was acquired immediately." msgid "Too many table locks were not granted immediately." -msgstr "Koliko krat je bil zaklep tabele pridobljen takoj." +msgstr "Preveč zaklepov tabel ni bilo dodeljenih nenudoma." #: po/advisory_rules.php:192 po/advisory_rules.php:197 msgid "Optimize queries and/or use InnoDB to reduce lock wait." @@ -12458,10 +12414,9 @@ msgid "Table lock wait rate: %s, this value should be less than 1 per hour" msgstr "" #: po/advisory_rules.php:200 -#, fuzzy #| msgid "Key cache" msgid "Thread cache" -msgstr "Predpomnilnik ključev" +msgstr "Predpomnilnik niti" #: po/advisory_rules.php:201 msgid "" @@ -12484,14 +12439,13 @@ msgid "Thread cache hit rate %%" msgstr "Sledenje ni aktivno." #: po/advisory_rules.php:206 -#, fuzzy #| msgid "Tracking is not active." msgid "Thread cache is not efficient." -msgstr "Sledenje ni aktivno." +msgstr "Predpomnjenje niti ni učinkovito." #: po/advisory_rules.php:207 msgid "Increase {thread_cache_size}." -msgstr "" +msgstr "Povečajte {thread_cache_size}." #: po/advisory_rules.php:208 #, php-format @@ -12500,13 +12454,12 @@ msgstr "" #: po/advisory_rules.php:210 msgid "Threads that are slow to launch" -msgstr "" +msgstr "Niti, ki se zaganjajo počasi" #: po/advisory_rules.php:211 -#, fuzzy #| msgid "The number of threads that are not sleeping." msgid "There are too many threads that are slow to launch." -msgstr "Število niti, ki ne spijo." +msgstr "Obstaja preveč niti, ki se zaganjajo počasi." #: po/advisory_rules.php:212 msgid "" @@ -12534,16 +12487,15 @@ msgid "" msgstr "" #: po/advisory_rules.php:218 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "slow_launch_time is set to %s" -msgstr "long_query_time je nastavljen na %d sekund(o)." +msgstr "slow_launch_time je nastavljen na %s" #: po/advisory_rules.php:220 -#, fuzzy #| msgid "Persistent connections" msgid "Percentage of used connections" -msgstr "Vztrajne povezave" +msgstr "Odstotek uporabljenih povezav" #: po/advisory_rules.php:221 msgid "" @@ -12565,10 +12517,9 @@ msgid "" msgstr "" #: po/advisory_rules.php:225 -#, fuzzy #| msgid "Persistent connections" msgid "Percentage of aborted connections" -msgstr "Vztrajne povezave" +msgstr "Odstotek prekinjenih povezav" #: po/advisory_rules.php:226 msgid "Too many connections are aborted." @@ -12588,30 +12539,30 @@ msgid "%s%% of all connections are aborted. This value should be below 1%%" msgstr "" #: po/advisory_rules.php:230 -#, fuzzy #| msgid "Persistent connections" msgid "Rate of aborted connections" -msgstr "Vztrajne povezave" +msgstr "Delež prekinjenih povezav" #: po/advisory_rules.php:231 msgid "Too many connections are aborted" -msgstr "" +msgstr "Preveč povezav je prekinjenih" #: po/advisory_rules.php:233 #, php-format msgid "" "Aborted connections rate is at %s, this value should be less than 1 per hour" msgstr "" +"Delež prekinjenih povezav je %s; ta vrednost bi morala biti manj kot 1 na " +"uro" #: po/advisory_rules.php:235 -#, fuzzy #| msgid "Format of imported file" msgid "Percentage of aborted clients" -msgstr "Oblika uvožene datoteke" +msgstr "Odstotek prekinjenih odjemalcev" #: po/advisory_rules.php:236 po/advisory_rules.php:241 msgid "Too many clients are aborted." -msgstr "" +msgstr "Preveč odjemalcev je prekinjenih." #: po/advisory_rules.php:237 po/advisory_rules.php:242 msgid "" @@ -12624,41 +12575,41 @@ msgstr "" #, php-format msgid "%s%% of all clients are aborted. This value should be below 2%%" msgstr "" +"%s %% vseh odjemalcev je prekinjenih. Ta vrednost bi morala biti pod 2 %%" #: po/advisory_rules.php:240 -#, fuzzy #| msgid "Format of imported file" msgid "Rate of aborted clients" -msgstr "Oblika uvožene datoteke" +msgstr "Delež prekinjenih objemalcev" #: po/advisory_rules.php:243 #, php-format msgid "Aborted client rate is at %s, this value should be less than 1 per hour" msgstr "" +"Delež prekinjenih objemalcev je %s; ta vrednost bit morala biti manj kot 1 " +"na uro" #: po/advisory_rules.php:245 msgid "Is InnoDB disabled?" -msgstr "" +msgstr "Je InnoDB onemogočen?" #: po/advisory_rules.php:246 -#, fuzzy #| msgid "Could not save recent table" msgid "You do not have InnoDB enabled." -msgstr "Ne morem shraniti nedavne tabele" +msgstr "Nimate omogočenega InnoDB." #: po/advisory_rules.php:247 msgid "InnoDB is usually the better choice for table engines." -msgstr "" +msgstr "InnoDB je po navadi boljša izbira za pogone tabel." #: po/advisory_rules.php:248 msgid "have_innodb is set to 'value'" -msgstr "" +msgstr "have_innodb je nastavljeno na 'value'" #: po/advisory_rules.php:250 -#, fuzzy #| msgid "Buffer pool size" msgid "InnoDB log size" -msgstr "Velikost zaloge medpomnilnika" +msgstr "Velikost dnevnika InnoDB" #: po/advisory_rules.php:251 #, fuzzy diff --git a/po/tr.po b/po/tr.po index dd4f68b..ad431f0 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-16 19:11+0200\n" -"PO-Revision-Date: 2011-08-16 16:08+0200\n" +"PO-Revision-Date: 2011-08-16 16:49+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -11900,6 +11900,8 @@ msgid "" "This might be caused by {query_cache_limit} being too low. Flushing the " "query cache might help as well." msgstr "" +"Buna {query_cache_limit} çok düşük olması sebep oluyor olabilir. Sorgu " +"önbelleğinin temizlenmesi de yardımcı olabilir." #: po/advisory_rules.php:83 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15231-gcbca775
by Dieter Adriaenssens 17 Aug '11

17 Aug '11

The branch, master has been updated via cbca7757387adb91e77a61c3bf673b3d0692d482 (commit) from 3e342bceace595aaa5b34227618c65c5a3651814 (commit) - Log ----------------------------------------------------------------- commit cbca7757387adb91e77a61c3bf673b3d0692d482 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Wed Aug 17 00:09:17 2011 +0200 coding style and wrapping long lines ----------------------------------------------------------------------- Summary of changes: libraries/import.lib.php | 25 ++- server_privileges.php | 32 ++-- server_synchronize.php | 384 +++++++++++++++++++++++++++++----------------- 3 files changed, 277 insertions(+), 164 deletions(-) diff --git a/libraries/import.lib.php b/libraries/import.lib.php index eda224f..0d0239c 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -97,16 +97,21 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) $sql_query .= $import_run_buffer['full']; } if (!$cfg['AllowUserDropDatabase'] - && !$is_superuser - && preg_match('@^[[:space:]]*DROP[[:space:]]+(IF EXISTS[[:space:]]+)?DATABASE @i', $import_run_buffer['sql'])) { + && !$is_superuser + && preg_match('@^[[:space:]]*DROP[[:space:]]+(IF EXISTS[[:space:]]+)?DATABASE @i', $import_run_buffer['sql']) + ) { $GLOBALS['message'] = PMA_Message::error(__('"DROP DATABASE" statements are disabled.')); $error = true; } else { $executed_queries++; - if ($run_query && $GLOBALS['finished'] && empty($sql) && !$error && ( - (!empty($import_run_buffer['sql']) && preg_match('/^[\s]*(SELECT|SHOW|HANDLER)/i', $import_run_buffer['sql'])) || - ($executed_queries == 1) - )) { + if ($run_query + && $GLOBALS['finished'] + && empty($sql) + && !$error + && ((!empty($import_run_buffer['sql']) + && preg_match('/^[\s]*(SELECT|SHOW|HANDLER)/i', $import_run_buffer['sql'])) + || ($executed_queries == 1)) + ) { $go_sql = true; if (!$sql_query_disabled) { $complete_query = $sql_query; @@ -161,13 +166,15 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) list($db, $reload) = PMA_lookForUse($import_run_buffer['sql'], $db, $reload); } - if ($result != false && preg_match('@^[\s]*(DROP|CREATE)[\s]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@im', $import_run_buffer['sql'])) { + if ($result != false + && preg_match('@^[\s]*(DROP|CREATE)[\s]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@im', $import_run_buffer['sql']) + ) { $reload = true; } } // end run query } // end if not DROP DATABASE - } // end non empty query - elseif (!empty($import_run_buffer['full'])) { + // end non empty query + } elseif (!empty($import_run_buffer['full'])) { if ($go_sql) { $complete_query .= $import_run_buffer['full']; $display_query .= $import_run_buffer['full']; diff --git a/server_privileges.php b/server_privileges.php index f085889..78e4f06 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -325,14 +325,15 @@ function PMA_extractPrivInfo($row = '', $enableHTML = false) $allPrivileges = true; foreach ($grants as $current_grant) { if ((!empty($row) && isset($row[$current_grant[0]])) - || (empty($row) && isset($GLOBALS[$current_grant[0]]))) { + || (empty($row) && isset($GLOBALS[$current_grant[0]])) + ) { if ((!empty($row) && $row[$current_grant[0]] == 'Y') - || (empty($row) - && ($GLOBALS[$current_grant[0]] == 'Y' - || (is_array($GLOBALS[$current_grant[0]]) + || (empty($row) + && ($GLOBALS[$current_grant[0]] == 'Y' + || (is_array($GLOBALS[$current_grant[0]]) && count($GLOBALS[$current_grant[0]]) == $GLOBALS['column_count'] - && empty($GLOBALS[$current_grant[0] . '_none']))))) - { + && empty($GLOBALS[$current_grant[0] . '_none'])))) + ) { if ($enableHTML) { $privs[] = '<dfn title="' . $current_grant[2] . '">' . $current_grant[1] . '</dfn>'; } else { @@ -678,8 +679,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true) foreach ($privTable as $i => $table) { echo ' <fieldset>' . "\n" . ' <legend>' . __($privTable_names[$i]) . '</legend>' . "\n"; - foreach ($table as $priv) - { + foreach ($table as $priv) { echo ' <div class="item">' . "\n" . ' <input type="checkbox"' . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"' @@ -1218,10 +1218,10 @@ if (!empty($update_privs)) { * @todo similar code appears twice in this script */ if ((isset($Grant_priv) && $Grant_priv == 'Y') - || (! isset($dbname) - && (isset($max_questions) || isset($max_connections) - || isset($max_updates) || isset($max_user_connections)))) - { + || (! isset($dbname) + && (isset($max_questions) || isset($max_connections) + || isset($max_updates) || isset($max_user_connections))) + ) { $sql_query2 .= 'WITH'; if (isset($Grant_priv) && $Grant_priv == 'Y') { $sql_query2 .= ' GRANT OPTION'; @@ -1463,8 +1463,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE if (!empty($password) || isset($pma_pw)) { $new_user_string .= __('Yes'); - } - else { + } else { $new_user_string .= '<span style="color: #FF0000">' . __('No') . '</span>'; }; @@ -1474,8 +1473,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE if ((isset($Grant_priv) && $Grant_priv == 'Y')) { $new_user_string .= __('Yes'); - } - else { + } else { $new_user_string .= __('No'); } @@ -2381,7 +2379,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $extra_data['user_form'] = $user_form; $message = PMA_Message::success(__('User has been added.')); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); - }else{ + } else { // Offer to create a new user for the current database $user_form .= '<fieldset id="fieldset_add_user">' . "\n" . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1&dbname=' . htmlspecialchars($checkprivs) .'" val="'.'checkprivs='.htmlspecialchars($checkprivs). '&'.$GLOBALS['url_query'] . '" class="'.$conditional_class.'" name="db_specific">' . "\n" diff --git a/server_synchronize.php b/server_synchronize.php index 28a7193..9ba41b7 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -73,15 +73,22 @@ if ((isset($_REQUEST['submit_connect']))) { ${"{$con}_server"}['socket'] = ${"{$con}_socket"}; } else { ${"{$con}_server"}['host'] = ${"{$con}_host"}; - if (isset(${"{$con}_port"}) && ! empty(${"{$con}_port"}) && ((int)${"{$con}_port"} * 1) > 0) { + if (isset(${"{$con}_port"}) + && ! empty(${"{$con}_port"}) + && ((int)${"{$con}_port"} * 1) > 0 + ) { ${"{$con}_server"}['port'] = (int)${"{$con}_port"}; } } - ${"{$con}_connection"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}, $auxiliary_connection = true); + ${"{$con}_connection"} = PMA_DBI_connect(${"{$con}_username"}, + ${"{$con}_password"}, $is_controluser = false, + ${"{$con}_server"}, $auxiliary_connection = true); } // end foreach ($cons as $con) - if ((! $src_connection && $src_type != 'cur') || (! $trg_connection && $trg_type != 'cur')) { + if ((! $src_connection && $src_type != 'cur') + || (! $trg_connection && $trg_type != 'cur') + ) { /** * Displays the connection error string if * connections are not established @@ -104,7 +111,8 @@ if ((isset($_REQUEST['submit_connect']))) { */ foreach ($cons as $con) { if (${"{$con}_connection"} != null) { - ${"{$con}_link"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}); + ${"{$con}_link"} = PMA_DBI_connect(${"{$con}_username"}, + ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}); } else { ${"{$con}_link"} = null; } @@ -192,27 +200,36 @@ if ((isset($_REQUEST['submit_connect']))) { for ($i = 0; $i < sizeof($matching_tables); $i++) { /** - * Finding out all the differences structure, data and index diff for all the matching tables only + * Finding out all the differences structure, data and index diff + * for all the matching tables only */ - PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $matching_tables_fields, $update_array, $insert_array, - $delete_array, $fields_num, $i, $matching_tables_keys); - - PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, - $target_columns, $alter_str_array, $add_column_array, $uncommon_columns, $criteria, $target_tables_keys, $i); - - PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_indexes, $target_indexes, - $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $i); + PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, + $matching_tables, $matching_tables_fields, $update_array, + $insert_array, $delete_array, $fields_num, $i, + $matching_tables_keys); + + PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, + $matching_tables, $source_columns, $target_columns, + $alter_str_array, $add_column_array, $uncommon_columns, + $criteria, $target_tables_keys, $i); + + PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, + $matching_tables, $source_indexes, $target_indexes, + $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $i); } for ($j = 0; $j < sizeof($source_tables_uncommon); $j++) { /** - * Finding out the number of rows to be added in tables that need to be added in target database + * Finding out the number of rows to be added in tables + * that need to be added in target database */ - PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $j, $row_count); + PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, + $src_link, $j, $row_count); } /** - * Storing all arrays in session for use when page is reloaded for each button press + * Storing all arrays in session for use when page is reloaded + * for each button press */ $_SESSION['matching_tables'] = $matching_tables; $_SESSION['update_array'] = $update_array; @@ -250,7 +267,8 @@ if ((isset($_REQUEST['submit_connect']))) { $_SESSION['target_indexes'] = $target_indexes; /** - * Displays the sub-heading and icons showing Structure Synchronization and Data Synchronization + * Displays the sub-heading and icons showing Structure Synchronization + * and Data Synchronization */ ?> <form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php"> @@ -269,7 +287,8 @@ if ((isset($_REQUEST['submit_connect']))) { </table> <?php /** - * Displays the tables containing the source tables names, their difference with the target tables and target tables names + * Displays the tables containing the source tables names, + * their difference with the target tables and target tables names. */ PMA_syncDisplayHeaderCompare($src_db, $trg_db); $rows = array(); @@ -300,7 +319,8 @@ if ((isset($_REQUEST['submit_connect']))) { } /** - * Calculating the number of alter columns, number of columns to be added, number of columns to be removed, + * Calculating the number of alter columns, number of columns to be + * added, number of columns to be removed, * number of index to be added and removed. */ $num_alter_cols = 0; @@ -333,19 +353,32 @@ if ((isset($_REQUEST['submit_connect']))) { $btn_data_params = null; /** - * Display the red button of structure synchronization if there exists any structure difference or index difference. + * Display the red button of structure synchronization if there + * exists any structure difference or index difference. */ - if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) { + if (($num_alter_cols > 0) + || ($num_insert_cols > 0) + || ($num_remove_cols > 0) + || ($num_add_index > 0) + || ($num_remove_index > 0) + ) { $btn_structure_params = array($i, $num_alter_cols, $num_insert_cols, $num_remove_cols, $num_add_index, $num_remove_index); } /** - * Display the green button of data synchronization if there exists any data difference. + * Display the green button of data synchronization if there exists + * any data difference. */ - if ((isset($update_array[$i]) || isset($insert_array[$i])) && !empty($matching_tables_keys[$i])) { - if (isset($update_array[$i][0][$matching_tables_keys[$i][0]]) || isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { - $btn_data_params = array($i, $num_of_updates, $num_of_insertions, null, null, null); + if ((isset($update_array[$i]) + || isset($insert_array[$i])) + && !empty($matching_tables_keys[$i]) + ) { + if (isset($update_array[$i][0][$matching_tables_keys[$i][0]]) + || isset($insert_array[$i][0][$matching_tables_keys[$i][0]]) + ) { + $btn_data_params = array($i, $num_of_updates, + $num_of_insertions, null, null, null); } } @@ -387,8 +420,10 @@ if ((isset($_REQUEST['submit_connect']))) { </fieldset>'; /** - * This "list" div will contain a table and each row will depict information about structure/data diffrence in tables. - * Rows will be generated dynamically as soon as the colored buttons "D" or "S" are clicked. + * This "list" div will contain a table and each row will depict + * information about structure/data difference in tables. + * Rows will be generated dynamically as soon as the colored + * buttons "D" or "S" are clicked. */ echo '<fieldset style="padding:0"><div id="list" style="overflow:auto; height:140px; padding:1em"> @@ -419,12 +454,17 @@ if ((isset($_REQUEST['submit_connect']))) { * This fieldset displays the checkbox to confirm deletion of previous rows from target tables */ echo '<fieldset> - <p><input type= "checkbox" name="delete_rows" id ="delete_rows" /><label for="delete_rows">' . __('Would you like to delete all the previous rows from target tables?') . '</label> </p> + <p><input type= "checkbox" name="delete_rows" id ="delete_rows" /><label for="delete_rows">' + . __('Would you like to delete all the previous rows from target tables?') + . '</label> </p> </fieldset> <fieldset class="tblFooters">'; - echo '<input type="button" name="apply_changes" value="' . __('Apply Selected Changes') - . '" onclick ="ApplySelectedChanges(' . "'" . htmlspecialchars($_SESSION['token']) . "'" . ')" />'; - echo '<input type="submit" name="synchronize_db" value="' . __('Synchronize Databases') . '" />' . '</fieldset>'; + echo '<input type="button" name="apply_changes" value="' + . __('Apply Selected Changes') + . '" onclick ="ApplySelectedChanges(' + . "'" . htmlspecialchars($_SESSION['token']) . "'" . ')" />'; + echo '<input type="submit" name="synchronize_db" value="' + . __('Synchronize Databases') . '" />' . '</fieldset>'; echo '</form>'; } } @@ -437,7 +477,9 @@ if (isset($_REQUEST['Table_ids'])) { /** * Displays success message */ - echo '<div class="success">' . __('Selected target tables have been synchronized with source tables.') . '</div>'; + echo '<div class="success">' + . __('Selected target tables have been synchronized with source tables.') + . '</div>'; $src_db = $_SESSION['src_db']; $trg_db = $_SESSION['trg_db']; @@ -480,7 +522,8 @@ if (isset($_REQUEST['Table_ids'])) { */ foreach ($cons as $con) { if (${"{$con}_type"} != "cur") { - ${"{$con}_link"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}); + ${"{$con}_link"} = PMA_DBI_connect(${"{$con}_username"}, + ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}); } else { ${"{$con}_link"} = null; // working on current server, so initialize this for tracking @@ -521,42 +564,49 @@ if (isset($_REQUEST['Table_ids'])) { /** * Applying the structure difference on selected matching tables */ - for ($q = 0; $q < sizeof($matching_table_structure_diff); $q++) - { + for ($q = 0; $q < sizeof($matching_table_structure_diff); $q++) { if (isset($alter_str_array[$matching_table_structure_diff[$q]])) { - - PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields, - $criteria, $matching_tables_keys, $target_tables_keys, $matching_table_structure_diff[$q], false); + PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, + $source_columns, $alter_str_array, $matching_tables_fields, + $criteria, $matching_tables_keys, $target_tables_keys, + $matching_table_structure_diff[$q], false); unset($alter_str_array[$matching_table_structure_diff[$q]]); } if (isset($add_column_array[$matching_table_structure_diff[$q]])) { - - PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $matching_table_structure_diff[$q], $target_tables_keys, - $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); + PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, + $matching_table_structure_diff[$q], $target_tables_keys, + $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); if (isset($delete_array[$matching_table_structure_diff[$q]])) { - - PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $matching_table_structure_diff[$q], $target_tables_keys, $delete_array, false); + PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, + $matching_table_structure_diff[$q], $target_tables_keys, + $delete_array, false); unset($delete_array[$matching_table_structure_diff[$q]]); } - PMA_addColumnsInTargetTable($src_db, $trg_db,$src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, $matching_tables_fields, - $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables,$uncommon_tables_fields, $matching_table_structure_diff[$q], $uncommon_cols, false); + PMA_addColumnsInTargetTable($src_db, $trg_db,$src_link, $trg_link, + $matching_tables, $source_columns, $add_column_array, + $matching_tables_fields, $criteria, $matching_tables_keys, + $target_tables_keys, $uncommon_tables,$uncommon_tables_fields, + $matching_table_structure_diff[$q], $uncommon_cols, false); unset($add_column_array[$matching_table_structure_diff[$q]]); } if (isset($uncommon_columns[$matching_table_structure_diff[$q]])) { - - PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $matching_table_structure_diff[$q], false); + PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, + $uncommon_columns, $matching_table_structure_diff[$q], false); unset($uncommon_columns[$matching_table_structure_diff[$q]]); } - if (isset($add_indexes_array[$matching_table_structure_diff[$q]]) || isset($remove_indexes_array[$matching_table_structure_diff[$q]]) - || isset($alter_indexes_array[$matching_table_structure_diff[$q]])) { - - PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, - $remove_indexes_array, $matching_table_structure_diff[$q], false); + if (isset($add_indexes_array[$matching_table_structure_diff[$q]]) + || isset($remove_indexes_array[$matching_table_structure_diff[$q]]) + || isset($alter_indexes_array[$matching_table_structure_diff[$q]]) + ) { + PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, + $source_indexes, $target_indexes, $add_indexes_array, + $alter_indexes_array, $remove_indexes_array, + $matching_table_structure_diff[$q], false); unset($add_indexes_array[$matching_table_structure_diff[$q]]); unset($alter_indexes_array[$matching_table_structure_diff[$q]]); @@ -567,55 +617,65 @@ if (isset($_REQUEST['Table_ids'])) { * Applying the data difference. First checks if structure diff is applied or not. * If not, then apply structure difference first then apply data difference. */ - for ($p = 0; $p < sizeof($matching_table_data_diff); $p++) - { + for ($p = 0; $p < sizeof($matching_table_data_diff); $p++) { if ($_REQUEST['checked'] == 'true') { - - PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $matching_table_data_diff[$p], $target_tables_keys, - $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); + PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, + $matching_table_data_diff[$p], $target_tables_keys, + $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); if (isset($delete_array[$matching_table_data_diff[$p]])) { - - PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $matching_table_data_diff[$p], $target_tables_keys, $delete_array, false); + PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, + $matching_table_data_diff[$p], $target_tables_keys, + $delete_array, false); unset($delete_array[$matching_table_data_diff[$p]]); } } if (isset($alter_str_array[$matching_table_data_diff[$p]])) { - - PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields, - $criteria, $matching_tables_keys, $target_tables_keys, $matching_table_data_diff[$p], false); + PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, + $source_columns, $alter_str_array, $matching_tables_fields, + $criteria, $matching_tables_keys, $target_tables_keys, + $matching_table_data_diff[$p], false); unset($alter_str_array[$matching_table_data_diff[$p]]); } if (isset($add_column_array[$matching_table_data_diff[$p]])) { - - PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $matching_table_data_diff[$p], $target_tables_keys, - $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); + PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, + $matching_table_data_diff[$p], $target_tables_keys, + $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); if (isset($delete_array[$matching_table_data_diff[$p]])) { - - PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $matching_table_data_diff[$p], $target_tables_keys, $delete_array, false); + PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, + $matching_table_data_diff[$p], $target_tables_keys, + $delete_array, false); unset($delete_array[$matching_table_data_diff[$p]]); } - PMA_addColumnsInTargetTable($src_db, $trg_db,$src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, $matching_tables_fields, - $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, $uncommon_tables_fields, $matching_table_data_diff[$p], $uncommon_cols, false); + PMA_addColumnsInTargetTable($src_db, $trg_db,$src_link, $trg_link, + $matching_tables, $source_columns, $add_column_array, + $matching_tables_fields, $criteria, $matching_tables_keys, + $target_tables_keys, $uncommon_tables, $uncommon_tables_fields, + $matching_table_data_diff[$p], $uncommon_cols, false); unset($add_column_array[$matching_table_data_diff[$p]]); } if (isset($uncommon_columns[$matching_table_data_diff[$p]])) { - - PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $matching_table_data_diff[$p], false); + PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, + $uncommon_columns, $matching_table_data_diff[$p], false); unset($uncommon_columns[$matching_table_data_diff[$p]]); } - if ((isset($matching_table_structure_diff[$q]) && isset($add_indexes_array[$matching_table_structure_diff[$q]])) - || (isset($matching_table_structure_diff[$q]) && isset($remove_indexes_array[$matching_table_structure_diff[$q]])) - || (isset($matching_table_structure_diff[$q]) && isset($alter_indexes_array[$matching_table_structure_diff[$q]]))) { - - PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, - $remove_indexes_array, $matching_table_structure_diff[$q], false); + if ((isset($matching_table_structure_diff[$q]) + && isset($add_indexes_array[$matching_table_structure_diff[$q]])) + || (isset($matching_table_structure_diff[$q]) + && isset($remove_indexes_array[$matching_table_structure_diff[$q]])) + || (isset($matching_table_structure_diff[$q]) + && isset($alter_indexes_array[$matching_table_structure_diff[$q]])) + ) { + PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, + $source_indexes, $target_indexes, $add_indexes_array, + $alter_indexes_array, $remove_indexes_array, + $matching_table_structure_diff[$q], false); unset($add_indexes_array[$matching_table_structure_diff[$q]]); unset($alter_indexes_array[$matching_table_structure_diff[$q]]); @@ -624,12 +684,16 @@ if (isset($_REQUEST['Table_ids'])) { /** * Applying the data difference. */ - PMA_updateTargetTables($matching_tables, $update_array, $src_db, $trg_db, $trg_link, $matching_table_data_diff[$p], $matching_tables_keys, false); - - PMA_insertIntoTargetTable($matching_tables, $src_db, $trg_db, $src_link, $trg_link , $matching_tables_fields, $insert_array, - $matching_table_data_diff[$p], $matching_tables_keys, $source_columns, $add_column_array, $criteria, $target_tables_keys, - $uncommon_tables, $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes, $target_indexes, $add_indexes_array, - $alter_indexes_array, $delete_array, $update_array, false); + PMA_updateTargetTables($matching_tables, $update_array, $src_db, $trg_db, + $trg_link, $matching_table_data_diff[$p], $matching_tables_keys, false); + + PMA_insertIntoTargetTable($matching_tables, $src_db, $trg_db, $src_link, + $trg_link, $matching_tables_fields, $insert_array, + $matching_table_data_diff[$p], $matching_tables_keys, $source_columns, + $add_column_array, $criteria, $target_tables_keys, $uncommon_tables, + $uncommon_tables_fields, $uncommon_cols, $alter_str_array, + $source_indexes, $target_indexes, $add_indexes_array, + $alter_indexes_array, $delete_array, $update_array, false); } /** * Updating the session variables to the latest values of the arrays. @@ -644,32 +708,35 @@ if (isset($_REQUEST['Table_ids'])) { $_SESSION['update_array'] = $update_array; /** - * Applying structure difference to selected non-matching tables (present in Source but absent from Target). + * Applying structure difference to selected non-matching tables + * (present in Source but absent from Target). */ - for ($s = 0; $s < sizeof($uncommon_table_structure_diff); $s++) - { - PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $uncommon_table_structure_diff[$s], $uncommon_tables_fields, false); + for ($s = 0; $s < sizeof($uncommon_table_structure_diff); $s++) { + PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, + $uncommon_tables, $uncommon_table_structure_diff[$s], + $uncommon_tables_fields, false); $_SESSION['uncommon_tables_fields'] = $uncommon_tables_fields; unset($uncommon_tables[$uncommon_table_structure_diff[$s]]); } /** - * Applying data difference to selected non-matching tables (present in Source but absent from Target). + * Applying data difference to selected non-matching tables + * (present in Source but absent from Target). * Before data synchronization, structure synchronization is confirmed. */ - for ($r = 0; $r < sizeof($uncommon_table_data_diff); $r++) - { + for ($r = 0; $r < sizeof($uncommon_table_data_diff); $r++) { if (!(in_array($uncommon_table_data_diff[$r], $uncommon_table_structure_diff))) { if (isset($uncommon_tables[$uncommon_table_data_diff[$r]])) { - - PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $uncommon_table_data_diff[$r], + PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, + $uncommon_tables, $uncommon_table_data_diff[$r], $uncommon_tables_fields, false); $_SESSION['uncommon_tables_fields'] = $uncommon_tables_fields; unset($uncommon_tables[$uncommon_table_data_diff[$r]]); } } - PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $uncommon_table_data_diff[$r], + PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, + $source_tables_uncommon, $uncommon_table_data_diff[$r], $_SESSION['uncommon_tables_fields'], false); unset($row_count[$uncommon_table_data_diff[$r]]); @@ -709,13 +776,19 @@ if (isset($_REQUEST['Table_ids'])) { $btn_structure_params = null; $btn_data_params = null; - if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) { + if (($num_alter_cols > 0) + || ($num_insert_cols > 0) + || ($num_remove_cols > 0) + || ($num_add_index > 0) + || ($num_remove_index > 0) + ) { $btn_structure_params = array($i, $num_alter_cols, $num_insert_cols, $num_remove_cols, $num_add_index, $num_remove_index); } if (!(in_array($i, $matching_table_data_diff))) { - - if (isset($matching_tables_keys[$i][0]) && isset($update_array[$i][0][$matching_tables_keys[$i][0]])) { + if (isset($matching_tables_keys[$i][0]) + && isset($update_array[$i][0][$matching_tables_keys[$i][0]]) + ) { if (isset($update_array[$i])) { $num_of_updates = sizeof($update_array[$i]); } else { @@ -724,7 +797,9 @@ if (isset($_REQUEST['Table_ids'])) { } else { $num_of_updates = 0; } - if (isset($matching_tables_keys[$i][0]) && isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { + if (isset($matching_tables_keys[$i][0]) + && isset($insert_array[$i][0][$matching_tables_keys[$i][0]]) + ) { if (isset($insert_array[$i])) { $num_of_insertions = sizeof($insert_array[$i]); } else { @@ -734,8 +809,11 @@ if (isset($_REQUEST['Table_ids'])) { $num_of_insertions = 0; } - if ((isset($matching_tables_keys[$i][0]) && isset($update_array[$i][0][$matching_tables_keys[$i][0]])) - || (isset($matching_tables_keys[$i][0]) && isset($insert_array[$i][0][$matching_tables_keys[$i][0]]))) { + if ((isset($matching_tables_keys[$i][0]) + && isset($update_array[$i][0][$matching_tables_keys[$i][0]])) + || (isset($matching_tables_keys[$i][0]) + && isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) + ) { $btn_data_params = array($i, $num_of_updates, $num_of_insertions, null, null, null); } @@ -815,8 +893,10 @@ if (isset($_REQUEST['Table_ids'])) { </fieldset>'; /** - * This "list" div will contain a table and each row will depict information about structure/data diffrence in tables. - * Rows will be generated dynamically as soon as the colored buttons "D" or "S" are clicked. + * This "list" div will contain a table and each row will depict information about + * structure/data difference in tables. + * Rows will be generated dynamically as soon as the colored buttons "D" or "S" + * are clicked. */ echo '<fieldset style="padding:0"><div id="list" style = "overflow:auto; height:140px; padding:1em">'; @@ -847,14 +927,17 @@ if (isset($_REQUEST['Table_ids'])) { * This fieldset displays the checkbox to confirm deletion of previous rows from target tables */ echo '<fieldset> - <p><input type="checkbox" name="delete_rows" id ="delete_rows" /><label for="delete_rows">' . __('Would you like to delete all the previous rows from target tables?') . '</label> </p> - </fieldset>'; + <p><input type="checkbox" name="delete_rows" id ="delete_rows" /><label for="delete_rows">' + . __('Would you like to delete all the previous rows from target tables?') . '</label> </p> + </fieldset>'; echo '<fieldset class="tblFooters">'; - echo '<input type="button" name="apply_changes" value="' . __('Apply Selected Changes') . '" - onclick ="ApplySelectedChanges(' . "'" . htmlspecialchars($_SESSION['token']) . "'" .')" />'; - echo '<input type="submit" name="synchronize_db" value="' . __('Synchronize Databases') . '" />' - . '</fieldset>'; + echo '<input type="button" name="apply_changes" value="' + . __('Apply Selected Changes') . '" onclick ="ApplySelectedChanges(' + . "'" . htmlspecialchars($_SESSION['token']) . "'" .')" />'; + echo '<input type="submit" name="synchronize_db" value="' + . __('Synchronize Databases') . '" />' + . '</fieldset>'; echo '</form>'; } @@ -899,14 +982,16 @@ if (isset($_REQUEST['synchronize_db'])) { /** * Display success message. */ - echo '<div class="success">' . __('Target database has been synchronized with source database') . '</div>'; + echo '<div class="success">' + . __('Target database has been synchronized with source database') + . '</div>'; /** - * Displaying all the tables of source and target database and now no difference is there. + * Displaying all the tables of source and target database + * and now no difference is there. */ PMA_syncDisplayHeaderCompare($src_db, $trg_db); $rows = array(); - for ($i = 0; $i < count($matching_tables); $i++) - { + for ($i = 0; $i < count($matching_tables); $i++) { $rows[] = array( 'src_table_name' => $matching_tables[$i], 'dst_table_name' => $matching_tables[$i]); @@ -930,7 +1015,8 @@ if (isset($_REQUEST['synchronize_db'])) { * connecting the source and target servers */ if ('cur' != $_SESSION['src_type']) { - $src_link = PMA_DBI_connect($src_username, $src_password, $is_controluser = false, $_SESSION['src_server']); + $src_link = PMA_DBI_connect($src_username, $src_password, + $is_controluser = false, $_SESSION['src_server']); } else { $src_link = $GLOBALS['userlink']; // working on current server, so initialize this for tracking @@ -938,7 +1024,8 @@ if (isset($_REQUEST['synchronize_db'])) { $GLOBALS['db'] = $_SESSION['src_db']; } if ('cur' != $_SESSION['trg_type']) { - $trg_link = PMA_DBI_connect($trg_username, $trg_password, $is_controluser = false, $_SESSION['trg_server']); + $trg_link = PMA_DBI_connect($trg_username, $trg_password, + $is_controluser = false, $_SESSION['trg_server']); } else { $trg_link = $GLOBALS['userlink']; // working on current server, so initialize this for tracking @@ -958,65 +1045,83 @@ if (isset($_REQUEST['synchronize_db'])) { * first find out rows to be deleted and then delete the rows. */ if (isset($_REQUEST['delete_rows'])) { - PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys, + PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, + $target_tables_keys, $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); if (isset($delete_array[$p])) { - PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $p, $target_tables_keys, $delete_array, true); + PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $p, + $target_tables_keys, $delete_array, true); unset($delete_array[$p]); } } if (isset($alter_str_array[$p])) { - PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields, - $criteria, $matching_tables_keys, $target_tables_keys, $p, true); + PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, + $source_columns, $alter_str_array, $matching_tables_fields, + $criteria, $matching_tables_keys, $target_tables_keys, $p, true); unset($alter_str_array[$p]); } if (! empty($add_column_array[$p])) { - PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys, - $trg_db, $trg_link, $src_db, $src_link); + PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, + $target_tables_keys, $matching_tables_keys, + $trg_db, $trg_link, $src_db, $src_link); if (isset($delete_array[$p])) { - PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $p, $target_tables_keys, $delete_array, true); + PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $p, + $target_tables_keys, $delete_array, true); unset($delete_array[$p]); } - PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, - $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, $uncommon_tables_fields, + PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, + $matching_tables, $source_columns, $add_column_array, + $matching_tables_fields, $criteria, $matching_tables_keys, + $target_tables_keys, $uncommon_tables, $uncommon_tables_fields, $p, $uncommon_cols, true); unset($add_column_array[$p]); } if (isset($uncommon_columns[$p])) { - PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $p, true); + PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, + $uncommon_columns, $p, true); unset($uncommon_columns[$p]); } - if (isset($matching_table_structure_diff) && - (isset($add_indexes_array[$matching_table_structure_diff[$p]]) + if (isset($matching_table_structure_diff) + && (isset($add_indexes_array[$matching_table_structure_diff[$p]]) || isset($remove_indexes_array[$matching_table_structure_diff[$p]]) - || isset($alter_indexes_array[$matching_table_structure_diff[$p]]))) { - PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, - $remove_indexes_array, $matching_table_structure_diff[$p], true); + || isset($alter_indexes_array[$matching_table_structure_diff[$p]])) + ) { + PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, + $source_indexes, $target_indexes, $add_indexes_array, + $alter_indexes_array, $remove_indexes_array, + $matching_table_structure_diff[$p], true); unset($add_indexes_array[$matching_table_structure_diff[$p]]); unset($alter_indexes_array[$matching_table_structure_diff[$p]]); unset($remove_indexes_array[$matching_table_structure_diff[$p]]); } - PMA_updateTargetTables($matching_tables, $update_array, $src_db, $trg_db, $trg_link, $p, $matching_tables_keys, true); + PMA_updateTargetTables($matching_tables, $update_array, $src_db, $trg_db, + $trg_link, $p, $matching_tables_keys, true); - PMA_insertIntoTargetTable($matching_tables, $src_db, $trg_db, $src_link, $trg_link , $matching_tables_fields, $insert_array, $p, - $matching_tables_keys, $matching_tables_keys, $source_columns, $add_column_array, $criteria, $target_tables_keys, $uncommon_tables, - $uncommon_tables_fields,$uncommon_cols, $alter_str_array,$source_indexes, $target_indexes, $add_indexes_array, + PMA_insertIntoTargetTable($matching_tables, $src_db, $trg_db, $src_link, + $trg_link , $matching_tables_fields, $insert_array, $p, + $matching_tables_keys, $matching_tables_keys, $source_columns, + $add_column_array, $criteria, $target_tables_keys, $uncommon_tables, + $uncommon_tables_fields,$uncommon_cols, $alter_str_array,$source_indexes, + $target_indexes, $add_indexes_array, $alter_indexes_array, $delete_array, $update_array, true); } /** - * Creating and populating tables present in source but absent from target database. + * Creating and populating tables present in source but absent + * from target database. */ for ($q = 0; $q < sizeof($source_tables_uncommon); $q++) { if (isset($uncommon_tables[$q])) { - PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, true); + PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, + $source_tables_uncommon, $q, $uncommon_tables_fields, true); } if (isset($row_count[$q])) { - PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, true); + PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, + $source_tables_uncommon, $q, $uncommon_tables_fields, true); } } echo "</fieldset>"; @@ -1026,8 +1131,10 @@ if (isset($_REQUEST['synchronize_db'])) { * Displays the main page when none of the following buttons is pressed */ - if (! isset($_REQUEST['submit_connect']) && ! isset($_REQUEST['synchronize_db']) && ! isset($_REQUEST['Table_ids']) ) -{ +if (! isset($_REQUEST['submit_connect']) + && ! isset($_REQUEST['synchronize_db']) + && ! isset($_REQUEST['Table_ids']) +) { /** * Displays the sub-page heading */ @@ -1063,7 +1170,8 @@ if (isset($_REQUEST['synchronize_db'])) { $database_header = __('Target database'); } - $database_header .= PMA_showHint(PMA_sanitize(sprintf('%sAllowArbitraryServer%s', '[a@./Documentation.html#AllowArbitraryServer@_blank]', '[/a]'))); + $database_header .= PMA_showHint(PMA_sanitize(sprintf('%sAllowArbitraryServer%s', + '[a@./Documentation.html#AllowArbitraryServer@_blank]', '[/a]'))); ?> <table id="serverconnection_<?php echo $type; ?>_remote" class="data noclick"> <caption class="tblHeaders"><?php echo $database_header; ?></caption> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15230-g3e342bc
by Dieter Adriaenssens 16 Aug '11

16 Aug '11

The branch, master has been updated via 3e342bceace595aaa5b34227618c65c5a3651814 (commit) from d6ba069b01d4a9d89ed3d5eb7b76bc388c04938c (commit) - Log ----------------------------------------------------------------- commit 3e342bceace595aaa5b34227618c65c5a3651814 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Tue Aug 16 23:05:22 2011 +0200 fix typo ----------------------------------------------------------------------- Summary of changes: scripts/decode_bug.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php index e5a645b..e376ef8 100644 --- a/scripts/decode_bug.php +++ b/scripts/decode_bug.php @@ -4,7 +4,7 @@ * Parser bug report decoder * * This is the parser bug decoder system - * Throw the bug data in teh query box, and hit submit for output. + * Throw the bug data in the query box, and hit submit for output. * * Copyright 2002 Robin Johnson <robbat2(a)users.sourceforge.net> * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15229-gd6ba069
by Dieter Adriaenssens 16 Aug '11

16 Aug '11

The branch, master has been updated via d6ba069b01d4a9d89ed3d5eb7b76bc388c04938c (commit) via 35b3595ec0e6833b9199da0cb238243b4c7457fe (commit) from 8c4530e338ba81851cc5f0e2c9b3708293efa4ec (commit) - Log ----------------------------------------------------------------- commit d6ba069b01d4a9d89ed3d5eb7b76bc388c04938c Merge: 35b3595 8c4530e Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Tue Aug 16 22:40:30 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 35b3595ec0e6833b9199da0cb238243b4c7457fe Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Tue Aug 16 22:39:46 2011 +0200 coding style and wrapping long lines ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 72 ++++++++++++++++++++++++++++++---------------- tbl_change.php | 55 ++++++++++++++++++++-------------- 2 files changed, 79 insertions(+), 48 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index eee6035..0b89345 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -94,7 +94,7 @@ function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = fa $button .= '<span class="nowrap">'; if ($include_icon) { - if($noSprite) { + if ($noSprite) { $button .= '<img src="' . $GLOBALS['pmaThemeImage'] . $icon . '"' . ' class="icon" width="16" height="16" />'; } else { @@ -713,8 +713,8 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = // in $group we save the reference to the place in $table_groups // where to store the table info if ($GLOBALS['cfg']['LeftFrameDBTree'] - && $sep && strstr($table_name, $sep)) - { + && $sep && strstr($table_name, $sep) + ) { $parts = explode($sep, $table_name); $group =& $table_groups; @@ -754,7 +754,8 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = if ($GLOBALS['cfg']['ShowTooltipAliasTB'] - && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { + && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested' + ) { // switch tooltip and name $table['Comment'] = $table['Name']; $table['disp_name'] = $table['Comment']; @@ -935,7 +936,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // @todo what about $GLOBALS['display_query']??? // @todo this is REALLY the wrong place to do this - very unexpected here if (strlen($GLOBALS['table']) - && $GLOBALS['sql_query'] == 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table'])) { + && $GLOBALS['sql_query'] == 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table']) + ) { if (PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], 'Index_length') > 1024) { PMA_DBI_try_query('REPAIR TABLE ' . PMA_backquote($GLOBALS['table'])); } @@ -1029,7 +1031,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view */ if (isset($analyzed_display_query[0]['queryflags']['select_from']) - && isset($GLOBALS['sql_limit_to_append'])) { + && isset($GLOBALS['sql_limit_to_append']) + ) { $query_base = $analyzed_display_query[0]['section_before_limit'] . "\n" . $GLOBALS['sql_limit_to_append'] . $analyzed_display_query[0]['section_after_limit']; @@ -1142,7 +1145,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // Refresh query if (! empty($cfg['SQLQuery']['Refresh']) - && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query)) { + && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query) + ) { $refresh_link = 'import.php' . PMA_generate_common_url($url_params); $refresh_link = ' [' . PMA_linkOrButton($refresh_link, __('Refresh')) . ']'; } else { @@ -1150,7 +1154,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view } //show as php if (! empty($cfg['SQLValidator']['use']) - && ! empty($cfg['SQLQuery']['Validate'])) { + && ! empty($cfg['SQLQuery']['Validate']) + ) { $validate_params = $url_params; if (!empty($GLOBALS['validatequery'])) { $validate_message = __('Skip Validate SQL') ; @@ -1251,8 +1256,9 @@ function PMA_profilingSupported() // (avoid a trip to the server for MySQL before 5.0.37) // and do not set a constant as we might be switching servers if (defined('PMA_MYSQL_INT_VERSION') - && PMA_MYSQL_INT_VERSION >= 50037 - && PMA_DBI_fetch_value("SHOW VARIABLES LIKE 'profiling'")) { + && PMA_MYSQL_INT_VERSION >= 50037 + && PMA_DBI_fetch_value("SHOW VARIABLES LIKE 'profiling'") + ) { PMA_cacheSet('profiling_supported', true, true); } else { PMA_cacheSet('profiling_supported', false, true); @@ -1734,7 +1740,10 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $displayed_message = ''; // Add text if not already added - if (stristr($message, '<img') && (!$strip_img || $GLOBALS['cfg']['PropertiesIconic'] === true) && strip_tags($message)==$message) { + if (stristr($message, '<img') + && (!$strip_img || $GLOBALS['cfg']['PropertiesIconic'] === true) + && strip_tags($message)==$message + ) { $displayed_message = '<span>' . htmlspecialchars(preg_replace('/^.*\salt="([^"]*)".*$/si', '\1', $message)) . '</span>'; } @@ -1996,7 +2005,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force $meta->orgname = $meta->name; if (isset($GLOBALS['analyzed_sql'][0]['select_expr']) - && is_array($GLOBALS['analyzed_sql'][0]['select_expr'])) { + && is_array($GLOBALS['analyzed_sql'][0]['select_expr']) + ) { foreach ($GLOBALS['analyzed_sql'][0]['select_expr'] as $select_expr) { // need (string) === (string) // '' !== 0 but '' == 0 @@ -2019,7 +2029,10 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force // a view because this view might be updatable. // (The isView() verification should not be costly in most cases // because there is some caching in the function). - if (isset($meta->orgtable) && $meta->table != $meta->orgtable && ! PMA_Table::isView($GLOBALS['db'], $meta->table)) { + if (isset($meta->orgtable) + && $meta->table != $meta->orgtable + && ! PMA_Table::isView($GLOBALS['db'], $meta->table) + ) { $meta->table = $meta->orgtable; } @@ -2042,7 +2055,10 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force } else { // timestamp is numeric on some MySQL 4.1 // for real we use CONCAT above and it should compare to string - if ($meta->numeric && $meta->type != 'timestamp' && $meta->type != 'real') { + if ($meta->numeric + && $meta->type != 'timestamp' + && $meta->type != 'real' + ) { $con_val = '= ' . $row[$i]; } elseif (($meta->type == 'blob' || $meta->type == 'string') // hexify only if this is a true not empty BLOB or a BINARY @@ -2131,10 +2147,13 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, . PMA_getIcon($image, $text) .'</button>' . "\n"; } else { - echo '<input type="image" name="' . $image_name . '" value="' - . htmlspecialchars($value) . '" title="' . htmlspecialchars($text) . '" src="' . $GLOBALS['pmaThemeImage'] - . $image . '" />' - . ($GLOBALS['cfg']['PropertiesIconic'] === 'both' ? ' ' . htmlspecialchars($text) : '') . "\n"; + echo '<input type="image" name="' . $image_name + . '" value="' . htmlspecialchars($value) + . '" title="' . htmlspecialchars($text) + . '" src="' . $GLOBALS['pmaThemeImage']. $image . '" />' + . ($GLOBALS['cfg']['PropertiesIconic'] === 'both' + ? ' ' . htmlspecialchars($text) + : '') . "\n"; } } // end function @@ -2228,7 +2247,8 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, } else { $selected = ''; } - $gotopage .= ' <option ' . $selected . ' value="' . (($i - 1) * $rows) . '">' . $i . '</option>' . "\n"; + $gotopage .= ' <option ' . $selected + . ' value="' . (($i - 1) * $rows) . '">' . $i . '</option>' . "\n"; } $gotopage .= ' </select><noscript><input type="submit" value="' . __('Go') . '" /></noscript>'; @@ -2363,8 +2383,8 @@ function PMA_getDbLink($database = null) } return '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($database) . '"' - .' title="' . sprintf(__('Jump to database "%s".'), htmlspecialchars($database)) . '">' - .htmlspecialchars($database) . '</a>'; + . ' title="' . sprintf(__('Jump to database "%s".'), htmlspecialchars($database)) . '">' + . htmlspecialchars($database) . '</a>'; } /** @@ -3185,7 +3205,8 @@ function PMA_getFunctionsForField($field, $insert_mode) // or something similar. Then directly look up the entry in the RestrictFunctions array, // which will then reveal the available dropdown options if (isset($cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]) - && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]])) { + && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]]) + ) { $current_func_type = $cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]; $dropdown = $cfg['RestrictFunctions'][$current_func_type]; $default_function = $cfg['DefaultFunctions'][$current_func_type]; @@ -3202,9 +3223,10 @@ function PMA_getFunctionsForField($field, $insert_mode) // and the column does not have the // ON UPDATE DEFAULT TIMESTAMP attribute. if ($field['True_Type'] == 'timestamp' - && empty($field['Default']) - && empty($data) - && ! isset($analyzed_sql[0]['create_table_fields'][$field['Field']]['on_update_current_timestamp'])) { + && empty($field['Default']) + && empty($data) + && ! isset($analyzed_sql[0]['create_table_fields'][$field['Field']]['on_update_current_timestamp']) + ) { $default_function = $cfg['DefaultFunctions']['first_timestamp']; } // For primary keys of type char(36) or varchar(36) UUID if the default function diff --git a/tbl_change.php b/tbl_change.php index 8befabb..9148ef3 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -791,26 +791,26 @@ foreach ($rows as $row_id => $vrow) { // We don't want binary data destroyed elseif ($field['is_binary'] || $field['is_blob']) { if (($cfg['ProtectBinary'] && $field['is_blob']) - || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { + || ($cfg['ProtectBinary'] == 'all' && $field['is_binary']) + ) { echo "\n"; // for blobstreaming - if (PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) && PMA_BS_IsPBMSReference($data, $db)) - { - echo '<input type="hidden" name="remove_blob_ref_' . $field['Field_md5'] . $vkey . '" value="' . $data . '" />'; - echo '<input type="checkbox" name="remove_blob_repo_' . $field['Field_md5'] . $vkey . '" /> ' . __('Remove BLOB Repository Reference') . "<br />"; - echo PMA_BS_CreateReferenceLink($data, $db); - echo "<br />"; + if (PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) + && PMA_BS_IsPBMSReference($data, $db) + ) { + echo '<input type="hidden" name="remove_blob_ref_' . $field['Field_md5'] . $vkey . '" value="' . $data . '" />'; + echo '<input type="checkbox" name="remove_blob_repo_' . $field['Field_md5'] . $vkey . '" /> ' . __('Remove BLOB Repository Reference') . "<br />"; + echo PMA_BS_CreateReferenceLink($data, $db); + echo "<br />"; + } else { + echo __('Binary - do not edit'); + if (isset($data)) { + $data_size = PMA_formatByteDown(strlen(stripslashes($data)), 3, 1); + echo ' ('. $data_size [0] . ' ' . $data_size[1] . ')'; + unset($data_size); } - else - { - echo __('Binary - do not edit'); - if (isset($data)) { - $data_size = PMA_formatByteDown(strlen(stripslashes($data)), 3, 1); - echo ' ('. $data_size [0] . ' ' . $data_size[1] . ')'; - unset($data_size); - } - echo "\n"; - } // end if (PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) && PMA_BS_IsPBMSReference($data, $db)) + echo "\n"; + } // end if (PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) && PMA_BS_IsPBMSReference($data, $db)) ?> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="protected" /> <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" value="" /> @@ -849,7 +849,9 @@ foreach ($rows as $row_id => $vrow) { if ($is_upload && $field['is_blob']) { // check if field type is of longblob and if the table is PBMS enabled. - if (($field['pma_type'] == "longblob") && PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type)) { + if (($field['pma_type'] == "longblob") + && PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) + ) { echo '<br />'; echo '<input type="checkbox" name="upload_blob_repo' . $vkey . '[' . $field['Field_md5'] . ']" /> ' . __('Upload to BLOB repository'); } @@ -898,12 +900,14 @@ foreach ($rows as $row_id => $vrow) { elseif (in_array($field['pma_type'], $no_support_types)) { // ignore this column to avoid changing it - } - else { + } else { // field size should be at least 4 and max 40 $fieldsize = min(max($field['len'], 4), 40); echo $backup_field . "\n"; - if ($field['is_char'] && ($cfg['CharEditing'] == 'textarea' || strpos($data, "\n") !== false)) { + if ($field['is_char'] + && ($cfg['CharEditing'] == 'textarea' + || strpos($data, "\n") !== false) + ) { echo "\n"; ?> <textarea name="fields<?php echo $field_name_appendix; ?>" @@ -919,7 +923,9 @@ foreach ($rows as $row_id => $vrow) { $the_class = 'textfield'; if ($field['pma_type'] == 'date') { $the_class .= ' datefield'; - } elseif ($field['pma_type'] == 'datetime' || substr($field['pma_type'], 0, 9) == 'timestamp') { + } elseif ($field['pma_type'] == 'datetime' + || substr($field['pma_type'], 0, 9) == 'timestamp' + ) { $the_class .= ' datetimefield'; } ?> @@ -949,7 +955,10 @@ foreach ($rows as $row_id => $vrow) { <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="bit" /> <?php } - if ($field['pma_type'] == 'date' || $field['pma_type'] == 'datetime' || substr($field['pma_type'], 0, 9) == 'timestamp') { + if ($field['pma_type'] == 'date' + || $field['pma_type'] == 'datetime' + || substr($field['pma_type'], 0, 9) == 'timestamp' + ) { // the _3 suffix points to the date field // the _2 suffix points to the corresponding NULL checkbox // in dateFormat, 'yy' means the year with 4 digits hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15227-g8c4530e
by Piotr Przybylski 16 Aug '11

16 Aug '11

The branch, master has been updated via 8c4530e338ba81851cc5f0e2c9b3708293efa4ec (commit) via 6694352f0c5ae67f8b80df29ee319ea538874b39 (commit) via 726594645ccd3906e39c6d8be973b2ac2d4bffd2 (commit) via 701c957f40696a17c1ee5d3804ffb21d6674090e (commit) from 71184688b507f04bc3b5e521cb8d710de682b633 (commit) - Log ----------------------------------------------------------------- commit 8c4530e338ba81851cc5f0e2c9b3708293efa4ec Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 22:19:41 2011 +0200 Simplify code commit 6694352f0c5ae67f8b80df29ee319ea538874b39 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 22:18:08 2011 +0200 Only PMA_DBI_fetch_assoc is needed here commit 726594645ccd3906e39c6d8be973b2ac2d4bffd2 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 22:17:23 2011 +0200 Optimize tracking query, only the first row is needed commit 701c957f40696a17c1ee5d3804ffb21d6674090e Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 20:23:15 2011 +0200 Inline three one-line methods ----------------------------------------------------------------------- Summary of changes: libraries/Tracker.class.php | 53 ++++++------------------------------------ 1 files changed, 8 insertions(+), 45 deletions(-) diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 8a622aa..de216ab 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -131,39 +131,6 @@ class PMA_Tracker } /** - * Returns a simple DROP TABLE statement. - * - * @param string $tablename - * @return string - */ - static public function getStatementDropTable($tablename) - { - return 'DROP TABLE IF EXISTS ' . $tablename; - } - - /** - * Returns a simple DROP VIEW statement. - * - * @param string $viewname - * @return string - */ - static public function getStatementDropView($viewname) - { - return 'DROP VIEW IF EXISTS ' . $viewname; - } - - /** - * Returns a simple DROP DATABASE statement. - * - * @param string $dbname - * @return string - */ - static public function getStatementDropDatabase($dbname) - { - return 'DROP DATABASE IF EXISTS ' . $dbname; - } - - /** * Parses the name of a table from a SQL statement substring. * * @static @@ -303,13 +270,13 @@ class PMA_Tracker if (self::$add_drop_table == true && $is_view == false) { $create_sql .= self::getLogComment() . - self::getStatementDropTable(PMA_backquote($tablename)) . ";\n"; + 'DROP TABLE IF EXISTS ' . PMA_backquote($tablename) . ";\n"; } if (self::$add_drop_view == true && $is_view == true) { $create_sql .= self::getLogComment() . - self::getStatementDropView(PMA_backquote($tablename)) . ";\n"; + 'DROP VIEW IF EXISTS ' . PMA_backquote($tablename) . ";\n"; } $create_sql .= self::getLogComment() . @@ -399,7 +366,7 @@ class PMA_Tracker if (self::$add_drop_database == true) { $create_sql .= self::getLogComment() . - self::getStatementDropDatabase(PMA_backquote($dbname)) . ";\n"; + 'DROP DATABASE IF EXISTS ' . PMA_backquote($dbname) . ";\n"; } $create_sql .= self::getLogComment() . $query; @@ -564,13 +531,9 @@ class PMA_Tracker $sql_query .= " AND FIND_IN_SET('" . $statement . "',tracking) > 0" ; } $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); - if (isset($row[0])) { - $version = $row[0]; - } - if (! isset($version)) { - $version = -1; - } - return $version; + return isset($row[0]) + ? $row[0] + : -1; } @@ -596,9 +559,9 @@ class PMA_Tracker $sql_query .= " AND `table_name` = '" . PMA_sqlAddSlashes($tablename) ."' "; } $sql_query .= " AND `version` = '" . PMA_sqlAddSlashes($version) ."' ". - " ORDER BY `version` DESC "; + " ORDER BY `version` DESC LIMIT 1"; - $mixed = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); + $mixed = PMA_DBI_fetch_assoc(PMA_query_as_controluser($sql_query)); // Parse log $log_schema_entries = explode('# log ', $mixed['schema_sql']); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15223-g7118468
by Piotr Przybylski 16 Aug '11

16 Aug '11

The branch, master has been updated via 71184688b507f04bc3b5e521cb8d710de682b633 (commit) from 11465727162f945c331f8fa4d7a13dc2c466024e (commit) - Log ----------------------------------------------------------------- commit 71184688b507f04bc3b5e521cb8d710de682b633 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 19:57:23 2011 +0200 We need only associative array here ----------------------------------------------------------------------- Summary of changes: libraries/Tracker.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index bb106a9..8a622aa 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -289,7 +289,7 @@ class PMA_Tracker $indexes = array(); - while($row = PMA_DBI_fetch_array($sql_result)) { + while($row = PMA_DBI_fetch_assoc($sql_result)) { $indexes[] = $row; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15222-g1146572
by Piotr Przybylski 16 Aug '11

16 Aug '11

The branch, master has been updated via 11465727162f945c331f8fa4d7a13dc2c466024e (commit) via 5cd731b232b3e7d4aa9d3d2cc6c276e52e6459f0 (commit) from e3f09710dc121148e8421c8d07e87deba1899f63 (commit) - Log ----------------------------------------------------------------- commit 11465727162f945c331f8fa4d7a13dc2c466024e Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 19:53:11 2011 +0200 Use PMA_DBI_get_columns in Tracker code commit 5cd731b232b3e7d4aa9d3d2cc6c276e52e6459f0 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 19:33:09 2011 +0200 Make this usage of $sql_backquotes less cryptic ----------------------------------------------------------------------- Summary of changes: libraries/Tracker.class.php | 14 ++++++-------- libraries/export/sql.php | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 5d24b78..bb106a9 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -273,13 +273,13 @@ class PMA_Tracker $date = date('Y-m-d H:i:s'); // Get data definition snapshot of table - $sql_query = ' - SHOW FULL COLUMNS FROM ' . PMA_backquote($dbname) . '.' . PMA_backquote($tablename); - - $sql_result = PMA_DBI_query($sql_query); - while ($row = PMA_DBI_fetch_array($sql_result)) { - $columns[] = $row; + $columns = PMA_DBI_get_columns($dbname, $tablename, true); + // int indices to reduce size + $columns = array_values($columns); + // remove Privileges to reduce size + for ($i = 0; $i < count($columns); $i++) { + unset($columns[$i]['Privileges']); } $sql_query = ' @@ -387,8 +387,6 @@ class PMA_Tracker */ static public function createDatabaseVersion($dbname, $version, $query, $tracking_set = 'CREATE DATABASE,ALTER DATABASE,DROP DATABASE') { - global $sql_backquotes; - $date = date('Y-m-d H:i:s'); if ($tracking_set == '') { diff --git a/libraries/export/sql.php b/libraries/export/sql.php index a561bb6..40efc2b 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -297,8 +297,8 @@ if (isset($plugin_list)) { /** * Avoids undefined variables, use NULL so isset() returns false */ - if (! isset($sql_backquotes)) { - $sql_backquotes = null; + if (! isset($GLOBALS['sql_backquotes'])) { + $GLOBALS['sql_backquotes'] = null; } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15218-g2a48ac6
by Michal Čihař 16 Aug '11

16 Aug '11

The branch, master has been updated via 2a48ac61288c8e9f0dcf49da5883410081a2596e (commit) via 578d2dc33ddbf435abada44e9122f07829995272 (commit) via 5092d728a90da172ff00f2edb6a3b294ef918118 (commit) via 95e01565f0e0196354a8d3be144ce37a79e50e99 (commit) via d1c44c49089678f15f6ae24766fd1e5b3c709fce (commit) via e05ce12e53a67130b5f54ea7e75ae6d2cc583ad8 (commit) via cf14b03298ae48d8d2aaeffaaf6ff36e7928eafa (commit) via caedcb695ca6e31c993af355a8845b2f73c63e19 (commit) via 86badc082dc73484364ec8aaa10bd5e508cf2047 (commit) via 2b04f19b1c824b642eb7ac804422a03685ceb06d (commit) via 750042aadc210972204e5fb48ec5c06fd90f0116 (commit) via 09e3f99c6c83fb90416eaf4d7706595bd933ce9b (commit) via c7e02dad6ab498b048063b93a25a16e1f37412f1 (commit) from 79f746198eeea63e17a85bddacbddb3c48663e7b (commit) - Log ----------------------------------------------------------------- commit 2a48ac61288c8e9f0dcf49da5883410081a2596e Merge: 578d2dc 79f7461 Author: Pootle server <pootle(a)cihar.com> Date: Tue Aug 16 16:40:09 2011 +0200 Merge remote-tracking branch 'origin/master' commit 578d2dc33ddbf435abada44e9122f07829995272 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 16:10:29 2011 +0200 Translation update done using Pootle. commit 5092d728a90da172ff00f2edb6a3b294ef918118 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 16:08:04 2011 +0200 Translation update done using Pootle. commit 95e01565f0e0196354a8d3be144ce37a79e50e99 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 16:06:46 2011 +0200 Translation update done using Pootle. commit d1c44c49089678f15f6ae24766fd1e5b3c709fce Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 16:05:21 2011 +0200 Translation update done using Pootle. commit e05ce12e53a67130b5f54ea7e75ae6d2cc583ad8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 16:03:07 2011 +0200 Translation update done using Pootle. commit cf14b03298ae48d8d2aaeffaaf6ff36e7928eafa Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 15:59:51 2011 +0200 Translation update done using Pootle. commit caedcb695ca6e31c993af355a8845b2f73c63e19 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 15:59:42 2011 +0200 Translation update done using Pootle. commit 86badc082dc73484364ec8aaa10bd5e508cf2047 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 15:55:45 2011 +0200 Translation update done using Pootle. commit 2b04f19b1c824b642eb7ac804422a03685ceb06d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 15:55:38 2011 +0200 Translation update done using Pootle. commit 750042aadc210972204e5fb48ec5c06fd90f0116 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 15:51:26 2011 +0200 Translation update done using Pootle. commit 09e3f99c6c83fb90416eaf4d7706595bd933ce9b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 15:44:24 2011 +0200 Translation update done using Pootle. commit c7e02dad6ab498b048063b93a25a16e1f37412f1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 15:42:44 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 16 +++++++--------- po/tr.po | 17 +++++++++++++---- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/po/ja.po b/po/ja.po index 546d556..2aeefb9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-15 10:09+0200\n" -"PO-Revision-Date: 2011-08-16 11:21+0200\n" +"PO-Revision-Date: 2011-08-16 16:10+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1497,10 +1497,9 @@ msgid "Analyse Query" msgstr "クエリを更新する" #: js/messages.php:196 -#, fuzzy #| msgid "Apply a divisor" msgid "Advisor system" -msgstr "除数を適用する" +msgstr "アドバイザ・システム" #: js/messages.php:197 msgid "Possible performance issues" @@ -9339,7 +9338,7 @@ msgstr "はじめに" msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." -msgstr "" +msgstr "アドバイザ・システムは、サーバの状態変数を分析することにより、サーバ変数のお勧め設定方法を提供するものです。" #: server_status.php:810 msgid "" @@ -9347,6 +9346,7 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"このシステムは、単純な計算を基にして経験則によってお勧め設定を提供するため、お使いのシステムに必ずしも当てはまるものではないことに注意してください。" #: server_status.php:812 msgid "" @@ -11583,9 +11583,7 @@ msgstr "稼働時間が 1 日未満" #: po/advisory_rules.php:6 msgid "Uptime is less than 1 day, performance tuning may not be accurate." -msgstr "" -"稼働時間は 1 日未満です。パフォーマンスチューニングが正確でない可能性がありま" -"す。" +msgstr "稼働時間が 1 日未満です。パフォーマンスチューニングが正確でない可能性があります。" #: po/advisory_rules.php:7 msgid "" @@ -12312,8 +12310,8 @@ msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" -"テーブルを開くことは、コストがかかるディスクへの入出力を必要とします。{table_open_cache} " -"大きくすることで、これを緩和できることがあります。" +"テーブルを開くことは、負荷がかかるディスクへの入出力を必要とします。{table_open_cache} " +"を大きくすることで、これを緩和できることがあります。" #: po/advisory_rules.php:178 #, php-format diff --git a/po/tr.po b/po/tr.po index b0ec0df..e954ed1 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-15 10:09+0200\n" -"PO-Revision-Date: 2011-08-16 08:21+0200\n" +"PO-Revision-Date: 2011-08-16 16:08+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -9386,6 +9386,8 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"Yine de not edin bu sistem basit hesaplamalar üzerine kurulu ve sisteminize " +"zorunlu olarak uygulanamayabilir başlıca kurallara göre öneriler sağlar." #: server_status.php:812 msgid "" @@ -9393,6 +9395,10 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" +"Yapılandırmanın herhangi bir yerini değiştirmeden önce, neyi " +"değiştirdiğinizi bildiğinizden (belgeyi okuyarak) ve değişikliği nasıl geri " +"alacağınızdan emin olun. Yanlış ayarlama performansa çok olumsuz etki " +"edebilir." #: server_status.php:814 msgid "" @@ -9400,6 +9406,9 @@ msgid "" "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." msgstr "" +"Sisteminizi ayarlamanın en iyi yolu bir defada sadece bir değişiklik yapmak, " +"gözlemlemek, veritabanınızı kıyaslamak ve eğer açıkça ölçülebilir bir " +"gelişme olmadıysa, değişikliği geri almak olacaktır." #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:836 @@ -11907,12 +11916,12 @@ msgstr "Sorgu önbelleği verimli çalışmıyor, düşük tavan oranına sahip. #: po/advisory_rules.php:77 msgid "Consider increasing {query_cache_limit}." -msgstr "" +msgstr "Dikkate değer artış {query_cache_limit}." #: po/advisory_rules.php:78 #, php-format msgid "The current query cache hit rate of %s%% is below 20%%" -msgstr "" +msgstr "Şu anki %%%s sorgu önbelleği tavan oranı %%20'nin altında" #: po/advisory_rules.php:80 msgid "Query Cache usage" @@ -11921,7 +11930,7 @@ msgstr "Sorgu Önbelleği kullanımı" #: po/advisory_rules.php:81 #, php-format msgid "Less than 80%% of the query cache is being utilized." -msgstr "" +msgstr "Sorgu önbelleğinin %%80'den azı değerlendirilmekte." #: po/advisory_rules.php:82 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15205-g79f7461
by Rouslan Placella 16 Aug '11

16 Aug '11

The branch, master has been updated via 79f746198eeea63e17a85bddacbddb3c48663e7b (commit) via 8f1aca48180621de54a24472a6c10af412fdd947 (commit) via 4e4456e9b87720ea9e1c426e9efc381356b68c3d (commit) via 39b0f4d34bff1815ff37241ea4c47698e6d4f935 (commit) from f2842a22bf179b93a7eeebd034ed9302fb781e97 (commit) - Log ----------------------------------------------------------------- commit 79f746198eeea63e17a85bddacbddb3c48663e7b Merge: 8f1aca4 f2842a2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 16 14:02:40 2011 +0100 Merge remote-tracking branch 'origin/master' commit 8f1aca48180621de54a24472a6c10af412fdd947 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 16 14:02:16 2011 +0100 MySQL allows a function and a procedure with the same name in the same db. This case was unhandled. commit 4e4456e9b87720ea9e1c426e9efc381356b68c3d Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 16 12:36:38 2011 +0100 Fixed wrong permission check for "Drop Routine" action commit 39b0f4d34bff1815ff37241ea4c47698e6d4f935 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 16 12:35:43 2011 +0100 Fixed wrong destination page on "Drop Routine" action ----------------------------------------------------------------------- Summary of changes: libraries/rte/rte_export.lib.php | 21 +++++++++++---------- libraries/rte/rte_list.lib.php | 10 +++++++--- libraries/rte/rte_routines.lib.php | 20 +++++++++++++------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/libraries/rte/rte_export.lib.php b/libraries/rte/rte_export.lib.php index d4d8f99..8cac214 100644 --- a/libraries/rte/rte_export.lib.php +++ b/libraries/rte/rte_export.lib.php @@ -70,16 +70,17 @@ function PMA_RTN_handleExport() { global $_GET, $db; - if (! empty($_GET['export_item']) && ! empty($_GET['item_name'])) { - $item_name = $_GET['item_name']; - $type = PMA_DBI_fetch_value( - "SELECT ROUTINE_TYPE " . - "FROM INFORMATION_SCHEMA.ROUTINES " . - "WHERE ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " . - "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($item_name) . "';" - ); - $export_data = PMA_DBI_get_definition($db, $type, $item_name); - PMA_RTE_handleExport($item_name, $export_data); + if ( ! empty($_GET['export_item']) + && ! empty($_GET['item_name']) + && ! empty($_GET['item_type']) + ) { + if ($_GET['item_type'] == 'FUNCTION' || $_GET['item_type'] == 'PROCEDURE') { + $export_data = PMA_DBI_get_definition( + $db, + $_GET['item_type'], + $_GET['item_name']); + PMA_RTE_handleExport($_GET['item_name'], $export_data); + } } } // end PMA_RTN_handleExport() diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index 3b6177d..19e8e64 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -117,7 +117,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') $sql_drop = sprintf('DROP %s IF EXISTS %s', $routine['ROUTINE_TYPE'], PMA_backquote($routine['SPECIFIC_NAME'])); - + $type_link = "item_type={$routine['ROUTINE_TYPE']}"; $retval = " <tr class='noclick $rowclass'>\n"; $retval .= " <td>\n"; @@ -136,6 +136,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') . $url_query . '&edit_item=1' . '&item_name=' . urlencode($routine['SPECIFIC_NAME']) + . '&' . $type_link . '">' . $titles['Edit'] . "</a>\n"; } else { $retval .= " {$titles['NoEdit']}\n"; @@ -150,6 +151,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') // otherwise we can execute it directly. $routine_details = PMA_RTN_getDataFromName( $routine['SPECIFIC_NAME'], + $routine['ROUTINE_TYPE'], false ); if ($routine !== false) { @@ -168,6 +170,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') . $url_query . '&' . $execute_action . '=1' . '&item_name=' . urlencode($routine['SPECIFIC_NAME']) + . '&' . $type_link . '">' . $titles['Execute'] . "</a>\n"; } } else { @@ -180,15 +183,16 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') . $url_query . '&export_item=1' . '&item_name=' . urlencode($routine['SPECIFIC_NAME']) + . '&' . $type_link . '">' . $titles['Export'] . "</a>\n"; $retval .= " </td>\n"; $retval .= " <td>\n"; - if (PMA_currentUserHasPrivilege('EVENT', $db)) { + if (PMA_currentUserHasPrivilege('ALTER ROUTINE', $db)) { $retval .= ' <a ' . $ajax_class['drop'] . ' href="sql.php?' . $url_query . '&sql_query=' . urlencode($sql_drop) - . '&goto=db_events.php' . urlencode("?db={$db}") + . '&goto=db_routines.php' . urlencode("?db={$db}") . '" >' . $titles['Drop'] . "</a>\n"; } else { $retval .= " {$titles['NoDrop']}\n"; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 3e63603..8cd0529 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -304,7 +304,9 @@ function PMA_RTN_handleEditor() $extra_data = array(); if ($message->isSuccess()) { $columns = "`SPECIFIC_NAME`, `ROUTINE_NAME`, `ROUTINE_TYPE`, `DTD_IDENTIFIER`, `ROUTINE_DEFINITION`"; - $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' AND ROUTINE_NAME='" . PMA_sqlAddSlashes($_REQUEST['item_name']) . "'"; + $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " + . "AND ROUTINE_NAME='" . PMA_sqlAddSlashes($_REQUEST['item_name']) . "'" + . "AND ROUTINE_TYPE='" . PMA_sqlAddSlashes($_REQUEST['item_type']) . "'"; $routine = PMA_DBI_fetch_single_row("SELECT $columns FROM `INFORMATION_SCHEMA`.`ROUTINES` WHERE $where;"); $extra_data['name'] = htmlspecialchars(strtoupper($_REQUEST['item_name'])); $extra_data['new_row'] = PMA_RTN_getRowForList($routine); @@ -343,7 +345,7 @@ function PMA_RTN_handleEditor() } else if (! empty($_REQUEST['edit_item'])) { $title = __("Edit routine"); if (! $operation && ! empty($_REQUEST['item_name']) && empty($_REQUEST['editor_process_edit'])) { - $routine = PMA_RTN_getDataFromName($_REQUEST['item_name']); + $routine = PMA_RTN_getDataFromName($_REQUEST['item_name'], $_REQUEST['item_type']); if ($routine !== false) { $routine['item_original_name'] = $routine['item_name']; $routine['item_original_type'] = $routine['item_type']; @@ -501,12 +503,13 @@ function PMA_RTN_getDataFromRequest() * the "Edit routine" form given the name of a routine. * * @param string $name The name of the routine. + * @param string $type Type of routine (ROUTINE|PROCEDURE) * @param bool $all Whether to return all data or just * the info about parameters. * * @return array Data necessary to create the routine editor. */ -function PMA_RTN_getDataFromName($name, $all = true) +function PMA_RTN_getDataFromName($name, $type, $all = true) { global $param_directions, $param_sqldataaccess, $db; @@ -517,7 +520,8 @@ function PMA_RTN_getDataFromName($name, $all = true) . "ROUTINE_DEFINITION, IS_DETERMINISTIC, SQL_DATA_ACCESS, " . "ROUTINE_COMMENT, SECURITY_TYPE"; $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " - . "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($name) . "'"; + . "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($name) . "'" + . "AND ROUTINE_TYPE='" . PMA_sqlAddSlashes($type) . "'"; $query = "SELECT $fields FROM INFORMATION_SCHEMA.ROUTINES WHERE $where;"; $routine = PMA_DBI_fetch_single_row($query); @@ -1002,7 +1006,7 @@ function PMA_RTN_getQueryFromRequest() $warned_about_dir = false; $warned_about_name = false; $warned_about_length = false; - if (! empty($_REQUEST['item_param_name']) + if ( ! empty($_REQUEST['item_param_name']) && ! empty($_REQUEST['item_param_type']) && ! empty($_REQUEST['item_param_length']) && is_array($_REQUEST['item_param_name']) @@ -1124,7 +1128,7 @@ function PMA_RTN_handleExecute() */ if (! empty($_REQUEST['execute_routine']) && ! empty($_REQUEST['item_name'])) { // Build the queries - $routine = PMA_RTN_getDataFromName($_REQUEST['item_name'], false); + $routine = PMA_RTN_getDataFromName($_REQUEST['item_name'], $_REQUEST['item_type'], false); if ($routine !== false) { $queries = array(); $end_query = array(); @@ -1279,7 +1283,7 @@ function PMA_RTN_handleExecute() /** * Display the execute form for a routine. */ - $routine = PMA_RTN_getDataFromName($_GET['item_name'], false); + $routine = PMA_RTN_getDataFromName($_GET['item_name'], $_GET['item_type'], true); if ($routine !== false) { $form = PMA_RTN_getExecuteForm($routine); if ($GLOBALS['is_ajax_request'] == true) { @@ -1336,6 +1340,8 @@ function PMA_RTN_getExecuteForm($routine) $retval .= "<form action='db_routines.php' method='post' class='rte_form'>\n"; $retval .= "<input type='hidden' name='item_name'\n"; $retval .= " value='{$routine['item_name']}' />\n"; + $retval .= "<input type='hidden' name='item_type'\n"; + $retval .= " value='{$routine['item_type']}' />\n"; $retval .= PMA_generate_common_hidden_inputs($db) . "\n"; $retval .= "<fieldset>\n"; if ($GLOBALS['is_ajax_request'] != true) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15201-gf2842a2
by Piotr Przybylski 16 Aug '11

16 Aug '11

The branch, master has been updated via f2842a22bf179b93a7eeebd034ed9302fb781e97 (commit) via df9b8c2729decf39321771452bc1884b979f31ef (commit) via a9d583e5d5b1ed4c82dbf687b13a3eb964ce63e1 (commit) via 6dca42107e3c16cb886bc470953e71fbe4aa3503 (commit) via 493aa3a6f0912d13a46703469bd0630362db5ee0 (commit) from e16bd0bb796b8ae895a0cac78389491aa5569114 (commit) - Log ----------------------------------------------------------------- commit f2842a22bf179b93a7eeebd034ed9302fb781e97 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 14:35:02 2011 +0200 Fox comment commit df9b8c2729decf39321771452bc1884b979f31ef Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 14:31:52 2011 +0200 Fix comments for functions with missing @return tag commit a9d583e5d5b1ed4c82dbf687b13a3eb964ce63e1 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 14:30:46 2011 +0200 Add some missing @return tags in tests commit 6dca42107e3c16cb886bc470953e71fbe4aa3503 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 14:18:15 2011 +0200 Fix comments in upload progress libs and add make returns consistent commit 493aa3a6f0912d13a46703469bd0630362db5ee0 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 14:16:46 2011 +0200 A few fixes for comments in Relation_Schema classes (they still require further work) ----------------------------------------------------------------------- Summary of changes: libraries/Advisor.class.php | 10 ++++++++++ libraries/Config.class.php | 9 +++++++-- libraries/Error_Handler.class.php | 1 + libraries/File.class.php | 5 ++++- libraries/List_Database.class.php | 1 + libraries/PMA.php | 6 ++++++ libraries/Theme.class.php | 2 ++ libraries/Theme_Manager.class.php | 10 +++++++++- libraries/auth/cookie.auth.lib.php | 1 + libraries/blobstreaming.lib.php | 10 ++++++++++ libraries/blowfish.php | 1 + libraries/common.lib.php | 7 +++---- libraries/database_interface.lib.php | 1 + libraries/db_structure.lib.php | 8 ++++---- libraries/file_listing.php | 16 ++++++++-------- libraries/grab_globals.lib.php | 5 +++-- libraries/import/upload/apc.php | 5 ++++- libraries/import/upload/noplugin.php | 5 ++++- libraries/import/upload/uploadprogress.php | 5 ++++- libraries/mime.lib.php | 3 +++ libraries/schema/Pdf_Relation_Schema.class.php | 10 +++++++--- libraries/schema/Svg_Relation_Schema.class.php | 2 +- libraries/schema/Visio_Relation_Schema.class.php | 7 +++---- libraries/select_lang.lib.php | 5 +++++ libraries/sysinfo.lib.php | 3 +++ scripts/signon-script.php | 3 +++ .../libraries/common/PMA_expandUserString_test.php | 2 ++ .../libraries/common/PMA_extractFieldSpec_test.php | 2 ++ .../common/PMA_foreignKeySupported_test.php | 2 ++ .../common/PMA_formatNumberByteDown_test.php | 5 ++++- .../common/PMA_localisedDateTimespan_test.php | 5 ++++- .../common/PMA_printableBitValue_test.php | 3 ++- .../libraries/common/PMA_quoting_slashing_test.php | 6 ++++++ .../libraries/common/PMA_stringOperations_test.php | 12 ++++++++---- 34 files changed, 138 insertions(+), 40 deletions(-) diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php index bf4fd41..26696bd 100644 --- a/libraries/Advisor.class.php +++ b/libraries/Advisor.class.php @@ -85,6 +85,9 @@ class Advisor /** * Escapes percent string to be used in format string. + * + * @param string $str + * @return string */ function escapePercent($str) { @@ -93,6 +96,10 @@ class Advisor /** * Wrapper function for translating. + * + * @param string $str + * @param mixed $param + * @return string */ function translate($str, $param = null) { @@ -109,6 +116,9 @@ class Advisor /** * Splits justification to text and formula. + * + * @param string $rule + * @return array */ function splitJustification($rule) { diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 803e0c0..f390856 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -334,6 +334,7 @@ class PMA_Config * should be called on object creation * * @param string $source config file + * @return bool */ function load($source = null) { @@ -698,6 +699,8 @@ class PMA_Config * $cfg['PmaAbsoluteUri'] is a required directive else cookies won't be * set properly and, depending on browsers, inserting or updating a * record might fail + * + * @return bool */ function checkPmaAbsoluteUri() { @@ -937,7 +940,7 @@ class PMA_Config } /** - * @static + * @return bool */ public function isHttps() { @@ -964,6 +967,8 @@ class PMA_Config * * Please note that this just detects what we see, so * it completely ignores things like reverse proxies. + * + * @return bool */ function detectHttps() { @@ -1012,7 +1017,7 @@ class PMA_Config } /** - * @static + * @return string */ public function getCookiePath() { diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index 1a9cdb0..ac132fa 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -127,6 +127,7 @@ class PMA_Error_Handler * * @todo finish! * @param PMA_Error $error + * @return bool */ protected function _logError($error) { diff --git a/libraries/File.class.php b/libraries/File.class.php index 66a88b8..592127b 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -189,6 +189,7 @@ class PMA_File /** * @access public + * @return bool */ function isUploaded() { @@ -591,7 +592,7 @@ class PMA_File } /** - * + * @return bool */ function open() { @@ -688,6 +689,8 @@ class PMA_File * http://bugs.php.net/bug.php?id=29532 * bzip reads a maximum of 8192 bytes on windows systems * @todo this function is unused + * @param int $max_size + * @return bool|string */ function getNextChunk($max_size = null) { diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index a890773..e9907cf 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -90,6 +90,7 @@ require_once './libraries/List.class.php'; * * @todo we could also search mysql tables if all fail? * @param string $like_db_name usally a db_name containing wildcards + * @return array */ protected function _retrieve($like_db_name = null) { diff --git a/libraries/PMA.php b/libraries/PMA.php index 4f148b7..ea2c27e 100644 --- a/libraries/PMA.php +++ b/libraries/PMA.php @@ -44,6 +44,9 @@ class PMA * magic access to protected/inaccessible members/properties * * @see http://php.net/language.oop5.overloading + * + * @param string $param + * @return mixed */ public function __get($param) { @@ -66,6 +69,9 @@ class PMA * magic access to protected/inaccessible members/properties * * @see http://php.net/language.oop5.overloading + * + * @param string $param + * @param mixed $value */ public function __set($param, $value) { diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index f6b08a0..87f6a3e 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -130,6 +130,7 @@ class PMA_Theme * checks image path for existance - if not found use img from original theme * * @access public + * @return bool */ function checkImgPath() { @@ -282,6 +283,7 @@ class PMA_Theme * * @access public * @param string $type left, right or print + * @return bool */ function loadCss(&$type) { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 174c031..93f5ecf 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -38,7 +38,7 @@ class PMA_Theme_Manager var $active_theme = ''; /** - * @var object PMA_Theme active theme + * @var PMA_Theme PMA_Theme active theme */ var $theme = null; @@ -193,6 +193,7 @@ class PMA_Theme_Manager /** * save theme in cookie * + * @return bool true */ function setThemeCookie() { @@ -224,6 +225,8 @@ class PMA_Theme_Manager /** * read all themes + * + * @return bool true */ function loadThemes() { @@ -259,6 +262,7 @@ class PMA_Theme_Manager * checks if given theme name is a known theme * * @param string $theme name fo theme to check for + * @return bool */ function checkTheme($theme) { @@ -273,6 +277,7 @@ class PMA_Theme_Manager * returns HTML selectbox, with or without form enclosed * * @param boolean $form whether enclosed by from tags or not + * @return string */ function getHtmlSelectBox($form = true) { @@ -351,6 +356,9 @@ class PMA_Theme_Manager /** * prints css data + * + * @param string $type + * @return bool */ function printCss($type) { diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 4615c55..c2e50c0 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -80,6 +80,7 @@ if (function_exists('mcrypt_encrypt')) { * Returns blowfish secret or generates one if needed. * * @access public + * @return string */ function PMA_get_blowfish_secret() { diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index 5cfae23..d3827f9 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -4,6 +4,11 @@ * @package BLOBStreaming */ +/** + * Initializes PBMS database + * + * @return bool + */ function initPBMSDatabase() { $query = "create database IF NOT EXISTS pbms;"; // If no other choice then try this. @@ -379,6 +384,11 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) * BLOB streaming on a per table or database basis. So in anticipation of this * PMA_BS_IsTablePBMSEnabled() passes in the table and database name even though * they are not currently needed. + * + * @param string $db_name + * @param string $tbl_name + * @param string $tbl_type + * @return bool */ function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type) { diff --git a/libraries/blowfish.php b/libraries/blowfish.php index 69abf52..0c04106 100644 --- a/libraries/blowfish.php +++ b/libraries/blowfish.php @@ -321,6 +321,7 @@ class Horde_Cipher_blowfish * Set the key to be used for en/decryption. * * @param string $key The key to use. + * @return bool */ public function setKey($key) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 4850e41..eee6035 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2953,10 +2953,9 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) * function that generates a json output for an ajax request and ends script * execution * - * @param bool $message message string containing the html of the message - * @param bool $success success whether the ajax request was successfull - * @param array $extra_data extra_data optional - any other data as part of the json request - * + * @param PMA_Message|string $message message string containing the html of the message + * @param bool $success success whether the ajax request was successfull + * @param array $extra_data extra_data optional - any other data as part of the json request */ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) { diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 1873ef1..58307fe 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -23,6 +23,7 @@ define('PMA_DBI_GETVAR_GLOBAL', 2); * Checks one of the mysql extensions * * @param string $extension mysql extension to check + * @return bool */ function PMA_DBI_checkMysqlExtension($extension = 'mysql') { diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 179e752..d2702eb 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -65,10 +65,10 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false /** * Creates a clickable column header for table information * - * @param string title to use for the link - * @param string corresponds to sortable data name mapped in libraries/db_info.inc.php - * @param string initial sort order - * @returns string link to be displayed in the table header + * @param string $title title to use for the link + * @param string $sort corresponds to sortable data name mapped in libraries/db_info.inc.php + * @param string $initial_sort_order + * @return string link to be displayed in the table header */ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC') { diff --git a/libraries/file_listing.php b/libraries/file_listing.php index 720ba82..5d9058a 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -10,9 +10,9 @@ /** * Returns array of filtered file names * - * @param string directory to list - * @param string regular expression to match files - * @returns array sorted file list on success, false on failure + * @param string $dir directory to list + * @param string $expression regular expression to match files + * @return array sorted file list on success, false on failure */ function PMA_getDirContent($dir, $expression = '') { @@ -39,10 +39,10 @@ function PMA_getDirContent($dir, $expression = '') /** * Returns options of filtered file names * - * @param string directory to list - * @param string regullar expression to match files - * @param string currently active choice - * @returns array sorted file list on success, false on failure + * @param string $dir directory to list + * @param string $extensions regullar expression to match files + * @param string $active currently active choice + * @return array sorted file list on success, false on failure */ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') { @@ -64,7 +64,7 @@ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') /** * Get currently supported decompressions. * - * @returns string | separated list of extensions usable in PMA_getDirContent + * @return string | separated list of extensions usable in PMA_getDirContent */ function PMA_supportedDecompressions() { diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index aafd169..993ca9d 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -16,8 +16,9 @@ if (! defined('PHPMYADMIN')) { * copy values from one array to another, usually from a superglobal into $GLOBALS * * @param array $array values from - * @param array $target values to - * @param boolean $sanitize prevent importing key names in $_import_blacklist + * @param array &$target values to + * @param bool $sanitize prevent importing key names in $_import_blacklist + * @return bool */ function PMA_recursive_extract($array, &$target, $sanitize = true) { diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php index 5250c92..5fe34bb 100644 --- a/libraries/import/upload/apc.php +++ b/libraries/import/upload/apc.php @@ -15,6 +15,9 @@ $ID_KEY = 'APC_UPLOAD_PROGRESS'; * Returns upload status. * * This is implementation for APC extension. + * + * @param string $id + * @return array|null */ function PMA_getUploadStatus($id) { @@ -22,7 +25,7 @@ function PMA_getUploadStatus($id) global $ID_KEY; if (trim($id) == "") { - return; + return null; } if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) { $_SESSION[$SESSION_KEY][$id] = array( diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php index fa7796c..00dcb11 100644 --- a/libraries/import/upload/noplugin.php +++ b/libraries/import/upload/noplugin.php @@ -15,6 +15,9 @@ $ID_KEY = 'noplugin'; * Returns upload status. * * This is implementation when no webserver support exists, so it returns just zeroes. + * + * @param string $id + * @return array|null */ function PMA_getUploadStatus($id) { @@ -22,7 +25,7 @@ function PMA_getUploadStatus($id) global $ID_KEY; if (trim($id) == "") { - return; + return null; } if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) { $_SESSION[$SESSION_KEY][$id] = array( diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php index a3ec60b..d5c361c 100644 --- a/libraries/import/upload/uploadprogress.php +++ b/libraries/import/upload/uploadprogress.php @@ -14,6 +14,9 @@ $ID_KEY = "UPLOAD_IDENTIFIER"; * Returns upload status. * * This is implementation for uploadprogress extension. + * + * @param string $id + * @return array|null */ function PMA_getUploadStatus($id) { @@ -21,7 +24,7 @@ function PMA_getUploadStatus($id) global $ID_KEY; if (trim($id) == "") { - return; + return null; } if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) { diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php index f394b8f..e9eb386 100644 --- a/libraries/mime.lib.php +++ b/libraries/mime.lib.php @@ -9,6 +9,9 @@ /** * Tries to detect MIME type of content. + * + * @param string &$test + * @return string */ function PMA_detectMIME(&$test) { diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 6e7846a..e74c14d 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -144,7 +144,7 @@ class PMA_Schema_PDF extends PMA_PDF /** * Sets the scaled line width * - * @param float width The line width + * @param float $width The line width * @access public * @see TCPDF::SetLineWidth() */ @@ -224,6 +224,10 @@ class PMA_Schema_PDF extends PMA_PDF /** * Compute number of lines used by a multicell of width w + * + * @param int $w + * @param string $txt + * @return int */ function NbLines($w, $txt) { @@ -386,7 +390,7 @@ class Table_Stats * Returns title of the current table, * title can have the dimensions of the table * - * @access private + * @return string */ private function _getTitle() { @@ -401,7 +405,7 @@ class Table_Stats * @access private * @see PMA_Schema_PDF */ - function _setWidth($fontSize) + private function _setWidth($fontSize) { global $pdf; diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 0593abd..b405b22 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -440,7 +440,7 @@ class Table_Stats * @access private * @see PMA_SVG */ - function _setWidthTable($font,$fontSize) + private function _setWidthTable($font,$fontSize) { global $svg; diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index cfe4424..cf7bab2 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -280,13 +280,12 @@ class Table_Stats /** * Sets the width of the table * - * @param string font The font name - * @param integer fontSize The font size + * @param string $font font name + * @param integer $fontSize font size * @global object The current Visio XML document - * @access private * @see PMA_VISIO */ - function _setWidthTable($font,$fontSize) + private function _setWidthTable($font,$fontSize) { global $visio; diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f4030ef..62b1ea7 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -11,6 +11,9 @@ if (! defined('PHPMYADMIN')) { /** * Returns language name + * + * @param string $tmplang + * @return string */ function PMA_langName($tmplang) { @@ -182,6 +185,8 @@ function PMA_langDetect($str, $envType) * traditional) must be detected before 'zh' (chinese simplified) for * example. * + * @param string $lang + * @return array */ function PMA_langDetails($lang) { diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php index bc0192f..96ac0e2 100644 --- a/libraries/sysinfo.lib.php +++ b/libraries/sysinfo.lib.php @@ -9,6 +9,9 @@ * @package phpMyAdmin */ +/** + * @return array + */ function getSysInfo() { $supported = array('Linux','WINNT'); diff --git a/scripts/signon-script.php b/scripts/signon-script.php index e57ca1f..201d217 100644 --- a/scripts/signon-script.php +++ b/scripts/signon-script.php @@ -16,6 +16,9 @@ * This function returns username and password. * * It can optionally use configured username as parameter. + * + * @param string $user + * @return array */ function get_login_credentials($user) { diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index 748ddfe..39cc664 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -59,6 +59,8 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase /** * Data provider + * + * @return array */ public function provider() { diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index ab789f4..eeb79c4 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -30,6 +30,8 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase /** * Data provider + * + * @return array */ public function provider() { diff --git a/test/libraries/common/PMA_foreignKeySupported_test.php b/test/libraries/common/PMA_foreignKeySupported_test.php index e0ebd2e..f9c3049 100644 --- a/test/libraries/common/PMA_foreignKeySupported_test.php +++ b/test/libraries/common/PMA_foreignKeySupported_test.php @@ -17,6 +17,8 @@ class PMA_foreignKeySupported_test extends PHPUnit_Framework_TestCase { /** * data provider for foreign key supported test + * + * @return array */ public function foreignkeySupportedDataProvider() { return array( diff --git a/test/libraries/common/PMA_formatNumberByteDown_test.php b/test/libraries/common/PMA_formatNumberByteDown_test.php index f0265c6..18ab8ba 100644 --- a/test/libraries/common/PMA_formatNumberByteDown_test.php +++ b/test/libraries/common/PMA_formatNumberByteDown_test.php @@ -47,8 +47,9 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase /** * format number data provider + * + * @return array */ - public function formatNumberDataProvider() { return array( array(10, 2, 2, '10 '), @@ -72,6 +73,8 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase /** * format byte down data provider + * + * @return array */ public function formatByteDownDataProvider() { return array( diff --git a/test/libraries/common/PMA_localisedDateTimespan_test.php b/test/libraries/common/PMA_localisedDateTimespan_test.php index 92f980c..4ed2909 100644 --- a/test/libraries/common/PMA_localisedDateTimespan_test.php +++ b/test/libraries/common/PMA_localisedDateTimespan_test.php @@ -54,6 +54,8 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase /** * data provider for localised date test + * + * @return array */ public function localisedDateDataProvider() { return array( @@ -72,8 +74,9 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase /** * data provider for localised timestamp test + * + * @return array */ - public function timespanFormatDataProvider() { return array( array(1258, '0 days, 0 hours, 20 minutes and 58 seconds'), diff --git a/test/libraries/common/PMA_printableBitValue_test.php b/test/libraries/common/PMA_printableBitValue_test.php index d211981..20d4f4f 100644 --- a/test/libraries/common/PMA_printableBitValue_test.php +++ b/test/libraries/common/PMA_printableBitValue_test.php @@ -18,8 +18,9 @@ class PMA_printableBitValue_test extends PHPUnit_Framework_TestCase /** * data provider for printable bit value test + * + * @return array */ - public function printableBitValueDataProvider() { return array( array('testtest', 64, '0111010001100101011100110111010001110100011001010111001101110100'), diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php index 4ebecc0..d4e7104 100644 --- a/test/libraries/common/PMA_quoting_slashing_test.php +++ b/test/libraries/common/PMA_quoting_slashing_test.php @@ -35,6 +35,8 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase /** * data provider for unQuote test + * + * @return array */ public function unQuoteProvider() { return array( @@ -55,6 +57,8 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase /** * data provider for unQuote test with chosen quote + * + * @return array */ public function unQuoteSelectedProvider() { return array( @@ -75,6 +79,8 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase /** * data provider for backquote test + * + * @return array */ public function backquoteDataProvider() { return array( diff --git a/test/libraries/common/PMA_stringOperations_test.php b/test/libraries/common/PMA_stringOperations_test.php index ca43335..3664b44 100644 --- a/test/libraries/common/PMA_stringOperations_test.php +++ b/test/libraries/common/PMA_stringOperations_test.php @@ -41,8 +41,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for flipstring test + * + * @return array */ - public function flipStringDataProvider() { return array( array('test', "t<br />\ne<br />\ns<br />\nt"), @@ -61,8 +62,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for userDir test + * + * @return array */ - public function userDirDataProvider() { return array( array('/var/pma_tmp/%u/', "/var/pma_tmp/root/"), @@ -83,8 +85,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for replace binary content test + * + * @return array */ - public function replaceBinaryContentsDataProvider() { return array( array("\x000", '\00'), @@ -104,8 +107,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for duplicate first newline test + * + * @return array */ - public function duplicateFirstNewlineDataProvider() { return array( array('test', 'test'), hooks/post-receive -- phpMyAdmin

1 0