January 2011 - Git - lists.phpmyadmin.net

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

13 Jan '11

The branch, master has been updated via 5ed2e7aa3531311654ceae7bab9842923473fd3e (commit) via 0944c1fee30d92e3c10acfca921864f4a177b7ea (commit) via 193c5261a6cfb56bc1c476604704847331af19be (commit) via 258b8c371f6214ab9d16cf81371604839bb37090 (commit) via 42e1895f64805a55fe06c13c90cd94b6d2eee93a (commit) via 48329e0df4e6e295218823c59e80c49f02d60c8f (commit) via 6e2defc90fc55a3b4fd88724d210c398c3e5376f (commit) via 3541d979567452ee3aa6539cb3e82aaba2153695 (commit) via 2911da9d2e8f3f3770f9c0bdb3e06806f8f804b1 (commit) via 3abad9d1db4e49891cc757a45e44c6a0e8bdedd0 (commit) via 7cddc0db10ae72a88dd720e779ad8b466ffb302e (commit) via 271ebb4c5b14132e0d05daa7f2613e341e642cae (commit) via 9196318e5d39e4a1207a10124d35e514f1551ce6 (commit) via f9fb1a44d24d9136f5fd0a5f1a7f0d8950c67674 (commit) via 7f1ff4c2bca1162c1cddef72d7897caaa87371fe (commit) via 001785de7a32774e3d75487f1df28a0405cfa32f (commit) via 331c5865ed99d1a3a6401e3a2835f4f7a493e3f6 (commit) via e7408daf8d7bd6c033f337a3baab60488da1f8a2 (commit) via 5ffa1a63a41f52593fcbe253de6766820ae51dc3 (commit) via 82c590667ba0509951da985f0682b4754f58dffd (commit) via 6bdb2bb934f871de931fb08b4000d1307809ff4c (commit) via 30a64604c0467bcbbc96464e875589f66342671a (commit) via dbac34d7d9bf271a949f64d14f61bb0970025408 (commit) via e44607ccbcd580998175338597780a95d9b5c450 (commit) via 7c6cec2568d913bf431a0c82c2e2d2403b17af75 (commit) via 74b41cb31a131e7127af1b26c5ed2981a4af92fa (commit) from a9c4feac0dfdd4215f3fd014423a0bc437be62fd (commit) - Log ----------------------------------------------------------------- commit 5ed2e7aa3531311654ceae7bab9842923473fd3e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 01:04:41 2011 +0200 Translation update done using Pootle. commit 0944c1fee30d92e3c10acfca921864f4a177b7ea Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 01:03:30 2011 +0200 Translation update done using Pootle. commit 193c5261a6cfb56bc1c476604704847331af19be Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 01:00:19 2011 +0200 Translation update done using Pootle. commit 258b8c371f6214ab9d16cf81371604839bb37090 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 13 00:42:29 2011 +0200 Translation update done using Pootle. commit 42e1895f64805a55fe06c13c90cd94b6d2eee93a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 23:30:04 2011 +0200 Translation update done using Pootle. commit 48329e0df4e6e295218823c59e80c49f02d60c8f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 23:23:51 2011 +0200 Translation update done using Pootle. commit 6e2defc90fc55a3b4fd88724d210c398c3e5376f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 23:16:45 2011 +0200 Translation update done using Pootle. commit 3541d979567452ee3aa6539cb3e82aaba2153695 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 23:13:52 2011 +0200 Translation update done using Pootle. commit 2911da9d2e8f3f3770f9c0bdb3e06806f8f804b1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 23:12:11 2011 +0200 Translation update done using Pootle. commit 3abad9d1db4e49891cc757a45e44c6a0e8bdedd0 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 23:08:18 2011 +0200 Translation update done using Pootle. commit 7cddc0db10ae72a88dd720e779ad8b466ffb302e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 22:49:23 2011 +0200 Translation update done using Pootle. commit 271ebb4c5b14132e0d05daa7f2613e341e642cae Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 22:35:32 2011 +0200 Translation update done using Pootle. commit 9196318e5d39e4a1207a10124d35e514f1551ce6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 22:32:43 2011 +0200 Translation update done using Pootle. commit f9fb1a44d24d9136f5fd0a5f1a7f0d8950c67674 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 21:50:51 2011 +0200 Translation update done using Pootle. commit 7f1ff4c2bca1162c1cddef72d7897caaa87371fe Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 21:50:01 2011 +0200 Translation update done using Pootle. commit 001785de7a32774e3d75487f1df28a0405cfa32f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 21:45:19 2011 +0200 Translation update done using Pootle. commit 331c5865ed99d1a3a6401e3a2835f4f7a493e3f6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 21:42:04 2011 +0200 Translation update done using Pootle. commit e7408daf8d7bd6c033f337a3baab60488da1f8a2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 21:41:32 2011 +0200 Translation update done using Pootle. commit 5ffa1a63a41f52593fcbe253de6766820ae51dc3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 21:39:38 2011 +0200 Translation update done using Pootle. commit 82c590667ba0509951da985f0682b4754f58dffd Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 21:37:45 2011 +0200 Translation update done using Pootle. commit 6bdb2bb934f871de931fb08b4000d1307809ff4c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 21:36:52 2011 +0200 Translation update done using Pootle. commit 30a64604c0467bcbbc96464e875589f66342671a Merge: dbac34d7d9bf271a949f64d14f61bb0970025408 a9c4feac0dfdd4215f3fd014423a0bc437be62fd Author: Pootle server <pootle(a)cihar.com> Date: Wed Jan 12 18:40:08 2011 +0100 Merge remote branch 'origin/master' commit dbac34d7d9bf271a949f64d14f61bb0970025408 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 19:19:58 2011 +0200 Translation update done using Pootle. commit e44607ccbcd580998175338597780a95d9b5c450 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 19:18:10 2011 +0200 Translation update done using Pootle. commit 7c6cec2568d913bf431a0c82c2e2d2403b17af75 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 19:17:36 2011 +0200 Translation update done using Pootle. commit 74b41cb31a131e7127af1b26c5ed2981a4af92fa Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 19:16:41 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 64 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 31 insertions(+), 33 deletions(-) diff --git a/po/ru.po b/po/ru.po index 297d8b7..022ff6d 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-12 19:04+0200\n" +"PO-Revision-Date: 2011-01-13 01:04+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -2211,24 +2211,22 @@ msgid "Custom - like above, but without the quick/custom choice" msgstr "По выбору - как выше, но без выбора быстро/по выбору" #: libraries/config.values.php:119 -#, fuzzy #| msgid "Complete inserts" msgid "complete inserts" -msgstr "Полная вставка" +msgstr "полная вставка" #: libraries/config.values.php:120 -#, fuzzy #| msgid "Extended inserts" msgid "extended inserts" -msgstr "Расширенные вставки" +msgstr "расширенная вставка" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "оба верхних варианта" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "иначе, чем в вариантах выше" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:418 @@ -2255,7 +2253,7 @@ msgstr "Некорректное значение" #: libraries/config/validate.lib.php:460 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "Значение должно быть больше или равно %s" #: libraries/config/FormDisplay.class.php:535 #, php-format @@ -2264,46 +2262,44 @@ msgstr "Отсутствуют данные для %s" #: libraries/config/FormDisplay.class.php:727 #: libraries/config/FormDisplay.class.php:731 -#, fuzzy #| msgid "Variable" msgid "unavailable" -msgstr "Переменная" +msgstr "недоступно" #: libraries/config/FormDisplay.class.php:728 #: libraries/config/FormDisplay.class.php:732 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "Для \"%s\" требуется расширение %s" #: libraries/config/FormDisplay.class.php:746 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "импорт не будет функционировать без функции (%s)" #: libraries/config/FormDisplay.class.php:750 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "экспорт не будет функционировать без функции (%s)" #: libraries/config/FormDisplay.class.php:757 msgid "SQL Validator is disabled" -msgstr "" +msgstr "SQL валидатор отключен" #: libraries/config/FormDisplay.class.php:764 -#, fuzzy #| msgid "PHP extension to use" msgid "SOAP extension not found" -msgstr "PHP расширение" +msgstr "Не найдено расширение SOAP" #: libraries/config/FormDisplay.class.php:772 -#, fuzzy, php-format +#, php-format #| msgid "Maximum tables" msgid "maximum %s" -msgstr "Максимальное количество таблиц" +msgstr "максимум %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" -msgstr "" +msgstr "Эта настройка отключена и не будет применена при конфигурации" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:83 #: libraries/relation.lib.php:90 pmd_relation_new.php:68 @@ -2322,7 +2318,7 @@ msgstr "Восстановить изначальное значение" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Разрешить пользователям изменять данное значение" #: libraries/config/FormDisplay.tpl.php:332 #: libraries/schema/User_Schema.class.php:317 @@ -2355,10 +2351,14 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"Включение данного параметра позволяет странице расположенной на другом " +"домене вызвать phpMyAdmin внутри фрейма, что является потенциальной " +"[strong]дырой в безопасности[/strong] допуская возможность XFS (Cross Frame " +"Seripting)." #: libraries/config/messages.inc.php:20 msgid "Allow third party framing" -msgstr "" +msgstr "Разрешить встраивание во фрейм" #: libraries/config/messages.inc.php:21 msgid "Show "Drop database" link to normal users" @@ -2406,7 +2406,6 @@ msgid "Bzip2" msgstr "Bzip2" #: libraries/config/messages.inc.php:30 -#, fuzzy #| msgid "" #| "Defines which type of editing controls should be used for CHAR and " #| "VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]" @@ -2421,10 +2420,9 @@ msgstr "" "использовать в полях перенос строки." #: libraries/config/messages.inc.php:31 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" -msgstr "Поля редактирования CHAR" +msgstr "Редактирование полей типа CHAR" #: libraries/config/messages.inc.php:32 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -2476,23 +2474,25 @@ msgstr "Подтверждать DROP запросы" #: libraries/config/messages.inc.php:42 msgid "Debug SQL" -msgstr "" +msgstr "Отладка SQL" #: libraries/config/messages.inc.php:43 -#, fuzzy #| msgid "Databases display options" msgid "Default display direction" -msgstr "Параметры отображения списка баз данных" +msgstr "Вид отображения по умолчанию" #: libraries/config/messages.inc.php:44 msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]horizontal[/kbd], [kbd]vertical[/kbd] или [kbd]horizontalflipped[/kbd] " +"для определения горизонтального, вертикального или смешанного режима " +"отображения" #: libraries/config/messages.inc.php:45 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "Вид отображения столбцов при их редакции/создании" #: libraries/config/messages.inc.php:46 msgid "Tab that is displayed when entering a database" @@ -2519,10 +2519,9 @@ msgid "Default table tab" msgstr "Вкладка по умолчанию для таблицы" #: libraries/config/messages.inc.php:52 -#, fuzzy #| msgid "Show binary contents as HEX" msgid "Show binary contents as HEX by default" -msgstr "Показывать бинарные данные в виде HEX значений" +msgstr "Показывать двоичные данные по умолчанию в шестнадцатеричном виде (HEX)" #: libraries/config/messages.inc.php:53 libraries/display_tbl.lib.php:597 msgid "Show binary contents as HEX" @@ -2549,13 +2548,12 @@ msgstr "Выводить серверы списком" #: libraries/config/messages.inc.php:58 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Редактировать SQL запросы во всплывающем окне" #: libraries/config/messages.inc.php:59 -#, fuzzy #| msgid "Edit next row" msgid "Edit in window" -msgstr "Редактировать следующую строку" +msgstr "Редактировать в окне" #: libraries/config/messages.inc.php:60 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-174-ga9c4fea
by Michal Čihař 12 Jan '11

12 Jan '11

The branch, master has been updated via a9c4feac0dfdd4215f3fd014423a0bc437be62fd (commit) via a0e920bbfc03c574820d4799e4df12db17a579b5 (commit) via 959a262e1e89792ce0dd68046498ee41f7276fe2 (commit) via d238922bd8b43a67cf72cabe0c92c70491c1d122 (commit) via 3d5b8f9ed0e6017cfc198e6a71b09e43a17c1029 (commit) via 575f403650be099b69aec69dd6de3d02ae10293b (commit) via 26b582a62b4e1539d5ad25788ca86107273c8f11 (commit) via 592eb9e9ac21fb8855b736a2338b3112163563e1 (commit) via 6a216b2b949dc4acf616ba460940bb2888db0981 (commit) via f35abb7956880372600400686ce5bfb0da10e88b (commit) via a32d547c5a9755caf298a58d23d42627ef5c780f (commit) via 13eb49ca94b1f529fa313a35da3ace72243030ae (commit) via 3974dae22ffdc1eb4865fbc6100e8259aa693435 (commit) via b9363e938fdc786c52f8f95c2aaa2990ef02148b (commit) via 4c72dd7d7a9529dbf9b62237922ea8a2629bcbf5 (commit) via 41cbc577496bce433dfbcf956c924400b9a316a2 (commit) via 321fe03abe44ec99419dd6eeadd831a621794bb8 (commit) via e915afcaa1b135fb13ee8e1cdfba1797d7b8e16e (commit) via 3707a6f949e862d788e44038720d9dbb6f535be8 (commit) via fcc6d1621dbe3ae4e874544a1e8a01ca2334ef0b (commit) via f6f00e02dc250656b260e641841774032a981355 (commit) via 238d7a9ca99fb87a89986b48e554b7b8f7f98c87 (commit) via 7e45d752528985b171384ff1417a90129e55de97 (commit) via e423b13aeebfc2363d83fdcf3173ac423225689d (commit) via b4311e2380f2b90512f630521141f625b5386d2f (commit) via 9003910b8ccba3ecfcb928dcb7228519bcf6c5eb (commit) via 1a4322eac36967cab7dd4d814962e2555387187c (commit) via 1491e3a94667c888812137794ae9e2fa1e729a25 (commit) via 7be8e0cdde5c6503020ac3d3506a3affe081ffdc (commit) via 8368e2e7414632715fb35a4243166c80a1f70c4e (commit) via e3af50d49f4a5899eadfd947c123cbd725cfa1b8 (commit) via a69f9f6e09791e656e7433e4ae07a1986ff19798 (commit) via 039a8431e48327c44b9525fba25aa248f35ef37b (commit) via 5d733ba7160624e08890c717d697d23e0733f3d5 (commit) via 7427edb47c8286e52791a9be00229a11b3ccd60b (commit) via 0c69de33a2140dabef7b399dc5f4c6b03921ad93 (commit) via ba4a321f09c44165fd2be959e73e358b623e78ea (commit) via 41221ed8e83e67aa6d648fd2883ad830952329af (commit) via ac828cca9616a3fb76af5defceac724b7c35bea4 (commit) via 976c7a5ebe9b7320c6226226e2929f65f9bf5956 (commit) via 47ed208d2d6670ba8d59161315abd02ad86f197b (commit) via 5ffc0dcaf2497fb572a684ba46aa2c2ea3d973ac (commit) via c8e43af80deddda22f19718aa1aa6f85ac4d9aaf (commit) via 3d4c264fe192b2e67824c2e62cd2fd5823297d69 (commit) via b2830ae787665dac1f38e5d7c0bb04afeff59b9f (commit) via 4aadadb73f27b5ddebcd3f8356a5fd3581210267 (commit) via a021ba123e430fb04e3e0d7d98bd3506f40cea8c (commit) via fdf1c22d55262cda5b5d4afc629878464ce61401 (commit) via e8d9080da772519d030ce4ffec33c86d29e9aebd (commit) via 5d4b4bc7b56e34dcec0009d4c119f444cbb99d1f (commit) via 1db0010a49a06ab650e8ba28a8f77ecaaa2be852 (commit) via 12e7bf6012d4d7c305f15fb023b4cc08f3a03f4b (commit) via fc26356dbbce849fc6291c3671686fafc53274f8 (commit) via 0d9c8b4e5d0f3258c75c4c75b8fe2d48ec9c3d1a (commit) via cb3bb6541140d4fc1bce5b9490e129eef7d51aba (commit) via 86b517e4a0eec1c9b6f73e805fd0e15ddfbd8cfe (commit) via e2917a0e0ef3eaa60fe4b92270d776012327021b (commit) via 552b24112a67fdde9d0acd1448b65e8d4cc81b31 (commit) via 7e9ecace8dced89cb3ccb01317dec30f9d8c1604 (commit) via b4a4e084e2775687f939d0cd73c72e87ba4d62b2 (commit) via dfd6d90cb22cbe41a059263a19e66fc8acdd9480 (commit) via 6cbe4958ccfbec9b063bfab69d862459b9d6d935 (commit) via 090e8dd33d3c68b9a6cc15b6e5ae53c35f177916 (commit) via ed5776cee9f7d6481bab05ea8e2d6d9a486fbea9 (commit) via 187c7531c6cd079d5f943187fce2d49e5afd5753 (commit) via 78e508db1beecdf260fcc73207a6585aab524bf9 (commit) via 7203ef291e3205fbdd6dfbd3e21b4d1d120bc859 (commit) via 2ffa7b07ac4349b3941b630d8d0e7106d4d04622 (commit) via 418a91079e3f331a389dd457c50c10cd716f7f32 (commit) via f2822aa12e2c216b22cb57d733ccf676367deeef (commit) via d7947304507800abd9ee9ca7c13c65182e6f4dba (commit) via 5bf59fe0edb9eb2e2a81de6dbcbfd90c8452a548 (commit) via fe0444531438d30524144224603af144217894ed (commit) via b4fa4a0280c6e36598e08469d9ff5b646e8897b7 (commit) via 78c820816f221bf6ca7177a49dee3a67e4af5970 (commit) via 5fde2030cf3b82000d406fe68cc27c9232427d1a (commit) via 3df66917da217c283ec70ed85410b0990f79fb0f (commit) via 688916ab65afd2df40ab18a334f53673d8c4daf3 (commit) via 403aef1032a27ca6dc479e47256253824b9f88a2 (commit) via e8487dcba5017170f0812587350ffca73901128d (commit) via 701dfda8fdbd74967b80348d4c1ff8b38c9a262f (commit) via 15d7aa4e9f14332dc95a8047623cdd3a292e3a95 (commit) via 976ef838d5550fbe2cfa9a0ec1a97d11980840f9 (commit) via d7e1ccf1a3aeea85ff6d70e9826040164245ad45 (commit) via 9afe51353fe3983e324a89ccf6d72b09c88a8cee (commit) via bb92c9966a45689bfb4a4f9f3b02aa028989fc20 (commit) via 0cc4616558782b027c8b298843c2b1c44e520c19 (commit) via af704398b8f5ad542d55fc81f4663630856b9d77 (commit) via 407d1b4547e195d15b298d9ed27f7f9a017927bb (commit) via 6f71c5fe3f6eaf85354f57090c1c3f40dfd4df6b (commit) via 62f3c95d65f6525a2edc7a01e35bd0a433b5f60c (commit) via 7a57bc1cfb1236290437399de23789269a99b0e3 (commit) via 3a08161ae6bafe9420532264d6a812b3d2d20239 (commit) via 55da4a83a8229affef8b967489f4f9ec58b2a3a7 (commit) via 810d364bb69011d59f3cd666c95dee0010aabaf2 (commit) via a4c94fa2b19f5a90460c2e32e95a90d74169f504 (commit) via 52825bd599b7545dd5bb9e67dcc39b21accb809c (commit) via c94c8d5017f41cfd1f40197b81be0ab8a957be09 (commit) via 277453a9fe1e5a980543a5826d92377810ebbd2c (commit) via 082c076480e216e983bfe2bda6c45fecbc25a6ec (commit) via 2d9441e5e5ef8e06485cec6105a8885f971d6dde (commit) via 719f17c7c4f26afe72b5e01392931315d98a45d2 (commit) via 3eed01d449192bcee5a1258b46e50c913f56b63f (commit) via f6be3174b8459fd07a2154c7f4423075e994fb09 (commit) via c722ea3521d89a6f518aedebd44060be203bdb6a (commit) via e7d8cd556376330a5372fe50419206ac41f56b2c (commit) from 5d4999c8cc5692cb47552c367863d0ab9a601605 (commit) - Log ----------------------------------------------------------------- commit a9c4feac0dfdd4215f3fd014423a0bc437be62fd Merge: 5d4999c8cc5692cb47552c367863d0ab9a601605 a0e920bbfc03c574820d4799e4df12db17a579b5 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jan 12 18:07:15 2011 +0100 Merge remote branch 'pootle/master' commit a0e920bbfc03c574820d4799e4df12db17a579b5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 19:04:16 2011 +0200 Translation update done using Pootle. commit 959a262e1e89792ce0dd68046498ee41f7276fe2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:58:37 2011 +0200 Translation update done using Pootle. commit d238922bd8b43a67cf72cabe0c92c70491c1d122 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:57:18 2011 +0200 Translation update done using Pootle. commit 3d5b8f9ed0e6017cfc198e6a71b09e43a17c1029 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:54:47 2011 +0200 Translation update done using Pootle. commit 575f403650be099b69aec69dd6de3d02ae10293b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:54:21 2011 +0200 Translation update done using Pootle. commit 26b582a62b4e1539d5ad25788ca86107273c8f11 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:52:30 2011 +0200 Translation update done using Pootle. commit 592eb9e9ac21fb8855b736a2338b3112163563e1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:50:52 2011 +0200 Translation update done using Pootle. commit 6a216b2b949dc4acf616ba460940bb2888db0981 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:49:06 2011 +0200 Translation update done using Pootle. commit f35abb7956880372600400686ce5bfb0da10e88b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:47:01 2011 +0200 Translation update done using Pootle. commit a32d547c5a9755caf298a58d23d42627ef5c780f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:45:44 2011 +0200 Translation update done using Pootle. commit 13eb49ca94b1f529fa313a35da3ace72243030ae Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:43:32 2011 +0200 Translation update done using Pootle. commit 3974dae22ffdc1eb4865fbc6100e8259aa693435 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:41:49 2011 +0200 Translation update done using Pootle. commit b9363e938fdc786c52f8f95c2aaa2990ef02148b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:39:34 2011 +0200 Translation update done using Pootle. commit 4c72dd7d7a9529dbf9b62237922ea8a2629bcbf5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:38:08 2011 +0200 Translation update done using Pootle. commit 41cbc577496bce433dfbcf956c924400b9a316a2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:29:11 2011 +0200 Translation update done using Pootle. commit 321fe03abe44ec99419dd6eeadd831a621794bb8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:28:34 2011 +0200 Translation update done using Pootle. commit e915afcaa1b135fb13ee8e1cdfba1797d7b8e16e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:27:13 2011 +0200 Translation update done using Pootle. commit 3707a6f949e862d788e44038720d9dbb6f535be8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:23:37 2011 +0200 Translation update done using Pootle. commit fcc6d1621dbe3ae4e874544a1e8a01ca2334ef0b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:22:01 2011 +0200 Translation update done using Pootle. commit f6f00e02dc250656b260e641841774032a981355 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:21:17 2011 +0200 Translation update done using Pootle. commit 238d7a9ca99fb87a89986b48e554b7b8f7f98c87 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:19:31 2011 +0200 Translation update done using Pootle. commit 7e45d752528985b171384ff1417a90129e55de97 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:15:11 2011 +0200 Translation update done using Pootle. commit e423b13aeebfc2363d83fdcf3173ac423225689d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:11:03 2011 +0200 Translation update done using Pootle. commit b4311e2380f2b90512f630521141f625b5386d2f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 18:10:38 2011 +0200 Translation update done using Pootle. commit 9003910b8ccba3ecfcb928dcb7228519bcf6c5eb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 17:51:16 2011 +0200 Translation update done using Pootle. commit 1a4322eac36967cab7dd4d814962e2555387187c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 17:50:08 2011 +0200 Translation update done using Pootle. commit 1491e3a94667c888812137794ae9e2fa1e729a25 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 17:48:29 2011 +0200 Translation update done using Pootle. commit 7be8e0cdde5c6503020ac3d3506a3affe081ffdc Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 17:47:10 2011 +0200 Translation update done using Pootle. commit 8368e2e7414632715fb35a4243166c80a1f70c4e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 17:45:35 2011 +0200 Translation update done using Pootle. commit e3af50d49f4a5899eadfd947c123cbd725cfa1b8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 17:43:17 2011 +0200 Translation update done using Pootle. commit a69f9f6e09791e656e7433e4ae07a1986ff19798 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 17:41:28 2011 +0200 Translation update done using Pootle. commit 039a8431e48327c44b9525fba25aa248f35ef37b Merge: 5d733ba7160624e08890c717d697d23e0733f3d5 b34b104a3061d315eec6ce540cae5e43e5190f34 Author: Pootle server <pootle(a)cihar.com> Date: Wed Jan 12 16:40:09 2011 +0100 Merge remote branch 'origin/master' commit 5d733ba7160624e08890c717d697d23e0733f3d5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 17:37:11 2011 +0200 Translation update done using Pootle. commit 7427edb47c8286e52791a9be00229a11b3ccd60b Merge: 0c69de33a2140dabef7b399dc5f4c6b03921ad93 89552c74c4fe7585e595d30c6b3553c21b89ae61 Author: Pootle server <pootle(a)cihar.com> Date: Wed Jan 12 14:40:25 2011 +0100 Merge remote branch 'origin/master' commit 0c69de33a2140dabef7b399dc5f4c6b03921ad93 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:24:19 2011 +0200 Translation update done using Pootle. commit ba4a321f09c44165fd2be959e73e358b623e78ea Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:23:46 2011 +0200 Translation update done using Pootle. commit 41221ed8e83e67aa6d648fd2883ad830952329af Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:21:51 2011 +0200 Translation update done using Pootle. commit ac828cca9616a3fb76af5defceac724b7c35bea4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:20:38 2011 +0200 Translation update done using Pootle. commit 976c7a5ebe9b7320c6226226e2929f65f9bf5956 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:18:22 2011 +0200 Translation update done using Pootle. commit 47ed208d2d6670ba8d59161315abd02ad86f197b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:18:07 2011 +0200 Translation update done using Pootle. commit 5ffc0dcaf2497fb572a684ba46aa2c2ea3d973ac Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:17:57 2011 +0200 Translation update done using Pootle. commit c8e43af80deddda22f19718aa1aa6f85ac4d9aaf Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:17:38 2011 +0200 Translation update done using Pootle. commit 3d4c264fe192b2e67824c2e62cd2fd5823297d69 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:17:22 2011 +0200 Translation update done using Pootle. commit b2830ae787665dac1f38e5d7c0bb04afeff59b9f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:15:27 2011 +0200 Translation update done using Pootle. commit 4aadadb73f27b5ddebcd3f8356a5fd3581210267 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:15:23 2011 +0200 Translation update done using Pootle. commit a021ba123e430fb04e3e0d7d98bd3506f40cea8c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:15:18 2011 +0200 Translation update done using Pootle. commit fdf1c22d55262cda5b5d4afc629878464ce61401 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:15:14 2011 +0200 Translation update done using Pootle. commit e8d9080da772519d030ce4ffec33c86d29e9aebd Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:15:09 2011 +0200 Translation update done using Pootle. commit 5d4b4bc7b56e34dcec0009d4c119f444cbb99d1f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:15:04 2011 +0200 Translation update done using Pootle. commit 1db0010a49a06ab650e8ba28a8f77ecaaa2be852 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:14:59 2011 +0200 Translation update done using Pootle. commit 12e7bf6012d4d7c305f15fb023b4cc08f3a03f4b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:14:29 2011 +0200 Translation update done using Pootle. commit fc26356dbbce849fc6291c3671686fafc53274f8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:14:19 2011 +0200 Translation update done using Pootle. commit 0d9c8b4e5d0f3258c75c4c75b8fe2d48ec9c3d1a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:14:08 2011 +0200 Translation update done using Pootle. commit cb3bb6541140d4fc1bce5b9490e129eef7d51aba Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:13:48 2011 +0200 Translation update done using Pootle. commit 86b517e4a0eec1c9b6f73e805fd0e15ddfbd8cfe Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:13:35 2011 +0200 Translation update done using Pootle. commit e2917a0e0ef3eaa60fe4b92270d776012327021b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:13:21 2011 +0200 Translation update done using Pootle. commit 552b24112a67fdde9d0acd1448b65e8d4cc81b31 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:12:58 2011 +0200 Translation update done using Pootle. commit 7e9ecace8dced89cb3ccb01317dec30f9d8c1604 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:11:37 2011 +0200 Translation update done using Pootle. commit b4a4e084e2775687f939d0cd73c72e87ba4d62b2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:11:02 2011 +0200 Translation update done using Pootle. commit dfd6d90cb22cbe41a059263a19e66fc8acdd9480 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:10:58 2011 +0200 Translation update done using Pootle. commit 6cbe4958ccfbec9b063bfab69d862459b9d6d935 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:10:48 2011 +0200 Translation update done using Pootle. commit 090e8dd33d3c68b9a6cc15b6e5ae53c35f177916 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:10:37 2011 +0200 Translation update done using Pootle. commit ed5776cee9f7d6481bab05ea8e2d6d9a486fbea9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:10:28 2011 +0200 Translation update done using Pootle. commit 187c7531c6cd079d5f943187fce2d49e5afd5753 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:10:20 2011 +0200 Translation update done using Pootle. commit 78e508db1beecdf260fcc73207a6585aab524bf9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:10:11 2011 +0200 Translation update done using Pootle. commit 7203ef291e3205fbdd6dfbd3e21b4d1d120bc859 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:10:02 2011 +0200 Translation update done using Pootle. commit 2ffa7b07ac4349b3941b630d8d0e7106d4d04622 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:09:54 2011 +0200 Translation update done using Pootle. commit 418a91079e3f331a389dd457c50c10cd716f7f32 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:09:31 2011 +0200 Translation update done using Pootle. commit f2822aa12e2c216b22cb57d733ccf676367deeef Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:09:09 2011 +0200 Translation update done using Pootle. commit d7947304507800abd9ee9ca7c13c65182e6f4dba Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:08:46 2011 +0200 Translation update done using Pootle. commit 5bf59fe0edb9eb2e2a81de6dbcbfd90c8452a548 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:08:10 2011 +0200 Translation update done using Pootle. commit fe0444531438d30524144224603af144217894ed Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:07:10 2011 +0200 Translation update done using Pootle. commit b4fa4a0280c6e36598e08469d9ff5b646e8897b7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:05:28 2011 +0200 Translation update done using Pootle. commit 78c820816f221bf6ca7177a49dee3a67e4af5970 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 15:03:26 2011 +0200 Translation update done using Pootle. commit 5fde2030cf3b82000d406fe68cc27c9232427d1a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:57:55 2011 +0200 Translation update done using Pootle. commit 3df66917da217c283ec70ed85410b0990f79fb0f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:56:57 2011 +0200 Translation update done using Pootle. commit 688916ab65afd2df40ab18a334f53673d8c4daf3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:55:40 2011 +0200 Translation update done using Pootle. commit 403aef1032a27ca6dc479e47256253824b9f88a2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:46:16 2011 +0200 Translation update done using Pootle. commit e8487dcba5017170f0812587350ffca73901128d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:44:00 2011 +0200 Translation update done using Pootle. commit 701dfda8fdbd74967b80348d4c1ff8b38c9a262f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:42:45 2011 +0200 Translation update done using Pootle. commit 15d7aa4e9f14332dc95a8047623cdd3a292e3a95 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:36:25 2011 +0200 Translation update done using Pootle. commit 976ef838d5550fbe2cfa9a0ec1a97d11980840f9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:04:31 2011 +0200 Translation update done using Pootle. commit d7e1ccf1a3aeea85ff6d70e9826040164245ad45 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:03:58 2011 +0200 Translation update done using Pootle. commit 9afe51353fe3983e324a89ccf6d72b09c88a8cee Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:02:55 2011 +0200 Translation update done using Pootle. commit bb92c9966a45689bfb4a4f9f3b02aa028989fc20 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:01:56 2011 +0200 Translation update done using Pootle. commit 0cc4616558782b027c8b298843c2b1c44e520c19 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 14:01:41 2011 +0200 Translation update done using Pootle. commit af704398b8f5ad542d55fc81f4663630856b9d77 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:58:40 2011 +0200 Translation update done using Pootle. commit 407d1b4547e195d15b298d9ed27f7f9a017927bb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:58:03 2011 +0200 Translation update done using Pootle. commit 6f71c5fe3f6eaf85354f57090c1c3f40dfd4df6b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:57:12 2011 +0200 Translation update done using Pootle. commit 62f3c95d65f6525a2edc7a01e35bd0a433b5f60c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:55:59 2011 +0200 Translation update done using Pootle. commit 7a57bc1cfb1236290437399de23789269a99b0e3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:53:23 2011 +0200 Translation update done using Pootle. commit 3a08161ae6bafe9420532264d6a812b3d2d20239 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:52:42 2011 +0200 Translation update done using Pootle. commit 55da4a83a8229affef8b967489f4f9ec58b2a3a7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:49:47 2011 +0200 Translation update done using Pootle. commit 810d364bb69011d59f3cd666c95dee0010aabaf2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:46:42 2011 +0200 Translation update done using Pootle. commit a4c94fa2b19f5a90460c2e32e95a90d74169f504 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:42:04 2011 +0200 Translation update done using Pootle. commit 52825bd599b7545dd5bb9e67dcc39b21accb809c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:40:09 2011 +0200 Translation update done using Pootle. commit c94c8d5017f41cfd1f40197b81be0ab8a957be09 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:29:07 2011 +0200 Translation update done using Pootle. commit 277453a9fe1e5a980543a5826d92377810ebbd2c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:28:09 2011 +0200 Translation update done using Pootle. commit 082c076480e216e983bfe2bda6c45fecbc25a6ec Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:26:23 2011 +0200 Translation update done using Pootle. commit 2d9441e5e5ef8e06485cec6105a8885f971d6dde Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:25:04 2011 +0200 Translation update done using Pootle. commit 719f17c7c4f26afe72b5e01392931315d98a45d2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:23:10 2011 +0200 Translation update done using Pootle. commit 3eed01d449192bcee5a1258b46e50c913f56b63f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:19:50 2011 +0200 Translation update done using Pootle. commit f6be3174b8459fd07a2154c7f4423075e994fb09 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 13:11:59 2011 +0200 Translation update done using Pootle. commit c722ea3521d89a6f518aedebd44060be203bdb6a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 12:59:24 2011 +0200 Translation update done using Pootle. commit e7d8cd556376330a5372fe50419206ac41f56b2c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 12:56:26 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 235 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 90 insertions(+), 145 deletions(-) diff --git a/po/ru.po b/po/ru.po index 4677a1e..297d8b7 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-12 00:01+0200\n" +"PO-Revision-Date: 2011-01-12 19:04+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -977,23 +977,21 @@ msgstr "База данных будет полностью удалена!" #: js/messages.php:32 msgid "Dropping Event" -msgstr "" +msgstr "Удаление события" #: js/messages.php:33 -#, fuzzy #| msgid "Procedures" msgid "Dropping Procedure" -msgstr "Процедуры" +msgstr "Удаление процедуры" #: js/messages.php:35 -#, fuzzy #| msgid "Delete tracking data for this table" msgid "Deleting tracking data" -msgstr "Удалить данные слежения за таблицей" +msgstr "Удаление данных слежения" #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Удаление первичного ключа / индекса" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" @@ -1033,28 +1031,24 @@ msgid "The passwords aren't the same!" msgstr "Некорректное подтверждение пароля!" #: js/messages.php:52 -#, fuzzy #| msgid "Add a new User" msgid "Add a New User" msgstr "Добавить нового пользователя" #: js/messages.php:53 -#, fuzzy #| msgid "Create version" msgid "Create User" -msgstr "Создать версию" +msgstr "Создать пользователя" #: js/messages.php:54 -#, fuzzy #| msgid "Reloading the privileges" msgid "Reloading Privileges" msgstr "Перезагрузка привилегий" #: js/messages.php:55 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Удалить выделенных пользователей" +msgstr "Удаление выбранных пользователей" #: js/messages.php:56 libraries/tbl_properties.inc.php:793 #: tbl_tracking.php:245 tbl_tracking.php:373 @@ -1068,28 +1062,26 @@ msgid "Cancel" msgstr "Отмена" #: js/messages.php:63 -#, fuzzy #| msgid "Load" msgid "Loading" -msgstr "Загрузить" +msgstr "Загрузка" #: js/messages.php:64 -#, fuzzy #| msgid "Processes" msgid "Processing Request" -msgstr "Процессы" +msgstr "Обработка запроса" #: js/messages.php:65 msgid "Error in Processing Request" -msgstr "" +msgstr "Ошибка при обработке запроса" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "Удаление столбца" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "Добавление первичного ключа" #: js/messages.php:68 libraries/relation.lib.php:81 pmd_general.php:388 #: pmd_general.php:545 pmd_general.php:593 pmd_general.php:669 @@ -1098,76 +1090,64 @@ msgid "OK" msgstr "OK" #: js/messages.php:71 -#, fuzzy #| msgid "Rename database to" msgid "Renaming Databases" -msgstr "Переименовать базу данных в" +msgstr "Переименование базы данных" #: js/messages.php:72 -#, fuzzy #| msgid "Rename database to" msgid "Reload Database" -msgstr "Переименовать базу данных в" +msgstr "Перезагрузка базы данных" #: js/messages.php:73 -#, fuzzy #| msgid "Copy database to" msgid "Copying Database" -msgstr "Скопировать базу данных в" +msgstr "Копирование базы данных" #: js/messages.php:74 -#, fuzzy #| msgid "Charset" msgid "Changing Charset" -msgstr "Кодировка" +msgstr "Смена кодировки" #: js/messages.php:75 -#, fuzzy #| msgid "Table must have at least one field." msgid "Table must have at least one column" -msgstr "У таблицы должно быть, как минимум, одно поле." +msgstr "У таблицы должен быть, как минимум, один столбец" #: js/messages.php:76 -#, fuzzy #| msgid "Create table" msgid "Create Table" msgstr "Создать таблицу" #: js/messages.php:81 -#, fuzzy #| msgid "Search" msgid "Searching" msgstr "Поиск" #: js/messages.php:84 -#, fuzzy #| msgid "SQL Query box" msgid "Hide query box" -msgstr "SQL Запрос" +msgstr "Скрыть поле запроса" #: js/messages.php:85 -#, fuzzy #| msgid "SQL Query box" msgid "Show query box" -msgstr "SQL Запрос" +msgstr "Отобразить поле запроса" #: js/messages.php:86 -#, fuzzy #| msgid "Engines" msgid "Inline Edit" -msgstr "Типы таблиц" +msgstr "Быстрая правка" #: js/messages.php:89 -#, fuzzy #| msgid "SQL Query box" msgid "Hide search criteria" -msgstr "SQL Запрос" +msgstr "Скрыть параметры поиска" #: js/messages.php:90 -#, fuzzy #| msgid "SQL Query box" msgid "Show search criteria" -msgstr "SQL Запрос" +msgstr "Отобразить параметры поиска" #: js/messages.php:93 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -1189,17 +1169,15 @@ msgstr "" "индексом!" #: js/messages.php:99 pmd_general.php:89 tbl_relation.php:545 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Выбор отображаемого столбца" #: js/messages.php:102 msgid "Add an option for column " -msgstr "" +msgstr "Добавить параметр для столбца" #: js/messages.php:105 -#, fuzzy #| msgid "Generate Password" msgid "Generate password" msgstr "Создать пароль" @@ -1209,30 +1187,26 @@ msgid "Generate" msgstr "Генерировать" #: js/messages.php:107 -#, fuzzy #| msgid "Change password" msgid "Change Password" msgstr "Изменить пароль" #: js/messages.php:110 -#, fuzzy #| msgid "Mon" msgid "More" -msgstr "Пн" +msgstr "Ещё" #. l10n: Display text for calendar close link #: js/messages.php:120 -#, fuzzy #| msgid "Donate" msgid "Done" -msgstr "Пожертвование" +msgstr "Готово" #. l10n: Display text for previous month link in calendar #: js/messages.php:122 -#, fuzzy #| msgid "Previous" msgid "Prev" -msgstr "Назад" +msgstr "Предыдущий" #. l10n: Display text for next month link in calendar #: js/messages.php:124 libraries/common.lib.php:2333 @@ -1244,72 +1218,64 @@ msgstr "Следующий" #. l10n: Display text for current month link in calendar #: js/messages.php:126 -#, fuzzy #| msgid "Total" msgid "Today" -msgstr "Всего" +msgstr "Сегодня" #: js/messages.php:129 -#, fuzzy #| msgid "Binary" msgid "January" -msgstr "Двоичный" +msgstr "Январь" #: js/messages.php:130 msgid "February" -msgstr "" +msgstr "Февраль" #: js/messages.php:131 -#, fuzzy #| msgid "Mar" msgid "March" -msgstr "Мар" +msgstr "Март" #: js/messages.php:132 -#, fuzzy #| msgid "Apr" msgid "April" -msgstr "Апр" +msgstr "Апрель" #: js/messages.php:133 msgid "May" msgstr "Май" #: js/messages.php:134 -#, fuzzy #| msgid "Jun" msgid "June" -msgstr "Июн" +msgstr "Июнь" #: js/messages.php:135 -#, fuzzy #| msgid "Jul" msgid "July" -msgstr "Июл" +msgstr "Июль" #: js/messages.php:136 -#, fuzzy #| msgid "Aug" msgid "August" -msgstr "Авг" +msgstr "Август" #: js/messages.php:137 msgid "September" -msgstr "" +msgstr "Сентябрь" #: js/messages.php:138 -#, fuzzy #| msgid "Oct" msgid "October" -msgstr "Окт" +msgstr "Октябрь" #: js/messages.php:139 msgid "November" -msgstr "" +msgstr "Ноябрь" #: js/messages.php:140 msgid "December" -msgstr "" +msgstr "Декабрь" #. l10n: Short month name #: js/messages.php:144 libraries/common.lib.php:1538 @@ -1333,7 +1299,6 @@ msgstr "Апр" #. l10n: Short month name #: js/messages.php:152 libraries/common.lib.php:1546 -#, fuzzy #| msgid "May" msgctxt "Short month name" msgid "May" @@ -1375,40 +1340,36 @@ msgid "Dec" msgstr "Дек" #: js/messages.php:169 -#, fuzzy #| msgid "Sun" msgid "Sunday" -msgstr "Вс" +msgstr "Воскресенье" #: js/messages.php:170 -#, fuzzy #| msgid "Mon" msgid "Monday" -msgstr "Пн" +msgstr "Понедельник" #: js/messages.php:171 -#, fuzzy #| msgid "Tue" msgid "Tuesday" -msgstr "Вт" +msgstr "Вторник" #: js/messages.php:172 msgid "Wednesday" -msgstr "" +msgstr "Среда" #: js/messages.php:173 msgid "Thursday" -msgstr "" +msgstr "Четверг" #: js/messages.php:174 -#, fuzzy #| msgid "Fri" msgid "Friday" -msgstr "Пт" +msgstr "Пятница" #: js/messages.php:175 msgid "Saturday" -msgstr "" +msgstr "Суббота" #. l10n: Short week day name #: js/messages.php:179 libraries/common.lib.php:1563 @@ -1447,75 +1408,65 @@ msgstr "Сб" #. l10n: Minimal week day name #: js/messages.php:195 -#, fuzzy #| msgid "Sun" msgid "Su" msgstr "Вс" #. l10n: Minimal week day name #: js/messages.php:197 -#, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Пн" #. l10n: Minimal week day name #: js/messages.php:199 -#, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Вт" #. l10n: Minimal week day name #: js/messages.php:201 -#, fuzzy #| msgid "Wed" msgid "We" msgstr "Ср" #. l10n: Minimal week day name #: js/messages.php:203 -#, fuzzy #| msgid "Thu" msgid "Th" msgstr "Чт" #. l10n: Minimal week day name #: js/messages.php:205 -#, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Пт" #. l10n: Minimal week day name #: js/messages.php:207 -#, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Сб" #. l10n: Column header for week of the year in calendar #: js/messages.php:209 -#, fuzzy #| msgid "Wiki" msgid "Wk" -msgstr "Вики" +msgstr "Нед." #: js/messages.php:211 msgid "Hour" -msgstr "" +msgstr "Час" #: js/messages.php:212 -#, fuzzy #| msgid "in use" msgid "Minute" -msgstr "используется" +msgstr "Минута" #: js/messages.php:213 -#, fuzzy #| msgid "per second" msgid "Second" -msgstr "в секунду" +msgstr "Секунда" #: libraries/Config.class.php:1190 tbl_chart.php:159 msgid "Font size" @@ -1627,28 +1578,31 @@ msgid "Error" msgstr "Ошибка" #: libraries/Message.class.php:281 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) affected." msgid "%1$d row affected." msgid_plural "%1$d rows affected." -msgstr[0] "Затронуто строк: %1$d." -msgstr[1] "Затронуто строк: %1$d." +msgstr[0] "Затронута %1$d строка." +msgstr[1] "Затронуто %1$d строки." +msgstr[2] "Затронуто %1$d строк." #: libraries/Message.class.php:300 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) deleted." msgid "%1$d row deleted." msgid_plural "%1$d rows deleted." -msgstr[0] "Удалено строк: %1$d." -msgstr[1] "Удалено строк: %1$d." +msgstr[0] "Удалена %1$d строка." +msgstr[1] "Удалено %1$d строки." +msgstr[2] "Удалено %1$d строк." #: libraries/Message.class.php:319 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) inserted." msgid "%1$d row inserted." msgid_plural "%1$d rows inserted." -msgstr[0] "Вставлено строк: %1$d." -msgstr[1] "Вставлено строк: %1$d." +msgstr[0] "Добавлена %1$d строка." +msgstr[1] "Добавлено %1$d строки." +msgstr[2] "Добавлено %1$d строк." #: libraries/StorageEngine.class.php:194 msgid "" @@ -1833,21 +1787,20 @@ msgstr "Идентификация..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "Ошибка PBMS" #: libraries/blobstreaming.lib.php:267 -#, fuzzy #| msgid "MySQL connection collation" msgid "PBMS connection failed:" -msgstr "Сопоставление соединения с MySQL" +msgstr "Ошибка подключения к PBMS:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "Ошибка получения информации о BLOB данных от PBMS:" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "Ошибка получения заголовка Content-Type BLOB данных" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1868,7 +1821,7 @@ msgstr "Загрузить файл" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Невозможно открыть файл: %s" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:178 libraries/export/xml.php:36 @@ -1901,22 +1854,19 @@ msgid "Overhead" msgstr "Фрагментировано" #: libraries/build_html_for_db.lib.php:93 -#, fuzzy #| msgid "Go to database" msgid "Jump to database" msgstr "Перейти к базе данных" #: libraries/build_html_for_db.lib.php:130 -#, fuzzy #| msgid "Master replication" msgid "Not replicated" -msgstr "Репликация головного сервера" +msgstr "Не реплицировано" #: libraries/build_html_for_db.lib.php:136 -#, fuzzy #| msgid "Replication" msgid "Replicated" -msgstr "Репликация" +msgstr "Реплицировано" #: libraries/build_html_for_db.lib.php:150 #, php-format @@ -1928,32 +1878,30 @@ msgid "Check Privileges" msgstr "Проверить привилегии" #: libraries/chart.lib.php:40 -#, fuzzy #| msgid "Show statistics" msgid "Query statistics" -msgstr "Показывать статистику" +msgstr "Статистика запросов" #: libraries/chart.lib.php:63 msgid "Query execution time comparison (in microseconds)" -msgstr "" +msgstr "Сравнение времени выполнения запроса (в микросекундах)" #: libraries/chart.lib.php:83 -#, fuzzy #| msgid "Query results operations" msgid "Query results" -msgstr "Использование результатов запроса" +msgstr "Результаты запроса" #: libraries/chart.lib.php:109 msgid "No data found for the chart." -msgstr "" +msgstr "Данные для графика не найдены." #: libraries/chart.lib.php:249 msgid "GD extension is needed for charts." -msgstr "" +msgstr "Для графиков необходимо расширение GD." #: libraries/chart.lib.php:252 msgid "JSON encoder is needed for chart tooltips." -msgstr "" +msgstr "Для всплывающих подсказок графиков необходимо расширение JSON." #: libraries/common.inc.php:574 msgid "" @@ -1972,10 +1920,10 @@ msgstr "" "запятой.<br />Если отобразится пустая страница - все в порядке." #: libraries/common.inc.php:585 -#, fuzzy, php-format +#, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" -msgstr "Невозможно загрузить изначальную конфигурацию из: "%1$s"" +msgstr "Невозможно загрузить изначальную конфигурацию из: %1$s" #: libraries/common.inc.php:590 msgid "" @@ -1986,10 +1934,10 @@ msgstr "" "конфигурационном файле!" #: libraries/common.inc.php:620 -#, fuzzy, php-format +#, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" -msgstr "Неправильный номер сервера: "%s"" +msgstr "Неверный индекс сервера: %s" #: libraries/common.inc.php:627 #, php-format @@ -2050,10 +1998,9 @@ msgid "MySQL said: " msgstr "Ответ MySQL: " #: libraries/common.lib.php:1071 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Failed to connect to SQL validator!" -msgstr "Невозможно соединиться с сервером MySQL" +msgstr "Невозможно соединиться с SQL валидатором!" #: libraries/common.lib.php:1112 libraries/config/messages.inc.php:459 msgid "Explain SQL" @@ -2086,13 +2033,12 @@ msgstr "Проверка синтаксиса" #: libraries/common.lib.php:1237 msgid "Inline edit of this query" -msgstr "" +msgstr "Быстрое редактирование запроса" #: libraries/common.lib.php:1239 -#, fuzzy #| msgid "Engines" msgid "Inline" -msgstr "Типы таблиц" +msgstr "Быстрая правка" #: libraries/common.lib.php:1303 libraries/common.lib.php:1319 msgid "Profiling" @@ -2215,13 +2161,13 @@ msgstr "Операции" #: libraries/common.lib.php:2951 msgid "Browse your computer:" -msgstr "" +msgstr "Обзор вашего компьютера:" #: libraries/common.lib.php:2964 -#, fuzzy, php-format +#, php-format #| msgid "web server upload directory" msgid "Select from the web server upload directory <b>%s</b>:" -msgstr "Из каталога загрузки" +msgstr "Выберите из каталога загрузки сервера <b>%s</b>:" #: libraries/common.lib.php:2976 libraries/sql_query_form.lib.php:496 #: tbl_change.php:913 @@ -2230,7 +2176,7 @@ msgstr "Установленный каталог загрузки не дост #: libraries/common.lib.php:2984 msgid "There are no files to upload" -msgstr "" +msgstr "Файлы для загрузки отсутствуют" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2243,27 +2189,26 @@ msgstr "структура" #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "данные" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#, fuzzy #| msgid "Structure and data" msgid "structure and data" -msgstr "Структура и данные" +msgstr "структура и данные" #: libraries/config.values.php:99 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "Быстро - отображать минимальный набор параметров" #: libraries/config.values.php:100 msgid "Custom - display all possible options to configure" -msgstr "" +msgstr "По выбору - отображать все возможные параметры" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" -msgstr "" +msgstr "По выбору - как выше, но без выбора быстро/по выбору" #: libraries/config.values.php:119 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-68-g5d4999c
by Marc Delisle 12 Jan '11

12 Jan '11

The branch, master has been updated via 5d4999c8cc5692cb47552c367863d0ab9a601605 (commit) from 7e79589eba71b758e94587fae369ce5792da4d17 (commit) - Log ----------------------------------------------------------------- commit 5d4999c8cc5692cb47552c367863d0ab9a601605 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jan 12 10:59:16 2011 -0500 Use a multiple selector Cache jQuery object to avoid unneeded DOM traversal ----------------------------------------------------------------------- Summary of changes: js/sql.js | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/js/sql.js b/js/sql.js index e61214e..43b3af7 100644 --- a/js/sql.js +++ b/js/sql.js @@ -106,15 +106,10 @@ function appendInlineAnchor() { $this_td.after($cloned_anchor); }); - $('#rowsDeleteForm').find('thead').find('th').each(function() { - if($(this).attr('colspan') == 3) { - $(this).attr('colspan', '4') - } - }); - - $('#rowsDeleteForm').find('tbody').find('th').each(function() { - if($(this).attr('colspan') == 3) { - $(this).attr('colspan', '4') + $('#rowsDeleteForm').find('thead, tbody').find('th').each(function() { + var $this_th = $(this); + if ($this_th.attr('colspan') == 3) { + $this_th.attr('colspan', '4') } }); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-67-g7e79589
by Marc Delisle 12 Jan '11

12 Jan '11

The branch, master has been updated via 7e79589eba71b758e94587fae369ce5792da4d17 (commit) from b34b104a3061d315eec6ce540cae5e43e5190f34 (commit) - Log ----------------------------------------------------------------- commit 7e79589eba71b758e94587fae369ce5792da4d17 Author: Madhura Jayaratne <madhuracj(a)users.sourceforge.net> Date: Wed Jan 12 10:48:43 2011 -0500 Patch #3155803 - Column header misalignment ----------------------------------------------------------------------- Summary of changes: js/sql.js | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index e985be2..e61214e 100644 --- a/js/sql.js +++ b/js/sql.js @@ -110,7 +110,13 @@ function appendInlineAnchor() { if($(this).attr('colspan') == 3) { $(this).attr('colspan', '4') } - }) + }); + + $('#rowsDeleteForm').find('tbody').find('th').each(function() { + if($(this).attr('colspan') == 3) { + $(this).attr('colspan', '4') + } + }); } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-66-gb34b104
by Marc Delisle 12 Jan '11

12 Jan '11

The branch, master has been updated via b34b104a3061d315eec6ce540cae5e43e5190f34 (commit) from cc9f99d303d2103775dcd44094351fbc9b33242e (commit) - Log ----------------------------------------------------------------- commit b34b104a3061d315eec6ce540cae5e43e5190f34 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jan 12 08:53:06 2011 -0500 Improve function naming and remove vulgar term ----------------------------------------------------------------------- Summary of changes: libraries/schema/User_Schema.class.php | 8 ++++---- schema_edit.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index bcb92da..fbec138 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -40,7 +40,7 @@ class PMA_User_Schema * @access public */ - public function processUserPreferences() + public function processUserChoice() { global $action_choose,$db,$cfgRelation,$cfg,$query_default_option; @@ -65,7 +65,7 @@ class PMA_User_Schema $this->c_table_rows = $_POST['c_table_rows']; $this->_editCoordinates($db, $cfgRelation,$query_default_option); break; - case 'deleteCrap': + case 'delete_old_references': $this->_deleteTableRows($delrow,$cfgRelation,$db,$this->chosenPage); break; case 'process_export': @@ -84,7 +84,7 @@ class PMA_User_Schema * @return void * @access public */ - public function createPage($db) + public function showCreatePageDialog($db) { ?> <form method="post" action="schema_edit.php" name="frm_create_page"> @@ -439,7 +439,7 @@ class PMA_User_Schema if ($shoot) { echo '<form action="schema_edit.php" method="post">' . "\n" . PMA_generate_common_hidden_inputs($db, $table) - . '<input type="hidden" name="do" value="deleteCrap" />' . "\n" + . '<input type="hidden" name="do" value="delete_old_references" />' . "\n" . '<input type="hidden" name="chpage" value="' . htmlspecialchars($chpage) . '" />' . "\n" . __('The current page has references to tables that no longer exist. Would you like to delete those references?') . '<ul>' . "\n" diff --git a/schema_edit.php b/schema_edit.php index bf97b24..a5d3a38 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -85,7 +85,7 @@ if ($cfgRelation['pdfwork']) { */ if(isset($_REQUEST['do'])){ $user_schema->setAction($_REQUEST['do']); - $user_schema->processUserPreferences(); + $user_schema->processUserChoice(); } /** @@ -99,7 +99,7 @@ if ($cfgRelation['pdfwork']) { * Create a new page where relations will be drawn */ - $user_schema->createPage($db); + $user_schema->showCreatePageDialog($db); /** * After selection of page or creating a page hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-65-gcc9f99d
by Marc Delisle 12 Jan '11

12 Jan '11

The branch, master has been updated via cc9f99d303d2103775dcd44094351fbc9b33242e (commit) from 89552c74c4fe7585e595d30c6b3553c21b89ae61 (commit) - Log ----------------------------------------------------------------- commit cc9f99d303d2103775dcd44094351fbc9b33242e Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jan 12 08:40:54 2011 -0500 Typo "choosen" -> "chosen" ----------------------------------------------------------------------- Summary of changes: libraries/schema/Export_Relation_Schema.class.php | 2 +- libraries/schema/User_Schema.class.php | 36 ++++++++++---------- libraries/select_lang.lib.php | 2 +- schema_edit.php | 4 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index 4179dd0..2d23c5b 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -182,7 +182,7 @@ class PMA_Export_Relation_Schema /** * Displays an error message * - * @param integer pageNumber ID of the page choosen + * @param integer pageNumber ID of the chosen page * @param string type Schema Type * @param string error_message the error mesage * @global array the PMA configuration array diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index e69daa0..bcb92da 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -18,7 +18,7 @@ class PMA_User_Schema { - public $choosenPage; + public $chosenPage; public $autoLayoutForeign; public $autoLayoutInternal; public $pageNumber; @@ -47,11 +47,11 @@ class PMA_User_Schema if (isset($this->action)) { switch ($this->action) { case 'selectpage': - $this->choosenPage = $_REQUEST['chpage']; + $this->chosenPage = $_REQUEST['chpage']; if ($action_choose=="1") { - $this->deleteCoordinates($db, $cfgRelation, $this->choosenPage, $query_default_option); - $this->deletePages($db, $cfgRelation, $this->choosenPage, $query_default_option); - $this->choosenPage = 0; + $this->deleteCoordinates($db, $cfgRelation, $this->chosenPage, $query_default_option); + $this->deletePages($db, $cfgRelation, $this->chosenPage, $query_default_option); + $this->chosenPage = 0; } break; case 'createpage': @@ -61,12 +61,12 @@ class PMA_User_Schema $this->processRelations($db, $this->pageNumber,$cfgRelation,$query_default_option); break; case 'edcoord': - $this->choosenPage = $_POST['chpage']; + $this->chosenPage = $_POST['chpage']; $this->c_table_rows = $_POST['c_table_rows']; $this->_editCoordinates($db, $cfgRelation,$query_default_option); break; case 'deleteCrap': - $this->_deleteTableRows($delrow,$cfgRelation,$db,$this->choosenPage); + $this->_deleteTableRows($delrow,$cfgRelation,$db,$this->chosenPage); break; case 'process_export': $this->_processExportSchema(); @@ -155,7 +155,7 @@ class PMA_User_Schema while ($curr_page = PMA_DBI_fetch_assoc($page_rs)) { echo "\n" . ' ' . '<option value="' . $curr_page['page_nr'] . '"'; - if (isset($this->choosenPage) && $this->choosenPage == $curr_page['page_nr']) { + if (isset($this->chosenPage) && $this->chosenPage == $curr_page['page_nr']) { echo ' selected="selected"'; } echo '>' . $curr_page['page_nr'] . ': ' . htmlspecialchars($curr_page['page_descr']) . '</option>'; @@ -205,14 +205,14 @@ class PMA_User_Schema * show the tables involved */ - if (isset($this->choosenPage) && $this->choosenPage > 0) { + if (isset($this->chosenPage) && $this->chosenPage > 0) { echo "\n"; ?> <h2><?php echo __('Select Tables') ;?></h2> <?php $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->choosenPage) . '\''; + . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\''; $page_rs = PMA_query_as_controluser($page_query, FALSE, $query_default_option); $array_sh_page = array(); while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) { @@ -230,7 +230,7 @@ class PMA_User_Schema <form method="post" action="schema_edit.php" name="edcoord"> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> - <input type="hidden" name="chpage" value="<?php echo htmlspecialchars($this->choosenPage); ?>" /> + <input type="hidden" name="chpage" value="<?php echo htmlspecialchars($this->chosenPage); ?>" /> <input type="hidden" name="do" value="edcoord" /> <table border="0"> <tr> @@ -318,7 +318,7 @@ class PMA_User_Schema echo "\n" . '</form>' . "\n\n"; } // end if - $this->_deleteTables($db, $this->choosenPage, isset($tabExist)); + $this->_deleteTables($db, $this->chosenPage, isset($tabExist)); } /** @@ -369,7 +369,7 @@ class PMA_User_Schema ?> </select><br /> <?php } else { ?> - <input type="hidden" name="pdf_page_number" value="<?php echo htmlspecialchars($this->choosenPage); ?>" /> + <input type="hidden" name="pdf_page_number" value="<?php echo htmlspecialchars($this->chosenPage); ?>" /> <?php } ?> <input type="hidden" name="do" value="process_export" /> <input type="hidden" name="chpage" value="<?php echo $chpage; ?>" /> @@ -708,7 +708,7 @@ class PMA_User_Schema $this->addRelationCoordinates($all_tables,$pageNumber,$db, $cfgRelation,$query_default_option); } - $this->choosenPage = $pageNumber; + $this->chosenPage = $pageNumber; } /** @@ -793,7 +793,7 @@ class PMA_User_Schema $test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\'' - . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->choosenPage) . '\''; + . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\''; $test_rs = PMA_query_as_controluser($test_query, FALSE, $query_default_option); //echo $test_query; if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { @@ -801,18 +801,18 @@ class PMA_User_Schema $ch_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\'' - . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->choosenPage) . '\''; + . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\''; } else { $ch_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . 'SET x = ' . $arrvalue['x'] . ', y= ' . $arrvalue['y'] . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\'' - . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->choosenPage) . '\''; + . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\''; } } else { $ch_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . '(db_name, table_name, pdf_page_number, x, y) ' - . 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($arrvalue['name']) . '\', \'' . PMA_sqlAddslashes($this->choosenPage) . '\',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')'; + . 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($arrvalue['name']) . '\', \'' . PMA_sqlAddslashes($this->chosenPage) . '\',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')'; } //echo $ch_query; PMA_query_as_controluser($ch_query, FALSE, $query_default_option); diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 3ed35e4..407da6f 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -452,7 +452,7 @@ if (! PMA_langCheck()) { . __FILE__ . '#' . $line . ', check hard coded fall back language.', E_USER_WARNING); // stop execution - // and tell the user that his choosen language is invalid + // and tell the user that his chosen language is invalid PMA_fatalError('Could not load any language, please check your language settings and folder.'); } } diff --git a/schema_edit.php b/schema_edit.php index 8494959..bf97b24 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -111,8 +111,8 @@ if ($cfgRelation['pdfwork']) { if (isset($_REQUEST['do']) && ($_REQUEST['do'] == 'edcoord' - || ($_REQUEST['do']== 'selectpage' && isset($user_schema->choosenPage) && $user_schema->choosenPage != 0) - || ($_REQUEST['do'] == 'createpage' && isset($user_schema->choosenPage) && $user_schema->choosenPage != 0))) { + || ($_REQUEST['do']== 'selectpage' && isset($user_schema->chosenPage) && $user_schema->chosenPage != 0) + || ($_REQUEST['do'] == 'createpage' && isset($user_schema->chosenPage) && $user_schema->chosenPage != 0))) { /** * show Export schema generation options hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-64-g89552c7
by Marc Delisle 12 Jan '11

12 Jan '11

The branch, master has been updated via 89552c74c4fe7585e595d30c6b3553c21b89ae61 (commit) via 31cd4bdd6a7c42527b2011201d378e3c9accce8a (commit) from 7411f7cca83af4e763fb6bf1eb08e67800bda770 (commit) - Log ----------------------------------------------------------------- commit 89552c74c4fe7585e595d30c6b3553c21b89ae61 Merge: 7411f7cca83af4e763fb6bf1eb08e67800bda770 31cd4bdd6a7c42527b2011201d378e3c9accce8a Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jan 12 08:05:40 2011 -0500 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/dbi/mysql.dbi.lib.php | 4 +--- libraries/dbi/mysqli.dbi.lib.php | 8 +++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f30df3..889c140 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ - patch #3150164 [structure] Ordering by size gives incorrect results, thanks to Madhura Jayaratne - madhuracj - bug #3153409 [core] 0 row(s) affected +- bug #3155842 [core] Edit relational page and page number 3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 1db4f1e..2ddd765 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -392,13 +392,11 @@ function PMA_DBI_insert_id($link = null) return false; } } - //$insert_id = mysql_insert_id($link); - // if the primary key is BIGINT we get an incorrect result + // If the primary key is BIGINT we get an incorrect result // (sometimes negative, sometimes positive) // and in the present function we don't know if the PK is BIGINT // so better play safe and use LAST_INSERT_ID() // - // by the way, no problem with mysqli_insert_id() return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 8022c77..71693ab 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -452,7 +452,13 @@ function PMA_DBI_insert_id($link = '') return false; } } - return mysqli_insert_id($link); + // When no controluser is defined, using mysqli_insert_id($link) + // does not always return the last insert id due to a mixup with + // the tracking mechanism, but this works: + return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link); + // Curiously, this problem does not happen with the mysql extension but + // there is another problem with BIGINT primary keys so PMA_DBI_insert_id() + // in the mysql extension also uses this logic. } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_9-11-g31cd4bd
by Marc Delisle 12 Jan '11

12 Jan '11

The branch, QA_3_3 has been updated via 31cd4bdd6a7c42527b2011201d378e3c9accce8a (commit) from 824458981388fbaad52c0e1d11db4c681bf03789 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/dbi/mysql.dbi.lib.php | 4 +--- libraries/dbi/mysqli.dbi.lib.php | 8 +++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2831d07..a5226f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #3150164 [structure] Ordering by size gives incorrect results, thanks to Madhura Jayaratne - madhuracj - bug #3153409 [core] 0 row(s) affected +- bug #3155842 [core] Edit relational page and page number 3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 6aa9c6a..5d2f8fe 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -396,13 +396,11 @@ function PMA_DBI_insert_id($link = null) return false; } } - //$insert_id = mysql_insert_id($link); - // if the primary key is BIGINT we get an incorrect result + // If the primary key is BIGINT we get an incorrect result // (sometimes negative, sometimes positive) // and in the present function we don't know if the PK is BIGINT // so better play safe and use LAST_INSERT_ID() // - // by the way, no problem with mysqli_insert_id() return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index f1f037c..07de2f7 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -457,7 +457,13 @@ function PMA_DBI_insert_id($link = '') return false; } } - return mysqli_insert_id($link); + // When no controluser is defined, using mysqli_insert_id($link) + // does not always return the last insert id due to a mixup with + // the tracking mechanism, but this works: + return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link); + // Curiously, this problem does not happen with the mysql extension but + // there is another problem with BIGINT primary keys so PMA_DBI_insert_id() + // in the mysql extension also uses this logic. } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. d122c9e628999df1f30e607d497d10ecda94e4fc
by Michal Čihař 12 Jan '11

12 Jan '11

The branch, master has been updated via d122c9e628999df1f30e607d497d10ecda94e4fc (commit) from 0594f2a5819237e87f3d92c19aca738c2ede6c38 (commit) - Log ----------------------------------------------------------------- commit d122c9e628999df1f30e607d497d10ecda94e4fc Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jan 12 11:06:27 2011 +0100 Update PPA url. ----------------------------------------------------------------------- Summary of changes: templates/downloads.tpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/downloads.tpl b/templates/downloads.tpl index e665e4e..ac7ae3a 100644 --- a/templates/downloads.tpl +++ b/templates/downloads.tpl @@ -100,7 +100,7 @@ <p> Ubuntu ships phpMyAdmin package, however if you want to use recent version, you can use packages from <a - href="https://launchpad.net/~nijel/+archive/">PPA for Michal + href="https://launchpad.net/~nijel/+archive/phpmyadmin">PPA for Michal Čihař</a>. </p> <h3>Gentoo</h3> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 9a2ba2f815e5b8e9a80477f78ea9c434de1c5ba7
by Michal Čihař 12 Jan '11

12 Jan '11

The branch, master has been updated via 9a2ba2f815e5b8e9a80477f78ea9c434de1c5ba7 (commit) via 825e29d19f6f4a5949d96b622282dec729929157 (commit) via 58bceb74befb3165ad5bbbb02a783bb629e1f4f2 (commit) via 76d3110fa19f3967a896d0d368bfc99caaa67e34 (commit) via 38d31bab0e9ecf321211b8cced3cb8f9880beee4 (commit) via 359f5bc03b3c7bdfae40824621e63985439d1b8f (commit) via 34cb141e5d5659f496290a64f09e5d5563c422a3 (commit) via a9ec7f46adeef58f5b23b544275417e0564abb31 (commit) via 506b7fda36a08de412ac3cfd637a501b9654b5c6 (commit) via 201eb5fcf5b2c19186a32924b0cfdf6660b2785e (commit) via f0884bb12bfc869e75933282afb8c9ffe311b6be (commit) via fd2d4202525610a08d042563ebe14a8a7c660e30 (commit) via d8b2f4a56cc33310d72d23d06d5bebe1313026ba (commit) via e33add2fd8a337c9b88159ee9963c8ba12bbbae0 (commit) from 4366767aefa9fa0ce3bc09ad26ff9aeb999f966d (commit) - Log ----------------------------------------------------------------- commit 9a2ba2f815e5b8e9a80477f78ea9c434de1c5ba7 Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:36:12 2011 +0200 Translation update done using Pootle. commit 825e29d19f6f4a5949d96b622282dec729929157 Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:32:06 2011 +0200 Translation update done using Pootle. commit 58bceb74befb3165ad5bbbb02a783bb629e1f4f2 Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:31:46 2011 +0200 Translation update done using Pootle. commit 76d3110fa19f3967a896d0d368bfc99caaa67e34 Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:30:39 2011 +0200 Translation update done using Pootle. commit 38d31bab0e9ecf321211b8cced3cb8f9880beee4 Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:25:59 2011 +0200 Translation update done using Pootle. commit 359f5bc03b3c7bdfae40824621e63985439d1b8f Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:25:16 2011 +0200 Translation update done using Pootle. commit 34cb141e5d5659f496290a64f09e5d5563c422a3 Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:24:39 2011 +0200 Translation update done using Pootle. commit a9ec7f46adeef58f5b23b544275417e0564abb31 Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:23:27 2011 +0200 Translation update done using Pootle. commit 506b7fda36a08de412ac3cfd637a501b9654b5c6 Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:22:39 2011 +0200 Translation update done using Pootle. commit 201eb5fcf5b2c19186a32924b0cfdf6660b2785e Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:22:22 2011 +0200 Translation update done using Pootle. commit f0884bb12bfc869e75933282afb8c9ffe311b6be Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:21:30 2011 +0200 Translation update done using Pootle. commit fd2d4202525610a08d042563ebe14a8a7c660e30 Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:17:39 2011 +0200 Translation update done using Pootle. commit d8b2f4a56cc33310d72d23d06d5bebe1313026ba Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:17:06 2011 +0200 Translation update done using Pootle. commit e33add2fd8a337c9b88159ee9963c8ba12bbbae0 Author: David Mateos <porquewhich(a)hotmail.com> Date: Tue Jan 11 18:16:52 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/po/es.po b/po/es.po index 87c408a..4e566d3 100644 --- a/po/es.po +++ b/po/es.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-11 15:11+0100\n" -"PO-Revision-Date: 2010-12-16 22:32+0200\n" -"Last-Translator: <gaspy(a)totaki.com>\n" +"PO-Revision-Date: 2011-01-11 18:36+0200\n" +"Last-Translator: David Mateos <porquewhich(a)hotmail.com>\n" "Language-Team: none\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -1893,10 +1893,13 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:734 +#, fuzzy msgid "" "In phpMyAdmin versions before 2.2.5, those were called "stduser/" "stdpass"." msgstr "" +"En las versiones de phpMyAdmin anteriores a la 2.2.5 se llamaban " +""stduser/stdpass"" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:737 @@ -1904,6 +1907,8 @@ msgid "" "$cfg['Servers'][$i]['auth_type'] string <tt>['<abbr title=\"HyperText " "Transfer Protocol\">HTTP</abbr>'|'http'|'cookie'|'config'|'signon']</tt>" msgstr "" +"$cfg['Servers'][$i]['auth_type'] string <tt>['<abbr title=\"HyperText " +"Transfer Protocol\">HTTP</abbr>'|'http'|'cookie'|'config'|'signon']</tt>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:739 @@ -2091,12 +2096,18 @@ msgid "" "(using, for example, the SQL query area). To limit access, use the MySQL " "privilege system." msgstr "" +"Expresiones regulares para ocultar algunas bases de datos de usuarios sin " +"privilegios. Sólo evita que sean listadas, pero el usuario podrá aún acceder " +"a ellas (usando por ejemplo el área de consulta SQL). Para limitar el " +"acceso, usa el sistema de privilegios de MySQL." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:845 msgid "" "For example, to hide all databases starting with the letter "a", use" msgstr "" +"Por ejemplo, para ocultar todas las bases de datos que empiecen con la letra " +""a", usa" #. type: Content of: <html><body><div><dl><dd><pre> #: orig-docs/Documentation.html:846 @@ -2106,8 +2117,9 @@ msgstr "$cfg['Servers'][$i]['hide_db'] = '^a';" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:847 +#, fuzzy msgid "and to hide both "db1" and "db2" use" -msgstr "" +msgstr "y para ocultar "db1" and "db2" usa" #. type: Content of: <html><body><div><dl><dd><pre> #: orig-docs/Documentation.html:848 @@ -2126,7 +2138,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:854 msgid "$cfg['Servers'][$i]['verbose'] string" -msgstr "" +msgstr "$cfg['Servers'][$i]['verbose'] string" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:855 @@ -2142,13 +2154,15 @@ msgstr "" #: orig-docs/Documentation.html:862 msgid "" "<span id=\"cfg_Servers_pmadb\">$cfg['Servers'][$i]['pmadb']</span> string" -msgstr "" +msgstr "<span id=\"cfg_Servers_pmadb\">$cfg['Servers'][$i]['pmadb']</span> string" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:864 msgid "" "The name of the database containing the phpMyAdmin configuration storage." msgstr "" +"El nombre de la base de datos contiene la configuración de almacenamiento de " +"phpMyAdmin." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:867 @@ -2174,6 +2188,9 @@ msgid "" "<span id=\"cfg_Servers_bookmarktable\">$cfg['Servers'][$i]['bookmarktable']</" "span> string" msgstr "" +"<span " +"id=\"cfg_Servers_bookmarktable\">$cfg['Servers'][$i]['bookmarktable']</span> " +"string" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:882 @@ -2181,6 +2198,9 @@ msgid "" "Since release 2.2.0 phpMyAdmin allows users to bookmark queries. This can be " "useful for queries you often run." msgstr "" +"Desde la versión 2.2.0 phpMyAdmin permite a los usuarios que guarden las " +"consultas como favoritas. Esto es útil para consultas que se realizan a " +"menudo. " #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:885 orig-docs/Documentation.html:920 @@ -2188,7 +2208,7 @@ msgstr "" #: orig-docs/Documentation.html:1043 orig-docs/Documentation.html:1074 #: orig-docs/Documentation.html:1151 orig-docs/Documentation.html:1167 msgid "To allow the usage of this functionality:" -msgstr "" +msgstr "Para permitir el uso de esta funcionalidad." #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:886 orig-docs/Documentation.html:922 @@ -2214,11 +2234,15 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:895 +#, fuzzy msgid "" "Since release 2.2.4 you can describe, in a special 'relation' table, which " "column is a key in another table (a foreign key). phpMyAdmin currently uses " "this to" msgstr "" +"Desde la versión 2.2.4 puedes describir, en una tabla 'relación' especial, " +"qué columna es una clave en otra tabla (una clave externa - foreign key). " +"phpMyAdmin normalmente usa esto para" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:898 hooks/post-receive -- phpMyAdmin localized documentation

1 0