- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1443-g6ca2a7b
by Michal Čihař 25 Jan '11

25 Jan '11

The branch, master has been updated via 6ca2a7bef3d7485c36264fea962a14a41d621287 (commit) via 42391e93e0af136d6904ce6d09c3151c768a6d6f (commit) via 839ed0d0e593bdf11ab4e210bba88d50f4c1490a (commit) via 549c553ffd9a64c29d7848f5c0ef1e5b40182c8a (commit) via 89a1b0182897710cca03d7154798e04fb5448ee6 (commit) via 8b2cd394e4306719ada717c6b9755e5238fb7453 (commit) via b5f10ba027618086c74561202143e6ea3e9faf7a (commit) via 1ac47de703c1eea218b204fb9e25d069dc819199 (commit) via 5598ebc30ac6377a84f76f301926838161f85da1 (commit) via fbcfc43e39e33c75e184bed5ec38410a43833eea (commit) via 8a6fc82d1b27c1ad7bd5828e253e2fb99f2d66f4 (commit) via dd4a017d1772176e37a6003fc6d40241a6a9deff (commit) via 3e54ce11ee651dfb44f44794eadfd329cdc399d6 (commit) via a5217264e4cfe41e28d8d900a6272f335bab9458 (commit) via 2da46147af736a6ba9118a13beb9dc6088730fb5 (commit) via 14f2964762aeacd7004c3d5dcb0b9867b6348d0a (commit) via eaa2e559d990dedaccdbf9ad1632be05771cf5a6 (commit) via 08d80af5610b7896fb9de05a1fdc4969b7627559 (commit) via d435a47d48d48e1536873c5860635b966a89cfa6 (commit) via 93613aec4770cc659209ce35c09f54d4f329f389 (commit) via 8f528b379694a47dc79e08a911ccf922d34cba27 (commit) via a20d341508223773f36823d56042713fa7e10c3c (commit) via 0a9081eadac148361da974b9d64e3c7b09d5c29f (commit) via e3e1575bb9fe454af48827894e6e4c73fb437272 (commit) via fc799390e0e609b22ae158aae24c17c6b37edff8 (commit) via d7d58782936fbf9ff6c7485f404f6bb491699ced (commit) via 06ee78d85d2ee1217d9b6a29ee65d17d7bacc4d2 (commit) via a151eea29db61a575596ef94b8fb4ff6db0ea9fb (commit) via 0809f9f01997299dd4445db762c19e0c71111ddc (commit) via bfac9a97ac4288e2779699f126d66eb0f460ffa6 (commit) via 77d34e3d2acae41b4293caf2cd7e9a2a680fb129 (commit) via 22bf420d4ea053010db0574d7c9d2ca135d40543 (commit) via fff3aca97d6438e320d9937c97c3b778cb3a2d17 (commit) via a361487148da36a50195ad1099143d98b2ff846a (commit) via 0b920de418b8111e6a9fc6f338ca4bf675a7cfb3 (commit) via 9b74786d115edad026875da142ede82a4cd20de3 (commit) via da439b6b18a42040b44e413b765c67c2999ecaaa (commit) via 4b96ebd3719087ef28fc186f699ce8387d4f88fd (commit) from e3870e938edabc3cdd0f5c71fd9a2a87359f3271 (commit) - Log ----------------------------------------------------------------- commit 6ca2a7bef3d7485c36264fea962a14a41d621287 Merge: 42391e93e0af136d6904ce6d09c3151c768a6d6f e3870e938edabc3cdd0f5c71fd9a2a87359f3271 Author: Pootle server <pootle(a)cihar.com> Date: Tue Jan 25 04:40:31 2011 +0100 Merge remote branch 'origin/master' commit 42391e93e0af136d6904ce6d09c3151c768a6d6f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 23:01:00 2011 +0200 Translation update done using Pootle. commit 839ed0d0e593bdf11ab4e210bba88d50f4c1490a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:58:04 2011 +0200 Translation update done using Pootle. commit 549c553ffd9a64c29d7848f5c0ef1e5b40182c8a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:56:41 2011 +0200 Translation update done using Pootle. commit 89a1b0182897710cca03d7154798e04fb5448ee6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:55:09 2011 +0200 Translation update done using Pootle. commit 8b2cd394e4306719ada717c6b9755e5238fb7453 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:54:56 2011 +0200 Translation update done using Pootle. commit b5f10ba027618086c74561202143e6ea3e9faf7a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:54:38 2011 +0200 Translation update done using Pootle. commit 1ac47de703c1eea218b204fb9e25d069dc819199 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:54:33 2011 +0200 Translation update done using Pootle. commit 5598ebc30ac6377a84f76f301926838161f85da1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:54:28 2011 +0200 Translation update done using Pootle. commit fbcfc43e39e33c75e184bed5ec38410a43833eea Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:54:05 2011 +0200 Translation update done using Pootle. commit 8a6fc82d1b27c1ad7bd5828e253e2fb99f2d66f4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:53:36 2011 +0200 Translation update done using Pootle. commit dd4a017d1772176e37a6003fc6d40241a6a9deff Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:53:10 2011 +0200 Translation update done using Pootle. commit 3e54ce11ee651dfb44f44794eadfd329cdc399d6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:52:05 2011 +0200 Translation update done using Pootle. commit a5217264e4cfe41e28d8d900a6272f335bab9458 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:51:16 2011 +0200 Translation update done using Pootle. commit 2da46147af736a6ba9118a13beb9dc6088730fb5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:51:05 2011 +0200 Translation update done using Pootle. commit 14f2964762aeacd7004c3d5dcb0b9867b6348d0a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:50:54 2011 +0200 Translation update done using Pootle. commit eaa2e559d990dedaccdbf9ad1632be05771cf5a6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:50:48 2011 +0200 Translation update done using Pootle. commit 08d80af5610b7896fb9de05a1fdc4969b7627559 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:48:56 2011 +0200 Translation update done using Pootle. commit d435a47d48d48e1536873c5860635b966a89cfa6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:48:19 2011 +0200 Translation update done using Pootle. commit 93613aec4770cc659209ce35c09f54d4f329f389 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:48:00 2011 +0200 Translation update done using Pootle. commit 8f528b379694a47dc79e08a911ccf922d34cba27 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:46:40 2011 +0200 Translation update done using Pootle. commit a20d341508223773f36823d56042713fa7e10c3c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:46:35 2011 +0200 Translation update done using Pootle. commit 0a9081eadac148361da974b9d64e3c7b09d5c29f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:45:49 2011 +0200 Translation update done using Pootle. commit e3e1575bb9fe454af48827894e6e4c73fb437272 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:41:21 2011 +0200 Translation update done using Pootle. commit fc799390e0e609b22ae158aae24c17c6b37edff8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:41:14 2011 +0200 Translation update done using Pootle. commit d7d58782936fbf9ff6c7485f404f6bb491699ced Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:39:44 2011 +0200 Translation update done using Pootle. commit 06ee78d85d2ee1217d9b6a29ee65d17d7bacc4d2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:39:28 2011 +0200 Translation update done using Pootle. commit a151eea29db61a575596ef94b8fb4ff6db0ea9fb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:39:06 2011 +0200 Translation update done using Pootle. commit 0809f9f01997299dd4445db762c19e0c71111ddc Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:32:29 2011 +0200 Translation update done using Pootle. commit bfac9a97ac4288e2779699f126d66eb0f460ffa6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:32:03 2011 +0200 Translation update done using Pootle. commit 77d34e3d2acae41b4293caf2cd7e9a2a680fb129 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:31:52 2011 +0200 Translation update done using Pootle. commit 22bf420d4ea053010db0574d7c9d2ca135d40543 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:28:00 2011 +0200 Translation update done using Pootle. commit fff3aca97d6438e320d9937c97c3b778cb3a2d17 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:27:56 2011 +0200 Translation update done using Pootle. commit a361487148da36a50195ad1099143d98b2ff846a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:24:54 2011 +0200 Translation update done using Pootle. commit 0b920de418b8111e6a9fc6f338ca4bf675a7cfb3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:15:26 2011 +0200 Translation update done using Pootle. commit 9b74786d115edad026875da142ede82a4cd20de3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:14:24 2011 +0200 Translation update done using Pootle. commit da439b6b18a42040b44e413b765c67c2999ecaaa Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:07:06 2011 +0200 Translation update done using Pootle. commit 4b96ebd3719087ef28fc186f699ce8387d4f88fd Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 24 22:06:46 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 72 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/po/ru.po b/po/ru.po index 213954c..00be8f1 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-23 15:04+0200\n" +"PO-Revision-Date: 2011-01-24 23:01+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -5018,26 +5018,23 @@ msgid "Options" msgstr "Параметры" #: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" -msgstr "Сокращенное отображение данных" +msgstr "Сокращенные тексты" #: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572 -#, fuzzy #| msgid "Full Texts" msgid "Full texts" -msgstr "Развернутое отображение данных" +msgstr "Полные тексты" #: libraries/display_tbl.lib.php:585 msgid "Relational key" msgstr "Ссылочный ключ" #: libraries/display_tbl.lib.php:586 -#, fuzzy #| msgid "Relational display field" msgid "Relational display column" -msgstr "Значение связанного поля" +msgstr "Отображение связанного поля" #: libraries/display_tbl.lib.php:593 msgid "Show binary contents" @@ -5098,10 +5095,9 @@ msgid "Print view (with full texts)" msgstr "Версия для печати (полностью)" #: libraries/display_tbl.lib.php:2236 tbl_chart.php:81 -#, fuzzy #| msgid "Display PDF schema" msgid "Display chart" -msgstr "Показать PDF-схему" +msgstr "Отобразить график" #: libraries/display_tbl.lib.php:2386 msgid "Link not found" @@ -5298,20 +5294,16 @@ msgstr "" "ALTER TABLE." #: libraries/engines/pbms.lib.php:30 -#, fuzzy #| msgid "Garbage threshold" msgid "Garbage Threshold" msgstr "Порог захламления" #: libraries/engines/pbms.lib.php:31 -#, fuzzy #| msgid "" #| "The percentage of garbage in a data log file before it is compacted. This " #| "is a value between 1 and 99. The default is 50." msgid "The percentage of garbage in a repository file before it is compacted." -msgstr "" -"Процентное соотношение захламления в файле журнала данных до его компоновки. " -"Значение между 1 и 99. Изначальное значение 50." +msgstr "Процентное соотношение захламления в файле хранилища до его уплотнения." #: libraries/engines/pbms.lib.php:35 libraries/replication_gui.lib.php:69 #: server_synchronize.php:1161 @@ -5323,10 +5315,12 @@ msgid "" "The port for the PBMS stream-based communications. Setting this value to 0 " "will disable HTTP communication with the daemon." msgstr "" +"Порт для PBMS поточных соединений. Установка этого значения равным 0 " +"запретит HTTP соединение с процессом." #: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" -msgstr "" +msgstr "Порог хранилища" #: libraries/engines/pbms.lib.php:41 msgid "" @@ -5334,22 +5328,27 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"Максимальный размер файла хранилища BLOB. Вы можете использовать Kb, MB или " +"GB для обозначения единицы измерения. Отсутствие единицы измерения означает " +"значение в байтах." #: libraries/engines/pbms.lib.php:45 msgid "Temp Blob Timeout" -msgstr "" +msgstr "Лимит временного BLOB" #: libraries/engines/pbms.lib.php:46 msgid "" "The timeout, in seconds, for temporary BLOBs. Uploaded BLOB data is removed " "after this time, unless they are referenced by a record in the database." msgstr "" +"Интервал в секундах для временных BLOB данных. Загруженные BLOB данные " +"удаляются по истечении этого времени, если на них не ссылаются записи в базе " +"данных." #: libraries/engines/pbms.lib.php:50 -#, fuzzy #| msgid "Log file threshold" msgid "Temp Log Threshold" -msgstr "Порог файла журнала" +msgstr "Порог временного журнала" #: libraries/engines/pbms.lib.php:51 msgid "" @@ -5357,26 +5356,35 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"Максимальный размер временного файла журнала BLOB. Вы можете использовать " +"Kb, MB или GB для обозначения единицы измерения. Отсутствие единицы " +"измерения означает значение в байтах." #: libraries/engines/pbms.lib.php:55 msgid "Max Keep Alive" -msgstr "" +msgstr "Максимальное время жизни" #: libraries/engines/pbms.lib.php:56 msgid "" "The timeout for inactive connection with the keep-alive flag set. After this " "time the connection will be closed. The time-out is in milliseconds (1/1000)." msgstr "" +"Временное ограничение для неактивных соединений с установленным флагом Keep-" +"Alive. По истечении этого времени соединение будет закрыто. Лимит " +"указывается в миллисекундах (1/1000)." #: libraries/engines/pbms.lib.php:60 msgid "Metadata Headers" -msgstr "" +msgstr "Заголовки метаданных" #: libraries/engines/pbms.lib.php:61 msgid "" "A \":\" delimited list of metadata headers to be used to initialize the " "pbms_metadata_header table when a database is created." msgstr "" +"Символ \":\" разделяет список заголовков метаданных, которые будут " +"использоваться для инициализации pbms_metadata_header таблицы при создании " +"базы данных." #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5528,57 +5536,49 @@ msgstr "" "порядковый номер." #: libraries/export/csv.php:21 libraries/import/csv.php:27 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns separated with:" -msgstr "Разделитель строк" +msgstr "Разделитель полей:" #: libraries/export/csv.php:22 libraries/import/csv.php:28 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed with:" -msgstr "Значения полей обрамлены" +msgstr "Значения полей обрамлены:" #: libraries/export/csv.php:23 libraries/import/csv.php:29 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped with:" -msgstr "Символ экранирования" +msgstr "Символ экранирования:" #: libraries/export/csv.php:24 libraries/import/csv.php:30 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Разделитель строк" +msgstr "Разделитель строк:" #: libraries/export/csv.php:25 libraries/export/excel.php:22 #: libraries/export/htmlword.php:28 libraries/export/latex.php:79 #: libraries/export/ods.php:23 libraries/export/odt.php:59 #: libraries/export/xls.php:23 libraries/export/xlsx.php:23 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" -msgstr "Заменить NULL на" +msgstr "Заменить NULL на:" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove carriage return/line feed characters within columns" -msgstr "Удалите из полей символы CRLF" +msgstr "Удалить из полей символы разрыва строк" #: libraries/export/excel.php:32 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" -msgstr "Excel-версия" +msgstr "Версия Excel:" #: libraries/export/htmlword.php:27 libraries/export/latex.php:69 #: libraries/export/odt.php:55 libraries/export/sql.php:132 #: libraries/export/texytext.php:25 libraries/export/xml.php:45 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Параметры отображения списка баз данных" +msgstr "Параметры сохранения данных" #: libraries/export/htmlword.php:135 libraries/export/odt.php:175 #: libraries/export/sql.php:946 libraries/export/texytext.php:123 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1405-ge3870e9
by Madhura Jayaratne 25 Jan '11

25 Jan '11

The branch, master has been updated via e3870e938edabc3cdd0f5c71fd9a2a87359f3271 (commit) via cc7cd4eca883f6df996f9a3914ab1b6bb4132d91 (commit) from 251ecae49d17dafbccd802c1e004b8e8adffd01f (commit) - Log ----------------------------------------------------------------- commit e3870e938edabc3cdd0f5c71fd9a2a87359f3271 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Jan 25 08:10:54 2011 +0530 Avoid current page being reset to initial page when an empty table is encountered. commit cc7cd4eca883f6df996f9a3914ab1b6bb4132d91 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Jan 25 00:28:52 2011 +0530 To avoid php notices on undefined variables ----------------------------------------------------------------------- Summary of changes: libraries/export/pdf.php | 2 +- libraries/schema/Pdf_Relation_Schema.class.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index f1aeb6d..8e2bd53 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -152,7 +152,7 @@ class PMA_PDF extends TCPDF // Now let's start to write the table $row = 0; $tmpheight = array(); - $maxpage = 0; + $maxpage = $this->page; while ($data = PMA_DBI_fetch_row($this->results)) { $this->page = $currpage; diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 73f075b..46644dc 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -979,14 +979,17 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ private function _strokeGrid() { - global $pdf, $with_doc; + global $pdf; $gridSize = 10; $labelHeight = 4; $labelWidth = 5; - if ($with_doc) { + if ($this->withDoc) { $topSpace = 6; $bottomSpace = 15; + } else { + $topSpace = 0; + $bottomSpace = 0; } $pdf->SetMargins(0, 0); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1403-g251ecae
by Marc Delisle 24 Jan '11

24 Jan '11

The branch, master has been updated via 251ecae49d17dafbccd802c1e004b8e8adffd01f (commit) from dec8229eaeb6ce91db2886f2842c4eb2458acaa7 (commit) - Log ----------------------------------------------------------------- commit 251ecae49d17dafbccd802c1e004b8e8adffd01f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 24 06:20:26 2011 -0500 Bug #3163256 Ajax copy database does not refresh the database list in case the "switch to copied database" option is not ticked ----------------------------------------------------------------------- Summary of changes: js/common.js | 24 ++++++++++++++++-------- js/db_operations.js | 5 +++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/js/common.js b/js/common.js index 9a690c6..0ab1e88 100644 --- a/js/common.js +++ b/js/common.js @@ -187,15 +187,23 @@ function refreshMain(url) { * @uses lang * @uses collation_connection * @uses encodeURIComponent() + * @param boolean force force reloading */ -function refreshNavigation() { - goTo('navigation.php?server=' + encodeURIComponent(server) + - '&token=' + encodeURIComponent(token) + - '&db=' + encodeURIComponent(db) + - '&table=' + encodeURIComponent(table) + - '&lang=' + encodeURIComponent(lang) + - '&collation_connection=' + encodeURIComponent(collation_connection) - ); +function refreshNavigation(force) { + // The goTo() function won't refresh in case the target + // url is the same as the url given as parameter, but sometimes + // we want to refresh anyway. + if (typeof force != undefined && force && window.parent && window.parent.frame_navigation) { + window.parent.frame_navigation.location.reload(); + } else { + goTo('navigation.php?server=' + encodeURIComponent(server) + + '&token=' + encodeURIComponent(token) + + '&db=' + encodeURIComponent(db) + + '&table=' + encodeURIComponent(table) + + '&lang=' + encodeURIComponent(lang) + + '&collation_connection=' + encodeURIComponent(collation_connection) + ); + } } /** diff --git a/js/db_operations.js b/js/db_operations.js index 0f9240a..12b17c1 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -100,6 +100,11 @@ $(document).ready(function() { window.parent.db = data.newname; window.parent.refreshMain(); window.parent.refreshNavigation(); + } else { + // Here we force a refresh because the navigation + // frame url is not changing so this function would + // not refresh it + window.parent.refreshNavigation(true); } } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1402-gdec8229
by Madhura Jayaratne 24 Jan '11

24 Jan '11

The branch, master has been updated via dec8229eaeb6ce91db2886f2842c4eb2458acaa7 (commit) from 467b7c9afe84f7f0c881ea462e9ecd3ad4f0b2a2 (commit) - Log ----------------------------------------------------------------- commit dec8229eaeb6ce91db2886f2842c4eb2458acaa7 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Jan 24 00:23:48 2011 +0530 bug #3164338 [pdf] Exporting database to PDF incomplete ----------------------------------------------------------------------- Summary of changes: libraries/export/pdf.php | 258 +++++++++++++++++++++++++--------------------- 1 files changed, 140 insertions(+), 118 deletions(-) diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index 59fd8f4..f1aeb6d 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -85,19 +85,20 @@ class PMA_PDF extends TCPDF function Header() { global $maxY; - // Check if header for this page already exists if (!isset($this->headerset[$this->page])) { $fullwidth = 0; foreach ($this->tablewidths as $width) { $fullwidth += $width; } - $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*2); + $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*3); $this->cellFontSize = $this->FontSizePt ; $this->SetFont(PMA_PDF_FONT, '', ($this->titleFontSize ? $this->titleFontSize : $this->FontSizePt)); $this->Cell(0, $this->FontSizePt, $this->titleText, 0, 1, 'C'); - $l = ($this->lMargin); $this->SetFont(PMA_PDF_FONT, '', $this->cellFontSize); + $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*1.5); + $this->Cell(0, $this->FontSizePt, __('Database') .': ' .$this->currentDb .', ' .__('Table') .': ' .$this->currentTable, 0, 1, 'L'); + $l = ($this->lMargin); foreach ($this->colTitles as $col => $txt) { $this->SetXY($l, ($this->tMargin)); $this->MultiCell($this->tablewidths[$col], $this->FontSizePt, $txt); @@ -207,12 +208,26 @@ class PMA_PDF extends TCPDF $this->page = $maxpage; } - - function mysql_report($query, $attr = array()) + function setAttributes($attr = array()) { foreach ($attr as $key => $val){ $this->$key = $val ; } + } + + function setTopMargin($topMargin) + { + $this->tMargin = $topMargin; + } + + function mysql_report($query) + { + unset($this->tablewidths); + unset($this->colTitles); + unset($this->titleWidth); + unset($this->colFits); + unset($this->display_column); + unset($this->colAlign); /** * Pass 1 for column widths @@ -221,118 +236,114 @@ class PMA_PDF extends TCPDF $this->numFields = PMA_DBI_num_fields($this->results); $this->fields = PMA_DBI_get_fields_meta($this->results); - // if column widths not set - if (!isset($this->tablewidths)){ - - // sColWidth = starting col width (an average size width) - $availableWidth = $this->w - $this->lMargin - $this->rMargin; - $this->sColWidth = $availableWidth / $this->numFields; - $totalTitleWidth = 0; - - // loop through results header and set initial col widths/ titles/ alignment - // if a col title is less than the starting col width, reduce that column size - for ($i = 0; $i < $this->numFields; $i++){ - $stringWidth = $this->getstringwidth($this->fields[$i]->name) + 6 ; - // save the real title's width - $titleWidth[$i] = $stringWidth; - $totalTitleWidth += $stringWidth; - - // set any column titles less than the start width to the column title width - if ($stringWidth < $this->sColWidth){ - $colFits[$i] = $stringWidth ; - } - $this->colTitles[$i] = $this->fields[$i]->name; - $this->display_column[$i] = true; - - switch ($this->fields[$i]->type){ - case 'int': - $this->colAlign[$i] = 'R'; - break; - case 'blob': - case 'tinyblob': - case 'mediumblob': - case 'longblob': - /** - * @todo do not deactivate completely the display - * but show the field's name and [BLOB] - */ - if (stristr($this->fields[$i]->flags, 'BINARY')) { - $this->display_column[$i] = false; - unset($this->colTitles[$i]); - } - $this->colAlign[$i] = 'L'; - break; - default: - $this->colAlign[$i] = 'L'; + // sColWidth = starting col width (an average size width) + $availableWidth = $this->w - $this->lMargin - $this->rMargin; + $this->sColWidth = $availableWidth / $this->numFields; + $totalTitleWidth = 0; + + // loop through results header and set initial col widths/ titles/ alignment + // if a col title is less than the starting col width, reduce that column size + for ($i = 0; $i < $this->numFields; $i++){ + $stringWidth = $this->getstringwidth($this->fields[$i]->name) + 6 ; + // save the real title's width + $titleWidth[$i] = $stringWidth; + $totalTitleWidth += $stringWidth; + + // set any column titles less than the start width to the column title width + if ($stringWidth < $this->sColWidth){ + $colFits[$i] = $stringWidth ; + } + $this->colTitles[$i] = $this->fields[$i]->name; + $this->display_column[$i] = true; + + switch ($this->fields[$i]->type){ + case 'int': + $this->colAlign[$i] = 'R'; + break; + case 'blob': + case 'tinyblob': + case 'mediumblob': + case 'longblob': + /** + * @todo do not deactivate completely the display + * but show the field's name and [BLOB] + */ + if (stristr($this->fields[$i]->flags, 'BINARY')) { + $this->display_column[$i] = false; + unset($this->colTitles[$i]); } + $this->colAlign[$i] = 'L'; + break; + default: + $this->colAlign[$i] = 'L'; } + } - // title width verification - if ($totalTitleWidth > $availableWidth) { - $adjustingMode = true; - } else { - $adjustingMode = false; - // we have enough space for all the titles at their - // original width so use the true title's width - foreach ($titleWidth as $key => $val) { - $colFits[$key] = $val; - } + // title width verification + if ($totalTitleWidth > $availableWidth) { + $adjustingMode = true; + } else { + $adjustingMode = false; + // we have enough space for all the titles at their + // original width so use the true title's width + foreach ($titleWidth as $key => $val) { + $colFits[$key] = $val; } + } - // loop through the data; any column whose contents - // is greater than the column size is resized - /** - * @todo force here a LIMIT to avoid reading all rows - */ - while ($row = PMA_DBI_fetch_row($this->results)) { - foreach ($colFits as $key => $val) { - $stringWidth = $this->getstringwidth($row[$key]) + 6 ; - if ($adjustingMode && ($stringWidth > $this->sColWidth)) { - // any column whose data's width is bigger than the start width is now discarded - unset($colFits[$key]); - } else { - // if data's width is bigger than the current column width, - // enlarge the column (but avoid enlarging it if the - // data's width is very big) - if ($stringWidth > $val && $stringWidth < ($this->sColWidth * 3)) { - $colFits[$key] = $stringWidth ; - } + // loop through the data; any column whose contents + // is greater than the column size is resized + /** + * @todo force here a LIMIT to avoid reading all rows + */ + while ($row = PMA_DBI_fetch_row($this->results)) { + foreach ($colFits as $key => $val) { + $stringWidth = $this->getstringwidth($row[$key]) + 6 ; + if ($adjustingMode && ($stringWidth > $this->sColWidth)) { + // any column whose data's width is bigger than the start width is now discarded + unset($colFits[$key]); + } else { + // if data's width is bigger than the current column width, + // enlarge the column (but avoid enlarging it if the + // data's width is very big) + if ($stringWidth > $val && $stringWidth < ($this->sColWidth * 3)) { + $colFits[$key] = $stringWidth ; } } } + } - $totAlreadyFitted = 0; - foreach ($colFits as $key => $val){ - // set fitted columns to smallest size - $this->tablewidths[$key] = $val; - // to work out how much (if any) space has been freed up - $totAlreadyFitted += $val; - } + $totAlreadyFitted = 0; + foreach ($colFits as $key => $val){ + // set fitted columns to smallest size + $this->tablewidths[$key] = $val; + // to work out how much (if any) space has been freed up + $totAlreadyFitted += $val; + } - if ($adjustingMode) { - $surplus = (sizeof($colFits) * $this->sColWidth) - $totAlreadyFitted; - $surplusToAdd = $surplus / ($this->numFields - sizeof($colFits)); - } else { - $surplusToAdd = 0; - } + if ($adjustingMode) { + $surplus = (sizeof($colFits) * $this->sColWidth) - $totAlreadyFitted; + $surplusToAdd = $surplus / ($this->numFields - sizeof($colFits)); + } else { + $surplusToAdd = 0; + } - for ($i=0; $i < $this->numFields; $i++) { - if (!in_array($i, array_keys($colFits))) { - $this->tablewidths[$i] = $this->sColWidth + $surplusToAdd; - } - if ($this->display_column[$i] == false) { - $this->tablewidths[$i] = 0; - } + for ($i=0; $i < $this->numFields; $i++) { + if (!in_array($i, array_keys($colFits))) { + $this->tablewidths[$i] = $this->sColWidth + $surplusToAdd; + } + if ($this->display_column[$i] == false) { + $this->tablewidths[$i] = 0; } - - ksort($this->tablewidths); } + + ksort($this->tablewidths); + PMA_DBI_free_result($this->results); // Pass 2 $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED); - $this->Open(); $this->setY($this->tMargin); $this->AddPage(); $this->morepagestable($this->FontSizePt); @@ -342,6 +353,8 @@ class PMA_PDF extends TCPDF } // end of PMA_PDF class +$pdf = new PMA_PDF('L', 'pt', 'A3'); + /** * Outputs comment * @@ -355,7 +368,7 @@ function PMA_exportComment($text) } /** - * Outputs export footer + * Finalize the pdf. * * @return bool Whether it suceeded * @@ -363,11 +376,18 @@ function PMA_exportComment($text) */ function PMA_exportFooter() { + global $pdf; + + // instead of $pdf->Output(): + if (!PMA_exportOutputHandler($pdf->getPDFData())) { + return FALSE; + } + return TRUE; } /** - * Outputs export header + * Initialize the pdf to export data. * * @return bool Whether it suceeded * @@ -375,6 +395,21 @@ function PMA_exportFooter() */ function PMA_exportHeader() { + global $pdf_report_title; + global $pdf; + + $pdf->AddFont('DejaVuSans', '', 'dejavusans.php'); + $pdf->AddFont('DejaVuSans', 'B', 'dejavusansb.php'); + $pdf->AddFont('DejaVuSerif', '', 'dejavuserif.php'); + $pdf->AddFont('DejaVuSerif', 'B', 'dejavuserifb.php'); + $pdf->SetFont(PMA_PDF_FONT, '', 11.5); + $pdf->AliasNbPages(); + $pdf->Open(); + + $attr=array('titleFontSize' => 18, 'titleText' => $pdf_report_title); + $pdf->setAttributes($attr); + $pdf->setTopMargin(45); + return TRUE; } @@ -436,24 +471,11 @@ function PMA_exportDBCreate($db) */ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { - global $what; - global $pdf_report_title; + global $pdf; - $pdf = new PMA_PDF('L', 'pt', 'A3'); - - $pdf->AddFont('DejaVuSans', '', 'dejavusans.php'); - $pdf->AddFont('DejaVuSans', 'B', 'dejavusansb.php'); - $pdf->AddFont('DejaVuSerif', '', 'dejavuserif.php'); - $pdf->AddFont('DejaVuSerif', 'B', 'dejavuserifb.php'); - $pdf->SetFont(PMA_PDF_FONT, '', 11.5); - $pdf->AliasNbPages(); - $attr=array('titleFontSize' => 18, 'titleText' => $pdf_report_title); - $pdf->mysql_report($sql_query, $attr); - - // instead of $pdf->Output(): - if (!PMA_exportOutputHandler($pdf->getPDFData())) { - return FALSE; - } + $attr=array('currentDb' => $db, 'currentTable' => $table); + $pdf->setAttributes($attr); + $pdf->mysql_report($sql_query); return TRUE; } // end of the 'PMA_exportData()' function hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1401-g467b7c9
by Michal Čihař 23 Jan '11

23 Jan '11

The branch, master has been updated via 467b7c9afe84f7f0c881ea462e9ecd3ad4f0b2a2 (commit) via b035f7bd1a9f6872c7817b4afb22c68e1c1fcbe0 (commit) via 39a35b7de40c12c804cd580b48952e2171d2e2f1 (commit) via 3d64590a7ae1f4db4881a2ab0c954daa0865dcd9 (commit) via 944adde0370fcf73a5e870e8bd5c9fd8aa88739e (commit) via 20b928592f9ee520f8500f22630a5038659af43c (commit) via 3313c230225ae6135f9cd4d3bbe1da7375d29972 (commit) via 006853ade5e9772f3ad1314f673b4c2d50726a0f (commit) via 0847e6364036a878c411d0bfbb4171a01cc860c6 (commit) via ac637cd94b0ef9b17828e11b5bc52b9e359e878a (commit) via a8fdc1a35104342f0dd35bd98c0bf612ea05cd7c (commit) via 51eba902d82a4e94851b276f0eee04b625961bfc (commit) via d151048e4c7e729b1a370a3fd11b4c958230000f (commit) via f067c490adc31288e8d813da0a607536743fb6b4 (commit) via a8f6886a242c50517f0a5377dadf64414dbaa627 (commit) via d3bd1347109dec17dbc7a1168017d14f2283dbfe (commit) via ebe84e9f53818912550ce38a79a37ff15b21c901 (commit) via be6deae1fe67cd9362fbcb19a08bbad363d26ed8 (commit) via 38f7eee13140dbc1e70b1e05349c5ea4bce407e9 (commit) via a2697b687e3080c82c3b05a9e8ae0aeb3be59b74 (commit) via 2d617b17f5f4035eae42a742abd41e86ee259ce8 (commit) via fa2d50bc8c2551848908b131d40106ec29f61e76 (commit) via 9f8e9fde223d1a918cf64627d9dd3b1c2ea4601a (commit) via 4200b6c1bea6ec946af0395f44783623a208eba8 (commit) via 1cd13d881f17c292dbdfca3511306d97a1478331 (commit) via ab91969ce73f7905d711ca7a9beca842ac51f704 (commit) via b28320a3e27f9792ef82154048a1c570c949e1a9 (commit) via f93bdec431f97c60e9ee22f719b076e5fa7f59f6 (commit) via ba074aacad9ccbfa1a8e6d4aeaa62b78d6fc05a1 (commit) via 3db7c63e37babd2ea1e60365f3fc2900d96e0e08 (commit) via eef592ad9674c5eb5aad0b81d5965c5988fd0099 (commit) via f54ad4f1bccd3246a883823525dfd316ed690c76 (commit) via 9b9f24af0ef2464e073fca8506ed5269fc1b2b36 (commit) via 1f65888465fe551135328ca04fce35bd7a5afdd1 (commit) via 932eeb0384c203fa316fc764463aef0b4e66d893 (commit) via a17ce3a48a59b445a8548a8c892f3aa99b0f2b33 (commit) via 27c5b3c2697b04449c606aee0ea37074319536ad (commit) via 2cf4ed490ad2dbd6652483489c67ab76d7a54c33 (commit) via ab7866dd3a8e974e3f69c8080d7c7df8f81c768a (commit) via b73dfd9967c46171024aeeb31288b8f67f2a6126 (commit) via c43d3282e0ca4356a29c6cb7a7a3647eee707490 (commit) via b72e91cf07277505680608e817838136be80135d (commit) via 45fc1ecfea72f686d9f484c458be2d60333dfac6 (commit) via 6d8bee126038dcc3407cf151fbef86c63696b0d4 (commit) via 697101765a67135658abf6ba70d025927b6d3d4d (commit) via 81c16304ec1f00324e464bac1b5a057ad12963de (commit) via bf14b78ffe73465a43c694c0f0f1fb853083c4c7 (commit) via cb247f1ab9540d7b9ed0e7be0e2045f81d33cc07 (commit) via 1442c3bacd1caf8ec7bac0aa5546cb133dce0dce (commit) via a9b6d70f14369da791580f982751a533f33fb409 (commit) via 83c68770e1f762fb5cdd7ed1c92aedfe6cde8bbe (commit) via a28f1999a7f0d0aefa447a8ab46fba3fef137389 (commit) via 254b7baa4e807d680a0e5fe018e8e0c18426a778 (commit) via 05cdf8a05d7577bb5984dd1babda9b4cde4e3503 (commit) via acd32be4b35a65a1ea3cf140e4f9576e95bb10f8 (commit) via bb6aa57fb71ddd712c89c991ae530a560edb3561 (commit) via fe752c2f656414c6dea123c3b2afabe0237bd634 (commit) via a56e47e46aaedac8fd3ecfc29bd0f44efc1597ce (commit) via 449a14b369ca43ea5f670e2b6ba8489fd612f0c1 (commit) via 3a54dbbbb8f0d90c8559a74c24eb5ced1dfe605b (commit) via 23b28ec74cc497ea6526bf10dd0fe27b7ff51251 (commit) via 61d241087c04e6876bfddbcb64c1a020d65c0c93 (commit) via 40cc536d19e49aa6dc56d7b9351375b2aadd28e3 (commit) via 8618166240547a260b03770a85bc6f72fe5a4268 (commit) via 410aae1a45c1eee733a0fb3551691bf84069be86 (commit) via 4a33dc94d96027052182c12a0d0e8f128cde6f90 (commit) via 5b45e946a1d3fb0608915900686768a5b243de71 (commit) via 6b9dd4aaa3e3dedeaf29a61ba7a22584c6feaf23 (commit) via 035e298c79604fa211daf62786b0e34a6fbe8696 (commit) via ac06ec3e429edf0dc802f9ccec372b8ddddd5456 (commit) via c08e3bb3639d8c20ee0eafbb4efc0960d2a49814 (commit) via 94847c6bfbc25a1fcfe6475fe682c2396b270bfe (commit) via 404c72e1f92a74f9601da78a3bd93f52c06e50d9 (commit) via b86faf6f2b3266560dd7aac8be98735083d768b3 (commit) via 6e6ca3369372c0a33aee5bafe9c63a5734f28583 (commit) via 54fc8cb766d9fa4790038c233b336c0b36594216 (commit) via 1f2d2183cda86fb35f091e80d0da46098366be7d (commit) via 369340fe3ff47c524ffd496c10789cc2970d63f4 (commit) via 004f7df6b7f48b195de24425539a30f4927be6b5 (commit) via 33fcf73daa3294cddcaf3805d869dce26fa91f14 (commit) via 34f97fd56dd1ad2f61ea0964f686c8a15d47c500 (commit) from 63a224b05af1fc40cdf28a66f309ece251a0983b (commit) - Log ----------------------------------------------------------------- commit 467b7c9afe84f7f0c881ea462e9ecd3ad4f0b2a2 Merge: b035f7bd1a9f6872c7817b4afb22c68e1c1fcbe0 63a224b05af1fc40cdf28a66f309ece251a0983b Author: Pootle server <pootle(a)cihar.com> Date: Sun Jan 23 14:40:25 2011 +0100 Merge remote branch 'origin/master' commit b035f7bd1a9f6872c7817b4afb22c68e1c1fcbe0 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 15:04:14 2011 +0200 Translation update done using Pootle. commit 39a35b7de40c12c804cd580b48952e2171d2e2f1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 14:57:33 2011 +0200 Translation update done using Pootle. commit 3d64590a7ae1f4db4881a2ab0c954daa0865dcd9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 14:56:40 2011 +0200 Translation update done using Pootle. commit 944adde0370fcf73a5e870e8bd5c9fd8aa88739e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 14:55:12 2011 +0200 Translation update done using Pootle. commit 20b928592f9ee520f8500f22630a5038659af43c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 14:44:55 2011 +0200 Translation update done using Pootle. commit 3313c230225ae6135f9cd4d3bbe1da7375d29972 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 14:44:16 2011 +0200 Translation update done using Pootle. commit 006853ade5e9772f3ad1314f673b4c2d50726a0f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 14:41:14 2011 +0200 Translation update done using Pootle. commit 0847e6364036a878c411d0bfbb4171a01cc860c6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 14:38:43 2011 +0200 Translation update done using Pootle. commit ac637cd94b0ef9b17828e11b5bc52b9e359e878a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 14:37:54 2011 +0200 Translation update done using Pootle. commit a8fdc1a35104342f0dd35bd98c0bf612ea05cd7c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 14:37:11 2011 +0200 Translation update done using Pootle. commit 51eba902d82a4e94851b276f0eee04b625961bfc Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Jan 23 14:35:53 2011 +0200 Translation update done using Pootle. commit d151048e4c7e729b1a370a3fd11b4c958230000f Merge: f067c490adc31288e8d813da0a607536743fb6b4 8cbee94e5d284ddfeda527379b9893e737bc5d4f Author: Pootle server <pootle(a)cihar.com> Date: Sat Jan 22 16:40:08 2011 +0100 Merge remote branch 'origin/master' commit f067c490adc31288e8d813da0a607536743fb6b4 Merge: a8f6886a242c50517f0a5377dadf64414dbaa627 3a739c1beec1d300bf0d54d8b7f3136f1775fcee Author: Pootle server <pootle(a)cihar.com> Date: Sat Jan 22 14:40:23 2011 +0100 Merge remote branch 'origin/master' commit a8f6886a242c50517f0a5377dadf64414dbaa627 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:30:16 2011 +0200 Translation update done using Pootle. commit d3bd1347109dec17dbc7a1168017d14f2283dbfe Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:29:32 2011 +0200 Translation update done using Pootle. commit ebe84e9f53818912550ce38a79a37ff15b21c901 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:29:13 2011 +0200 Translation update done using Pootle. commit be6deae1fe67cd9362fbcb19a08bbad363d26ed8 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:27:27 2011 +0200 Translation update done using Pootle. commit 38f7eee13140dbc1e70b1e05349c5ea4bce407e9 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:26:39 2011 +0200 Translation update done using Pootle. commit a2697b687e3080c82c3b05a9e8ae0aeb3be59b74 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:25:51 2011 +0200 Translation update done using Pootle. commit 2d617b17f5f4035eae42a742abd41e86ee259ce8 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:23:41 2011 +0200 Translation update done using Pootle. commit fa2d50bc8c2551848908b131d40106ec29f61e76 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:21:52 2011 +0200 Translation update done using Pootle. commit 9f8e9fde223d1a918cf64627d9dd3b1c2ea4601a Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:21:16 2011 +0200 Translation update done using Pootle. commit 4200b6c1bea6ec946af0395f44783623a208eba8 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:20:08 2011 +0200 Translation update done using Pootle. commit 1cd13d881f17c292dbdfca3511306d97a1478331 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:19:42 2011 +0200 Translation update done using Pootle. commit ab91969ce73f7905d711ca7a9beca842ac51f704 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:18:45 2011 +0200 Translation update done using Pootle. commit b28320a3e27f9792ef82154048a1c570c949e1a9 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:17:06 2011 +0200 Translation update done using Pootle. commit f93bdec431f97c60e9ee22f719b076e5fa7f59f6 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:16:37 2011 +0200 Translation update done using Pootle. commit ba074aacad9ccbfa1a8e6d4aeaa62b78d6fc05a1 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:16:24 2011 +0200 Translation update done using Pootle. commit 3db7c63e37babd2ea1e60365f3fc2900d96e0e08 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:14:48 2011 +0200 Translation update done using Pootle. commit eef592ad9674c5eb5aad0b81d5965c5988fd0099 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:13:10 2011 +0200 Translation update done using Pootle. commit f54ad4f1bccd3246a883823525dfd316ed690c76 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:12:21 2011 +0200 Translation update done using Pootle. commit 9b9f24af0ef2464e073fca8506ed5269fc1b2b36 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:11:06 2011 +0200 Translation update done using Pootle. commit 1f65888465fe551135328ca04fce35bd7a5afdd1 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:10:50 2011 +0200 Translation update done using Pootle. commit 932eeb0384c203fa316fc764463aef0b4e66d893 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:10:28 2011 +0200 Translation update done using Pootle. commit a17ce3a48a59b445a8548a8c892f3aa99b0f2b33 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:10:13 2011 +0200 Translation update done using Pootle. commit 27c5b3c2697b04449c606aee0ea37074319536ad Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:10:04 2011 +0200 Translation update done using Pootle. commit 2cf4ed490ad2dbd6652483489c67ab76d7a54c33 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:07:53 2011 +0200 Translation update done using Pootle. commit ab7866dd3a8e974e3f69c8080d7c7df8f81c768a Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:07:40 2011 +0200 Translation update done using Pootle. commit b73dfd9967c46171024aeeb31288b8f67f2a6126 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:07:12 2011 +0200 Translation update done using Pootle. commit c43d3282e0ca4356a29c6cb7a7a3647eee707490 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:06:35 2011 +0200 Translation update done using Pootle. commit b72e91cf07277505680608e817838136be80135d Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:05:22 2011 +0200 Translation update done using Pootle. commit 45fc1ecfea72f686d9f484c458be2d60333dfac6 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:03:59 2011 +0200 Translation update done using Pootle. commit 6d8bee126038dcc3407cf151fbef86c63696b0d4 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:03:47 2011 +0200 Translation update done using Pootle. commit 697101765a67135658abf6ba70d025927b6d3d4d Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:03:07 2011 +0200 Translation update done using Pootle. commit 81c16304ec1f00324e464bac1b5a057ad12963de Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:02:21 2011 +0200 Translation update done using Pootle. commit bf14b78ffe73465a43c694c0f0f1fb853083c4c7 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 15:01:25 2011 +0200 Translation update done using Pootle. commit cb247f1ab9540d7b9ed0e7be0e2045f81d33cc07 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 14:59:36 2011 +0200 Translation update done using Pootle. commit 1442c3bacd1caf8ec7bac0aa5546cb133dce0dce Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 14:58:46 2011 +0200 Translation update done using Pootle. commit a9b6d70f14369da791580f982751a533f33fb409 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 14:57:16 2011 +0200 Translation update done using Pootle. commit 83c68770e1f762fb5cdd7ed1c92aedfe6cde8bbe Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 14:56:48 2011 +0200 Translation update done using Pootle. commit a28f1999a7f0d0aefa447a8ab46fba3fef137389 Author: stefan <stefan(a)inkopsforum.se> Date: Sat Jan 22 14:55:31 2011 +0200 Translation update done using Pootle. commit 254b7baa4e807d680a0e5fe018e8e0c18426a778 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:52:34 2011 +0200 Translation update done using Pootle. commit 05cdf8a05d7577bb5984dd1babda9b4cde4e3503 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:50:28 2011 +0200 Translation update done using Pootle. commit acd32be4b35a65a1ea3cf140e4f9576e95bb10f8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:43:53 2011 +0200 Translation update done using Pootle. commit bb6aa57fb71ddd712c89c991ae530a560edb3561 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:42:03 2011 +0200 Translation update done using Pootle. commit fe752c2f656414c6dea123c3b2afabe0237bd634 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:41:49 2011 +0200 Translation update done using Pootle. commit a56e47e46aaedac8fd3ecfc29bd0f44efc1597ce Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:41:12 2011 +0200 Translation update done using Pootle. commit 449a14b369ca43ea5f670e2b6ba8489fd612f0c1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:40:59 2011 +0200 Translation update done using Pootle. commit 3a54dbbbb8f0d90c8559a74c24eb5ced1dfe605b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:40:43 2011 +0200 Translation update done using Pootle. commit 23b28ec74cc497ea6526bf10dd0fe27b7ff51251 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:40:01 2011 +0200 Translation update done using Pootle. commit 61d241087c04e6876bfddbcb64c1a020d65c0c93 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:38:56 2011 +0200 Translation update done using Pootle. commit 40cc536d19e49aa6dc56d7b9351375b2aadd28e3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:36:29 2011 +0200 Translation update done using Pootle. commit 8618166240547a260b03770a85bc6f72fe5a4268 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:33:42 2011 +0200 Translation update done using Pootle. commit 410aae1a45c1eee733a0fb3551691bf84069be86 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:33:23 2011 +0200 Translation update done using Pootle. commit 4a33dc94d96027052182c12a0d0e8f128cde6f90 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:33:01 2011 +0200 Translation update done using Pootle. commit 5b45e946a1d3fb0608915900686768a5b243de71 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:31:22 2011 +0200 Translation update done using Pootle. commit 6b9dd4aaa3e3dedeaf29a61ba7a22584c6feaf23 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:31:06 2011 +0200 Translation update done using Pootle. commit 035e298c79604fa211daf62786b0e34a6fbe8696 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:30:06 2011 +0200 Translation update done using Pootle. commit ac06ec3e429edf0dc802f9ccec372b8ddddd5456 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:29:02 2011 +0200 Translation update done using Pootle. commit c08e3bb3639d8c20ee0eafbb4efc0960d2a49814 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:28:34 2011 +0200 Translation update done using Pootle. commit 94847c6bfbc25a1fcfe6475fe682c2396b270bfe Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:27:53 2011 +0200 Translation update done using Pootle. commit 404c72e1f92a74f9601da78a3bd93f52c06e50d9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:27:36 2011 +0200 Translation update done using Pootle. commit b86faf6f2b3266560dd7aac8be98735083d768b3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:26:53 2011 +0200 Translation update done using Pootle. commit 6e6ca3369372c0a33aee5bafe9c63a5734f28583 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:26:13 2011 +0200 Translation update done using Pootle. commit 54fc8cb766d9fa4790038c233b336c0b36594216 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:25:57 2011 +0200 Translation update done using Pootle. commit 1f2d2183cda86fb35f091e80d0da46098366be7d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:24:52 2011 +0200 Translation update done using Pootle. commit 369340fe3ff47c524ffd496c10789cc2970d63f4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:24:26 2011 +0200 Translation update done using Pootle. commit 004f7df6b7f48b195de24425539a30f4927be6b5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:22:45 2011 +0200 Translation update done using Pootle. commit 33fcf73daa3294cddcaf3805d869dce26fa91f14 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:21:04 2011 +0200 Translation update done using Pootle. commit 34f97fd56dd1ad2f61ea0964f686c8a15d47c500 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Jan 21 22:20:26 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 113 ++++++++++++++++++++++++++----------------------------------- po/sv.po | 97 ++++++++++++++++++++--------------------------------- 2 files changed, 84 insertions(+), 126 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2c0a6d0..213954c 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-20 22:40+0200\n" +"PO-Revision-Date: 2011-01-23 15:04+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -4698,66 +4698,59 @@ msgid "Exporting databases from the current server" msgstr "Экспорт баз данных с текущего сервера" #: libraries/display_export.lib.php:89 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Exporting tables from \"%s\" database" -msgstr "Создать новую таблицу в базе данных %s" +msgstr "Экспорт таблиц из базы данных \"%s\"" #: libraries/display_export.lib.php:91 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Exporting rows from \"%s\" table" -msgstr "Создать новую таблицу в базе данных %s" +msgstr "Экспорт строк из таблицы \"%s\"" #: libraries/display_export.lib.php:97 -#, fuzzy #| msgid "Export type" msgid "Export Method:" -msgstr "Тип экспорта" +msgstr "Способ экспорта" #: libraries/display_export.lib.php:113 msgid "Quick - display only the minimal options" -msgstr "" +msgstr "Быстрый - отображать минимум настроек" #: libraries/display_export.lib.php:129 -#, fuzzy #| msgid "Customize default export options" msgid "Custom - display all possible options" -msgstr "Настройте параметры экспорта используемые по умолчанию" +msgstr "Обычный - отображать все возможные настройки" #: libraries/display_export.lib.php:137 -#, fuzzy #| msgid "Databases" msgid "Database(s):" -msgstr "Базы данных" +msgstr "Базы данных:" #: libraries/display_export.lib.php:139 -#, fuzzy #| msgid "Tables" msgid "Table(s):" -msgstr "Таблицы" +msgstr "Таблицы:" #: libraries/display_export.lib.php:149 -#, fuzzy #| msgid "Rows" msgid "Rows:" -msgstr "Строки" +msgstr "Строки:" #: libraries/display_export.lib.php:157 -#, fuzzy #| msgid "Dump all rows" msgid "Dump some row(s)" -msgstr "Выгрузить все строки" +msgstr "Выгрузить часть строк" #: libraries/display_export.lib.php:159 -#, fuzzy #| msgid "Number of fields" msgid "Number of rows:" -msgstr "Количество полей" +msgstr "Количество строк:" #: libraries/display_export.lib.php:162 msgid "Row to begin at:" -msgstr "" +msgstr "Начать со строки:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" @@ -4765,40 +4758,38 @@ msgstr "Выгрузить все строки" #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202 msgid "Output:" -msgstr "" +msgstr "Вывод:" #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 -#, fuzzy, php-format +#, php-format #| msgid "Save on server in %s directory" msgid "Save on server in the directory <b>%s</b>" -msgstr "Сохранить на сервере в каталоге %s" +msgstr "Сохранить на сервере в каталоге <b>%s</b>" #: libraries/display_export.lib.php:206 -#, fuzzy #| msgid "Save as file" msgid "Save output to a file" -msgstr "Сохранить как файл" +msgstr "Сохранить вывод в файл" #: libraries/display_export.lib.php:227 -#, fuzzy #| msgid "File name template" msgid "File name template:" -msgstr "Шаблон имени файла" +msgstr "Шаблон имени файла:" #: libraries/display_export.lib.php:229 msgid "@SERVER@ will become the server name" -msgstr "" +msgstr "@SERVER@ будет замещено именем сервера" #: libraries/display_export.lib.php:231 msgid ", @DATABASE@ will become the database name" -msgstr "" +msgstr ", @DATABASE@ будет замещено именем базы данных" #: libraries/display_export.lib.php:233 msgid ", @TABLE@ will become the table name" -msgstr "" +msgstr ", @TABLE@ будет замещено именем таблицы" #: libraries/display_export.lib.php:237 -#, fuzzy, php-format +#, php-format #| msgid "" #| "This value is interpreted using %1$sstrftime%2$s, so you can use time " #| "formatting strings. Additionally the following transformations will " @@ -4810,11 +4801,12 @@ msgid "" msgstr "" "Значение обрабатывается функцией %1$sstrftime%2$s, благодаря чему возможна " "вставка текущей даты и времени. Дополнительно могут быть использованы " -"следующие подстановки: %3$s. Остальной текст останется без изменений." +"следующие подстановки: %3$s. Остальной текст останется без изменений. " +"Подробности смотрите в %4$sFAQ%5$s." #: libraries/display_export.lib.php:275 msgid "use this for future exports" -msgstr "" +msgstr "использовать для будущего экспорта" #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:512 @@ -4822,10 +4814,9 @@ msgid "Character set of the file:" msgstr "Кодировка файла:" #: libraries/display_export.lib.php:309 -#, fuzzy #| msgid "Compression" msgid "Compression:" -msgstr "Упаковать" +msgstr "Компрессия:" #: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528 #: libraries/export/sql.php:933 libraries/tbl_properties.inc.php:578 @@ -4834,53 +4825,48 @@ msgid "None" msgstr "Нет" #: libraries/display_export.lib.php:313 -#, fuzzy #| msgid "\"zipped\"" msgid "zipped" msgstr "zip" #: libraries/display_export.lib.php:315 -#, fuzzy #| msgid "\"gzipped\"" msgid "gzipped" msgstr "gzip" #: libraries/display_export.lib.php:317 -#, fuzzy #| msgid "\"bzipped\"" msgid "bzipped" msgstr "bzip" #: libraries/display_export.lib.php:326 -#, fuzzy #| msgid "Save as file" msgid "View output as text" -msgstr "Сохранить как файл" +msgstr "Отобразить вывод как текст" #: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:37 -#, fuzzy #| msgid "Format" msgid "Format:" -msgstr "Формат" +msgstr "Формат:" #: libraries/display_export.lib.php:336 -#, fuzzy #| msgid "Transformation options" msgid "Format-specific options:" -msgstr "Параметры преобразований" +msgstr "Параметры формата:" #: libraries/display_export.lib.php:337 msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Заполните параметры для выбранного формата и игнорируйте параметры остальных " +"форматов." #: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260 -#, fuzzy #| msgid "Recoding engine" msgid "Encoding Conversion:" -msgstr "Механизм перекодирования" +msgstr "Изменение кодировки:" #: libraries/display_import.lib.php:66 msgid "" @@ -4903,49 +4889,48 @@ msgid "" msgstr "Пожалуйста, подождите, файл был загружен. Детали загрузки недоступны." #: libraries/display_import.lib.php:129 -#, fuzzy #| msgid "Cannot log in to the MySQL server" msgid "Importing into the current server" -msgstr "Невозможно подключиться к серверу MySQL" +msgstr "Импорт на текущий сервер" #: libraries/display_import.lib.php:131 -#, fuzzy, php-format +#, php-format #| msgid "Go to database" msgid "Importing into the database \"%s\"" -msgstr "Перейти к базе данных" +msgstr "Импорт в базу данных \"%s\"" #: libraries/display_import.lib.php:133 -#, fuzzy, php-format +#, php-format #| msgid "Go to database" msgid "Importing into the table \"%s\"" -msgstr "Перейти к базе данных" +msgstr "Импорт в таблицу \"%s\"" #: libraries/display_import.lib.php:139 -#, fuzzy #| msgid "File to import" msgid "File to Import:" -msgstr "Импортируемый файл" +msgstr "Импортируемый файл:" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "Файл может быть сжат в архив (%s) или находиться без сжатия." #: libraries/display_import.lib.php:158 msgid "" "A compressed file's name must end in <b>.[format].[compression]</b>. " "Example: <b>.sql.zip</b>" msgstr "" +"Имя сжатого файла должно заканчиваться в виде <b>.[формат].[сжатие]</b>. " +"Пример: <b>.sql.zip</b>" #: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." msgstr "Загрузка файлов на сервер, невозможна." #: libraries/display_import.lib.php:208 -#, fuzzy #| msgid "Partial import" msgid "Partial Import:" -msgstr "Частичный импорт" +msgstr "Частичный импорт:" #: libraries/display_import.lib.php:214 #, php-format @@ -4956,7 +4941,6 @@ msgstr "" "перезапуска импорт будет продолжен с позиции %d." #: libraries/display_import.lib.php:221 -#, fuzzy #| msgid "" #| "Allow the interruption of an import in case the script detects it is " #| "close to the PHP timeout limit. This might be good way to import large " @@ -4967,17 +4951,17 @@ msgid "" "however it can break transactions.)</i>" msgstr "" "Разрешить скрипту разбивать процесс импорта при приближении временного " -"лимита. Может быть использовано при импорте файлов большого размера." +"лимита. <i>(Может быть использовано при импорте файлов большого размера, " +"однако при этом вероятны проблемы с транзакциями.)</i>" #: libraries/display_import.lib.php:228 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of rows to skip, starting from the first row:" -msgstr "Количество запросов пропускаемых от начала импорта" +msgstr "Количество пропускаемых строк, начиная от первой строки:" #: libraries/display_import.lib.php:250 msgid "Format-Specific Options:" -msgstr "" +msgstr "Параметры формата:" #: libraries/display_select_lang.lib.php:44 #: libraries/display_select_lang.lib.php:45 setup/frames/index.inc.php:71 @@ -4990,10 +4974,9 @@ msgid "%d is not valid row number." msgstr "Число %d не является правильным номером строки." #: libraries/display_tbl.lib.php:308 -#, fuzzy #| msgid "row(s) starting from record #" msgid "row(s) starting from row #" -msgstr "строк начиная с" +msgstr "строки начиная от" #: libraries/display_tbl.lib.php:314 msgid "horizontal" diff --git a/po/sv.po b/po/sv.po index cb19be2..b0242f8 100644 --- a/po/sv.po +++ b/po/sv.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-16 18:26+0200\n" +"PO-Revision-Date: 2011-01-22 15:30+0200\n" "Last-Translator: <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" "Language: sv\n" @@ -422,7 +422,7 @@ msgstr "Byt till" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "grafisk modellerare" #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 @@ -475,16 +475,14 @@ msgid "Modify" msgstr "Ändra" #: db_qbe.php:603 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" -msgstr "Lägg till/ta bort villkorsrader" +msgstr "Lägg till / ta bort villkorsrader" #: db_qbe.php:615 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "Lägg till/ta bort fältkolumner" +msgstr "Lägg till / ta bort kolumner" #: db_qbe.php:628 db_qbe.php:653 msgid "Update Query" @@ -559,10 +557,10 @@ msgid "Delete" msgstr "Radera" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Dumping data for table" msgid "Delete the matches for the %s table?" -msgstr "Data i tabell" +msgstr "radera matchande för %s tabellen?" #: db_search.php:273 #, php-format @@ -593,10 +591,9 @@ msgid "Inside table(s):" msgstr "I tabell(er):" #: db_search.php:352 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" -msgstr "I fält:" +msgstr "Inuti kolumnen:" #: db_structure.php:59 #| msgid "No tables found in database." @@ -733,9 +730,8 @@ msgid "Data Dictionary" msgstr "Datalexikon" #: db_tracking.php:78 -#, fuzzy msgid "Tracked tables" -msgstr "Hoppa över låsta tabeller" +msgstr "Spårade tabeller" #: db_tracking.php:83 libraries/config/messages.inc.php:478 #: libraries/export/htmlword.php:89 libraries/export/latex.php:162 @@ -794,23 +790,20 @@ msgstr "Versioner" #: db_tracking.php:134 tbl_tracking.php:373 tbl_tracking.php:618 msgid "Tracking report" -msgstr "" +msgstr "Spårningsrapport" #: db_tracking.php:135 tbl_tracking.php:245 tbl_tracking.php:618 -#, fuzzy msgid "Structure snapshot" -msgstr "Enbart struktur" +msgstr "Ögonblicksbild på strukturen" #: db_tracking.php:164 -#, fuzzy msgid "Untracked tables" -msgstr "Hoppa över låsta tabeller" +msgstr "Ej spårade tabeller" #: db_tracking.php:184 db_tracking.php:186 tbl_structure.php:619 #: tbl_structure.php:621 -#, fuzzy msgid "Track table" -msgstr "Kontrollera tabell" +msgstr "Spåra tabell" #: db_tracking.php:212 msgid "Database Log" @@ -827,7 +820,7 @@ msgstr "Mata in varje värde i ett eget fält." #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ Återstarta inmatandet och lägg till nytt värde" #: enum_editor.php:67 msgid "Output" @@ -945,18 +938,18 @@ msgstr "Bakåt" #: index.php:183 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser." -msgstr "phpMyAdmin fungerarbättre med webbläsare som hanterar ramar." +msgstr "phpMyAdmin fungerar bättre med en webbläsare som hanterar ramar." #: js/messages.php:25 server_synchronize.php:343 server_synchronize.php:355 #: server_synchronize.php:371 server_synchronize.php:378 #: server_synchronize.php:737 server_synchronize.php:765 #: server_synchronize.php:793 server_synchronize.php:805 msgid "Click to select" -msgstr "Markera för att välja" +msgstr "Klicka för att markera" #: js/messages.php:26 msgid "Click to unselect" -msgstr "" +msgstr "Klicka för att avmarkera" #: js/messages.php:27 libraries/import.lib.php:103 sql.php:156 msgid "\"DROP DATABASE\" statements are disabled." @@ -1035,10 +1028,9 @@ msgid "Create User" msgstr "Skapa Användare" #: js/messages.php:54 -#, fuzzy #| msgid "Reloading the privileges" msgid "Reloading Privileges" -msgstr "Laddar om privilegierna" +msgstr "Ladda om privilegier" #: js/messages.php:55 #| msgid "Remove selected users" @@ -1057,10 +1049,9 @@ msgid "Cancel" msgstr "Avbryt" #: js/messages.php:63 -#, fuzzy #| msgid "Load" msgid "Loading" -msgstr "Ladda" +msgstr "Laddar" #: js/messages.php:64 #| msgid "Processes" @@ -1111,7 +1102,6 @@ msgid "Table must have at least one column" msgstr "Tabellen måste ha åtminstone ett fält." #: js/messages.php:76 -#, fuzzy #| msgid "Create table" msgid "Create Table" msgstr "Skapa tabell" @@ -1164,10 +1154,9 @@ msgid "Please select the primary key or a unique key" msgstr "Välj den primära nyckeln eller en unik nyckel" #: js/messages.php:99 pmd_general.php:89 tbl_relation.php:545 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" -msgstr "Välj fält som ska visas" +msgstr "Välj kolumn att visa" #: js/messages.php:102 msgid "Add an option for column " @@ -1183,10 +1172,9 @@ msgid "Generate" msgstr "Generera" #: js/messages.php:107 -#, fuzzy #| msgid "Change password" msgid "Change Password" -msgstr "Byt lösenord" +msgstr "Ändra lösenord" #: js/messages.php:110 #| msgid "Mon" @@ -1201,7 +1189,6 @@ msgstr "Klart" #. l10n: Display text for previous month link in calendar #: js/messages.php:122 -#, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Föregående" @@ -1798,7 +1785,7 @@ msgstr "PBMS hämtar BLOB info misslyckades" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "Hämta BLOB Content-typ misslyckades" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1879,9 +1866,8 @@ msgid "Query statistics" msgstr "Visa statistik" #: libraries/chart.lib.php:63 -#, fuzzy msgid "Query execution time comparison (in microseconds)" -msgstr "Visa exekveringstid jämförelse (millisekunder)" +msgstr "Jämför exekveringstid (millisekunder" #: libraries/chart.lib.php:83 #| msgid "Query results operations" @@ -1897,9 +1883,8 @@ msgid "GD extension is needed for charts." msgstr "GD filändelse är nödvändig för tabell. " #: libraries/chart.lib.php:252 -#, fuzzy msgid "JSON encoder is needed for chart tooltips." -msgstr "JSON kodare är nödvändig för tabell verktygstips" +msgstr "JSON avkodare behövs för verktygstips för diagram" #: libraries/common.inc.php:574 msgid "" @@ -1968,7 +1953,6 @@ msgstr "sv" #. l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:411 -#, fuzzy msgctxt "$mysql_5_0_doc_lang" msgid "en" msgstr "sv" @@ -2031,10 +2015,9 @@ msgid "Inline edit of this query" msgstr "Redigera denna fråga" #: libraries/common.lib.php:1239 -#, fuzzy #| msgid "Engines" msgid "Inline" -msgstr "Invändig" +msgstr "Infogad" #: libraries/common.lib.php:1303 libraries/common.lib.php:1319 msgid "Profiling" @@ -2195,7 +2178,7 @@ msgstr "struktur och data" #: libraries/config.values.php:99 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "Snabb - visa endast få alternativ för konfiguration" #: libraries/config.values.php:100 msgid "Custom - display all possible options to configure" @@ -2353,9 +2336,8 @@ msgstr "" "strong] och tillåter mellan ramar scripting-angrepp" #: libraries/config/messages.inc.php:20 -#, fuzzy msgid "Allow third party framing" -msgstr "Tillåt tredje parts inramning" +msgstr "Tillåt tredjeparts infogning" #: libraries/config/messages.inc.php:21 msgid "Show "Drop database" link to normal users" @@ -2416,10 +2398,9 @@ msgstr "" "[kbd]textarea[/kbd] - tillåter radbrytningar i kolumner" #: libraries/config/messages.inc.php:31 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" -msgstr "Redigering av CHAR-fält" +msgstr "Redigera CHAR kolumn" #: libraries/config/messages.inc.php:32 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -2475,10 +2456,9 @@ msgid "Debug SQL" msgstr "Debugga SQL" #: libraries/config/messages.inc.php:43 -#, fuzzy #| msgid "Databases display options" msgid "Default display direction" -msgstr "Visningsalternativ för databaser" +msgstr "Standard visningsriktning" #: libraries/config/messages.inc.php:44 msgid "" @@ -2613,18 +2593,16 @@ msgstr "Sätt kolumnnamn på första raden" #: 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 "Fälten omges av" +msgstr "Kolumnerna avgränsas av" #: 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 "Specialtecken i fält föregås av" +msgstr "Kolumner föregås av" #: libraries/config/messages.inc.php:73 libraries/config/messages.inc.php:79 #: libraries/config/messages.inc.php:86 libraries/config/messages.inc.php:95 @@ -2725,10 +2703,9 @@ msgid "Remember file name template" msgstr "Kom ihåg mall för filnamn" #: libraries/config/messages.inc.php:116 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" -msgstr "Använd bakåtcitat runt tabell- och fältnamn" +msgstr "Använd citat-tecken runt tabell- och fältnamn" #: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255 #: libraries/display_export.lib.php:351 @@ -2980,10 +2957,9 @@ msgid "Basic settings" msgstr "Grundläggande inställningar" #: libraries/config/messages.inc.php:194 -#, fuzzy #| msgid "Authentication type" msgid "Authentication" -msgstr "Typ av autentisering" +msgstr "Verifiering" #: libraries/config/messages.inc.php:195 #| msgid "Authentication type" @@ -3467,7 +3443,7 @@ msgstr "" #: libraries/config/messages.inc.php:309 msgid "mcrypt warning" -msgstr "" +msgstr "mcrypt varning" #: libraries/config/messages.inc.php:310 msgid "" @@ -6694,7 +6670,7 @@ msgstr "SLUT RÅTEXT" #: libraries/sqlparser.lib.php:363 msgid "Automatically appended backtick to the end of query!" -msgstr "" +msgstr "Automatiskt bifoga citattecken till slutet av frågan" #: libraries/sqlparser.lib.php:366 msgid "Unclosed quote" @@ -9923,7 +9899,7 @@ msgstr "Ta bort data eller tabell" #: tbl_operations.php:662 msgid "Empty the table (TRUNCATE)" -msgstr "" +msgstr "Töm tabellen (TRUNCATE)" #: tbl_operations.php:682 msgid "Delete the table (DROP)" @@ -10308,9 +10284,8 @@ msgid "VIEW name" msgstr "VIEW namn" #: view_operations.php:91 -#, fuzzy msgid "Rename view to" -msgstr "Döp om tabellen till" +msgstr "Ändra namn till" #~ msgid "to/from page" #~ msgstr "till/från sida" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1320-g63a224b
by Marc Delisle 23 Jan '11

23 Jan '11

The branch, master has been updated via 63a224b05af1fc40cdf28a66f309ece251a0983b (commit) via ac1bdef78428ec60500574f320d815d17ba6a327 (commit) from 8cbee94e5d284ddfeda527379b9893e737bc5d4f (commit) - Log ----------------------------------------------------------------- commit 63a224b05af1fc40cdf28a66f309ece251a0983b Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 23 07:34:50 2011 -0500 Bug #3163260 Database copy: Error hides too quickly commit ac1bdef78428ec60500574f320d815d17ba6a327 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 23 07:18:09 2011 -0500 Remove unneeded wrapping of jQuery object Avoid unneeded generating of hidden field ----------------------------------------------------------------------- Summary of changes: js/db_operations.js | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/js/db_operations.js b/js/db_operations.js index 502ca0d..0f9240a 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -85,11 +85,17 @@ $(document).ready(function() { event.preventDefault(); PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']); - $(this).append('<input type="hidden" name="ajax_request" value="true" />'); - - $.get($(this).attr('action'), $(this).serialize(), function(data) { + $form = $(this); + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } + + $.get($form.attr('action'), $form.serialize(), function(data) { + // use messages that stay on screen + $('.success').fadeOut(); + $('.error').fadeOut(); if(data.success == true) { - PMA_ajaxShowMessage(data.message); + $('#topmenucontainer').after(data.message); if( $("#checkbox_switch").is(":checked")) { window.parent.db = data.newname; window.parent.refreshMain(); @@ -97,7 +103,7 @@ $(document).ready(function() { } } else { - PMA_ajaxShowMessage(data.error); + $('#topmenucontainer').after(data.error); } }) // end $.get }) // end copy database hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1318-g8cbee94
by Marc Delisle 22 Jan '11

22 Jan '11

The branch, master has been updated via 8cbee94e5d284ddfeda527379b9893e737bc5d4f (commit) from 5464b54e17015ed4ca8c015597e4760a538dd866 (commit) - Log ----------------------------------------------------------------- commit 8cbee94e5d284ddfeda527379b9893e737bc5d4f Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 22 10:09:49 2011 -0500 Change a function definition to fit with newest TCPDF version ----------------------------------------------------------------------- Summary of changes: libraries/schema/Pdf_Relation_Schema.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 7e7de87..73f075b 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -245,7 +245,7 @@ class PMA_PDF extends TCPDF } } - function Bookmark($txt, $level = 0, $y = 0) + function Bookmark($txt, $level = 0, $y = 0, $page = '') { // Add a bookmark $this->Outlines[0][] = $level; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1317-g5464b54
by Marc Delisle 22 Jan '11

22 Jan '11

The branch, master has been updated via 5464b54e17015ed4ca8c015597e4760a538dd866 (commit) from 3a739c1beec1d300bf0d54d8b7f3136f1775fcee (commit) - Log ----------------------------------------------------------------- commit 5464b54e17015ed4ca8c015597e4760a538dd866 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 22 09:50:12 2011 -0500 Start implementing conditional Ajax (in results page) ----------------------------------------------------------------------- Summary of changes: js/sql.js | 28 ++++++++++++++++++---------- libraries/common.lib.php | 7 +++++-- libraries/config.default.php | 7 +++++++ libraries/display_tbl.lib.php | 4 ++-- sql.php | 12 ++++++++---- 5 files changed, 40 insertions(+), 18 deletions(-) diff --git a/js/sql.js b/js/sql.js index 43b3af7..e83cee8 100644 --- a/js/sql.js +++ b/js/sql.js @@ -172,11 +172,11 @@ $(document).ready(function() { /** * Trigger the appendAnchor event to prepare the first table for inline edit - * + * (see $GLOBALS['cfg']['AjaxEnable']) * @memberOf jQuery * @name sqlqueryresults_trigger */ - $("#sqlqueryresults").trigger('appendAnchor'); + $("#sqlqueryresults.ajax").trigger('appendAnchor'); /** * Append the "Show/Hide query box" message to the query input form @@ -264,11 +264,12 @@ $(document).ready(function() { /** * Paginate when we click any of the navigation buttons + * (only if the element has the ajax class, see $cfg['AjaxEnable']) * @memberOf jQuery * @name paginate_nav_button_click * @uses PMA_ajaxShowMessage() */ - $("input[name=navig]").live('click', function(event) { + $("input[name=navig].ajax").live('click', function(event) { /** @lends jQuery */ event.preventDefault(); @@ -293,15 +294,22 @@ $(document).ready(function() { * @name paginate_dropdown_change */ $("#pageselector").live('change', function(event) { - event.preventDefault(); - - PMA_ajaxShowMessage(); var $the_form = $(this).parent("form"); - $.post($the_form.attr('action'), $the_form.serialize() + '&ajax_request=true', function(data) { - $("#sqlqueryresults").html(data); - $("#sqlqueryresults").trigger('appendAnchor'); - }) // end $.post() + // see $cfg['AjaxEnable'] + if ($(this).hasClass('ajax')) { + event.preventDefault(); + + PMA_ajaxShowMessage(); + + $.post($the_form.attr('action'), $the_form.serialize() + '&ajax_request=true', function(data) { + $("#sqlqueryresults").html(data); + $("#sqlqueryresults").trigger('appendAnchor'); + }) // end $.post() + } else { + $the_form.submit(); + } + })// end Paginate results with Page Selector /** diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 3976431..711627f 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2201,8 +2201,11 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, $pageNowMinusRange = ($pageNow - $range); $pageNowPlusRange = ($pageNow + $range); - $gotopage = $prompt - . ' <select id="pageselector" name="pos" >' . "\n"; + $gotopage = $prompt . ' <select id="pageselector" '; + if ($GLOBALS['cfg']['AjaxEnable']) { + $gotopage .= ' class="ajax"'; + } + $gotopage .= ' name="pos" >' . "\n"; if ($nbTotalPage < $showAll) { $pages = range(1, $nbTotalPage); } else { diff --git a/libraries/config.default.php b/libraries/config.default.php index 028c14b..a544caf 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -488,6 +488,13 @@ $cfg['ServerDefault'] = 1; * Other core phpMyAdmin settings */ /** + * whether Ajax behavior is active + * + * @global boolean $cfg['AjaxEnable'] + */ +$cfg['AjaxEnable'] = true; + +/** * maximum number of db's displayed in left frame and database list * * @global integer $cfg['MaxDbList'] diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 53c610b..c2c8518 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -228,7 +228,7 @@ function PMA_displayTableNavigationOneButton($caption, $title, $pos, $html_sql_q <input type="hidden" name="pos" value="<?php echo $pos; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <?php echo $input_for_real_end; ?> - <input type="submit" name="navig" value="<?php echo $caption_output; ?>"<?php echo $title_output . $onclick; ?> /> + <input type="submit" name="navig" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : '' ); ?> value="<?php echo $caption_output; ?>"<?php echo $title_output . $onclick; ?> /> </form> </td> <?php @@ -303,7 +303,7 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="sql_query" value="<?php echo $html_sql_query; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> - <input type="submit" name="navig" value="<?php echo __('Show'); ?> :" /> + <input type="submit" name="navig" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> value="<?php echo __('Show'); ?> :" /> <input type="text" name="session_max_rows" size="3" value="<?php echo (($_SESSION['tmp_user_values']['max_rows'] != 'all') ? $_SESSION['tmp_user_values']['max_rows'] : $GLOBALS['cfg']['MaxRows']); ?>" class="textfield" onfocus="this.select()" /> <?php echo __('row(s) starting from row #') . "\n"; ?> <input type="text" name="pos" size="6" value="<?php echo (($pos_next >= $unlim_num_rows) ? 0 : $pos_next); ?>" class="textfield" onfocus="this.select()" /> diff --git a/sql.php b/sql.php index fa07398..8a05298 100644 --- a/sql.php +++ b/sql.php @@ -730,7 +730,7 @@ if (0 == $num_rows || $is_affected) { else { //If we are retrieving the full value of a truncated field or the original // value of a transformed field, show it here and exit - if( $GLOBALS['inline_edit'] == true) { + if( $GLOBALS['inline_edit'] == true && $GLOBALS['cfg']['AjaxEnable']) { $row = PMA_DBI_fetch_row($result); $extra_data = array(); $extra_data['value'] = $row[0]; @@ -750,7 +750,7 @@ else { unset($message); - if( $GLOBALS['is_ajax_request'] != true) { + if( ! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) { if (strlen($table)) { require './libraries/tbl_common.php'; $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; @@ -781,9 +781,13 @@ else { $fields_cnt = count($fields_meta); } - if( $GLOBALS['is_ajax_request'] != true ) { + if( ! $GLOBALS['is_ajax_request']) { //begin the sqlqueryresults div here. container div - echo '<div id="sqlqueryresults">'; + echo '<div id="sqlqueryresults"'; + if ($GLOBALS['cfg']['AjaxEnable']) { + echo ' class="ajax"'; + } + echo '>'; } // Display previous update query (from tbl_replace) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1316-g3a739c1
by Marc Delisle 22 Jan '11

22 Jan '11

The branch, master has been updated via 3a739c1beec1d300bf0d54d8b7f3136f1775fcee (commit) from 8fd3359cf9866b03714808cf1af31112e261925f (commit) - Log ----------------------------------------------------------------- commit 3a739c1beec1d300bf0d54d8b7f3136f1775fcee Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 22 08:10:10 2011 -0500 Force a smaller height to improve the chance to see the bottom of the popup (for easier horizontal scrolling) ----------------------------------------------------------------------- Summary of changes: js/functions.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/js/functions.js b/js/functions.js index 6559b34..782c725 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1689,6 +1689,7 @@ $(document).ready(function() { .append(data) .dialog({ title: PMA_messages['strCreateTable'], + height: 600, width: 900, open: PMA_verifyTypeOfAllColumns, buttons : button_options hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1315-g8fd3359
by Madhura Jayaratne 21 Jan '11

21 Jan '11

The branch, master has been updated via 8fd3359cf9866b03714808cf1af31112e261925f (commit) from 3081456e1fe037d75f74ab6a72131ea139d21b47 (commit) - Log ----------------------------------------------------------------- commit 8fd3359cf9866b03714808cf1af31112e261925f Author: madhuracj <madhura.cj(a)gmail.com> Date: Fri Jan 21 18:53:27 2011 +0530 Code formatting. ----------------------------------------------------------------------- Summary of changes: libraries/schema/Pdf_Relation_Schema.class.php | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 0d7e935..7e7de87 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -18,7 +18,7 @@ require_once './libraries/tcpdf/tcpdf.php'; /** * Extends the "TCPDF" class and helps * in developing the structure of PDF Schema Export - * + * * @name PMA_PDF * @copyright * @license @@ -435,8 +435,8 @@ class PMA_PDF extends TCPDF /** * Table preferences/statistics - * - * This class preserves the table co-ordinates,fields + * + * This class preserves the table co-ordinates,fields * and helps in drawing/generating the Tables in PDF document. * * @name Table_Stats @@ -444,7 +444,7 @@ class PMA_PDF extends TCPDF * @license * @see PMA_PDF */ -class Table_Stats +class Table_Stats { /** * Defines properties @@ -646,9 +646,9 @@ class Table_Stats /** * Relation preferences/statistics - * + * * This class fetches the table master and foreign fields positions - * and helps in generating the Table references and then connects + * and helps in generating the Table references and then connects * master table's master field to foreign table's foreign key * in PDF document. * @@ -657,7 +657,7 @@ class Table_Stats * @license * @see PMA_PDF::SetDrawColor,PMA_PDF::PMA_PDF_setLineWidthScale,PMA_PDF::PMA_PDF_lineScale */ -class Relation_Stats +class Relation_Stats { /** * Defines properties @@ -923,7 +923,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } // end while } // end if } // end while - + if ($seen_a_relation) { $this->_drawRelations($this->showColor); } @@ -979,8 +979,8 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ private function _strokeGrid() { - global $pdf, $with_doc;; - + global $pdf, $with_doc; + $gridSize = 10; $labelHeight = 4; $labelWidth = 5; @@ -1041,7 +1041,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } /** - * Ouputs the PDF document to a file + * Ouputs the PDF document to a file * or sends the output to browser * * @global object The current PDF document @@ -1333,7 +1333,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } // end while $pdf->SetFont('', '', 14); PMA_DBI_free_result($result); - } //end each + } //end each } } ?> hooks/post-receive -- phpMyAdmin

1 0