Git January 2011

git@phpmyadmin.net

5 participants
154 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-297-g5ed1d80
by Michal Čihař 13 Jan '11

13 Jan '11

The branch, master has been updated via 5ed1d80bff394d913decff2caad545f69d850de0 (commit) via a1fe2f26d041d40ef55da61dffafa6570caa4ccf (commit) via 4672d59d43bdcbd117dd6e196b7fac5176989449 (commit) via 9d0621ef3936a7947384514e10814c7c200d6af1 (commit) via f1f80e43ec2a576fab9ec4a8a20466bd492b5a1a (commit) via ab9ddcf02f65e88143bc73d4c0f535c2f68af217 (commit) via 76dc3b5dac18b2d809ad5b4e8d2b348e053a7ef5 (commit) via bcdcd09a05a0642474189fd0c23ec055116facbe (commit) via 40c6a9ccf8cc0e8648b488d32fd8f1d1326bdb97 (commit) via a2bb74d2b70a386b92c8fdb111fe6f9ea439ada5 (commit) via 80926a345dfe6ca2df024eeeaeb7de8d15dfe1d8 (commit) via be91deaed1f76d44c3a8bbbb5ae7b3705d0bf75d (commit) via 2e94db6bf208fb34c940bfd983c42d1537ea80ab (commit) via ca7c1d5b2666f515020c31763d8b5db6db6dfc31 (commit) via bfc751cfe0e96eb229aa13d3c23968e71790205f (commit) via c0c8af848e45492567dc6dcd93bc638a9bcb4620 (commit) via f54af4087d6d67f9c99e6261347bd5bb872f111f (commit) via 8d26a66aec6473457d3b7e8227db73fee4609d33 (commit) via 9c951fb43364200a2f0dbf2e6605f52c352c2634 (commit) via 188b945364ceff16c677013472aba6971c745fc7 (commit) via eeb77b9268065ddd06f39387e5adc90ad5d6f98b (commit) via d03a0f69966cc5710d4c8f91d28d80eda20a9156 (commit) via b8147d6c6b730d609228ca24277325846c7d3a6c (commit) via 31b1cea5008e091a78a6e5b0880a3441b92db2ca (commit) via 48fa47d4a5bb1699d0afc302972d899ce7920bfb (commit) via 36e354b54189d1a0d99f353f956ca9787a5b536a (commit) via 6df0f28294b808b88d71fab2b9a6d29c07271bbc (commit) via 312f966b89cbea5291ef6bc2e0e66fa47bdf10fb (commit) via 351619a90086b6a2494fe793ebf4d7237eab2edb (commit) via 30f169d2474d7269ede39594339ed7bb7655fae6 (commit) via 269a83d8f2a635a99a385ab2f4e93a416bf79b09 (commit) via c5e3c1ee65fb85b1f0349849714c9901e5783742 (commit) via 95969043ff7e1ec562a62d98e7e9318f56159a00 (commit) via be1491a1e4466e323018fadd2e5b71516813b295 (commit) via 5cebf5af007ef4da6b2a6291871158f8dac484e3 (commit) via 30989082720996e96325b37dd8925a790fcc4f8b (commit) via 9ad56c34f6d3aed3d61fabfec9e5ba191d2acb43 (commit) via 38546fa4a9f0ddeea0d9a971cb548309ceb12ff4 (commit) via 7e7adc4718a435bc32e5759736ff64a7ded8b087 (commit) via f67300ffa31ca532226391beea8de0d93c20a143 (commit) via 4f4602de72ac08a927b1097fc3d9079e1f8c86dd (commit) via 6657535a0b5a344fe602012b0cdc72d83265dc33 (commit) via 63b21ee37309793e8bc584d0de309fff30b5333d (commit) via 883a24f5a06eb3e7db2e2b1d8247cefcfbd1e46e (commit) via 3cbbe3ba1da2853dcbab1c8cb035ab524ddb487c (commit) via 54ed86f5d916322fe410447b813744a4401f7438 (commit) via c6575078d7559341e8f93d9a311823d7771bd605 (commit) via 45e893d2078962deadb11a9c237988b3a7c172e1 (commit) via 082b81acd5bd42df1dcadbf87c67fd3ff054f155 (commit) via fc9ab96ccbac776638b9a81e455778de43049b0b (commit) via 8c02434157dee10108fd8c44c2352b14fc2a66a5 (commit) via 877c6bec8674871276abb09524f339d981381be0 (commit) via c1e22062fae35c03ac9383bf58ede1e8dbccafdb (commit) via 1d29abb4668e4d54b8321dc55c6ace269bd4979e (commit) via fc1c44d2976ec5259e9d8ebb8b960c3d6a5ee702 (commit) via 237841b326f56de62fea0f3e46caf3a5ca6030cb (commit) via b00ece9f7dadea4f2a0576de033503fe474968b8 (commit) from d9f862a8c115811062f71d818c7d98e027c4f2c4 (commit) - Log ----------------------------------------------------------------- commit 5ed1d80bff394d913decff2caad545f69d850de0 Merge: d9f862a8c115811062f71d818c7d98e027c4f2c4 a1fe2f26d041d40ef55da61dffafa6570caa4ccf Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jan 13 22:45:43 2011 +0100 Merge remote branch 'pootle/master' commit a1fe2f26d041d40ef55da61dffafa6570caa4ccf Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 22:25:15 2011 +0200 Translation update done using Pootle. commit 4672d59d43bdcbd117dd6e196b7fac5176989449 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 22:24:47 2011 +0200 Translation update done using Pootle. commit 9d0621ef3936a7947384514e10814c7c200d6af1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 22:18:24 2011 +0200 Translation update done using Pootle. commit f1f80e43ec2a576fab9ec4a8a20466bd492b5a1a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 22:15:07 2011 +0200 Translation update done using Pootle. commit ab9ddcf02f65e88143bc73d4c0f535c2f68af217 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 22:13:54 2011 +0200 Translation update done using Pootle. commit 76dc3b5dac18b2d809ad5b4e8d2b348e053a7ef5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 22:06:43 2011 +0200 Translation update done using Pootle. commit bcdcd09a05a0642474189fd0c23ec055116facbe Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 22:05:04 2011 +0200 Translation update done using Pootle. commit 40c6a9ccf8cc0e8648b488d32fd8f1d1326bdb97 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:58:21 2011 +0200 Translation update done using Pootle. commit a2bb74d2b70a386b92c8fdb111fe6f9ea439ada5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:55:39 2011 +0200 Translation update done using Pootle. commit 80926a345dfe6ca2df024eeeaeb7de8d15dfe1d8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:51:24 2011 +0200 Translation update done using Pootle. commit be91deaed1f76d44c3a8bbbb5ae7b3705d0bf75d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:51:02 2011 +0200 Translation update done using Pootle. commit 2e94db6bf208fb34c940bfd983c42d1537ea80ab Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:44:29 2011 +0200 Translation update done using Pootle. commit ca7c1d5b2666f515020c31763d8b5db6db6dfc31 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:41:11 2011 +0200 Translation update done using Pootle. commit bfc751cfe0e96eb229aa13d3c23968e71790205f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:37:16 2011 +0200 Translation update done using Pootle. commit c0c8af848e45492567dc6dcd93bc638a9bcb4620 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:35:01 2011 +0200 Translation update done using Pootle. commit f54af4087d6d67f9c99e6261347bd5bb872f111f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:32:36 2011 +0200 Translation update done using Pootle. commit 8d26a66aec6473457d3b7e8227db73fee4609d33 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:32:22 2011 +0200 Translation update done using Pootle. commit 9c951fb43364200a2f0dbf2e6605f52c352c2634 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:32:05 2011 +0200 Translation update done using Pootle. commit 188b945364ceff16c677013472aba6971c745fc7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:31:48 2011 +0200 Translation update done using Pootle. commit eeb77b9268065ddd06f39387e5adc90ad5d6f98b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:18:31 2011 +0200 Translation update done using Pootle. commit d03a0f69966cc5710d4c8f91d28d80eda20a9156 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:13:54 2011 +0200 Translation update done using Pootle. commit b8147d6c6b730d609228ca24277325846c7d3a6c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 21:12:14 2011 +0200 Translation update done using Pootle. commit 31b1cea5008e091a78a6e5b0880a3441b92db2ca Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 20:59:50 2011 +0200 Translation update done using Pootle. commit 48fa47d4a5bb1699d0afc302972d899ce7920bfb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 20:57:40 2011 +0200 Translation update done using Pootle. commit 36e354b54189d1a0d99f353f956ca9787a5b536a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 20:41:03 2011 +0200 Translation update done using Pootle. commit 6df0f28294b808b88d71fab2b9a6d29c07271bbc Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:49:17 2011 +0200 Translation update done using Pootle. commit 312f966b89cbea5291ef6bc2e0e66fa47bdf10fb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:48:52 2011 +0200 Translation update done using Pootle. commit 351619a90086b6a2494fe793ebf4d7237eab2edb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:45:22 2011 +0200 Translation update done using Pootle. commit 30f169d2474d7269ede39594339ed7bb7655fae6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:45:04 2011 +0200 Translation update done using Pootle. commit 269a83d8f2a635a99a385ab2f4e93a416bf79b09 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:38:50 2011 +0200 Translation update done using Pootle. commit c5e3c1ee65fb85b1f0349849714c9901e5783742 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:38:29 2011 +0200 Translation update done using Pootle. commit 95969043ff7e1ec562a62d98e7e9318f56159a00 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:35:48 2011 +0200 Translation update done using Pootle. commit be1491a1e4466e323018fadd2e5b71516813b295 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:33:15 2011 +0200 Translation update done using Pootle. commit 5cebf5af007ef4da6b2a6291871158f8dac484e3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:31:24 2011 +0200 Translation update done using Pootle. commit 30989082720996e96325b37dd8925a790fcc4f8b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:30:47 2011 +0200 Translation update done using Pootle. commit 9ad56c34f6d3aed3d61fabfec9e5ba191d2acb43 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:28:44 2011 +0200 Translation update done using Pootle. commit 38546fa4a9f0ddeea0d9a971cb548309ceb12ff4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:26:10 2011 +0200 Translation update done using Pootle. commit 7e7adc4718a435bc32e5759736ff64a7ded8b087 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:19:52 2011 +0200 Translation update done using Pootle. commit f67300ffa31ca532226391beea8de0d93c20a143 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 19:17:50 2011 +0200 Translation update done using Pootle. commit 4f4602de72ac08a927b1097fc3d9079e1f8c86dd Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:52:16 2011 +0200 Translation update done using Pootle. commit 6657535a0b5a344fe602012b0cdc72d83265dc33 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:49:12 2011 +0200 Translation update done using Pootle. commit 63b21ee37309793e8bc584d0de309fff30b5333d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:46:29 2011 +0200 Translation update done using Pootle. commit 883a24f5a06eb3e7db2e2b1d8247cefcfbd1e46e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:45:02 2011 +0200 Translation update done using Pootle. commit 3cbbe3ba1da2853dcbab1c8cb035ab524ddb487c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:42:43 2011 +0200 Translation update done using Pootle. commit 54ed86f5d916322fe410447b813744a4401f7438 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:41:08 2011 +0200 Translation update done using Pootle. commit c6575078d7559341e8f93d9a311823d7771bd605 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:37:14 2011 +0200 Translation update done using Pootle. commit 45e893d2078962deadb11a9c237988b3a7c172e1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:36:19 2011 +0200 Translation update done using Pootle. commit 082b81acd5bd42df1dcadbf87c67fd3ff054f155 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:35:47 2011 +0200 Translation update done using Pootle. commit fc9ab96ccbac776638b9a81e455778de43049b0b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:34:14 2011 +0200 Translation update done using Pootle. commit 8c02434157dee10108fd8c44c2352b14fc2a66a5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:30:53 2011 +0200 Translation update done using Pootle. commit 877c6bec8674871276abb09524f339d981381be0 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:23:48 2011 +0200 Translation update done using Pootle. commit c1e22062fae35c03ac9383bf58ede1e8dbccafdb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:22:24 2011 +0200 Translation update done using Pootle. commit 1d29abb4668e4d54b8321dc55c6ace269bd4979e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:21:04 2011 +0200 Translation update done using Pootle. commit fc1c44d2976ec5259e9d8ebb8b960c3d6a5ee702 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:15:51 2011 +0200 Translation update done using Pootle. commit 237841b326f56de62fea0f3e46caf3a5ca6030cb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:14:24 2011 +0200 Translation update done using Pootle. commit b00ece9f7dadea4f2a0576de033503fe474968b8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 18:10:07 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 153 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 72 insertions(+), 81 deletions(-) diff --git a/po/ru.po b/po/ru.po index 73675e4..855bfc6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-13 15:11+0200\n" +"PO-Revision-Date: 2011-01-13 22:25+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -3017,13 +3017,11 @@ msgid "Enter server connection parameters" msgstr "Введите параметры соединения сервера" #: libraries/config/messages.inc.php:199 -#, fuzzy #| msgid "Configuration file" msgid "Configuration storage" -msgstr "Конфигурационный файл" +msgstr "Хранение конфигурации" #: libraries/config/messages.inc.php:200 -#, fuzzy #| msgid "" #| "Configure phpMyAdmin database to gain access to additional features, see " #| "[a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] " @@ -3033,19 +3031,21 @@ msgid "" "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" -"Настройка базы данных для установки расширенных возможностей phpMyAdmin. " -"Смотрите в документации раздел описывающий [a@../Documentation.html#linked-" -"tables]инфраструктуру связанных таблиц[/a]" +"Настройка phpMyAdmin для установки расширенных возможностей. Смотрите в " +"документации раздел описывающий [a@../Documentation.html#linked-" +"tables]хранение конфигурации[/a]" #: libraries/config/messages.inc.php:201 msgid "Changes tracking" -msgstr "" +msgstr "Слежение за изменениями" #: libraries/config/messages.inc.php:202 msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" +"Слежение за изменениями произведенными в базе данных. Для работы требуется " +"настройка хранения конфигурации phpMyAdmin." #: libraries/config/messages.inc.php:203 msgid "Customize export options" @@ -3077,16 +3077,14 @@ msgid "Customize links shown in SQL Query boxes" msgstr "Настройте ссылки выводимые в блоке SQL запросов" #: libraries/config/messages.inc.php:214 -#, fuzzy #| msgid "SQL queries" msgid "SQL queries settings" -msgstr "SQL запросы" +msgstr "Настройки SQL запросов" #: libraries/config/messages.inc.php:215 -#, fuzzy #| msgid "SQL history" msgid "SQL Validator" -msgstr "История SQL-запросов" +msgstr "Валидатор SQL" #: libraries/config/messages.inc.php:216 msgid "" @@ -3095,6 +3093,11 @@ msgid "" "strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], " "Copyright 2002 Upright Database Technology. All rights reserved.[/em]" msgstr "" +"Если вы хотите использовать валидатор SQL, имейте в виду, что [strong]все " +"SQL выражения сохраняются анонимно в статистических " +"целях[/strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL " +"Validator[/a], Copyright 2002 Upright Database Technology. Все права " +"сохранены.[/em]" #: libraries/config/messages.inc.php:217 msgid "Startup" @@ -3113,30 +3116,27 @@ msgid "Choose how you want tabs to work" msgstr "Настройте отображение вкладок" #: libraries/config/messages.inc.php:221 -#, fuzzy #| msgid "Use text field" msgid "Text fields" -msgstr "Использовать текстовое поле" +msgstr "Текстовые поля" #: libraries/config/messages.inc.php:222 -#, fuzzy #| msgid "Customize export options" msgid "Customize text input fields" -msgstr "Модифицировать параметры экспорта" +msgstr "Настройте отображение текстовых полей" #: libraries/config/messages.inc.php:223 libraries/export/texytext.php:17 msgid "Texy! text" msgstr "Texy! текст" #: libraries/config/messages.inc.php:225 -#, fuzzy #| msgid "Warning" msgid "Warnings" -msgstr "Предупреждение" +msgstr "Предупреждения" #: libraries/config/messages.inc.php:226 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "Отключение некоторых предупреждений выводимых phpMyAdmin" #: libraries/config/messages.inc.php:227 msgid "" @@ -3183,7 +3183,7 @@ msgstr "Частичный импорт: разрешает прерывание #: libraries/config/messages.inc.php:238 libraries/config/messages.inc.php:245 #: libraries/import/csv.php:26 libraries/import/ldi.php:39 msgid "Do not abort on INSERT error" -msgstr "" +msgstr "Не прерывать при возникновении ошибки во время выполнения INSERT" #: libraries/config/messages.inc.php:239 libraries/config/messages.inc.php:247 #: libraries/import/csv.php:25 libraries/import/ldi.php:38 @@ -3216,36 +3216,32 @@ msgid "Do not import empty rows" msgstr "Пропускать пустые строки" #: libraries/config/messages.inc.php:251 -#, fuzzy #| msgid "Import currencies ($5.00 to 5.00)" msgid "Import currencies ($5.00 to 5.00)" -msgstr "Импортировать денежные единицы ($5.00 в 5.00)" +msgstr "Импортировать денежные единицы (5.00 вместо $5.00)" #: libraries/config/messages.inc.php:252 -#, fuzzy #| msgid "Import percentages as proper decimals (12.00% to .12)" msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "Импортировать проценты в виде десятичных значений (12.00% в .12)" +msgstr "Импортировать проценты в виде десятичных значений (.12 вместо 12.00%)" #: libraries/config/messages.inc.php:253 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of queries to skip from start" -msgstr "Количество запросов пропускаемых от начала импорта" +msgstr "Количество запросов пропускаемых от начала" #: libraries/config/messages.inc.php:254 msgid "Partial import: skip queries" msgstr "Частичный импорт: пропуск запросов" #: libraries/config/messages.inc.php:256 -#, fuzzy #| msgid "Do not use AUTO_INCREMENT for zero values" msgid "Do not use AUTO_INCREMENT for zero values" -msgstr "Не используйте параметр AUTO_INCREMENT для нулевых значений" +msgstr "Не использовать AUTO_INCREMENT для нулевых значений" #: libraries/config/messages.inc.php:259 msgid "Initial state for sliders" -msgstr "" +msgstr "Исходное положение раскрывающихся блоков" #: libraries/config/messages.inc.php:260 msgid "How many rows can be inserted at one time" @@ -3276,10 +3272,9 @@ msgid "Display servers selection" msgstr "Отображать выбор сервера" #: libraries/config/messages.inc.php:267 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Minimum number of tables to display the table filter box" -msgstr "Максимальное количество таблиц отображаемых в списке" +msgstr "Минимальное количество таблиц для отображения поля фильтра" #: libraries/config/messages.inc.php:268 msgid "String that separates databases into different tree levels" @@ -3323,7 +3318,7 @@ msgstr "Разделитель дерева таблиц" #: libraries/config/messages.inc.php:277 msgid "URL where logo in the navigation frame will point to" -msgstr "" +msgstr "URL на который будет ссылаться логотип из фрейма навигации" #: libraries/config/messages.inc.php:278 msgid "Logo link URL" @@ -3358,16 +3353,16 @@ msgid "Light tabs" msgstr "Облегченные вкладки" #: libraries/config/messages.inc.php:285 -#, fuzzy #| msgid "Maximum number of characters used when a SQL query is displayed" msgid "" "Maximum number of characters shown in any non-numeric column on browse view" msgstr "" -"Максимальное количество символов используемых при отображении SQL запроса" +"Максимальное количество символов отображаемых в любом нечисловом поле в " +"режиме обзора" #: libraries/config/messages.inc.php:286 msgid "Limit column characters" -msgstr "" +msgstr "Ограничить по количеству символов в поле" #: libraries/config/messages.inc.php:287 msgid "" @@ -3424,14 +3419,15 @@ msgstr "Срок действия cookie" #: libraries/config/messages.inc.php:295 msgid "Double size of textarea for LONGTEXT columns" msgstr "" +"Двойное увеличение размера текстового поля для столбцов имеющих тип LONGTEXT" #: libraries/config/messages.inc.php:296 msgid "Bigger textarea for LONGTEXT" -msgstr "" +msgstr "Увеличение текстового поля для LONGTEXT" #: libraries/config/messages.inc.php:297 msgid "Use icons on main page" -msgstr "" +msgstr "Отображать пиктограммы на главной странице" #: libraries/config/messages.inc.php:298 msgid "Maximum number of characters used when a SQL query is displayed" @@ -3445,7 +3441,7 @@ msgstr "Максимальная длинна отображаемого SQL" #: libraries/config/messages.inc.php:300 libraries/config/messages.inc.php:305 #: libraries/config/messages.inc.php:332 msgid "Users cannot set a higher value" -msgstr "" +msgstr "Пользователи не смогут установить более высокое значение" #: libraries/config/messages.inc.php:301 msgid "Maximum number of databases displayed in left frame and database list" @@ -3483,10 +3479,12 @@ msgid "" "Disable the default warning that is displayed if mcrypt is missing for " "cookie authentication" msgstr "" +"Отключить отображение предупреждения при отсутствии mcrypt, необходимого для " +"идентификации методом cookie" #: libraries/config/messages.inc.php:309 msgid "mcrypt warning" -msgstr "" +msgstr "Предупреждение о mcrypt" #: libraries/config/messages.inc.php:310 msgid "" @@ -3501,24 +3499,22 @@ msgid "Memory limit" msgstr "Лимит памяти" #: libraries/config/messages.inc.php:312 -#, fuzzy #| msgid "Show/Hide left menu" msgid "Show left delete link" -msgstr "Показать/скрыть левое меню" +msgstr "Отобразить ссылки удаления слева" #: libraries/config/messages.inc.php:313 msgid "Show right delete link" -msgstr "" +msgstr "Отобразить ссылки удаления справа" #: libraries/config/messages.inc.php:314 msgid "Use natural order for sorting table and database names" -msgstr "" +msgstr "Использовать естественный порядок сортировки имен таблиц и баз данных" #: libraries/config/messages.inc.php:315 -#, fuzzy #| msgid "Alter table order by" msgid "Natural order" -msgstr "Изменить сортировку таблицы" +msgstr "Порядок сортировки" #: libraries/config/messages.inc.php:316 libraries/config/messages.inc.php:326 msgid "Use only icons, only text or both" @@ -3538,7 +3534,6 @@ msgid "GZip output buffering" msgstr "Буферизация вывода GZip" #: libraries/config/messages.inc.php:320 -#, fuzzy #| msgid "" #| "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, " #| "DATETIME and TIMESTAMP, ascending order otherwise" @@ -3546,8 +3541,8 @@ msgid "" "[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " "DATETIME and TIMESTAMP, ascending order otherwise" msgstr "" -"[kbd]SMART[/kbd] - означает обратный порядок для полей имеющих тип TIME, " -"DATE, DATETIME и TIMESTAMP; в ином случае порядок будет прямой" +"[kbd]SMART[/kbd] - означает обратный порядок сортировки для полей имеющих " +"тип TIME, DATE, DATETIME и TIMESTAMP; в ином случае порядок будет прямой" #: libraries/config/messages.inc.php:321 msgid "Default sorting order" @@ -3567,29 +3562,28 @@ msgid "" "Structure page if any of the required tables for the phpMyAdmin " "configuration storage could not be found" msgstr "" +"Отключить предупреждение отображаемое на странице структуры базы данных при " +"отсутствии таблиц необходимых для хранения конфигурации phpMyAdmin" #: libraries/config/messages.inc.php:325 msgid "Missing phpMyAdmin configuration storage tables" -msgstr "" +msgstr "Отсутствие таблиц хранения конфигурации phpMyAdmin" #: libraries/config/messages.inc.php:327 msgid "Iconic table operations" msgstr "Иконки операций над таблицами" #: libraries/config/messages.inc.php:328 -#, fuzzy #| msgid "Disallow BLOB and BINARY fields from editing" msgid "Disallow BLOB and BINARY columns from editing" msgstr "Запретить возможность редактирования данных полей типа BLOB и BINARY" #: libraries/config/messages.inc.php:329 -#, fuzzy #| msgid "Protect binary fields" msgid "Protect binary columns" msgstr "Защитить бинарные данные" #: libraries/config/messages.inc.php:330 -#, fuzzy #| msgid "" #| "Enable if you want DB-based query history (requires pmadb). If disabled, " #| "this utilizes JS-routines to display query history (lost by window close)." @@ -3599,8 +3593,8 @@ msgid "" "(lost by window close)." msgstr "" "Включите для хранения истории запросов с помощью базы данных (требуется " -"pmadb). При отключении, для истории запросов используется JS (история " -"теряется при закрытии окна)." +"настройка расширений phpMyAdmin). При отключении, для истории запросов " +"используется JavaScript (история теряется при закрытии окна)." #: libraries/config/messages.inc.php:331 msgid "Permanent query history" @@ -3626,25 +3620,22 @@ msgstr "Вкладка по умолчанию для окна запросов" #: libraries/config/messages.inc.php:337 msgid "Query window height (in pixels)" -msgstr "" +msgstr "Высота окна запроса (в пикселях)" #: libraries/config/messages.inc.php:338 -#, fuzzy #| msgid "Query window" msgid "Query window height" -msgstr "Окно запроса" +msgstr "Высота окна запроса" #: libraries/config/messages.inc.php:339 -#, fuzzy #| msgid "Query window" msgid "Query window width (in pixels)" -msgstr "Окно запроса" +msgstr "Ширина окна запроса (в пикселях)" #: libraries/config/messages.inc.php:340 -#, fuzzy #| msgid "Query window" msgid "Query window width" -msgstr "Окно запроса" +msgstr "Ширина окна запроса" #: libraries/config/messages.inc.php:341 msgid "Select which functions will be used for character set conversion" @@ -3657,20 +3648,21 @@ msgstr "Механизм перекодирования" #: libraries/config/messages.inc.php:343 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" msgstr "" +"Повторять заголовки через каждые X ячеек; [kbd]0[/kbd] отключает данную " +"функцию" #: libraries/config/messages.inc.php:344 -#, fuzzy #| msgid "Repair threads" msgid "Repeat headers" -msgstr "Потоков восстановления" +msgstr "Повтор заголовков" #: libraries/config/messages.inc.php:345 msgid "Show help button instead of Documentation text" -msgstr "" +msgstr "Отобразить кнопку помощи вместо текста Документация" #: libraries/config/messages.inc.php:346 msgid "Show help button" -msgstr "" +msgstr "Отобразить кнопку помощи" #: libraries/config/messages.inc.php:348 msgid "Directory where exports can be saved on server" @@ -3685,20 +3677,18 @@ msgid "Leave blank if not used" msgstr "Оставьте поле пустым, если не используете данную функцию" #: libraries/config/messages.inc.php:351 -#, fuzzy #| msgid "Host authentication order" msgid "Host authorization order" -msgstr "Порядок хостов для идентификации" +msgstr "Последовательность идентификации хоста" #: libraries/config/messages.inc.php:352 msgid "Leave blank for defaults" msgstr "Оставьте поле пустым для использования значения по умолчанию" #: libraries/config/messages.inc.php:353 -#, fuzzy #| msgid "Host authentication rules" msgid "Host authorization rules" -msgstr "Правила хостов для идентификации" +msgstr "Правила идентификации хоста" #: libraries/config/messages.inc.php:354 msgid "Allow logins without a password" @@ -3710,11 +3700,11 @@ msgstr "Разрешить вход под root" #: libraries/config/messages.inc.php:356 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" -msgstr "" +msgstr "Отображаемая строка при идентификации методом HTTP" #: libraries/config/messages.inc.php:357 msgid "HTTP Realm" -msgstr "" +msgstr "Область HTTP" #: libraries/config/messages.inc.php:358 msgid "" @@ -3879,7 +3869,6 @@ msgid "Connect without password" msgstr "Соединять без пароля" #: libraries/config/messages.inc.php:390 -#, fuzzy #| msgid "" #| "You can use MySQL wildcard characters (% and _), escape them if you want " #| "to use their literal instances, i.e. use 'my\\_db' and not 'my_db'" @@ -3891,8 +3880,11 @@ msgid "" "alphabetical order." msgstr "" "Вы можете использовать подстановочные символы (% и _), экранируйте их, если " -"хотите использовать, как обычные литературные символы, т.е. используйте 'my" -"\\_db' а не 'my_db'" +"хотите использовать, как обычные литературные символы, т.е. используйте " +"'my\\_db' а не 'my_db'. С помощью данной настройки можно сортировать список " +"баз данных, для чего достаточно ввести их имена в определенном порядке и " +"использовать [kbd]*[/kbd] в конце для вывода оставшихся в алфавитном " +"порядке." #: libraries/config/messages.inc.php:391 msgid "Show only listed databases" @@ -3929,10 +3921,9 @@ msgstr "" "[kbd]phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:397 -#, fuzzy #| msgid "database name" msgid "Database name" -msgstr "имя базы данных" +msgstr "Имя базы данных" #: libraries/config/messages.inc.php:398 msgid "Port on which MySQL server is listening, leave empty for default" @@ -4011,7 +4002,6 @@ msgid "PDF schema: table coordinates" msgstr "PDF схема: координаты таблиц" #: libraries/config/messages.inc.php:413 -#, fuzzy #| msgid "" #| "Table to describe the display fields, leave blank for no support; " #| "suggested: [kbd]pma_table_info[/kbd]" @@ -4019,24 +4009,25 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" -"Таблица для описания отображаемого поля. Для отключения поддержки данной " +"Таблица для описания отображаемых полей. Для отключения поддержки данной " "функции оставьте поле пустым. Рекомендуется: [kbd]pma_table_info[/kbd]" #: libraries/config/messages.inc.php:414 -#, fuzzy #| msgid "Display fields table" msgid "Display columns table" -msgstr "Таблица отображения полей" +msgstr "Таблица с описаниями полей" #: libraries/config/messages.inc.php:415 msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." msgstr "" +"Будет ли при создании базы данных в журнал первой строкой добавлено " +"выражение DROP DATABASE IF EXISTS." #: libraries/config/messages.inc.php:416 msgid "Add DROP DATABASE" -msgstr "" +msgstr "Добавить DROP DATABASE" #: libraries/config/messages.inc.php:417 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-240-gd9f862a
by Marc Delisle 13 Jan '11

13 Jan '11

The branch, master has been updated via d9f862a8c115811062f71d818c7d98e027c4f2c4 (commit) from a56b1da3f469b285dea489d1b00f71a49dca46a1 (commit) - Log ----------------------------------------------------------------- commit d9f862a8c115811062f71d818c7d98e027c4f2c4 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jan 13 16:29:14 2011 -0500 Clarify datepicker parameter ----------------------------------------------------------------------- Summary of changes: tbl_change.php | 2 +- tbl_select.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index 041f4e9..3256966 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -986,7 +986,7 @@ $(function() { stepMinutes: 1, stepHours: 1, <?php echo ($field['pma_type'] == 'date' ? "showTime: false,":"showTime: true,"); ?> - dateFormat: 'yy-mm-dd', + dateFormat: 'yy-mm-dd', // yy means year with four digits altTimeField: '', constrainInput: false }); diff --git a/tbl_select.php b/tbl_select.php index 7c65692..dacf59c 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -219,7 +219,7 @@ $(function() { stepMinutes: 1, stepHours: 1, <?php echo ($type == 'date' ? "showTime: false,":"showTime: true,"); ?> - dateFormat: 'yy-mm-dd', + dateFormat: 'yy-mm-dd', // yy means year with four digits altTimeField: '', constrainInput: false }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-239-ga56b1da
by Marc Delisle 13 Jan '11

13 Jan '11

The branch, master has been updated via a56b1da3f469b285dea489d1b00f71a49dca46a1 (commit) from 9b864bce9dca80299bc8ca3b7689f9c5b4f74824 (commit) - Log ----------------------------------------------------------------- commit a56b1da3f469b285dea489d1b00f71a49dca46a1 Author: Adnan <hiddenpearls(a)gmail.com> Date: Thu Jan 13 10:33:32 2011 -0500 Icon for date/time picker ----------------------------------------------------------------------- Summary of changes: tbl_change.php | 11 +++++++---- tbl_select.php | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index 8a594d1..041f4e9 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -978,13 +978,16 @@ foreach ($rows as $row_id => $vrow) { //<![CDATA[ $(function() { $('#field_<?php echo ($idindex); ?>_3').datepicker({ - duration: '', - time24h: true, - stepMinutes: 1, + showOn: 'button', + buttonImage: '<?php echo $GLOBALS['pmaThemeImage'] . 'b_calendar.png'; ?>', + buttonImageOnly: true, + duration: '', + time24h: true, + stepMinutes: 1, stepHours: 1, <?php echo ($field['pma_type'] == 'date' ? "showTime: false,":"showTime: true,"); ?> dateFormat: 'yy-mm-dd', - altTimeField: '', + altTimeField: '', constrainInput: false }); }); diff --git a/tbl_select.php b/tbl_select.php index e1b4c42..7c65692 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -211,6 +211,9 @@ if (!isset($param) || $param[0] == '') { //<![CDATA[ $(function() { $('#field_<?php echo $i; ?>').datepicker({ + showOn: 'button', + buttonImage: '<?php echo $GLOBALS['pmaThemeImage'] . 'b_calendar.png'; ?>', + buttonImageOnly: true, duration: '', time24h: true, stepMinutes: 1, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-238-g9b864bc
by Michal Čihař 13 Jan '11

13 Jan '11

The branch, master has been updated via 9b864bce9dca80299bc8ca3b7689f9c5b4f74824 (commit) via b596146d8b58ff0a51c9572c8300129861e49949 (commit) via 80f59a62726c7fa549accd223f7fa40eb673c6d9 (commit) via 6fb55fb9385a43a58d2c7602b863e7e88d94d716 (commit) via 6de8840a778d37ecace4ecdb85741c5221142d6d (commit) via 273064d85cae379be052d1b16f485e7683ae4f2a (commit) via f83549e73596a81b0e71f64f4a82560c1a184566 (commit) via c0d0e493d6b5ef2c54e8bbd2dfd6a036c2151cf2 (commit) via 9a5e828fd6a2e836dc0f45514eb287ea7621ca30 (commit) via e366eaa7f28d88b5eadee199f832ef96b35a5019 (commit) from f2ffdfce2e203b218625c72b73ca5bf79d60fb6a (commit) - Log ----------------------------------------------------------------- commit 9b864bce9dca80299bc8ca3b7689f9c5b4f74824 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 15:11:49 2011 +0200 Translation update done using Pootle. commit b596146d8b58ff0a51c9572c8300129861e49949 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 15:11:08 2011 +0200 Translation update done using Pootle. commit 80f59a62726c7fa549accd223f7fa40eb673c6d9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 15:07:24 2011 +0200 Translation update done using Pootle. commit 6fb55fb9385a43a58d2c7602b863e7e88d94d716 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:59:45 2011 +0200 Translation update done using Pootle. commit 6de8840a778d37ecace4ecdb85741c5221142d6d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:59:01 2011 +0200 Translation update done using Pootle. commit 273064d85cae379be052d1b16f485e7683ae4f2a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:57:41 2011 +0200 Translation update done using Pootle. commit f83549e73596a81b0e71f64f4a82560c1a184566 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:57:23 2011 +0200 Translation update done using Pootle. commit c0d0e493d6b5ef2c54e8bbd2dfd6a036c2151cf2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:56:01 2011 +0200 Translation update done using Pootle. commit 9a5e828fd6a2e836dc0f45514eb287ea7621ca30 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:44:21 2011 +0200 Translation update done using Pootle. commit e366eaa7f28d88b5eadee199f832ef96b35a5019 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:43:47 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/po/ru.po b/po/ru.po index a187754..73675e4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-13 14:40+0200\n" +"PO-Revision-Date: 2011-01-13 15:11+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -2840,11 +2840,11 @@ msgstr "CSV" #: libraries/config/messages.inc.php:155 msgid "Developer" -msgstr "" +msgstr "Разработчик" #: libraries/config/messages.inc.php:156 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "Настройки для разработчиков phpMyAdmin" #: libraries/config/messages.inc.php:157 msgid "Edit mode" @@ -2868,14 +2868,13 @@ msgid "Features" msgstr "Настройки" #: libraries/config/messages.inc.php:163 -#, fuzzy #| msgid "Generate" msgid "General" -msgstr "Генерировать" +msgstr "Общие" #: libraries/config/messages.inc.php:164 msgid "Set some commonly used options" -msgstr "" +msgstr "Настройте некоторые основные параметры" #: libraries/config/messages.inc.php:165 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2934,13 +2933,12 @@ msgstr "Основной фрейм" #: libraries/config/messages.inc.php:181 msgid "Microsoft Office" -msgstr "" +msgstr "Microsoft Office" #: libraries/config/messages.inc.php:183 -#, fuzzy #| msgid "Open Document Text" msgid "Open Document" -msgstr "OpenDocument текст" +msgstr "Open Document" #: libraries/config/messages.inc.php:185 msgid "Other core settings" @@ -2951,10 +2949,9 @@ msgid "Settings that didn't fit enywhere else" msgstr "Настройки не попадающие в другие разделы" #: libraries/config/messages.inc.php:187 -#, fuzzy #| msgid "Page number:" msgid "Page titles" -msgstr "Номер страницы:" +msgstr "Заголовки страниц" #: libraries/config/messages.inc.php:188 msgid "" @@ -2962,6 +2959,9 @@ msgid "" "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." msgstr "" +"Определите текст заголовка браузера. Для ввода особых значений используйте " +"подставные строки, которые описаны в " +"[a(a)Documentation.xn--html#cfg_titletable][/a-5rs9e0a6fa8c6c6a2a0l4a4i]." #: libraries/config/messages.inc.php:189 #: libraries/navigation_header.inc.php:83 @@ -2991,16 +2991,14 @@ msgid "Basic settings" msgstr "Основные настройки" #: libraries/config/messages.inc.php:194 -#, fuzzy #| msgid "Authentication type" msgid "Authentication" -msgstr "Тип идентификации" +msgstr "Идентификация" #: libraries/config/messages.inc.php:195 -#, fuzzy #| msgid "Authentication type" msgid "Authentication settings" -msgstr "Тип идентификации" +msgstr "Настройки идентификации" #: libraries/config/messages.inc.php:196 msgid "Server configuration" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-228-gf2ffdfc
by Michal Čihař 13 Jan '11

13 Jan '11

The branch, master has been updated via f2ffdfce2e203b218625c72b73ca5bf79d60fb6a (commit) via eeea3d6845016d0b20cf5ebc4b0c5139bcd28e06 (commit) via f5c70b9b073909320ba292274caa22ecf655f607 (commit) via 0bc3fda45c2cab0dbf649ae21508b5e8cd0f7416 (commit) via 75da7ba0e4e65b828aebabddb80a184324121dcb (commit) via 3dbb31d3f627d32ae45ab02429def8f44e409727 (commit) via aae1eb656713b73705adad1efb986aa1cc9eb07b (commit) from 89833a0603dde65f31138ba534a58e6841c767d9 (commit) - Log ----------------------------------------------------------------- commit f2ffdfce2e203b218625c72b73ca5bf79d60fb6a Merge: eeea3d6845016d0b20cf5ebc4b0c5139bcd28e06 f5c70b9b073909320ba292274caa22ecf655f607 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 13 13:42:58 2011 +0100 Merge remote branch 'pootle/master' commit eeea3d6845016d0b20cf5ebc4b0c5139bcd28e06 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 13 13:42:24 2011 +0100 [export] Better handling of export to PHP array. There is no need for own logic here, we can use var_export. commit f5c70b9b073909320ba292274caa22ecf655f607 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:40:54 2011 +0200 Translation update done using Pootle. commit 0bc3fda45c2cab0dbf649ae21508b5e8cd0f7416 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:39:42 2011 +0200 Translation update done using Pootle. commit 75da7ba0e4e65b828aebabddb80a184324121dcb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:38:13 2011 +0200 Translation update done using Pootle. commit 3dbb31d3f627d32ae45ab02429def8f44e409727 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:38:01 2011 +0200 Translation update done using Pootle. commit aae1eb656713b73705adad1efb986aa1cc9eb07b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:31:18 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/export/php_array.php | 19 ++++--------------- po/ru.po | 11 ++++------- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 889c140..60985a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,7 @@ + rfe #3141330 [relation] When displaying results, show a link to the foreign table even when phpMyAdmin configuration storage is not active - bug #3141327 [relation] Foreign key input options +- [export] Better handling of export to PHP array. 3.3.10.0 (not yet released) - patch #3147400 [structure] Aria table size printed as unknown, diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 5cf6fb7..983673c 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -147,7 +147,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) while ($record = PMA_DBI_fetch_row($result)) { $record_cnt++; - + // Output table name as comment if this is the first record of the table if ($record_cnt == 1) { $buffer .= $crlf . '// ' . $db . '.' . $table . $crlf; @@ -159,28 +159,17 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) for ($i = 0; $i < $columns_cnt; $i++) { - - $isLastLine = ($i + 1 >= $columns_cnt); - - $column = $columns[$i]; - - if (is_null($record[$i])) { - $buffer .= "'" . $column . "'=>null" . (! $isLastLine ? ',' : ''); - } elseif (is_numeric($record[$i])) { - $buffer .= "'" . $column . "'=>" . $record[$i] . (! $isLastLine ? ',' : ''); - } else { - $buffer .= "'" . $column . "'=>'" . addslashes($record[$i]) . "'" . (! $isLastLine ? ',' : ''); - } + $buffer .= "'" . $columns[$i]. "'=>" . var_export($record[$i], true) . (($i + 1 >= $columns_cnt) ? '' : ','); } $buffer .= ')'; } - + $buffer .= $crlf . ');' . $crlf; if (! PMA_exportOutputHandler($buffer)) { return FALSE; } - + PMA_DBI_free_result($result); return true; diff --git a/po/ru.po b/po/ru.po index d0fecef..a187754 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-13 14:27+0200\n" +"PO-Revision-Date: 2011-01-13 14:40+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -2742,7 +2742,7 @@ msgstr "Режим совместимости SQL" #: libraries/config/messages.inc.php:118 msgid "Syntax to use when inserting data" -msgstr "" +msgstr "Использовать синтаксис при вставке данных" #: libraries/config/messages.inc.php:119 msgid "Creation/Update/Check dates" @@ -2769,20 +2769,18 @@ msgid "Maximal length of created query" msgstr "Максимальная длина создаваемого запроса" #: libraries/config/messages.inc.php:133 -#, fuzzy #| msgid "Export tables" msgid "Export type" -msgstr "Экспортировать таблицы" +msgstr "Тип экспорта" #: libraries/config/messages.inc.php:134 libraries/export/sql.php:50 msgid "Enclose export in a transaction" msgstr "Заключить экспорт в транзакцию" #: libraries/config/messages.inc.php:135 -#, fuzzy #| msgid "Export contents" msgid "Export time in UTC" -msgstr "Экспортировать содержимое" +msgstr "Экспорт времени в UTC" #: libraries/config/messages.inc.php:143 msgid "Force secured connection while using phpMyAdmin" @@ -2828,7 +2826,6 @@ msgstr "Настройка режима обзора данных" #: libraries/config/messages.inc.php:171 libraries/config/messages.inc.php:182 #: libraries/config/messages.inc.php:184 libraries/config/messages.inc.php:212 #: libraries/config/messages.inc.php:224 -#, fuzzy #| msgid "Customize default export options" msgid "Customize default options" msgstr "Настройте параметры экспорта используемые по умолчанию" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-221-g89833a0
by Michal Čihař 13 Jan '11

13 Jan '11

The branch, master has been updated via 89833a0603dde65f31138ba534a58e6841c767d9 (commit) via bf3da02992a0894e8f3f81be0938b45763f19965 (commit) via 981066955222575ec031b199d44cb0387cf120cf (commit) via df97b1d2c075a0db4241b8494e36fa85eb231dcf (commit) via aa441c488450e65b00a5b693c552d13a8f5446c6 (commit) from d6d79aedbae33719c82813081a641b0377a97418 (commit) - Log ----------------------------------------------------------------- commit 89833a0603dde65f31138ba534a58e6841c767d9 Merge: bf3da02992a0894e8f3f81be0938b45763f19965 981066955222575ec031b199d44cb0387cf120cf Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 13 13:29:26 2011 +0100 Merge remote branch 'pootle/master' commit bf3da02992a0894e8f3f81be0938b45763f19965 Merge: d6d79aedbae33719c82813081a641b0377a97418 df97b1d2c075a0db4241b8494e36fa85eb231dcf Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 13 13:28:07 2011 +0100 Merge branch 'QA_3_3' commit 981066955222575ec031b199d44cb0387cf120cf Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:27:25 2011 +0200 Translation update done using Pootle. commit aa441c488450e65b00a5b693c552d13a8f5446c6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:25:27 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: libraries/export/yaml.php | 7 ++----- po/ru.po | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index bcf404e..550eb1d 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -168,11 +168,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) continue; } - $record[$i] = preg_replace('/\r\n|\r|\n/', $crlf.' ', $record[$i]); - if (strstr($record[$i], $crlf)) - $record[$i] = '|-' . $crlf . ' '.$record[$i]; - - $buffer .= ' ' . $column . ': ' . $record[$i] . $crlf; + $record[$i] = str_replace(array('\\', '"', "\n", "\r"), array('\\\\', '\"', '\n', '\r'), $record[$i]); + $buffer .= ' ' . $column . ': "' . $record[$i] . '"' . $crlf; } if (! PMA_exportOutputHandler($buffer)) { diff --git a/po/ru.po b/po/ru.po index 282ab12..d0fecef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-13 14:22+0200\n" +"PO-Revision-Date: 2011-01-13 14:27+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -2713,10 +2713,9 @@ msgid "Relations" msgstr "Связи" #: libraries/config/messages.inc.php:101 -#, fuzzy #| msgid "Export type" msgid "Export method" -msgstr "Тип экспорта" +msgstr "Метод экспорта" #: libraries/config/messages.inc.php:110 libraries/config/messages.inc.php:112 msgid "Save on server" @@ -2732,7 +2731,6 @@ msgid "Remember file name template" msgstr "Запомнить шаблон имени файла" #: libraries/config/messages.inc.php:116 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" msgstr "Заключить названия таблиц и полей в косые кавычки" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_9-12-gdf97b1d
by Michal Čihař 13 Jan '11

13 Jan '11

The branch, QA_3_3 has been updated via df97b1d2c075a0db4241b8494e36fa85eb231dcf (commit) from 31cd4bdd6a7c42527b2011201d378e3c9accce8a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/export/yaml.php | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index d1ba38e..946962c 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -167,11 +167,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) continue; } - $record[$i] = preg_replace('/\r\n|\r|\n/', $crlf.' ', $record[$i]); - if (strstr($record[$i], $crlf)) - $record[$i] = '|-' . $crlf . ' '.$record[$i]; - - $buffer .= ' ' . $column . ': ' . $record[$i] . $crlf; + $record[$i] = str_replace(array('\\', '"', "\n", "\r"), array('\\\\', '\"', '\n', '\r'), $record[$i]); + $buffer .= ' ' . $column . ': "' . $record[$i] . '"' . $crlf; } if (! PMA_exportOutputHandler($buffer)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-216-gd6d79ae
by Michal Čihař 13 Jan '11

13 Jan '11

The branch, master has been updated via d6d79aedbae33719c82813081a641b0377a97418 (commit) via 9d90fb1ce4a58785bc01136ce2631b298fc6edef (commit) from 9946b82a9edfbcb6c7fc6939528920b5d4ff81bc (commit) - Log ----------------------------------------------------------------- commit d6d79aedbae33719c82813081a641b0377a97418 Merge: 9946b82a9edfbcb6c7fc6939528920b5d4ff81bc 9d90fb1ce4a58785bc01136ce2631b298fc6edef Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 13 13:23:31 2011 +0100 Merge remote branch 'pootle/master' commit 9d90fb1ce4a58785bc01136ce2631b298fc6edef Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 14:22:49 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6b72dae..282ab12 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-13 13:53+0200\n" +"PO-Revision-Date: 2011-01-13 14:22+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -2679,10 +2679,9 @@ msgstr "Шаблон имени таблицы" #: libraries/config/messages.inc.php:138 libraries/export/htmlword.php:23 #: libraries/export/latex.php:39 libraries/export/odt.php:31 #: libraries/export/sql.php:77 libraries/export/texytext.php:22 -#, fuzzy #| msgid "%s table(s)" msgid "Dump table" -msgstr "Таблиц: %s" +msgstr "Сохранение таблицы" #: libraries/config/messages.inc.php:88 libraries/export/latex.php:31 msgid "Include table caption" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-214-g9946b82
by Michal Čihař 13 Jan '11

13 Jan '11

The branch, master has been updated via 9946b82a9edfbcb6c7fc6939528920b5d4ff81bc (commit) via e5e05312dbe1b7ffebcdf850b88e2c56213060d1 (commit) via e1b161be0f5b59050108daa7680bc72bca8236a7 (commit) via ad37424f499dd9f35a995ee444c856775653dae5 (commit) via 8adf63259098c87b364326cd00a052928753762a (commit) via 9fdfcecc365003d2e8e758caca2346ef4da317af (commit) via aec93e5e380bb69cf4b047e174f2480360b23088 (commit) via 5d05584e3843733ee164a14628e0442760c582c6 (commit) via 6c32ab65c977acfc362216e597492a6587b27d21 (commit) via ee8c1d6ea31f8004fccdcb9b68e6d006dad19f23 (commit) via 1d966c7fa1f66a2bc01dd3a5ad843b0ff9a9fece (commit) via 210818c15a869c0a4928138bb1b11b56775dc120 (commit) via 36a6fb8bb258c8b62c15bc0257e63810d36f517b (commit) from 7ee006ff8b5dcb75d2f1b837e7a661de0e7aea14 (commit) - Log ----------------------------------------------------------------- commit 9946b82a9edfbcb6c7fc6939528920b5d4ff81bc Merge: 7ee006ff8b5dcb75d2f1b837e7a661de0e7aea14 e5e05312dbe1b7ffebcdf850b88e2c56213060d1 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 13 13:19:40 2011 +0100 Merge remote branch 'pootle/master' commit e5e05312dbe1b7ffebcdf850b88e2c56213060d1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:53:27 2011 +0200 Translation update done using Pootle. commit e1b161be0f5b59050108daa7680bc72bca8236a7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:52:00 2011 +0200 Translation update done using Pootle. commit ad37424f499dd9f35a995ee444c856775653dae5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:51:31 2011 +0200 Translation update done using Pootle. commit 8adf63259098c87b364326cd00a052928753762a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:50:54 2011 +0200 Translation update done using Pootle. commit 9fdfcecc365003d2e8e758caca2346ef4da317af Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:49:46 2011 +0200 Translation update done using Pootle. commit aec93e5e380bb69cf4b047e174f2480360b23088 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:48:19 2011 +0200 Translation update done using Pootle. commit 5d05584e3843733ee164a14628e0442760c582c6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:44:50 2011 +0200 Translation update done using Pootle. commit 6c32ab65c977acfc362216e597492a6587b27d21 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:42:51 2011 +0200 Translation update done using Pootle. commit ee8c1d6ea31f8004fccdcb9b68e6d006dad19f23 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:39:45 2011 +0200 Translation update done using Pootle. commit 1d966c7fa1f66a2bc01dd3a5ad843b0ff9a9fece Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:38:33 2011 +0200 Translation update done using Pootle. commit 210818c15a869c0a4928138bb1b11b56775dc120 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:31:22 2011 +0200 Translation update done using Pootle. commit 36a6fb8bb258c8b62c15bc0257e63810d36f517b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 13:26:56 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/po/ru.po b/po/ru.po index 022ff6d..6b72dae 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-13 01:04+0200\n" +"PO-Revision-Date: 2011-01-13 13:53+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -2556,26 +2556,25 @@ msgid "Edit in window" msgstr "Редактировать в окне" #: libraries/config/messages.inc.php:60 -#, fuzzy #| msgid "Display Features" msgid "Display errors" -msgstr "Показать возможности" +msgstr "Выводить ошибки" #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Ignore errors" msgid "Gather errors" -msgstr "Игнорировать ошибки" +msgstr "Собирать ошибки" #: libraries/config/messages.inc.php:62 msgid "Show icons for warning, error and information messages" msgstr "" +"Отображать пиктограммы для сообщений об ошибках, а так же для " +"предупреждающих и информационных сообщений" #: libraries/config/messages.inc.php:63 -#, fuzzy #| msgid "Ignore errors" msgid "Iconic errors" -msgstr "Игнорировать ошибки" +msgstr "Пиктограммы сообщений об ошибках" #: libraries/config/messages.inc.php:64 msgid "" @@ -2615,7 +2614,6 @@ msgstr "Упаковать" #: libraries/export/latex.php:71 libraries/export/ods.php:24 #: libraries/export/odt.php:57 libraries/export/texytext.php:27 #: libraries/export/xls.php:24 libraries/export/xlsx.php:24 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" msgstr "Поместить названия полей в первой строке" @@ -2623,7 +2621,6 @@ msgstr "Поместить названия полей в первой стро #: libraries/config/messages.inc.php:71 libraries/config/messages.inc.php:236 #: libraries/config/messages.inc.php:243 libraries/import/csv.php:73 #: libraries/import/ldi.php:41 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed by" msgstr "Значения полей обрамлены" @@ -2631,7 +2628,6 @@ msgstr "Значения полей обрамлены" #: libraries/config/messages.inc.php:72 libraries/config/messages.inc.php:237 #: libraries/config/messages.inc.php:244 libraries/import/csv.php:77 #: libraries/import/ldi.php:42 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" msgstr "Символ экранирования" @@ -2645,18 +2641,16 @@ msgid "Replace NULL by" msgstr "Заменить NULL на" #: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:80 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove CRLF characters within columns" -msgstr "Удалите из полей символы CRLF" +msgstr "Удалить из полей символы перевода строки CRLF" #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:240 #: libraries/config/messages.inc.php:248 libraries/import/csv.php:61 #: libraries/import/ldi.php:40 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns terminated by" -msgstr "Разделитель строк" +msgstr "Разделитель столбцов" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:235 #: libraries/import/csv.php:81 libraries/import/ldi.php:43 @@ -2664,10 +2658,9 @@ msgid "Lines terminated by" msgstr "Разделитель строк" #: libraries/config/messages.inc.php:78 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition" -msgstr "Excel-версия" +msgstr "Версия Excel" #: libraries/config/messages.inc.php:81 msgid "Database name template" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-201-g7ee006f
by Marc Delisle 13 Jan '11

13 Jan '11

The branch, master has been updated via 7ee006ff8b5dcb75d2f1b837e7a661de0e7aea14 (commit) from 5ed2e7aa3531311654ceae7bab9842923473fd3e (commit) - Log ----------------------------------------------------------------- commit 7ee006ff8b5dcb75d2f1b837e7a661de0e7aea14 Author: Madhura Jayaratne <madhuracj(a)users.sourceforge.net> Date: Thu Jan 13 07:15:50 2011 -0500 Patch #3156447 Wrong format returned by datepicker in Search ----------------------------------------------------------------------- Summary of changes: tbl_select.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tbl_select.php b/tbl_select.php index 67bf5d2..e1b4c42 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -211,12 +211,13 @@ if (!isset($param) || $param[0] == '') { //<![CDATA[ $(function() { $('#field_<?php echo $i; ?>').datepicker({ - duration: '', - time24h: true, - stepMinutes: 1, + duration: '', + time24h: true, + stepMinutes: 1, stepHours: 1, <?php echo ($type == 'date' ? "showTime: false,":"showTime: true,"); ?> - altTimeField: '', + dateFormat: 'yy-mm-dd', + altTimeField: '', constrainInput: false }); }); hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git January 2011