Git November 2011

git@phpmyadmin.net

7 participants
156 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-22521-g6784a92

by Michal Čihař

The branch, master has been updated via 6784a92a746ad8f82396a019fb78a27874b734e1 (commit) via ef63fbe80c466b5c42639cbfa32de7f84c5f8a46 (commit) via 66b0d031bf04e8f02ef3406f22e3b1a9def28ae8 (commit) via 1b6e3e7135722369e6fe0a417ac15e9cf55082a1 (commit) via e184c0e9b677caff5f6c49fe7e5c523b55cc1762 (commit) via 645338b026944c94b66a3f6620a55fee679b8af5 (commit) via d46ec53a5c390a39d617b92f7ea4e6b53f784320 (commit) via 6cca7636b1d95abc47dea9ea74d1a00e8ae58fa0 (commit) via 516d983c17a52cddbab654ae61b421e4781acbdc (commit) via fffc7acd775abd22c092de95cdedfc2f6a2b1479 (commit) via 94165c15bf6af0d5c68bf87609558643e30b8e4c (commit) via 670e838a596b2d8e17775d83fd166465c4a9bd46 (commit) via bd5c89b19692a137a370fecd89384f73062d4d11 (commit) via 9cbd0b9714930579072d4ff34dfd74a7b75ce135 (commit) via 1307a94aa2a6bd6e47130d83bee0d15aaed90559 (commit) via e31b3bdb66cb5ef8fc325e4b6236118abbdb1d52 (commit) via 688f84e4e19a0ef68d5031442024b9b99af5a946 (commit) via 1be80c450660756bb705a5f16e41e03a23eda2ef (commit) via dae831eb1cee37be51710ef088df8d43aa2f3e12 (commit) via 89433031f7539c80166d5d78afdca9eff118e781 (commit) via f001f9d0416e486d49eb0238bf3d51a7e6159bf3 (commit) via cd0b439f9d29488018e809eeaa2467eba0f6b230 (commit) via 809dd01518f19068f304fb06687c899c37f90ee4 (commit) via 49963201ca636fdb82e5192771ea161cc454e095 (commit) via 4bc84903f229bcdd9ab084be4f26713d6a248ca4 (commit) via ca54bfd3573519e65047e5f20ba30699e7ac741f (commit) via fe72bda4d10487fbf4f498b9fcdb7b95e32d8d4c (commit) via 62d8a5d281a6d96b68b4d0a4e1f44efc1c1e63e5 (commit) via ab2798e2471e7126dcdc5a1d4c08ae01eb981191 (commit) via 2ec31dd5fea68544875dc8daf7563e5ad36fc93d (commit) via 4114d1b6c4f81fa83c96a7ad0214584c9dfce11d (commit) via 0b894193d18ce11d08b06aade2d9c6ef8570bfe5 (commit) via 66ab1aa2018896bbafa1643591a5ac0118b60098 (commit) via 7abf222225593c2f1f3b1dc1beab47bb6029b2c3 (commit) via 76f48302b9efd988de7d1ab819b1ebd1a5a5410e (commit) via 1082e047099a71db2fa8f4ab481c6113c6782bdc (commit) via 1bce24e4b88ad7fa87c9205dc7eee311d3b13a1d (commit) via 996d48b79506c98d98a59120f6eeeb66633533b0 (commit) via 0af4fb9586dfccdb6d35d537148e661b01c4cb21 (commit) via 818aa47d63d85881ae84ed825010d5dd76d3d512 (commit) via 2207dedcc74b26f6427b03a92bc30eca1dea15cb (commit) via 5795b349f829e10e0780caf16e105552d0786d41 (commit) via 96743ccc3c50e6f448d23d64eefc68870e8a59ec (commit) via 1bf7ed8d7e4d73a88593aeb039f60c9a8ba85a9d (commit) via 161c62103bf2900a0423325786d3a18c567f47e8 (commit) via 2ecb31ec542c64731126a46bf3e7e2c3dd8379c4 (commit) via 798f7eec7c2d5291b16987f6bea6e8d2ad380600 (commit) via 4c676d7c86eebcb81a7de8380761dae13668e3fa (commit) via 631f336a578d3ff9cc535ce02af67d64e13a0cd1 (commit) via a2bfce8f4f41f2fa9814bb74aafc910e9726b8de (commit) via 0e450e792e784f1d7c9997d95b891240cc8927e5 (commit) via b7ab34aa03a2f4e8123f1086614beb543eeea875 (commit) via 89b39632dd537e90e791ce8652e4b2fb870f9486 (commit) via bc6d9cf7138ddb5c465a0f5f8a6cb2db7f487f25 (commit) from d61769c13365be20f7c88196c015487221f01633 (commit) - Log ----------------------------------------------------------------- commit 6784a92a746ad8f82396a019fb78a27874b734e1 Author: Pootle server <noreply(a)l10n.cihar.com> Date: Tue Nov 8 23:19:27 2011 +0200 Translation update done using Pootle. commit ef63fbe80c466b5c42639cbfa32de7f84c5f8a46 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:12:56 2011 +0200 Translation update done using Pootle. commit 66b0d031bf04e8f02ef3406f22e3b1a9def28ae8 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:12:15 2011 +0200 Translation update done using Pootle. commit 1b6e3e7135722369e6fe0a417ac15e9cf55082a1 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:11:37 2011 +0200 Translation update done using Pootle. commit e184c0e9b677caff5f6c49fe7e5c523b55cc1762 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:11:25 2011 +0200 Translation update done using Pootle. commit 645338b026944c94b66a3f6620a55fee679b8af5 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:10:59 2011 +0200 Translation update done using Pootle. commit d46ec53a5c390a39d617b92f7ea4e6b53f784320 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:10:48 2011 +0200 Translation update done using Pootle. commit 6cca7636b1d95abc47dea9ea74d1a00e8ae58fa0 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:10:36 2011 +0200 Translation update done using Pootle. commit 516d983c17a52cddbab654ae61b421e4781acbdc Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:09:34 2011 +0200 Translation update done using Pootle. commit fffc7acd775abd22c092de95cdedfc2f6a2b1479 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:09:19 2011 +0200 Translation update done using Pootle. commit 94165c15bf6af0d5c68bf87609558643e30b8e4c Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:08:51 2011 +0200 Translation update done using Pootle. commit 670e838a596b2d8e17775d83fd166465c4a9bd46 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:08:25 2011 +0200 Translation update done using Pootle. commit bd5c89b19692a137a370fecd89384f73062d4d11 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:07:53 2011 +0200 Translation update done using Pootle. commit 9cbd0b9714930579072d4ff34dfd74a7b75ce135 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:07:38 2011 +0200 Translation update done using Pootle. commit 1307a94aa2a6bd6e47130d83bee0d15aaed90559 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:07:14 2011 +0200 Translation update done using Pootle. commit e31b3bdb66cb5ef8fc325e4b6236118abbdb1d52 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:06:56 2011 +0200 Translation update done using Pootle. commit 688f84e4e19a0ef68d5031442024b9b99af5a946 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:06:40 2011 +0200 Translation update done using Pootle. commit 1be80c450660756bb705a5f16e41e03a23eda2ef Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:05:41 2011 +0200 Translation update done using Pootle. commit dae831eb1cee37be51710ef088df8d43aa2f3e12 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:05:07 2011 +0200 Translation update done using Pootle. commit 89433031f7539c80166d5d78afdca9eff118e781 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:04:51 2011 +0200 Translation update done using Pootle. commit f001f9d0416e486d49eb0238bf3d51a7e6159bf3 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:04:28 2011 +0200 Translation update done using Pootle. commit cd0b439f9d29488018e809eeaa2467eba0f6b230 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:04:01 2011 +0200 Translation update done using Pootle. commit 809dd01518f19068f304fb06687c899c37f90ee4 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:03:49 2011 +0200 Translation update done using Pootle. commit 49963201ca636fdb82e5192771ea161cc454e095 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:03:28 2011 +0200 Translation update done using Pootle. commit 4bc84903f229bcdd9ab084be4f26713d6a248ca4 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:02:42 2011 +0200 Translation update done using Pootle. commit ca54bfd3573519e65047e5f20ba30699e7ac741f Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:01:51 2011 +0200 Translation update done using Pootle. commit fe72bda4d10487fbf4f498b9fcdb7b95e32d8d4c Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 23:01:06 2011 +0200 Translation update done using Pootle. commit 62d8a5d281a6d96b68b4d0a4e1f44efc1c1e63e5 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:57:41 2011 +0200 Translation update done using Pootle. commit ab2798e2471e7126dcdc5a1d4c08ae01eb981191 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:56:47 2011 +0200 Translation update done using Pootle. commit 2ec31dd5fea68544875dc8daf7563e5ad36fc93d Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:54:48 2011 +0200 Translation update done using Pootle. commit 4114d1b6c4f81fa83c96a7ad0214584c9dfce11d Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:54:29 2011 +0200 Translation update done using Pootle. commit 0b894193d18ce11d08b06aade2d9c6ef8570bfe5 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:54:13 2011 +0200 Translation update done using Pootle. commit 66ab1aa2018896bbafa1643591a5ac0118b60098 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:53:28 2011 +0200 Translation update done using Pootle. commit 7abf222225593c2f1f3b1dc1beab47bb6029b2c3 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:52:49 2011 +0200 Translation update done using Pootle. commit 76f48302b9efd988de7d1ab819b1ebd1a5a5410e Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:52:00 2011 +0200 Translation update done using Pootle. commit 1082e047099a71db2fa8f4ab481c6113c6782bdc Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:50:17 2011 +0200 Translation update done using Pootle. commit 1bce24e4b88ad7fa87c9205dc7eee311d3b13a1d Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:47:54 2011 +0200 Translation update done using Pootle. commit 996d48b79506c98d98a59120f6eeeb66633533b0 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:47:09 2011 +0200 Translation update done using Pootle. commit 0af4fb9586dfccdb6d35d537148e661b01c4cb21 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:46:20 2011 +0200 Translation update done using Pootle. commit 818aa47d63d85881ae84ed825010d5dd76d3d512 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:46:00 2011 +0200 Translation update done using Pootle. commit 2207dedcc74b26f6427b03a92bc30eca1dea15cb Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:45:25 2011 +0200 Translation update done using Pootle. commit 5795b349f829e10e0780caf16e105552d0786d41 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:44:21 2011 +0200 Translation update done using Pootle. commit 96743ccc3c50e6f448d23d64eefc68870e8a59ec Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:44:01 2011 +0200 Translation update done using Pootle. commit 1bf7ed8d7e4d73a88593aeb039f60c9a8ba85a9d Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:43:30 2011 +0200 Translation update done using Pootle. commit 161c62103bf2900a0423325786d3a18c567f47e8 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:42:51 2011 +0200 Translation update done using Pootle. commit 2ecb31ec542c64731126a46bf3e7e2c3dd8379c4 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:41:43 2011 +0200 Translation update done using Pootle. commit 798f7eec7c2d5291b16987f6bea6e8d2ad380600 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:41:14 2011 +0200 Translation update done using Pootle. commit 4c676d7c86eebcb81a7de8380761dae13668e3fa Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:38:56 2011 +0200 Translation update done using Pootle. commit 631f336a578d3ff9cc535ce02af67d64e13a0cd1 Author: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com> Date: Tue Nov 8 22:38:20 2011 +0200 Translation update done using Pootle. commit a2bfce8f4f41f2fa9814bb74aafc910e9726b8de Author: Pootle server <noreply(a)l10n.cihar.com> Date: Tue Nov 8 22:35:49 2011 +0200 Translation update done using Pootle. commit 0e450e792e784f1d7c9997d95b891240cc8927e5 Merge: b7ab34a d61769c Author: Pootle server <pootle(a)cihar.com> Date: Tue Nov 8 18:40:12 2011 +0100 Merge remote-tracking branch 'origin/master' commit b7ab34aa03a2f4e8123f1086614beb543eeea875 Merge: 89b3963 28f87bd Author: Pootle server <pootle(a)cihar.com> Date: Mon Nov 7 16:40:09 2011 +0100 Merge remote-tracking branch 'origin/master' commit 89b39632dd537e90e791ce8652e4b2fb870f9486 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 7 15:53:53 2011 +0200 Translation update done using Pootle. commit bc6d9cf7138ddb5c465a0f5f8a6cb2db7f487f25 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 7 15:53:34 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 8 ++-- po/ka.po | 147 ++++++++++++++++++++++++-------------------------------------- 2 files changed, 61 insertions(+), 94 deletions(-) diff --git a/po/fr.po b/po/fr.po index 1cd3184..a897bf1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ 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-11-02 15:30-0400\n" -"PO-Revision-Date: 2011-11-02 21:31+0200\n" +"PO-Revision-Date: 2011-11-07 15:53+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.1.6\n" @@ -13170,7 +13170,7 @@ msgstr "max. de connexions simultanées" #: po/advisory_rules.php:271 msgid "Enable concurrent_insert by setting it to 1" -msgstr "" +msgstr "Activez concurrent_insert en lui mettant une valeur de 1" #: po/advisory_rules.php:272 msgid "" @@ -13181,7 +13181,7 @@ msgstr "" #: po/advisory_rules.php:273 msgid "concurrent_insert is set to 0" -msgstr "" +msgstr "Le paramètre concurrent_insert a une valeur de 0" #~ msgid "+ Restart insertion and add a new value" #~ msgstr "+ Recommencer l'insertion et ajouter une valeur" diff --git a/po/ka.po b/po/ka.po index 28b937b..35b0842 100644 --- a/po/ka.po +++ b/po/ka.po @@ -4,19 +4,20 @@ 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-11-02 15:30-0400\n" -"PO-Revision-Date: 2010-03-12 09:14+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2011-11-08 23:12+0200\n" +"Last-Translator: Sulkhani Ninidze <sulxani.ninidze(a)hotmail.com>\n" "Language-Team: georgian <ka(a)li.org>\n" +"Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ka\n" -"X-Generator: Translate Toolkit 1.5.3\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Pootle 2.1.6\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:326 #: libraries/display_tbl.lib.php:358 server_privileges.php:1673 msgid "Show all" -msgstr "ყველას ჩვენება" +msgstr "ყველაფრის ჩვენება" #: browse_foreigners.php:70 libraries/PDF.class.php:42 #: libraries/common.lib.php:2406 @@ -95,7 +96,7 @@ msgstr "აღწერილობა" #: browse_foreigners.php:249 browse_foreigners.php:258 #: browse_foreigners.php:270 browse_foreigners.php:278 msgid "Use this value" -msgstr "გამოიყენე ეს ველი" +msgstr "გამოიყენეთ ეს ველი" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:385 @@ -122,11 +123,11 @@ msgstr "" #: db_create.php:60 #, php-format msgid "Database %1$s has been created." -msgstr "შეიქმნა მონაცემთა ბაზა %1$s." +msgstr "მონაცემთა ბაზა '%1$s' წარმატებით შეიქმნა" #: db_datadict.php:49 db_operations.php:364 msgid "Database comment: " -msgstr "მონაცემთა ბაზის კომენტარი: " +msgstr "კომენტარი მონაცემთა ბაზაში: " #: db_datadict.php:153 libraries/schema/Pdf_Relation_Schema.class.php:1279 #: libraries/tbl_properties.inc.php:662 tbl_operations.php:366 @@ -143,10 +144,9 @@ msgstr "ცხრილის კომენტარები" #: tbl_change.php:318 tbl_chart.php:89 tbl_indexes.php:196 #: tbl_printview.php:136 tbl_relation.php:395 tbl_tracking.php:257 #: tbl_tracking.php:308 tbl_zoom_select.php:434 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "სვეტების სახელები" +msgstr "სვეტები" #: db_datadict.php:163 db_printview.php:103 libraries/Index.class.php:433 #: libraries/db_structure.lib.php:46 libraries/export/htmlword.php:250 @@ -173,7 +173,7 @@ msgstr "ტიპი" #: tbl_printview.php:138 tbl_structure.php:205 tbl_tracking.php:260 #: tbl_tracking.php:311 tbl_zoom_select.php:435 msgid "Null" -msgstr "ნული" +msgstr "Null" #: db_datadict.php:166 db_structure.php:537 libraries/export/htmlword.php:252 #: libraries/export/latex.php:359 libraries/export/odt.php:295 @@ -183,7 +183,7 @@ msgstr "ნული" #: libraries/tbl_properties.inc.php:99 tbl_printview.php:139 #: tbl_structure.php:206 tbl_tracking.php:261 msgid "Default" -msgstr "ნაგულისხმები" +msgstr "სტანდარტული" #: db_datadict.php:170 libraries/export/htmlword.php:254 #: libraries/export/latex.php:361 libraries/export/odt.php:299 @@ -455,7 +455,7 @@ msgstr "ჩვენება" #: db_qbe.php:322 msgid "Criteria" -msgstr "კრიტერია" +msgstr "კრიტერიუმი" #: db_qbe.php:375 db_qbe.php:457 db_qbe.php:549 db_qbe.php:580 msgid "Ins" @@ -513,7 +513,7 @@ msgstr "მოთხოვნის გაგზავნა" #: libraries/auth/cookie.auth.lib.php:566 libraries/auth/http.auth.lib.php:51 #: libraries/auth/signon.auth.lib.php:237 msgid "Access denied" -msgstr "წვდომა აკრძალულია" +msgstr "მიუწვდომელია" #: db_search.php:43 db_search.php:286 msgid "at least one of the words" @@ -588,7 +588,7 @@ msgstr "Word(s) or value(s) to search for (wildcard: \"%\"):" #: db_search.php:282 msgid "Find:" -msgstr "იპოვე:" +msgstr "ძებნა:" #: db_search.php:286 db_search.php:287 msgid "Words are separated by a space character (\" \")." @@ -601,10 +601,9 @@ msgid "Inside tables:" msgstr "ცხრილ(ებ)ში:" #: db_search.php:330 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" -msgstr "ველში:" +msgstr "სვეტში:" #: db_structure.php:67 #, fuzzy @@ -732,9 +731,8 @@ msgid "Analyze table" msgstr "Analyze table" #: db_structure.php:600 -#, fuzzy msgid "Add prefix to table" -msgstr "მონაცემთა ბაზები არაა" +msgstr "პრეფიქსის დამატება მაგიდისათვის" #: db_structure.php:602 libraries/mult_submits.inc.php:251 #, fuzzy @@ -753,9 +751,8 @@ msgid "Data Dictionary" msgstr "მონაცემების ლექსიკონი" #: db_tracking.php:79 -#, fuzzy msgid "Tracked tables" -msgstr "დაბლოკილი ცხრილების გამოტოვება" +msgstr "ნანახი ცხრილები" #: db_tracking.php:84 libraries/config/messages.inc.php:502 #: libraries/export/htmlword.php:78 libraries/export/latex.php:151 @@ -776,9 +773,8 @@ msgid "Last version" msgstr "Create relation" #: db_tracking.php:87 tbl_tracking.php:636 -#, fuzzy msgid "Created" -msgstr "შექმნა" +msgstr "შეიქმნა" #: db_tracking.php:88 tbl_tracking.php:637 msgid "Updated" @@ -788,7 +784,7 @@ msgstr "" #: libraries/rte/rte_list.lib.php:67 libraries/server_links.inc.php:51 #: server_status.php:1231 sql.php:893 tbl_tracking.php:638 msgid "Status" -msgstr "მდგომარეობა" +msgstr "სტატუსი" #: db_tracking.php:90 libraries/Index.class.php:430 #: libraries/db_structure.lib.php:39 libraries/rte/rte_list.lib.php:52 @@ -811,23 +807,20 @@ msgid "not active" msgstr "" #: db_tracking.php:134 -#, fuzzy msgid "Versions" -msgstr "სპარსული" +msgstr "ვერსია" #: db_tracking.php:135 tbl_tracking.php:400 tbl_tracking.php:668 msgid "Tracking report" msgstr "" #: db_tracking.php:136 tbl_tracking.php:235 tbl_tracking.php:670 -#, fuzzy msgid "Structure snapshot" -msgstr "მხოლოდ სტრუქტურა" +msgstr "სნეიფშუთის სტრუქტურა" #: db_tracking.php:181 -#, fuzzy msgid "Untracked tables" -msgstr "დაბლოკილი ცხრილების გამოტოვება" +msgstr "Untracked tables" #: db_tracking.php:199 tbl_structure.php:638 #, fuzzy @@ -849,20 +842,19 @@ msgid "Values for a new column" msgstr "" #: enum_editor.php:30 js/messages.php:245 -#, fuzzy, php-format +#, php-format #| msgid "Number of fields" msgid "Values for column %s" -msgstr "ველების რაოდენობა" +msgstr "ველების რაოდენობა სვეტებისათვის %s" #: enum_editor.php:34 js/messages.php:247 msgid "Enter each value in a separate field" msgstr "" #: enum_editor.php:121 -#, fuzzy #| msgid "Add a new server" msgid "Add a value" -msgstr "ახალი სერვერის დამატება" +msgstr "ველის დამატება" #: enum_editor.php:127 gis_data_editor.php:317 msgid "Output" @@ -873,20 +865,18 @@ msgid "Copy and paste the joined values into the \"Length/Values\" field" msgstr "" #: export.php:29 -#, fuzzy #| msgid "Bar type" msgid "Bad type!" -msgstr "მოთხოვნის ტიპი" +msgstr "არასწორი ტიპი!" #: export.php:77 msgid "Selected export type has to be saved in file!" msgstr "Selected export type has to be saved in file!" #: export.php:106 -#, fuzzy #| msgid "Add new field" msgid "Bad parameters!" -msgstr "ახალი ველის დამატება" +msgstr "შეუსაბამობაა პარამეტრებში!" #: export.php:166 export.php:191 export.php:652 #, php-format @@ -955,10 +945,9 @@ msgstr "" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:302 -#, fuzzy #| msgid "Add new field" msgid "Add a point" -msgstr "ახალი ველის დამატება" +msgstr "წერტილის დამატება" #: gis_data_editor.php:220 js/messages.php:297 #, fuzzy @@ -975,32 +964,28 @@ msgid "Inner Ring" msgstr "" #: gis_data_editor.php:252 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "ახალი მომხმარებლის დამატება" +msgstr "ველის დამატება" #: gis_data_editor.php:252 gis_data_editor.php:304 js/messages.php:303 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" -msgstr "ახალი მომხმარებლის დამატება" +msgstr "შიდა ქსელის დამატება" #: gis_data_editor.php:266 js/messages.php:298 msgid "Polygon" msgstr "" #: gis_data_editor.php:306 js/messages.php:304 -#, fuzzy #| msgid "Add %s field(s)" msgid "Add a polygon" -msgstr "%s ველის დამატება" +msgstr "Add a polygon" #: gis_data_editor.php:310 -#, fuzzy #| msgid "Add a new server" msgid "Add geometry" -msgstr "ახალი სერვერის დამატება" +msgstr "გეომეტრიის დამატება" #: gis_data_editor.php:318 msgid "" @@ -1130,10 +1115,9 @@ msgid "You are about to DESTROY a complete table!" msgstr "You are about to DESTROY a complete database!" #: js/messages.php:35 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to TRUNCATE a complete table!" -msgstr "You are about to DESTROY a complete database!" +msgstr "თქვენ სრულიად გაანადგურეთ მონაცემთა ბაზა!" #: js/messages.php:37 #, fuzzy @@ -1175,26 +1159,25 @@ msgstr "Log file count" #: js/messages.php:54 msgid "The host name is empty!" -msgstr "ჰოსტის სახელი არაა შეყვანილი!" +msgstr "ჰოსტის სახელის ველი ცარიელია!" #: js/messages.php:55 msgid "The user name is empty!" -msgstr "მომხმარებლის სახელი ცარიელია!" +msgstr "მომხმარებლის სახელის ველი ცარიელია!" #: js/messages.php:56 server_privileges.php:1314 user_password.php:50 msgid "The password is empty!" -msgstr "პაროლი ცარიელია!" +msgstr "პაროლის ველი ცარიელია!" #: js/messages.php:57 server_privileges.php:1312 user_password.php:53 msgid "The passwords aren't the same!" -msgstr "პაროლები არ ემთხვევა!" +msgstr "პაროლებში შეუსაბამობაა!" #: js/messages.php:58 server_privileges.php:1769 server_privileges.php:1793 #: server_privileges.php:2205 server_privileges.php:2404 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "ნებისმიერი მომხმარებელი" +msgstr "მომხმარებლის დამატება" #: js/messages.php:59 #, fuzzy @@ -1222,20 +1205,18 @@ msgid "Edit" msgstr "რედაქტირება" #: js/messages.php:65 server_status.php:794 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "სერვერის არჩევა" +msgstr "გრაფიკული ტრაფიკის სქემა" #: js/messages.php:66 server_status.php:797 msgid "Live conn./process chart" msgstr "" #: js/messages.php:67 server_status.php:815 -#, fuzzy #| msgid "SQL Query box" msgid "Live query chart" -msgstr "SQL Query box" +msgstr "Live query chart" #: js/messages.php:69 msgid "Static data" @@ -2811,10 +2792,9 @@ msgid "PBMS error" msgstr "" #: libraries/blobstreaming.lib.php:306 -#, fuzzy #| msgid "MySQL connection collation" msgid "PBMS connection failed:" -msgstr "MySQL კავშირის კოლაცია" +msgstr "PBMS -სთან კავშირი ვერ ხერხდება:" #: libraries/blobstreaming.lib.php:361 msgid "PBMS get BLOB info failed:" @@ -3364,10 +3344,9 @@ msgid "SQL Validator is disabled" msgstr "" #: libraries/config/FormDisplay.class.php:745 -#, fuzzy #| msgid "PHP extension to use" msgid "SOAP extension not found" -msgstr "გამოსაყენებელი PHP გაფართოება" +msgstr "SOAP გაფართოება არ იქნა ნაპოვნი" #: libraries/config/FormDisplay.class.php:753 #, fuzzy, php-format @@ -3607,14 +3586,12 @@ msgid "Default table tab" msgstr "Default table tab" #: libraries/config/messages.inc.php:56 -#, fuzzy msgid "Show binary contents as HEX by default" -msgstr "ორობითი შიგთავსის ჩვენება" +msgstr "ორობითის ჩვენება HEX ფორმატში იყოს ნაგულისხმევი" #: libraries/config/messages.inc.php:57 libraries/display_tbl.lib.php:671 -#, fuzzy msgid "Show binary contents as HEX" -msgstr "ორობითი შიგთავსის ჩვენება" +msgstr "აჩვენეთ ორობით შინაარსი როგორც HEX" #: libraries/config/messages.inc.php:58 msgid "Show database listing as a list instead of a drop down" @@ -3888,9 +3865,8 @@ msgid "Enclose export in a transaction" msgstr "Enclose export in a transaction" #: libraries/config/messages.inc.php:142 -#, fuzzy msgid "Export time in UTC" -msgstr "Export defaults" +msgstr "ექსპორტის დრო UT- ში" #: libraries/config/messages.inc.php:150 msgid "Force secured connection while using phpMyAdmin" @@ -5139,9 +5115,8 @@ msgid "Server socket" msgstr "Server socket" #: libraries/config/messages.inc.php:427 -#, fuzzy msgid "Enable SSL for connection to MySQL server" -msgstr "MySQL სერვერთან კავშირის შეკუმშვა" +msgstr "SSL კავშირის ჩართვა MySQL სერვერზე" #: libraries/config/messages.inc.php:428 msgid "Use SSL" @@ -5188,10 +5163,9 @@ msgstr "" "kbd]" #: libraries/config/messages.inc.php:434 -#, fuzzy #| msgid "Defragment table" msgid "UI preferences table" -msgstr "Defragment table" +msgstr "UI პარამეტრების მაგიდა" #: libraries/config/messages.inc.php:435 msgid "" @@ -5653,10 +5627,9 @@ msgid "Cookie authentication" msgstr "Host authentication order" #: libraries/config/setup.forms.php:48 -#, fuzzy #| msgid "Host authentication order" msgid "HTTP authentication" -msgstr "Host authentication order" +msgstr "HTTP ავტორიზაცია" #: libraries/config/setup.forms.php:51 #, fuzzy @@ -8030,7 +8003,6 @@ msgstr "" msgid "%d row affected by the last statement inside the procedure" msgid_plural "%d rows affected by the last statement inside the procedure" msgstr[0] "" -msgstr[1] "" #: libraries/rte/rte_routines.lib.php:1225 #, fuzzy, php-format @@ -10112,20 +10084,18 @@ msgid "Reset slave" msgstr "" #: server_replication.php:326 -#, fuzzy #| msgid "Structure only" msgid "Start SQL Thread only" -msgstr "მხოლოდ სტრუქტურა" +msgstr "მხოლოდ SQL თემების გაშვება" #: server_replication.php:328 msgid "Stop SQL Thread only" msgstr "" #: server_replication.php:331 -#, fuzzy #| msgid "Structure only" msgid "Start IO Thread only" -msgstr "მხოლოდ სტრუქტურა" +msgstr "გაეშვას მხოლოდ IO სტრუქტურა" #: server_replication.php:333 msgid "Stop IO Thread only" @@ -11990,10 +11960,9 @@ msgid "View dump (schema) of table" msgstr "View dump (schema) of table" #: tbl_gis_visualization.php:112 -#, fuzzy #| msgid "Display servers selection" msgid "Display GIS Visualization" -msgstr "Display servers selection" +msgstr "ჩვენების GIS ვიზუალიზაცია" #: tbl_gis_visualization.php:128 msgid "Width" @@ -12162,9 +12131,8 @@ msgid "Empty the table (TRUNCATE)" msgstr "" #: tbl_operations.php:716 -#, fuzzy msgid "Delete the table (DROP)" -msgstr "მონაცემთა ბაზები არაა" +msgstr "მაგიდების წაშლა (DROP)" #: tbl_operations.php:738 msgid "Partition maintenance" @@ -12315,10 +12283,9 @@ msgid "Add unique index" msgstr "" #: tbl_structure.php:173 tbl_structure.php:174 -#, fuzzy #| msgid "Add new field" msgid "Add SPATIAL index" -msgstr "ახალი ველის დამატება" +msgstr "სივრცით ინდექსის დამატება" #: tbl_structure.php:175 tbl_structure.php:176 msgid "Add FULLTEXT index" @@ -14245,9 +14212,9 @@ msgstr "" #~ msgid "None" #~ msgstr "არაა" -#~ msgctxt "" -#~ msgid "None" -#~ msgstr "არაა" +msgctxt "" +msgid "None" +msgstr "არაა" #~ msgid "Grant all privileges on wildcard name (username_%)" #~ msgstr "Grant all privileges on wildcard name (username\\_%)" hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7-20-g2dfd1dc

by Aris Feryanto

The branch, QA_3_4 has been updated via 2dfd1dca1490959f4ee594eb7de9e3e996fd6b4c (commit) via efc03d8c8cfa354f703c7a40780035efa93235a4 (commit) from cc2fe91e767d2c38855f1bb866d71c4a721b82cd (commit) - Log ----------------------------------------------------------------- commit 2dfd1dca1490959f4ee594eb7de9e3e996fd6b4c Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Wed Nov 9 00:33:11 2011 +0800 Added Changelog entry commit efc03d8c8cfa354f703c7a40780035efa93235a4 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Mon Nov 7 10:27:55 2011 +0800 Fix bug #3431427: Dropdown displaying results - setting NULL does not work ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/tbl_change.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f89acb6..bab9d7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug #3428065 [parser] TRUE not recognized by parser + patch #3433770 [config] Make location of php-gettext configurable - patch #3430291 [import] Handle conflicts in some open_basedir situations +- bug #3431427 [display] Dropdown results - setting NULL does not work 3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/js/tbl_change.js b/js/tbl_change.js index 8fc7eca..79e7906 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -29,11 +29,11 @@ function nullify(theType, urlField, md5Field, multi_edit) // "SET" field , "ENUM" field with more than 20 characters // or foreign key field (drop-down) if (theType == 1 || theType == 3 || theType == 4) { - rowForm.elements['field_' + md5Field + multi_edit + '[]'].selectedIndex = -1; + rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].selectedIndex = -1; } // Other "ENUM" field else if (theType == 2) { - var elts = rowForm.elements['field_' + md5Field + multi_edit + '[]']; + var elts = rowForm.elements['fields' + multi_edit + '[' + md5Field + ']']; // when there is just one option in ENUM: if (elts.checked) { elts.checked = false; @@ -47,7 +47,7 @@ function nullify(theType, urlField, md5Field, multi_edit) } // foreign key field (with browsing icon for foreign values) else if (theType == 6) { - rowForm.elements['field_' + md5Field + multi_edit + '[]'].value = ''; + rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].value = ''; } // Other field types else /*if (theType == 5)*/ { hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-22467-gd61769c

by Aris Feryanto

The branch, master has been updated via d61769c13365be20f7c88196c015487221f01633 (commit) from 28f87bd8a0120ad323914c4e18a912e43947679f (commit) - Log ----------------------------------------------------------------- commit d61769c13365be20f7c88196c015487221f01633 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Wed Nov 9 00:33:11 2011 +0800 Added Changelog entry ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbe226a..d8b0494 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog - bug #3428065 [parser] TRUE not recognized by parser + patch #3433770 [config] Make location of php-gettext configurable - patch #3430291 [import] Handle conflicts in some open_basedir situations +- bug #3431427 [display] Dropdown results - setting NULL does not work 3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. fd6c4ccdbbf9d272dd8e5093f1c9c8981987cf70

by Michal Čihař

The branch, master has been updated via fd6c4ccdbbf9d272dd8e5093f1c9c8981987cf70 (commit) from b1fa51c11ea90709cb96667fb2e80f501ef4dbee (commit) - Log ----------------------------------------------------------------- commit fd6c4ccdbbf9d272dd8e5093f1c9c8981987cf70 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Nov 8 10:46:40 2011 +0100 Add link to Google+ profile ----------------------------------------------------------------------- Summary of changes: templates/_page.tpl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/templates/_page.tpl b/templates/_page.tpl index 6b71705..48755d1 100644 --- a/templates/_page.tpl +++ b/templates/_page.tpl @@ -16,6 +16,7 @@ <link rel="icon" href="${base_url}favicon.ico" type="image/x-icon" /> <link rel="vcs-git" href="git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin" title="phpMyAdmin Git repository" /> <link rel="vcs-browse" href="http://phpmyadmin.git.sourceforge.net/" title="phpMyAdmin Git repository browser" /> + <link href="https://plus.google.com/112870346549275765217/" rel="publisher" /> <script src="${base_url}js/mootools.js" type="text/javascript"></script> <script src="${base_url}js/mootools-more.js" type="text/javascript"></script> <script src="${base_url}js/slimbox.js" type="text/javascript"></script> @@ -60,6 +61,7 @@ <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li> <li class="logo"><a href="http://sourceforge.net/projects/phpmyadmin"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=23067&type=10" width="80" height="15" alt="Get phpMyAdmin at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></li> <li class="logo"><a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://www.phpmyadmin.net/"></a></li> + <li class="logo"><a href="https://plus.google.com/112870346549275765217/?prsrc=3" style="text-decoration: none;"><img src="https://ssl.gstatic.com/images/icons/gplus-16.png" width="16" height="16" style="border: 0;"/></a></li> </ul> <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); hooks/post-receive -- phpMyAdmin website

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-22466-g28f87bd

by Marc Delisle

The branch, master has been updated via 28f87bd8a0120ad323914c4e18a912e43947679f (commit) via cc2fe91e767d2c38855f1bb866d71c4a721b82cd (commit) from e7daa97c32d3791f1d452bdd7e9806630eb5a807 (commit) - Log ----------------------------------------------------------------- commit 28f87bd8a0120ad323914c4e18a912e43947679f Merge: e7daa97 cc2fe91 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 7 09:54:39 2011 -0500 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 19a86c8..a2b594b 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -67,7 +67,7 @@ h2 a img{display:inline;} } #table_results td.data { -border-right: 1px solid #444444; +border-right: 1px solid #BBBBBB; } h3 { hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7-18-gcc2fe91

by Marc Delisle

The branch, QA_3_4 has been updated via cc2fe91e767d2c38855f1bb866d71c4a721b82cd (commit) from 19c0de6be237e3393b65b93ee4ef67ee3be68c18 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 048791a..08f8ca5 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -68,7 +68,7 @@ margin: 0 0 12px 0; } #table_results td.data { -border-right: 1px solid #444444; +border-right: 1px solid #BBBBBB; } h3 { hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-22464-ge7daa97

by Michal Čihař

The branch, master has been updated via e7daa97c32d3791f1d452bdd7e9806630eb5a807 (commit) via 19c0de6be237e3393b65b93ee4ef67ee3be68c18 (commit) via 987f943de33a0d0aa6ac3e3c352d48ac4a527a6d (commit) via f496bc9f1f9c241ac2d36167703539e73f909fe8 (commit) from 1816110fbf9f8bddafb12a8862fc67e536cc1dfa (commit) - Log ----------------------------------------------------------------- commit e7daa97c32d3791f1d452bdd7e9806630eb5a807 Merge: f496bc9 19c0de6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Nov 7 15:47:56 2011 +0100 Merge remote-tracking branch 'origin/QA_3_4' commit f496bc9f1f9c241ac2d36167703539e73f909fe8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Nov 7 15:13:56 2011 +0100 Better error message ----------------------------------------------------------------------- Summary of changes: libraries/import/ods.php | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libraries/import/ods.php b/libraries/import/ods.php index ab9729b..fc1c177 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -73,8 +73,7 @@ unset($buffer); if ($xml === false) { $sheets = array(); - /* TODO: this message should be improved later, used existing because of string freeze */ - $message = PMA_Message::error(__('Error in Processing Request')); + $message = PMA_Message::error(__('The XML file specified was either malformed or incomplete. Please correct the issue and try again.')); $error = true; } else { $sheets = $xml->children('office', true)->{'body'}->{'spreadsheet'}->children('table', true); hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7-17-g19c0de6

by Michal Čihař

The branch, QA_3_4 has been updated via 19c0de6be237e3393b65b93ee4ef67ee3be68c18 (commit) via 987f943de33a0d0aa6ac3e3c352d48ac4a527a6d (commit) from c51353df21ea86afb8b6197b70560489bfee0e1d (commit) - Log ----------------------------------------------------------------- commit 19c0de6be237e3393b65b93ee4ef67ee3be68c18 Merge: c51353d 987f943 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Nov 7 15:47:12 2011 +0100 Merge branch 'MAINT_3_4_7' into QA_3_4 Conflicts: ChangeLog ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_7, updated. RELEASE_3_4_7-1-g987f943

by Michal Čihař

The branch, MAINT_3_4_7 has been updated via 987f943de33a0d0aa6ac3e3c352d48ac4a527a6d (commit) from a8a93c3e5af85dd0329e1a71b8bed664c9ec4bc2 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04455a7..1e06756 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.7.0 (not yet released) +3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false - bug #3418849 [interface] Inline edit shows dropdowns even after closing - bug [view] View renaming did not work hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-22460-g1816110

by Marc Delisle

The branch, master has been updated via 1816110fbf9f8bddafb12a8862fc67e536cc1dfa (commit) via 4d1e6f302f04543ce1fea0524d3d8179ee894d21 (commit) from d5a3be56efae8337b59f756537804ca053e7fbef (commit) - Log ----------------------------------------------------------------- commit 1816110fbf9f8bddafb12a8862fc67e536cc1dfa Merge: d5a3be5 4d1e6f3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 7 05:33:55 2011 -0500 Merge commit '4d1e6f302f04543ce1fea0524d3d8179ee894d21' commit 4d1e6f302f04543ce1fea0524d3d8179ee894d21 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Nov 6 12:46:02 2011 +0000 Fix column border visibility in makegrid.js ----------------------------------------------------------------------- Summary of changes: js/makegrid.js | 2 ++ themes/original/css/theme_right.css.php | 5 ++++- themes/pmahomme/css/theme_right.css.php | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index d87b7b4..299315a 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -80,6 +80,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi */ dragStartRsz: function(e, obj) { var n = $(g.cRsz).find('div').index(obj); // get the index of separator (i.e., column index) + $(obj).addClass('colborder_active'); g.colRsz = { x0: e.pageX, n: n, @@ -195,6 +196,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.reposRsz(); g.reposDrop(); g.colRsz = false; + $(g.cRsz).find('div').removeClass('colborder_active'); } else if (g.colReorder) { // shift columns if (g.colReorder.newn != g.colReorder.n) { diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index aaacd44..289d5c4 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -2195,7 +2195,6 @@ span.CodeMirror-selected { <?php echo $_SESSION['PMA_Theme']->getCssCodeMirror(); ?> .colborder { - border-right: solid 1px #FFFFFF; cursor: col-resize; height: 100%; margin-left: -5px; @@ -2203,6 +2202,10 @@ span.CodeMirror-selected { width: 5px; } +.colborder_active { + border-right: 2px solid #a44; +} + .pma_table td { position: static; } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 0737a37..19a86c8 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2606,7 +2606,6 @@ span.CodeMirror-selected { <?php echo $_SESSION['PMA_Theme']->getCssCodeMirror(); ?> .colborder { - border-right: 1px solid #FFF; cursor: col-resize; height: 100%; margin-left: -6px; @@ -2614,6 +2613,10 @@ span.CodeMirror-selected { width: 5px; } +.colborder_active { + border-right: 2px solid #a44; +} + .pma_table td { position: static; } hooks/post-receive -- phpMyAdmin

12 years, 10 months

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git November 2011