From af759c5fd7f2e640b55b2ec6ea15a22025fad813 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 8 Jun 2010 18:57:27 +0200 Subject: [PATCH 01/71] Translation update done using Pootle. --- po/fr.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index a9e80a26a..2feaa980b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-07 22:50+0200\n" +"PO-Revision-Date: 2010-06-08 18:57+0200\n" "Last-Translator: Marc \n" "Language-Team: french \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -4451,10 +4451,9 @@ msgid "Jump to database" msgstr "Aller à la base de données" #: server_databases.php:267 -#, fuzzy #| msgid "Master replication" msgid "Not replicated" -msgstr "Réplication maître" +msgstr "Non répliqué" #: server_databases.php:273 #, fuzzy From d0567d77e10d0248801e3f6e0f7d8173f6ba76f6 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 8 Jun 2010 18:57:39 +0200 Subject: [PATCH 02/71] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2feaa980b..7e169781b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4456,10 +4456,9 @@ msgid "Not replicated" msgstr "Non répliqué" #: server_databases.php:273 -#, fuzzy #| msgid "Replication" msgid "Replicated" -msgstr "Réplication" +msgstr "Répliqué" #: server_databases.php:289 #, php-format From 7340658b3dbc3373600040073332cf88b11d10d0 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:15:38 +0200 Subject: [PATCH 03/71] Translation update done using Pootle. --- po/bg.po | 292 ++----------------------------------------------------- 1 file changed, 6 insertions(+), 286 deletions(-) diff --git a/po/bg.po b/po/bg.po index e9332fdd2..c0a6f573a 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,14 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-03-12 09:12+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-06-09 10:15+0200\n" +"Last-Translator: \n" "Language-Team: bulgarian \n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" -"X-Generator: Translate Toolkit 1.5.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 #: libraries/display_tbl.lib.php:417 server_privileges.php:1514 @@ -8198,286 +8199,5 @@ msgid "VIEW name" msgstr "" #: view_operations.php:93 -#, fuzzy msgid "Rename view to" -msgstr "Преименуване на таблицата на" - -#, fuzzy -#~| msgid "Add new field" -#~ msgid "Add field" -#~ msgstr "Добавяне на ново поле" - -#~ msgid "Field" -#~ msgstr "Поле" - -#~ msgid "Records" -#~ msgstr "Записи" - -#~ msgid "Fields terminated by" -#~ msgstr "Полетата завършват с" - -#~ msgid "Fields" -#~ msgstr "Полета" - -#~ msgid "Field %s has been dropped" -#~ msgstr "Полето %s беше изтрито" - -#~ msgid "See image/jpeg: inline" -#~ msgstr "Виж image/jpeg: inline" - -#, fuzzy -#~| msgid "\"zipped\"" -#~ msgid "zipped" -#~ msgstr "\"zip-нато\"" - -#, fuzzy -#~| msgid "\"gzipped\"" -#~ msgid "gzipped" -#~ msgstr "\"gzip-нато\"" - -#, fuzzy -#~| msgid "\"bzipped\"" -#~ msgid "bzipped" -#~ msgstr "\"bzip-нато\"" - -#, fuzzy -#~| msgid "Add custom comment into header (\\n splits lines)" -#~ msgid "" -#~ "Add custom comment into header (\n" -#~ " splits lines)" -#~ msgstr "Добавяне на коментар в хедъра (\\n нов ред)" - -#, fuzzy -#~ msgid "and" -#~ msgstr "и" - -#, fuzzy -#~ msgctxt "$strBLOBRepositoryDisabled" -#~ msgid "Disabled" -#~ msgstr "Забранено" - -#, fuzzy -#~ msgctxt "$strBLOBRepositoryEnabled" -#~ msgid "Enabled" -#~ msgstr "Позволено" - -#, fuzzy -#~ msgctxt "$strBLOBRepositoryRepair" -#~ msgid "Repair" -#~ msgstr "Поправяне на таблицата" - -#~ msgid "Calendar" -#~ msgstr "Календар" - -#~ msgid "MySQL 4.0 compatible" -#~ msgstr "MySQL 4.0 съвместимо" - -#~ msgid "Could not load default configuration from: \"%1$s\"" -#~ msgstr "" -#~ "Конфигурацията по подразбиране не може да бъде заредена от: \"%1$s\"" - -#~ msgid "Create an index on %s columns" -#~ msgstr "Създаване на индекс върху  %s колони" - -#, fuzzy -#~ msgctxt "$strCreateTableShort" -#~ msgid "Create table" -#~ msgstr "Създай нова Страница" - -#, fuzzy -#~ msgctxt "$strCreateUserDatabaseNone" -#~ msgid "None" -#~ msgstr "Няма" - -#~ msgid "Flush the table (\"FLUSH\")" -#~ msgstr "Изчистване на кеша на таблицата (\"FLUSH\")" - -#~ msgctxt "$strMIME_description" -#~ msgid "Description" -#~ msgstr "Описание" - -#, fuzzy -#~ msgctxt "$strNoneDefault" -#~ msgid "None" -#~ msgstr "Няма" - -#~ msgid "Schema of the \"%s\" database - Page %s" -#~ msgstr "Схемата на база от данни \"%s\" - Страница %s" - -#~ msgid "The \"%s\" table doesn't exist!" -#~ msgstr "Таблица \"%s\" не съществува!" - -#~ msgid "running on %s" -#~ msgstr "работи на %s" - -#~ msgid "The scale factor is too small to fit the schema on one page" -#~ msgstr "Мащаба е твърде малък за да се събере схемата на една страница" - -#, fuzzy -#~| msgid "None" -#~ msgctxt "None action" -#~ msgid "None" -#~ msgstr "Няма" - -#, fuzzy -#~| msgid "None" -#~ msgctxt "" -#~ msgid "None" -#~ msgstr "Няма" - -#, fuzzy -#~ msgid "Grant all privileges on wildcard name (username_%)" -#~ msgstr "Провери привилегиите за база от данни "%s"." - -#, fuzzy -#~| msgid "The \"%s\" table doesn't exist!" -#~ msgid "The %s table doesn" -#~ msgstr "Таблица \"%s\" не съществува!" - -#, fuzzy -#~| msgid "Could not load default configuration from: \"%1$s\"" -#~ msgid "Could not load default configuration from: %1" -#~ msgstr "" -#~ "Конфигурацията по подразбиране не може да бъде заредена от: \"%1$s\"" - -#, fuzzy -#~| msgid "Error renaming table %1$s to %2$s" -#~ msgid "Error renaming table %1 to %2" -#~ msgstr "Грешка при преименуване на таблица %1$s в %2$s" - -#, fuzzy -#~| msgid "" -#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " -#~| "extension. Please check your PHP configuration." -#~ msgid "" -#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. " -#~ "Please check your PHP configuration." -#~ msgstr "" -#~ "не мога да заредя разширението %s,
моля проверете конфигурацията на " -#~ "PHP" - -#, fuzzy -#~ msgid "(or the local MySQL server" -#~ msgstr "Не мога да се логна към MySQL сървъра" - -#, fuzzy -#~| msgid "" -#~| "There is a chance that you may have found a bug in the SQL parser. " -#~| "Please examine your query closely, and check that the quotes are correct " -#~| "and not mis-matched. Other possible failure causes may be that you are " -#~| "uploading a file with binary outside of a quoted text area. You can also " -#~| "try your query on the MySQL command line interface. The MySQL server " -#~| "error output below, if there is any, may also help you in diagnosing the " -#~| "problem. If you still have problems or if the parser fails where the " -#~| "command line interface succeeds, please reduce your SQL query input to " -#~| "the single query that causes problems, and submit a bug report with the " -#~| "data chunk in the CUT section below:" -#~ msgid "" -#~ "There is a chance that you may have found a bug in the SQL parser. Please " -#~ "examine your query closely, and check that the quotes are correct and not " -#~ "mis-matched. Other possible failure causes may be that you are uploading " -#~ "a file with binary outside of a quoted text area. You can also try your " -#~ "query on the MySQL command line interface. The MySQL server error output " -#~ "be . " -#~ msgstr "" -#~ "Има известна вероятност да сте намерили бъг в SQL парсера. Моля проучете " -#~ "по-добре, и проверете коректността на кавичките. Друга вероятна причина " -#~ "за грешката може да бъде, че ъплоудвате файл с изпълним код извън " -#~ "областта заградена с кавички. Можете също така да се опитате да изпълните " -#~ "заявката чрез интерфейса за команден ред на MySQL. Грешката генерирана от " -#~ "MySQL сървъра по-долу, ако има такава, може също да ви помогне при " -#~ "откриването на проблема. Ако все още имате проблеми или парсера дава " -#~ "грешка там където интерфейса на командния ред не връща такава, моля " -#~ "ограничете вашите SQL заявки само до проблемната заявка, и изпратете " -#~ "съобщение за бъг с парчето от данните в CUT секцията по-долу:" - -#~ msgctxt "$strStrucCSV" -#~ msgid "CSV" -#~ msgstr "CSV данни" - -#~ msgid "Copy" -#~ msgstr "Копиране" - -#~ msgid "Delete the users and reload the privileges afterwards." -#~ msgstr "" -#~ "Изтриване на потребителите и след това презареждане на привилегиите." - -#~ msgid "" -#~ "This is the cleanest way, but reloading the privileges may take a while." -#~ msgstr "" -#~ "Това е най-чистия начин, но презареждането на привилегиите може да отнеме " -#~ "известно време." - -#~ msgid "has been altered." -#~ msgstr "беше променена." - -#~ msgid "" -#~ "The "deleted" users will still be able to access the server as " -#~ "usual until the privileges are reloaded." -#~ msgstr "" -#~ ""Изтритите" потребители ще имат достъп до сървъра както " -#~ "обикновено, докато не се презаредят привилегиите." - -#~ msgid "Just delete the users from the privilege tables." -#~ msgstr "Изтриване на потребителите от таблицата с привилегиите." - -#~ msgid "" -#~ "Allows running stored procedures; has no effect in this MySQL version." -#~ msgstr "" -#~ "Позволява стартирането на съхранени процедури; Няма ефект в тази версия " -#~ "на MySQL." - -#~ msgid "Process list" -#~ msgstr "Списък на процесите" - -#~ msgid "Reload privileges" -#~ msgstr "Презареждане на привилегиите" - -#~ msgid "" -#~ "The users will still have the USAGE privilege until the privileges are " -#~ "reloaded." -#~ msgstr "" -#~ "Потребителите все още ще имат USAGE привилегия докато не се презаредят " -#~ "привилегиите." - -#, fuzzy -#~| msgid "Select All" -#~ msgctxt "Create SELECT * query" -#~ msgid "Select all" -#~ msgstr "Селектиране на всичко" - -#, fuzzy -#~| msgid "Select All" -#~ msgctxt "Create SELECT ... query" -#~ msgid "Select" -#~ msgstr "Селектиране на всичко" - -#, fuzzy -#~| msgid "Insert" -#~ msgctxt "Create INSERT query" -#~ msgid "Insert" -#~ msgstr "Вмъкване" - -#, fuzzy -#~| msgid "Update Query" -#~ msgctxt "Create UPDATE query" -#~ msgid "Update" -#~ msgstr "Допълни Запитването" - -#, fuzzy -#~| msgid "Delete" -#~ msgctxt "Create DELETE query" -#~ msgid "Delete" -#~ msgstr "Изтриване" - -#~ msgid "utf-8" -#~ msgstr "utf-8" - -#~ msgid "Jan0" -#~ msgstr "януари0" - -#~ msgid "Jan1" -#~ msgstr "януари1" - -#~ msgid "Jan2" -#~ msgstr "януари2" +msgstr "Преименуване на изгледа на" From e05c50b7961c4dce7669a944aa0c5e994ad0c004 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:16:38 +0200 Subject: [PATCH 04/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index c0a6f573a..ff8b7e9d1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:15+0200\n" +"PO-Revision-Date: 2010-06-09 10:16+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -8162,7 +8162,7 @@ msgstr "" #: themes.php:42 msgid "Get more themes!" -msgstr "" +msgstr "Вземете си нови теми!" #: transformation_overview.php:25 msgid "Available MIME types" From 65ca97f095d872ceedb2a51884f1b9fbd35dab9f Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:17:47 +0200 Subject: [PATCH 05/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index ff8b7e9d1..6ade08066 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:16+0200\n" +"PO-Revision-Date: 2010-06-09 10:17+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -8196,7 +8196,7 @@ msgstr "Профила беше обновен." #: view_create.php:142 msgid "VIEW name" -msgstr "" +msgstr "Име на ИЗГЛЕД-а" #: view_operations.php:93 msgid "Rename view to" From 40c76dbf7691a0c7ba818962cf78cfd9702d6db6 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:19:03 +0200 Subject: [PATCH 06/71] Translation update done using Pootle. --- po/bg.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/bg.po b/po/bg.po index 6ade08066..2343275af 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:17+0200\n" +"PO-Revision-Date: 2010-06-09 10:19+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -8159,6 +8159,8 @@ msgid "" "No themes support; please check your configuration and/or your themes in " "directory %s." msgstr "" +"Няма поддръжка на теми. Моля, проверете конфигурацията и/или темите, в папка " +"%s." #: themes.php:42 msgid "Get more themes!" From 6fd1a02af46de6dc4e2dd0d2d0916c90d93dc82f Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:19:27 +0200 Subject: [PATCH 07/71] Translation update done using Pootle. --- po/bg.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 2343275af..de39bbe66 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8113,9 +8113,8 @@ msgid "Show versions" msgstr "" #: tbl_tracking.php:593 -#, fuzzy msgid "Version" -msgstr "Персийски" +msgstr "Версия" #: tbl_tracking.php:640 #, php-format From 8e83fe03110471680dd05ee06ff935d9875c2ae1 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:20:04 +0200 Subject: [PATCH 08/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index de39bbe66..fe30c52ae 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:19+0200\n" +"PO-Revision-Date: 2010-06-09 10:20+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -8110,7 +8110,7 @@ msgstr "" #: tbl_tracking.php:561 msgid "Show versions" -msgstr "" +msgstr "Показване на версиите" #: tbl_tracking.php:593 msgid "Version" From 400389f9e02229c42d5b8a799ba13d1a913ea9f0 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:21:05 +0200 Subject: [PATCH 09/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index fe30c52ae..666d9e867 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:20+0200\n" +"PO-Revision-Date: 2010-06-09 10:21+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -2922,7 +2922,7 @@ msgstr "Използване на INSERT IGNORE" #: libraries/export/sql.php:118 msgid "Use hexadecimal for BLOB" -msgstr "" +msgstr "Използване на шестнадесетична стойност за BLOB" #: libraries/export/sql.php:120 msgid "Export time in UTC" From 4526a8d904937e3ef1eb1b5b5b7033dc4c6ea77d Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:22:10 +0200 Subject: [PATCH 10/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 666d9e867..58d74c11c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:21+0200\n" +"PO-Revision-Date: 2010-06-09 10:22+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -3153,7 +3153,7 @@ msgstr "" #: libraries/import/sql.php:42 msgid "Do not use AUTO_INCREMENT for zero values" -msgstr "" +msgstr "Да не се използва AUTO_INCREMENT за нулеви стойности" #: libraries/import/xml.php:74 libraries/import/xml.php:130 msgid "" From 1fd19e56f2601e7f445ec94431e4a69d029daecc Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:26:35 +0200 Subject: [PATCH 11/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 58d74c11c..8205ae4ac 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:22+0200\n" +"PO-Revision-Date: 2010-06-09 10:26+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -2330,7 +2330,7 @@ msgstr "Релационна схема" #: libraries/display_tbl.lib.php:595 msgid "Show binary contents" -msgstr "" +msgstr "Показване на двоичните данни" #: libraries/display_tbl.lib.php:597 msgid "Show BLOB contents" From 60f5d7cfbdd1fc5b950bf917c9139fc46766f97a Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:26:44 +0200 Subject: [PATCH 12/71] Translation update done using Pootle. --- po/bg.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/bg.po b/po/bg.po index 8205ae4ac..50d942269 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2338,7 +2338,7 @@ msgstr "" #: libraries/display_tbl.lib.php:599 msgid "Show binary contents as HEX" -msgstr "" +msgstr "Показване на BLOB-данните" #: libraries/display_tbl.lib.php:607 pmd_general.php:141 tbl_change.php:314 #: tbl_change.php:320 From 4b22b6233cd38618eda2581db8d70e62c39c2dc8 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:27:18 +0200 Subject: [PATCH 13/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 50d942269..5f0a2bbcf 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:26+0200\n" +"PO-Revision-Date: 2010-06-09 10:27+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -2338,7 +2338,7 @@ msgstr "" #: libraries/display_tbl.lib.php:599 msgid "Show binary contents as HEX" -msgstr "Показване на BLOB-данните" +msgstr "Показване на двоичните данни в шестнадесетичен вид" #: libraries/display_tbl.lib.php:607 pmd_general.php:141 tbl_change.php:314 #: tbl_change.php:320 From 01b3d2d4a9057534e52f4ad6cb2e37736641c264 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:27:44 +0200 Subject: [PATCH 14/71] Translation update done using Pootle. --- po/bg.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/bg.po b/po/bg.po index 5f0a2bbcf..a9b36aff0 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2334,7 +2334,7 @@ msgstr "Показване на двоичните данни" #: libraries/display_tbl.lib.php:597 msgid "Show BLOB contents" -msgstr "" +msgstr "Показване на BLOB-данните" #: libraries/display_tbl.lib.php:599 msgid "Show binary contents as HEX" From 93ba1d91f0c5a5c3cc485b79389428c5b8fb0298 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:32:05 +0200 Subject: [PATCH 15/71] Translation update done using Pootle. --- po/bg.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/bg.po b/po/bg.po index a9b36aff0..ffa75b617 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:27+0200\n" +"PO-Revision-Date: 2010-06-09 10:32+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -2033,10 +2033,9 @@ msgid "No Privileges" msgstr "Няма привилегии" #: libraries/display_create_table.lib.php:41 -#, fuzzy #| msgid "Table must have at least one field." msgid "Table must have at least one column." -msgstr "Таблицата трябва да има поне едно поле." +msgstr "Таблицата трябва да има поне една колона." #: libraries/display_create_table.lib.php:48 #, php-format From 895811f5f297d0e73b893b537937947472befd91 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:32:16 +0200 Subject: [PATCH 16/71] Translation update done using Pootle. --- po/bg.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index ffa75b617..88d83a872 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2043,10 +2043,9 @@ msgid "Create table on database %s" msgstr "Създаване на нова таблица в БД %s" #: libraries/display_create_table.lib.php:57 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" -msgstr "Брой полета" +msgstr "Брой колони" #: libraries/display_export.lib.php:42 msgid "Could not load export plugins, please check your installation!" From 67064e3962bdf19b061f65623a3c0be1f1a20e01 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:32:48 +0200 Subject: [PATCH 17/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 88d83a872..1dc7d444f 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2054,10 +2054,10 @@ msgstr "" "инсталацията!" #: libraries/display_export.lib.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Dump %s row(s) starting at record # %s" msgid "Dump %s row(s) starting at row # %s" -msgstr "Дъмп-ни %s реда като започнеш от %s." +msgstr "Дъмп-ни %s ред(а) като започнеш от ред # %s." #: libraries/display_export.lib.php:115 msgid "Dump all rows" From 83e3fb131bf2ef569478f903a6026c51f05cbb55 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:32:58 +0200 Subject: [PATCH 18/71] Translation update done using Pootle. --- po/bg.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/bg.po b/po/bg.po index 1dc7d444f..6f3ff7424 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2061,7 +2061,7 @@ msgstr "Дъмп-ни %s ред(а) като започнеш от ред # %s." #: libraries/display_export.lib.php:115 msgid "Dump all rows" -msgstr "" +msgstr "Дъмп-ни всички редове" #: libraries/display_export.lib.php:125 setup/lib/messages.inc.php:82 msgid "Save as file" From a1ff22fcd59230ef77c907690a184de0aae5a754 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:34:37 +0200 Subject: [PATCH 19/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 6f3ff7424..5295d0d81 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:32+0200\n" +"PO-Revision-Date: 2010-06-09 10:34+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -7597,7 +7597,7 @@ msgstr "" #: sql.php:513 msgid "Showing as PHP code" -msgstr "" +msgstr "Показване като PHP-код" #: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" From 71776c3c7e18ef8363d830b852b67d2765c54bff Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:35:50 +0200 Subject: [PATCH 20/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 5295d0d81..86f07adb1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:34+0200\n" +"PO-Revision-Date: 2010-06-09 10:35+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -4067,7 +4067,7 @@ msgstr "" #: main.php:159 msgid "Custom color" -msgstr "" +msgstr "Потребителски зададен цвят" #: main.php:163 pdf_pages.php:363 setup/lib/FormDisplay.tpl.php:216 #: tbl_change.php:1175 From 1ee61a046be55a930d7ed99b35c327cf257df1c9 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:37:11 +0200 Subject: [PATCH 21/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 86f07adb1..7a5fe1625 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:35+0200\n" +"PO-Revision-Date: 2010-06-09 10:37+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -2000,7 +2000,7 @@ msgstr "Отново" #: libraries/display_change_password.lib.php:52 msgid "Password Hashing" -msgstr "" +msgstr "Хеширане на паролата" #: libraries/display_change_password.lib.php:66 #, fuzzy From 20bd57a98194f43cdf0f25791cec57923b9a7a04 Mon Sep 17 00:00:00 2001 From: stanprog Date: Wed, 9 Jun 2010 10:38:00 +0200 Subject: [PATCH 22/71] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 7a5fe1625..2795a3bbb 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 10:37+0200\n" +"PO-Revision-Date: 2010-06-09 10:38+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -1981,7 +1981,7 @@ msgstr "Смяна на паролата" #: libraries/display_change_password.lib.php:35 #: libraries/replication_gui.lib.php:345 server_privileges.php:807 msgid "No Password" -msgstr "Няма парола" +msgstr "Без парола" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:59 libraries/replication_gui.lib.php:60 From 7647a4c4c233ad6eba5ff490db51970e7bb8b512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 9 Jun 2010 10:42:12 +0200 Subject: [PATCH 23/71] Translation update done using Pootle. --- po/en_GB.po | 128 ++-------------------------------------------------- 1 file changed, 3 insertions(+), 125 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index c1272f31b..cb6be0061 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-04 22:01+0200\n" +"PO-Revision-Date: 2010-06-09 10:42+0200\n" "Last-Translator: Michal \n" "Language-Team: english-gb \n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -4407,10 +4407,9 @@ msgid "Jump to database" msgstr "Jump to database" #: server_databases.php:267 -#, fuzzy #| msgid "Master replication" msgid "Not replicated" -msgstr "Master replication" +msgstr "Not replicated" #: server_databases.php:273 #, fuzzy @@ -8336,124 +8335,3 @@ msgstr "VIEW name" #: view_operations.php:93 msgid "Rename view to" msgstr "Rename view to" - -#, fuzzy -#~| msgid "Add new field" -#~ msgid "Add field" -#~ msgstr "Add new field" - -#~ msgid "Field" -#~ msgstr "Field" - -#~ msgid "Records" -#~ msgstr "Records" - -#~ msgid "Fields terminated by" -#~ msgstr "Fields terminated by" - -#~ msgid "Fields" -#~ msgstr "Fields" - -#~ msgid "Add %s field(s)" -#~ msgstr "Add %s field(s)" - -#~ msgid "Field %s has been dropped" -#~ msgstr "Field %s has been dropped" - -#~ msgid "See image/jpeg: inline" -#~ msgstr "See image/jpeg: inline" - -#~ msgid "zipped" -#~ msgstr "zipped" - -#~ msgid "gzipped" -#~ msgstr "gzipped" - -#~ msgid "bzipped" -#~ msgstr "bzipped" - -#~ msgid "" -#~ "Add custom comment into header (\n" -#~ " splits lines)" -#~ msgstr "" -#~ "Add custom comment into header (\n" -#~ " splits lines)" - -#~ msgid "and" -#~ msgstr "and" - -#~ msgctxt "$strBLOBRepositoryDisabled" -#~ msgid "Disabled" -#~ msgstr "Disabled" - -#~ msgctxt "$strBLOBRepositoryEnabled" -#~ msgid "Enabled" -#~ msgstr "Enabled" - -#~ msgctxt "$strBLOBRepositoryRepair" -#~ msgid "Repair" -#~ msgstr "Repair" - -#~ msgid "Calendar" -#~ msgstr "Calendar" - -#~ msgid "MySQL 4.0 compatible" -#~ msgstr "MySQL 4.0 compatible" - -#~ msgid "Could not load default configuration from: \"%1$s\"" -#~ msgstr "Could not load default configuration from: \"%1$s\"" - -#~ msgid "Create an index on %s columns" -#~ msgstr "Create an index on %s columns" - -#~ msgctxt "$strCreateTableShort" -#~ msgid "Create table" -#~ msgstr "Create table" - -#~ msgctxt "$strCreateUserDatabaseNone" -#~ msgid "None" -#~ msgstr "None" - -#~ msgid "Flush the table (\"FLUSH\")" -#~ msgstr "Flush the table (\"FLUSH\")" - -#~ msgid "Invalid server index: \"%s\"" -#~ msgstr "Invalid server index: \"%s\"" - -#~ msgctxt "$strMIME_description" -#~ msgid "Description" -#~ msgstr "Description" - -#~ msgctxt "$strNoneDefault" -#~ msgid "None" -#~ msgstr "None" - -#~ msgid "Schema of the \"%s\" database - Page %s" -#~ msgstr "Schema of the \"%s\" database - Page %s" - -#~ msgid "The \"%s\" table doesn't exist!" -#~ msgstr "The \"%s\" table doesn't exist!" - -#~ msgid "" -#~ "This MySQL server works as %s in replication process. For further " -#~ "information about replication status on the server, please visit the replication section." -#~ msgstr "" -#~ "This MySQL server works as %s in replication process. For further " -#~ "information about replication status on the server, please visit the replication section." - -#~ msgid "running on %s" -#~ msgstr "running on %s" - -#~ msgid "The scale factor is too small to fit the schema on one page" -#~ msgstr "The scale factor is too small to fit the schema on one page" - -#~ msgid "" -#~ "Cannot start session without errors, please check errors given in your " -#~ "PHP and/or webserver log file and configure your PHP installation " -#~ "properly." -#~ msgstr "" -#~ "Cannot start session without errors, please check errors given in your " -#~ "PHP and/or webserver log file and configure your PHP installation " -#~ "properly." From 5b5aa6fc0feb58973c63bb710e78c94ff9883259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 9 Jun 2010 10:42:19 +0200 Subject: [PATCH 24/71] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index cb6be0061..b548e60bc 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4412,10 +4412,9 @@ msgid "Not replicated" msgstr "Not replicated" #: server_databases.php:273 -#, fuzzy #| msgid "Replication" msgid "Replicated" -msgstr "Replication" +msgstr "Replicated" #: server_databases.php:289 #, php-format From f4e73072f29a0533bed2a865905de9294a9ebbbf Mon Sep 17 00:00:00 2001 From: "sven.erik.andersen" Date: Wed, 9 Jun 2010 14:16:51 +0200 Subject: [PATCH 25/71] Translation update done using Pootle. --- po/nb.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/nb.po b/po/nb.po index c89c0e46e..02af33f81 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-07 10:58+0200\n" +"PO-Revision-Date: 2010-06-09 14:16+0200\n" "Last-Translator: \n" "Language-Team: norwegian \n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -4405,10 +4405,9 @@ msgid "Jump to database" msgstr "Gå til database" #: server_databases.php:267 -#, fuzzy #| msgid "Master replication" msgid "Not replicated" -msgstr "Masterreplikasjon" +msgstr "Ikke replikert" #: server_databases.php:273 #, fuzzy From 0d4a6b22ea59ebc39ce7079d4f72ec4052d93c19 Mon Sep 17 00:00:00 2001 From: "sven.erik.andersen" Date: Wed, 9 Jun 2010 14:16:59 +0200 Subject: [PATCH 26/71] Translation update done using Pootle. --- po/nb.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/nb.po b/po/nb.po index 02af33f81..a58c05aab 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4410,10 +4410,9 @@ msgid "Not replicated" msgstr "Ikke replikert" #: server_databases.php:273 -#, fuzzy #| msgid "Replication" msgid "Replicated" -msgstr "Replikering" +msgstr "Replikert" #: server_databases.php:289 #, php-format From 89550974db0ff14656b6c52da4c23c63f0763e29 Mon Sep 17 00:00:00 2001 From: "sven.erik.andersen" Date: Wed, 9 Jun 2010 14:17:08 +0200 Subject: [PATCH 27/71] Translation update done using Pootle. --- po/nb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/nb.po b/po/nb.po index a58c05aab..6da72596c 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-08 12:32-0400\n" -"PO-Revision-Date: 2010-06-09 14:16+0200\n" +"PO-Revision-Date: 2010-06-09 14:17+0200\n" "Last-Translator: \n" "Language-Team: norwegian \n" "Language: nb\n" From 3e41e6976271beb2284de308c63125eda311847e Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 9 Jun 2010 16:35:54 +0200 Subject: [PATCH 28/71] Documentation cleanup I found a few places that needed cleanup plus the Synchronization FAQ was using literal utf charachters for ' ` " and so on -- those are replaces with the appropriate escaped character entity or blocks. --- Documentation.html | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation.html b/Documentation.html index d1d589d4a..5c966737d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4366,8 +4366,8 @@ chmod o+rwx tmp the translations, since we define the right character set in the file. With HTML entities, the text on JavaScript messages would not display correctly. - However there are some entities that need to be there, for quotes - ,non-breakable spaces, ampersands, less than, greater than. + However there are some entities that need to be there, for quotes, + non-breakable spaces, ampersands, less than, greater than.

You can then put your translations, as a zip file to avoid losing special @@ -4417,7 +4417,7 @@ chmod o+rwx tmp 8.2 How can I protect phpMyAdmin against brute force attacks?

If you use Apache web server, phpMyAdmin exports information about - authentication to Apache environment and it can be used in Apache logs. + authentication to the Apache environment and it can be used in Apache logs. Currently there are two variables available:

@@ -4448,14 +4448,14 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \ 9.1 How can I synchronize two databases/tables in phpMyAdmin?

You can now synchronize databases/tables in phpMyAdmin using the Synchronize feature. -It allows you to connect to local as well as remote servers.This requires you to enter +It allows you to connect to local as well as remote servers. This requires you to enter server host name, username, password, port and the name of the database. Therefore you can now synchronize your databases placed on the same server or some remote server.

This feature is helpful for developers who need to replicate their -databases’ structure as well as data. Moreover, this feature not only +database’s structure as well as data. Moreover, this feature not only helps replication but also facilitates the user to keep his/her database in sync with another database. Other than the full database, certain tables of the databases can also be synchronized. @@ -4476,29 +4476,29 @@ representation.

-On the left, are listed the source database table names.  Some of the -names have a ‘+’ plus sign preceding them. This shows that these tables +On the left, are listed the source database table names. Some of the +names have a + plus sign preceding them. This shows that these tables are only present in source database and they need to be added to the target database in order to synchronize the target database. The tables -whose names are not preceded by a ‘+’ sign are already present in the +whose names are not preceded by a + sign are already present in the target database.

On the right, are listed the target database table names. There are few -table names that have “(not present)” appended after their names. This +table names that have (not present) appended after their names. This means that these tables are to be created in target database in order to -synchronize target database with source database. Some tables’ names -have a ‘-’ minus sign preceding them. This shows that these tables are +synchronize target database with source database. Some table names +have a - minus sign preceding them. This shows that these tables are only present in target database and they will remain unchanged in the target database. The column in the middle shows the difference between the source and target corresponding tables.

-The difference is depicted by the red and green buttons with S and D +The difference is depicted by the red and green buttons with S and D letters, indicating that either Structure or Data are not up to date. By -clicking on them, they will turn grey, what means that they will be synchronised. +clicking on them, they will turn grey, what means that they will be synchronized.

From f41c6f887ad88f42456392712ec83e5b0a0b7343 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 9 Jun 2010 16:37:01 +0200 Subject: [PATCH 29/71] FAQ 7.1 forum link Tiny improvement; link directly to the forum instead of the main sourceforge page. --- Documentation.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation.html b/Documentation.html index 5c966737d..72d03b55d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4344,8 +4344,9 @@ chmod o+rwx tmp under the Bugs section.

But please first discuss your bug with other users:
- - http://sf.net/projects/phpmyadmin/ (and choose Forums)

+ + https://sourceforge.net/projects/phpmyadmin/forums. +

7.2 I want to translate the messages to a new language or upgrade an From 761aaf8bf20779c1ac5942a7b62b2315d8f5218d Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 9 Jun 2010 16:38:09 +0200 Subject: [PATCH 30/71] FAQ 7.2 translation additions This adds a section about documentation translation. The text was taken from the PMA website. --- Documentation.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation.html b/Documentation.html index 72d03b55d..062657fa1 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4379,6 +4379,18 @@ chmod o+rwx tmp list, because this is where we ask for translations of new messages.

+

+ Documentation is being translated using po4a and gettext (see + documentation + for existing translations). To start, checkout + localized_docs/po + from Git, or just go to the translation server + and translate it online. If your language is missing, just contact + Michal Čihař; he will add it. If + you prefer to directly translate the po files, please put updated ones into our + translation tracker. +

+

7.3 I would like to help out with the development of phpMyAdmin. How should I proceed?

From aa98d772e6f380f9d3b1ee9d9a6104c58192d1bc Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 9 Jun 2010 16:40:29 +0200 Subject: [PATCH 31/71] Documentation: FAQ 7.2 cleanup Some cleanups for FAQ 7.2 --- Documentation.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation.html b/Documentation.html index 062657fa1..374366c4d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4352,14 +4352,14 @@ chmod o+rwx tmp 7.2 I want to translate the messages to a new language or upgrade an existing language, where do I start? -

Always use latest Git version of po file to translate. You can optionally +

Always use latest Git version of the po file to translate. You can optionally translate online at our translation - server where you can also get latest po files and merge them - with your translations. For creating new translation simply use + server where you can also get the latest po files and merge them + with your translations. For creating a new translation simply use po/phpmyadmin.pot and generate po/LANG_CODE.po for your language (you can use msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po - to do this) or ask on mailing list to add the translation to the web + to do this) or ask on the mailing list to add the translation to the web interface. More details are available on our wiki.

@@ -4367,15 +4367,15 @@ chmod o+rwx tmp the translations, since we define the right character set in the file. With HTML entities, the text on JavaScript messages would not display correctly. - However there are some entities that need to be there, for quotes, + However there are some entities that need to be there: quotes, non-breakable spaces, ampersands, less than, greater than.

You can then put your translations, as a zip file to avoid losing special - characters, on the sourceforge.net translation tracker. + characters, on the sourceforge.net translation tracker.

- It would be a good idea to subscribe to the phpmyadmin-translators mailing + It would be a good idea to subscribe to the phpmyadmin-translators mailing list, because this is where we ask for translations of new messages.

From 3fc1f82e3ef9bf4408786335f224aad8ad4977ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 9 Jun 2010 16:43:26 +0200 Subject: [PATCH 32/71] Fix markup. --- Documentation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation.html b/Documentation.html index 374366c4d..8839845e3 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4383,7 +4383,7 @@ chmod o+rwx tmp Documentation is being translated using po4a and gettext (see documentation for existing translations). To start, checkout - localized_docs/po + localized_docs/po from Git, or just go to the translation server and translate it online. If your language is missing, just contact Michal Čihař; he will add it. If From 483bef00e64bda27ad17153c447b16c71d91af0a Mon Sep 17 00:00:00 2001 From: ardavies Date: Wed, 9 Jun 2010 18:02:50 +0200 Subject: [PATCH 33/71] Translation update done using Pootle. --- po/cy.po | 60 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/po/cy.po b/po/cy.po index d6f4b3f22..fae9fe4f3 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1351,24 +1351,27 @@ msgstr "Gwall" #: libraries/Message.class.php:282 #, php-format +#, possible-php-format msgid "%1$d row affected." msgid_plural "%1$d rows affected." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%1$d rhes wedi'i heffeithio." +msgstr[1] "%1$d rhes wedi'u heffeithio." #: libraries/Message.class.php:301 #, php-format +#, possible-php-format msgid "%1$d row deleted." msgid_plural "%1$d rows deleted." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%1$d rhes wedi'i dileu." +msgstr[1] "%1$d rhes wedi'u dileu." #: libraries/Message.class.php:320 #, php-format +#, possible-php-format msgid "%1$d row inserted." msgid_plural "%1$d rows inserted." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%1$d rhes wedi'i hychwanegu." +msgstr[1] "%1$d rhes wedi'u hychwanegu." #: libraries/StorageEngine.class.php:198 msgid "" @@ -1392,65 +1395,72 @@ msgstr "" #: libraries/Table.class.php:1019 msgid "Invalid database" -msgstr "" +msgstr "Crofna ddata annilys" #: libraries/Table.class.php:1033 tbl_get_field.php:26 msgid "Invalid table name" -msgstr "" +msgstr "Enw tabl annilys" #: libraries/Table.class.php:1048 #, php-format +#, possible-php-format msgid "Error renaming table %1$s to %2$s" -msgstr "" +msgstr "Gwall wrth ailenwi tabl %1$s i %2$s" #: libraries/Table.class.php:1132 #, php-format +#, possible-php-format msgid "Table %s has been renamed to %s" -msgstr "" +msgstr "Cafodd y tabl %s ei ailenwi i %s" #: libraries/Theme.class.php:162 #, php-format +#, possible-php-format msgid "No valid image path for theme %s found!" -msgstr "" +msgstr "Dim llwybr delwedd dilys ar gael ar gyfer thema %s." #: libraries/Theme.class.php:384 msgid "No preview available." -msgstr "" +msgstr "Dim rhagolwg ar gael" #: libraries/Theme.class.php:387 msgid "take it" -msgstr "" +msgstr "cymerwch e" #: libraries/Theme_Manager.class.php:115 #, php-format +#, possible-php-format msgid "Default theme %s not found!" -msgstr "" +msgstr "Thema diofyn %s heb ei darganfod!" #: libraries/Theme_Manager.class.php:153 #, php-format +#, possible-php-format msgid "Theme %s not found!" -msgstr "" +msgstr "Heb ddarganfod thema ddiofyn %s!" #: libraries/Theme_Manager.class.php:221 #, php-format +#, possible-php-format msgid "Theme path not found for theme %s!" -msgstr "" +msgstr "Heb ddarganfod llwybr thema ar gyfer thema %s!" #: libraries/Theme_Manager.class.php:297 test/theme.php:161 themes.php:21 #: themes.php:41 msgid "Theme / Style" -msgstr "" +msgstr "Thema / Arddull" #: libraries/auth/config.auth.lib.php:77 msgid "Cannot connect: invalid settings." -msgstr "" +msgstr "Methu â chysylltu: gosodiadau annilys" #: libraries/auth/config.auth.lib.php:92 #: libraries/auth/cookie.auth.lib.php:219 libraries/auth/http.auth.lib.php:65 #: test/theme.php:152 #, php-format +#, possible-php-format msgid "Welcome to %s" -msgstr "" +msgstr "Croeso i %s" #: libraries/auth/config.auth.lib.php:107 #, php-format @@ -1476,28 +1486,30 @@ msgstr "Mewngofnodwch" #: libraries/navigation_header.inc.php:93 #: libraries/navigation_header.inc.php:95 msgid "phpMyAdmin documentation" -msgstr "" +msgstr "Dogfennaeth phpMyAdmin" #: libraries/auth/cookie.auth.lib.php:258 #: libraries/auth/cookie.auth.lib.php:259 msgid "You can enter hostname/IP address and port separated by space." msgstr "" +"Gallwch gyflwyno enw'r gwesteiwr / cyfeiriad IP a'r porth gan eu gwahanu gan " +"fwlch." #: libraries/auth/cookie.auth.lib.php:258 msgid "Server:" -msgstr "" +msgstr "Gweinydd:" #: libraries/auth/cookie.auth.lib.php:263 msgid "Username:" -msgstr "" +msgstr "Enw defnyddiwr:" #: libraries/auth/cookie.auth.lib.php:267 msgid "Password:" -msgstr "" +msgstr "Cyfrinair:" #: libraries/auth/cookie.auth.lib.php:274 msgid "Server Choice" -msgstr "" +msgstr "Dewis Gweinydd" #: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59 msgid "Cookies must be enabled past this point." From 22327d151e9583691d1590dcde162d76b4c0cf85 Mon Sep 17 00:00:00 2001 From: ardavies Date: Thu, 10 Jun 2010 00:31:24 +0200 Subject: [PATCH 34/71] Translation update done using Pootle. --- po/cy.po | 60 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/po/cy.po b/po/cy.po index fae9fe4f3..cb494199c 100644 --- a/po/cy.po +++ b/po/cy.po @@ -5944,11 +5944,11 @@ msgstr "" #: setup/lib/messages.inc.php:56 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "Tab a ddengys wrth fyned i dabl" #: setup/lib/messages.inc.php:57 msgid "Default table tab" -msgstr "" +msgstr "Tab tabl diofyn" #: setup/lib/messages.inc.php:58 msgid "" @@ -5962,7 +5962,7 @@ msgstr "" #: setup/lib/messages.inc.php:60 msgid "Display databases as a list" -msgstr "" +msgstr "Dangos cronfeydd data fel rhestr" #: setup/lib/messages.inc.php:62 msgid "Show server listing as a list instead of a drop down" @@ -5970,11 +5970,11 @@ msgstr "" #: setup/lib/messages.inc.php:63 msgid "Display servers as a list" -msgstr "" +msgstr "Dangos gweinyddion fel rhestr" #: setup/lib/messages.inc.php:67 msgid "Could not connect to MySQL server" -msgstr "" +msgstr "Methu â chysylltu i'r gweinydd MySQL" #: setup/lib/messages.inc.php:68 msgid "Empty phpMyAdmin control user password while using pmadb" @@ -6007,20 +6007,21 @@ msgstr "" #: setup/lib/messages.inc.php:75 msgid "Not a valid port number" -msgstr "" +msgstr "Nid yn rhif porth ddilys" #: setup/lib/messages.inc.php:77 #, php-format +#, possible-php-format msgid "Missing data for %s" -msgstr "" +msgstr "Data ar goll ar gyfer %s" #: setup/lib/messages.inc.php:78 msgid "Not a non-negative number" -msgstr "" +msgstr "Nid yn rhif annegyddol" #: setup/lib/messages.inc.php:79 msgid "Not a positive number" -msgstr "" +msgstr "Nid yn rhif bositif" #: setup/lib/messages.inc.php:80 msgid "" @@ -6034,31 +6035,31 @@ msgstr "" #: setup/lib/messages.inc.php:83 msgid "Character set of the file" -msgstr "" +msgstr "Set nodau y ffeil" #: setup/lib/messages.inc.php:85 msgid "Database name template" -msgstr "" +msgstr "Templed enw cronfa ddata" #: setup/lib/messages.inc.php:86 msgid "Server name template" -msgstr "" +msgstr "Templed enw gweinydd" #: setup/lib/messages.inc.php:87 msgid "Table name template" -msgstr "" +msgstr "Templed enw tabl" #: setup/lib/messages.inc.php:89 msgid "Save on server" -msgstr "" +msgstr "Cadw ar y gweinydd" #: setup/lib/messages.inc.php:91 msgid "Remember file name template" -msgstr "" +msgstr "Cofio templed enw ffeil" #: setup/lib/messages.inc.php:92 msgid "no" -msgstr "" +msgstr "na" #: setup/lib/messages.inc.php:93 msgid "Force secured connection while using phpMyAdmin" @@ -7733,42 +7734,45 @@ msgstr "" #: tbl_tracking.php:593 msgid "Version" -msgstr "" +msgstr "Fersiwn" #: tbl_tracking.php:640 #, php-format +#, possible-php-format msgid "Deactivate tracking for %s.%s" -msgstr "" +msgstr "Dadweithredwch dracio am %s.%s" #: tbl_tracking.php:642 msgid "Deactivate now" -msgstr "" +msgstr "Dadweithredwch nawr" #: tbl_tracking.php:653 #, php-format +#, possible-php-format msgid "Activate tracking for %s.%s" -msgstr "" +msgstr "Gweithredwch dracio am %s.%s" #: tbl_tracking.php:655 msgid "Activate now" -msgstr "" +msgstr "Gweithredwch nawr" #: tbl_tracking.php:668 #, php-format +#, possible-php-format msgid "Create version %s of %s.%s" -msgstr "" +msgstr "Crëwch fersiwn %s o %s.%s" #: tbl_tracking.php:672 msgid "Track these data definition statements:" -msgstr "" +msgstr "Traciwch y datganiadau diffiniad data hyn:" #: tbl_tracking.php:680 msgid "Track these data manipulation statements:" -msgstr "" +msgstr "Traciwch y datganiadau trin data hyn:" #: tbl_tracking.php:688 msgid "Create version" -msgstr "" +msgstr "Crëwch fersiwn" #: themes.php:32 #, php-format @@ -7779,11 +7783,11 @@ msgstr "" #: themes.php:42 msgid "Get more themes!" -msgstr "" +msgstr "Cael gafael ar mwy o themâu" #: transformation_overview.php:25 msgid "Available MIME types" -msgstr "" +msgstr "Mathau MIME ar gael" #: transformation_overview.php:38 msgid "" @@ -7797,7 +7801,7 @@ msgstr "" #: transformation_overview.php:48 msgctxt "for MIME transformation" msgid "Description" -msgstr "" +msgstr "Disgrifiad" #: user_password.php:54 msgid "You don't have sufficient privileges to be here right now!" From 1c5fd1f0fc6a342c536414a8755c2d4408738b4d Mon Sep 17 00:00:00 2001 From: ardavies Date: Thu, 10 Jun 2010 00:39:53 +0200 Subject: [PATCH 35/71] Translation update done using Pootle. --- po/cy.po | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/po/cy.po b/po/cy.po index cb494199c..810616840 100644 --- a/po/cy.po +++ b/po/cy.po @@ -5679,100 +5679,101 @@ msgstr "" #: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17 #: setup/lib/messages.inc.php:219 msgid "Overview" -msgstr "" +msgstr "Gorolwg" #: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337 msgid "Show hidden messages (#MSG_COUNT)" -msgstr "" +msgstr "Dangos negeseuon cudd (#MSG_COUNT)" #: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213 msgid "There are no configured servers" -msgstr "" +msgstr "Nid oes unrhyw gweinyddion a ffurfweddwyd" #: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212 msgid "New server" -msgstr "" +msgstr "Gweinydd newydd" #: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50 msgid "Default language" -msgstr "" +msgstr "Iaith ddiofyn" #: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187 msgid "let the user choose" -msgstr "" +msgstr "gadewch i'r defnyddiwr ddewis" #: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216 msgid "- none -" -msgstr "" +msgstr "-dim-" #: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51 msgid "Default server" -msgstr "" +msgstr "Gweinydd diofyn" #: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66 msgid "End of line" -msgstr "" +msgstr "Diwedd y llinell" #: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61 msgid "Display" -msgstr "" +msgstr "Dangos" #: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190 msgid "Load" -msgstr "" +msgstr "llwytho" #: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152 msgid "phpMyAdmin homepage" -msgstr "" +msgstr "hafan phpMyAdmin" #: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64 msgid "Donate" -msgstr "" +msgstr "Rhodd" #: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370 msgid "Check for latest version" -msgstr "" +msgstr "Gwiriwch y fersiwn diweddaraf" #: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137 msgid "Features" -msgstr "" +msgstr "Nodweddion" #: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113 msgid "Navigation frame" -msgstr "" +msgstr "Ffrâm llywio" #: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118 msgid "Main frame" -msgstr "" +msgstr "Prif ffrâm" #: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272 msgid "Edit server" -msgstr "" +msgstr "Golygu gweinydd" #: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241 msgid "Add a new server" -msgstr "" +msgstr "Ychwanegwch weinydd newydd" #: setup/lib/FormDisplay.class.php:458 setup/lib/messages.inc.php:76 msgid "Incorrect value" -msgstr "" +msgstr "Gwerth anghywir" #: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328 #, php-format +#, possible-php-format msgid "Set value: %s" -msgstr "" +msgstr "Gosod gwerth: %s" #: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234 msgid "Restore default value" -msgstr "" +msgstr "Adfer gwerth diofyn" #: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377 msgid "Warning" -msgstr "" +msgstr "Rhybudd" #: setup/lib/messages.inc.php:16 msgid "Allow character set conversion" -msgstr "" +msgstr "Caniatáu trosi set nodau" #: setup/lib/messages.inc.php:17 msgid "" @@ -5791,7 +5792,7 @@ msgstr "" #: setup/lib/messages.inc.php:19 msgid "Allow login to any MySQL server" -msgstr "" +msgstr "Caniatáu mewngofnodi i unrhyw weinydd MySQL" #: setup/lib/messages.inc.php:20 msgid "Show "Drop database" link to normal users" From ea110212d2f71408aad77c98074988c400d4f4aa Mon Sep 17 00:00:00 2001 From: ardavies Date: Thu, 10 Jun 2010 00:50:05 +0200 Subject: [PATCH 36/71] Translation update done using Pootle. --- po/cy.po | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/po/cy.po b/po/cy.po index 810616840..ea0001f20 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6745,7 +6745,7 @@ msgstr "" #: setup/lib/messages.inc.php:266 msgid "Count tables" -msgstr "" +msgstr "Cyfrifwch y tablau" #: setup/lib/messages.inc.php:267 msgid "" @@ -6784,15 +6784,15 @@ msgstr "" #: setup/lib/messages.inc.php:274 msgid "PHP extension to use" -msgstr "" +msgstr "Estyniad PHP i'w ddefnyddio" #: setup/lib/messages.inc.php:275 msgid "Hide databases matching regular expression (PCRE)" -msgstr "" +msgstr "Cuddio cronfeydd data sydd yn cydweddu â mynegiant arferol (PCRE)" #: setup/lib/messages.inc.php:276 msgid "Hide databases" -msgstr "" +msgstr "Cuddio cronfeydd data" #: setup/lib/messages.inc.php:277 msgid "" @@ -6802,7 +6802,7 @@ msgstr "" #: setup/lib/messages.inc.php:278 msgid "SQL query history table" -msgstr "" +msgstr "Tabl hanes ymholiadau SQL" #: setup/lib/messages.inc.php:279 msgid "" @@ -6812,45 +6812,48 @@ msgstr "" #: setup/lib/messages.inc.php:280 msgid "SQL query tracking table" -msgstr "" +msgstr "Tabl tracio ymholiadau SQL" #: setup/lib/messages.inc.php:281 msgid "Hostname where MySQL server is running" -msgstr "" +msgstr "Enw'r gwesteiwr ble mae'r gweinydd MySQL yn rhedeg" #: setup/lib/messages.inc.php:282 msgid "Server hostname" -msgstr "" +msgstr "Enw gwesteiwr y gweinydd" #: setup/lib/messages.inc.php:283 msgid "Logout URL" -msgstr "" +msgstr "URL allgofnodi" #: setup/lib/messages.inc.php:284 msgid "Try to connect without password" -msgstr "" +msgstr "Ceisiwch â chysylltu heb gyfrinair" #: setup/lib/messages.inc.php:285 msgid "Connect without password" -msgstr "" +msgstr "Cysylltwch heb gyfrinair" #: setup/lib/messages.inc.php:286 msgid "" "You can use MySQL wildcard characters (% and _), escape them if you want to " "use their literal instances, i.e. use 'my\\_db' and not 'my_db'" msgstr "" +"Gallwch ddefnyddio nod-chwilwyr (% and _) MySQL. Bydd angen eu dianc os " +"ydych am eu defnyddio'n llythrennol, h.y. defnyddiwch 'my\\_db' ac nid " +"'my_db'" #: setup/lib/messages.inc.php:287 msgid "Show only listed databases" -msgstr "" +msgstr "Dangoswch gronfeydd data a restrir yn unig" #: setup/lib/messages.inc.php:288 setup/lib/messages.inc.php:322 msgid "Leave empty if not using config auth" -msgstr "" +msgstr "Gadewch yn wag os nac ydych yn defnyddio 'config auth'" #: setup/lib/messages.inc.php:289 msgid "Password for config auth" -msgstr "" +msgstr "Cyfrinair am 'config auth'" #: setup/lib/messages.inc.php:290 msgid "" From 1bbefe5e0e007c2b3f4ad5467deee58906c6812b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 Jun 2010 10:52:00 +0200 Subject: [PATCH 37/71] Ignore non official themes. --- themes/.gitignore | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/themes/.gitignore b/themes/.gitignore index 306f1c3b1..267697069 100644 --- a/themes/.gitignore +++ b/themes/.gitignore @@ -1,3 +1,27 @@ -*/ -!darkblue_orange/ -!original/ +aqua +aqua_brushed +arctic_ocean +cactica_blues +clearview3 +crimson_gray +dark_lime +darkblue_gray +garvblue +graphivore +green_orange +grid +hillside +openphpnuke +original_small +paradice +pixeline +silk +silkline +smooth_yellow +very_small +xampp +xp_basic +xp_blue +xp_dirty +xp_green +xp_silver From b50c67724cf36bd967d9b154ee41e39bc1759d3b Mon Sep 17 00:00:00 2001 From: lorilee Date: Tue, 8 Jun 2010 10:52:38 -0400 Subject: [PATCH 38/71] New export page --- libraries/display_export.lib.php | 349 +++++++++++++++---------------- 1 file changed, 164 insertions(+), 185 deletions(-) diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 54867f503..cb7dc4b10 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -67,202 +67,181 @@ if (! empty($sql_query)) { } echo PMA_pluginGetJavascript($export_list); ?> -
- - -
- -
-
- - - -
- -
- - -
+
+

Format:

+
-
 - -
- +
+ ' . __('Database(s):') . ''; + } else if($export_type == 'database') { + echo '

' . __('Table(s):') . '

'; + } + if (! empty($multi_values)) { + echo $multi_values; + } + ?>
-
- -
- '; - - echo sprintf(__('Dump %s row(s) starting at row # %s'), - '', - ' '); - - echo ''; - echo ''; - ?> -
+
+

+
    +
  • + '; + echo ''; ?> +
      +
    • ' ?>
      • +
    • '; ?>
      • +
    +
    • +
  • + '; + echo ' ';?> +
    • +
+
-
-
- - /> - - +
+

+
    +
  • + /> + +
      + +
    • + /> + +
      • +
    • + /> + +
      • + +
    • +
      • +
    • + ' + . __('Character set of the file:') . '' . "\n"; + reset($cfg['AvailableCharsets']); + echo ''; + } // end if + ?> +
      • +
    • + + + + + + +
      • +
    +
    • +
    • +
+
- $trans = new PMA_Message; - $trans->addMessage('__SERVER__/'); - $trans->addString(__('server name')); - if ($export_type == 'database' || $export_type == 'table') { - $trans->addMessage('__DB__/'); - $trans->addString(__('database name')); - if ($export_type == 'table') { - $trans->addMessage('__TABLE__/'); - $trans->addString(__('table name')); - } - } - - $message = new PMA_Message(__('This value is interpreted using %1$sstrftime%2$s, so you can use time formatting strings. Additionally the following transformations will happen: %3$s. Other text will be kept as is.')); - $message->addParam('', false); - $message->addParam('', false); - $message->addParam($trans); - - echo PMA_showHint($message); - ?> - : - - /> - - ( - /> - - ) - -
- ' - . __('Character set of the file:') . '' . "\n"; - - reset($cfg['AvailableCharsets']); - echo ''; - } // end if - ?> -
- - -
- : - /> - - - /> - - - /> - - - /> - - -
- - - -
+
+

+ +
From af801d08ad88b1c1dbddaa838115ff08c827814d Mon Sep 17 00:00:00 2001 From: lorilee Date: Tue, 8 Jun 2010 10:53:26 -0400 Subject: [PATCH 39/71] Revert "New export page" This reverts commit f3dcd3502503147f18cfdf8eaceb37ac69f92b5a. --- libraries/display_export.lib.php | 349 ++++++++++++++++--------------- 1 file changed, 185 insertions(+), 164 deletions(-) diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index cb7dc4b10..54867f503 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -67,181 +67,202 @@ if (! empty($sql_query)) { } echo PMA_pluginGetJavascript($export_list); ?> +
+ -
-

Format:

- + +
+ +
+
+ + + +
+ +
+ + +
-
- ' . __('Database(s):') . ''; - } else if($export_type == 'database') { - echo '

' . __('Table(s):') . '

'; - } - if (! empty($multi_values)) { - echo $multi_values; - } - ?> +
 + +
+
+
+ -
-

-
    -
  • - '; - echo ''; ?> -
      -
    • ' ?>
      • -
    • '; ?>
      • -
    -
    • -
  • - '; - echo ' ';?> -
    • -
-
+
+ '; + + echo sprintf(__('Dump %s row(s) starting at row # %s'), + '', + ' '); + + echo ''; + echo ''; + ?> +
+
-
-

-
    -
  • - /> - -
      - -
    • - /> - -
      • -
    • - /> - -
      • - -
    • -
      • -
    • - ' - . __('Character set of the file:') . '' . "\n"; - reset($cfg['AvailableCharsets']); - echo ''; - } // end if - ?> -
      • -
    • - - - - - - -
      • -
    -
    • -
    • -
-
+ : + + /> + + ( + /> + + ) + +
+ ' + . __('Character set of the file:') . '' . "\n"; + + reset($cfg['AvailableCharsets']); + echo ''; + } // end if + ?> +
+ + +
+ : + /> + + + /> + + + /> + + + /> + + +
+ + + + From 417c185d35d4e6e69500577eb3d5a68987691d5a Mon Sep 17 00:00:00 2001 From: lorilee Date: Tue, 8 Jun 2010 10:57:31 -0400 Subject: [PATCH 40/71] The new export page --- libraries/display_export.lib.php | 349 +++++++++++++++---------------- 1 file changed, 164 insertions(+), 185 deletions(-) diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 54867f503..cb7dc4b10 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -67,202 +67,181 @@ if (! empty($sql_query)) { } echo PMA_pluginGetJavascript($export_list); ?> -
- - -
- -
-
- - - -
- -
- - -
+
+

Format:

+
-
 - -
- +
+ ' . __('Database(s):') . ''; + } else if($export_type == 'database') { + echo '

' . __('Table(s):') . '

'; + } + if (! empty($multi_values)) { + echo $multi_values; + } + ?>
-
- -
- '; - - echo sprintf(__('Dump %s row(s) starting at row # %s'), - '', - ' '); - - echo ''; - echo ''; - ?> -
+
+

+
    +
  • + '; + echo ''; ?> +
      +
    • ' ?>
      • +
    • '; ?>
      • +
    +
    • +
  • + '; + echo ' ';?> +
    • +
+
-
-
- - /> - - +
+

+
    +
  • + /> + +
      + +
    • + /> + +
      • +
    • + /> + +
      • + +
    • +
      • +
    • + ' + . __('Character set of the file:') . '' . "\n"; + reset($cfg['AvailableCharsets']); + echo ''; + } // end if + ?> +
      • +
    • + + + + + + +
      • +
    +
    • +
    • +
+
- $trans = new PMA_Message; - $trans->addMessage('__SERVER__/'); - $trans->addString(__('server name')); - if ($export_type == 'database' || $export_type == 'table') { - $trans->addMessage('__DB__/'); - $trans->addString(__('database name')); - if ($export_type == 'table') { - $trans->addMessage('__TABLE__/'); - $trans->addString(__('table name')); - } - } - - $message = new PMA_Message(__('This value is interpreted using %1$sstrftime%2$s, so you can use time formatting strings. Additionally the following transformations will happen: %3$s. Other text will be kept as is.')); - $message->addParam('', false); - $message->addParam('', false); - $message->addParam($trans); - - echo PMA_showHint($message); - ?> - : - - /> - - ( - /> - - ) - -
- ' - . __('Character set of the file:') . '' . "\n"; - - reset($cfg['AvailableCharsets']); - echo ''; - } // end if - ?> -
- - -
- : - /> - - - /> - - - /> - - - /> - - -
- - - -
+
+

+ +
From 9c486804802dcd88ba7ae82f9da0dd7a5e1fcf8d Mon Sep 17 00:00:00 2001 From: lorilee Date: Tue, 8 Jun 2010 22:22:41 -0400 Subject: [PATCH 41/71] Added styles for export --- themes/original/css/theme_right.css.php | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index b3c510154..3c671d68e 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1228,3 +1228,48 @@ table#serverconnection_trg_local { */ .invalid_value {background:#F00;} + +/** + * Export styles + */ +select#db_select, select#table_select { + width: 400px; +} + +.exportoptions h3, .importoptions h3 { + border-bottom: 1px #999999 solid; +} + +.exportoptions ul, .importoptions ul, .format_specific_options ul { + list-style-type: none; + margin-bottom: 15px; +} + +.exportoptions li, .importoptions li { + margin: 7px; +} + +.exportoptions label, .importoptions label { + margin: 5px; + float: none; +} + +.exportoptions, .importoptions { + margin: 30px 0px 30px 10px +} + +.export_sub_options { + margin: 30px 0px 0px 0px; +} + +.export_sub_options h4 { + border-bottom: 1px #999999 solid; +} + +p.desc { + margin: 5px; +} + +.formelementrow { + margin: 5px 0px 5px 0px; +} From bef15c266d02d4cdd507fa860a17c2943799dd02 Mon Sep 17 00:00:00 2001 From: lorilee Date: Tue, 8 Jun 2010 22:28:40 -0400 Subject: [PATCH 42/71] Modified formatting for new export page --- server_export.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server_export.php b/server_export.php index e728465bc..183b784c4 100644 --- a/server_export.php +++ b/server_export.php @@ -12,6 +12,7 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'functions.js'; +$GLOBALS['js_include'][] = 'export.js'; /** * Displays the links @@ -23,12 +24,12 @@ $checkall_url = 'server_export.php?' . PMA_generate_common_url() . '&goto=db_export.php'; -$multi_values = '
'; +$multi_values = '
'; $multi_values .= '' . __('Select All') . ' / ' . __('Unselect All') . '
'; -$multi_values .= ''; $multi_values .= "\n"; foreach ($GLOBALS['pma']->databases as $current_db) { @@ -41,7 +42,7 @@ foreach ($GLOBALS['pma']->databases as $current_db) { $multi_values .= ' ' . "\n"; } // end while $multi_values .= "\n"; -$multi_values .= '

'; +$multi_values .= '
'; $export_type = 'server'; require_once './libraries/display_export.lib.php'; From 101b14fef1afe6281054a7e9dd286fd0eda3bca1 Mon Sep 17 00:00:00 2001 From: lorilee Date: Tue, 8 Jun 2010 22:29:03 -0400 Subject: [PATCH 43/71] Modified formatting for new export page --- tbl_export.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tbl_export.php b/tbl_export.php index 086dd39f7..775650dc0 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -11,6 +11,8 @@ */ require_once './libraries/common.inc.php'; +$GLOBALS['js_include'][] = 'export.js'; + /** * Gets tables informations and displays top links */ From 5339c712a622b939d603d004514cdfaf96d40b4d Mon Sep 17 00:00:00 2001 From: lorilee Date: Tue, 8 Jun 2010 22:30:02 -0400 Subject: [PATCH 44/71] Modified formatting for new export page --- db_export.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/db_export.php b/db_export.php index 718a489d8..32971ab5f 100644 --- a/db_export.php +++ b/db_export.php @@ -16,6 +16,8 @@ */ require_once './libraries/common.inc.php'; +$GLOBALS['js_include'][] = 'export.js'; + // $sub_part is also used in db_info.inc.php to see if we are coming from // db_export.php, in which case we don't obey $cfg['MaxTableList'] $sub_part = '_export'; @@ -39,12 +41,12 @@ $checkall_url = 'db_export.php?' . PMA_generate_common_url($db) . '&goto=db_export.php'; -$multi_values = '
'; +$multi_values = '
'; $multi_values .= '' . __('Select All') . ' / ' . __('Unselect All') . '
'; -$multi_values .= ''; $multi_values .= "\n"; if (!empty($selected_tbl) && empty($table_select)) { @@ -65,7 +67,7 @@ foreach ($tables as $each_table) { } // end for $multi_values .= "\n"; -$multi_values .= '

'; +$multi_values .= '
'; $export_type = 'database'; require_once './libraries/display_export.lib.php'; From 07b6618cef5a5e4ba44c10b07a027f4a5916c7d6 Mon Sep 17 00:00:00 2001 From: lorilee Date: Tue, 8 Jun 2010 22:34:38 -0400 Subject: [PATCH 45/71] - radio buttons of plugins changed to a dropdown list - "formelement" divs changed to list elements - PMA_pluginGetOneOption() accepts radio buttons - fieldsets changed to divs - removed JavaScript code that toggles plugin-specific options (now in a separate file) --- libraries/plugin_interface.lib.php | 140 +++++++++++++---------------- 1 file changed, 61 insertions(+), 79 deletions(-) diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index b78d32f80..3883256a9 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -142,37 +142,44 @@ function PMA_pluginIsActive($section, $opt, $val) /** * string PMA_pluginGetChoice(string $section, string $name, array &$list, string $cfgname) * - * returns html radio form element for plugin choice + * returns html select form element for plugin choice + * and hidden fields denoting whether each plugin must be exported as a file * - * @uses PMA_pluginIsActive() + * @uses PMA_pluginGetDefault() * @uses PMA_getString() * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $name name of radio element + * @param string $name name of select element * @param array &$list array with plugin configuration defined in plugin file * @param string $cfgname name of config value, if none same as $name - * @return string html input radio tag + * @return string html select tag */ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL) { if (!isset($cfgname)) { $cfgname = $name; } - $ret = ''; + $ret = '' . "\n"; - $ret .= '' . "\n"; - $ret .= '
' . "\n"; + $ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . ' \n'; + } + $ret .= '' . "\n"; + + // Whether each plugin has to be saved as a file + foreach ($list as $plugin_name => $val) { + $ret .= ''. "\n"; } return $ret; } @@ -180,7 +187,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL) /** * string PMA_pluginGetOneOption(string $section, string $plugin_name, string $id, array &$opt) * - * returns single option in a table row + * returns single option in a list element * * @uses PMA_getString() * @uses PMA_pluginCheckboxCheck() @@ -196,7 +203,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) { $ret = "\n"; if ($opt['type'] == 'bool') { - $ret .= '
' . "\n"; + $ret .= '
  • ' . "\n"; $ret .= '' . PMA_getString($opt['text']) . ''; - $ret .= '
    • ' . "\n"; } elseif ($opt['type'] == 'text') { - $ret .= '
    ' . "\n"; + $ret .= '
  • ' . "\n"; $ret .= ''; $ret .= ''; - $ret .= '
    • ' . "\n"; } elseif ($opt['type'] == 'message_only') { - $ret .= '
    ' . "\n"; + $ret .= '
  • ' . "\n"; $ret .= '

    ' . PMA_getString($opt['text']) . '

    '; - $ret .= '
    • ' . "\n"; } elseif ($opt['type'] == 'select') { - $ret .= '
    ' . "\n"; + $ret .= '
  • ' . "\n"; $ret .= ''; $ret .= ''; - $ret .= '
    • ' . "\n"; + } elseif ($opt['type'] == 'radio') { + $default = PMA_pluginGetDefault($section, $plugin_name . '_' . $opt['name']); + foreach($opt['values'] as $key => $val) { + $ret .= '
  • ' + . PMA_getString($val) . ''; + } } elseif ($opt['type'] == 'hidden') { $ret .= ''; - } elseif ($opt['type'] == 'bgroup') { - $ret .= '
    '; - /* No checkbox without name */ - if (!empty($opt['name'])) { - $ret .= '' - . PMA_getString($opt['text']) . ''; - } else { - $ret .= PMA_getString($opt['text']); - } - $ret .= ''; - } elseif ($opt['type'] == 'egroup') { - $ret .= '
    '; + } elseif ($opt['type'] == 'begin_group') { + $ret .= '

    ' . PMA_getString($opt['text']) . '

      '; + } elseif ($opt['type'] == 'end_group') { + $ret .= '
    '; + } elseif ($opt['type'] == 'begin_subgroup') { + /* each subgroup can have a header, which may also be a form element */ + $ret .= PMA_pluginGetOneOption($section, $plugin_name, $id, $opt['subgroup_header']) . '
      '; + } elseif ($opt['type'] == 'end_subgroup') { + $ret .= '
    '; } else { /* This should be seen only by plugin writers, so I do not thing this * needs translation. */ @@ -279,6 +279,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) $ret .= PMA_showMySQLDocu($opt['doc'][0], $opt['doc'][1]); } } + $ret .= "\n"; return $ret; } @@ -286,10 +287,11 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) /** * string PMA_pluginGetOptions(string $section, array &$list) * - * return html fieldset with editable options for plugin + * return html div with editable options for plugin * * @uses PMA_getString() * @uses PMA_pluginGetOneOption() + * @uses PMA_pluginGetDefault(); * @param string $section name of config section in $GLOBALS['cfg'][$section] * @param array &$list array with plugin configuration defined in plugin file * @return string html fieldset with plugin options @@ -297,10 +299,14 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) function PMA_pluginGetOptions($section, &$list) { $ret = ''; + $default = PMA_pluginGetDefault('Export', 'format'); // Options for plugins that support them foreach ($list as $plugin_name => $val) { - $ret .= '
    '; - $ret .= '' . PMA_getString($val['options_text']) . ''; + $ret .= '
    0) { foreach ($val['options'] as $id => $opt) { @@ -311,7 +317,7 @@ function PMA_pluginGetOptions($section, &$list) if ($count == 0) { $ret .= __('This format has no options'); } - $ret .= '
    '; + $ret .= ''; } return $ret; } @@ -324,36 +330,12 @@ function PMA_pluginGetOptions($section, &$list) * @param array &$list array with plugin configuration defined in plugin file * @return string html fieldset with plugin options */ + //TODO eliminate this eventually function PMA_pluginGetJavascript(&$list) { $ret = ' - '; - return $ret; -} -?> From 9444aba181d399b0dac5d52146a13dbb7d3bbe98 Mon Sep 17 00:00:00 2001 From: lorilee Date: Fri, 11 Jun 2010 01:18:18 -0400 Subject: [PATCH 71/71] Added styles for import/export Go button, select and input types alignment, and import notification --- themes/original/css/theme_right.css.php | 26 +++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 3c671d68e..40189623a 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1249,13 +1249,30 @@ select#db_select, select#table_select { margin: 7px; } -.exportoptions label, .importoptions label { +.exportoptions label, .importoptions label, .exportoptions p, .importoptions p { margin: 5px; float: none; } +#csv_options .desc, #latex_options .desc, #output .desc{ + float: left; + width: 15em; +} + .exportoptions, .importoptions { - margin: 30px 0px 30px 10px + margin: 30px 30px 30px 10px +} + +.exportoptions #buttonGo, .importoptions #buttonGo { + padding: 5px 30px; + -moz-border-radius: 11px; + -webkit-border-radius: + background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); + background: -moz-linear-gradient(top, #ffffff, #cccccc); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc'); + border: 1px solid #444444; + background-color: #ffffff; + cursor: pointer; } .export_sub_options { @@ -1266,6 +1283,11 @@ select#db_select, select#table_select { border-bottom: 1px #999999 solid; } +.importoptions #import_notification { + margin: 10px 0px; + font-style: italic; +} + p.desc { margin: 5px; }