From a92bea7afedeb0ee6380c606219e52f1a13eba98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= Date: Fri, 15 May 2015 01:49:55 +0200 Subject: [PATCH 1/5] Translated using Weblate (Azerbaijani) Currently translated at 58.1% (1764 of 3035 strings) [CI skip] --- po/az.po | 59 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/po/az.po b/po/az.po index 30fe45fe32..fb13d85288 100644 --- a/po/az.po +++ b/po/az.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-05-05 15:46-0400\n" -"PO-Revision-Date: 2015-03-29 00:53+0200\n" +"PO-Revision-Date: 2015-05-15 01:49+0200\n" "Last-Translator: Sevdimali İsa \n" -"Language-Team: Azerbaijani \n" +"Language-Team: Azerbaijani " +"\n" +"Language: az\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: az\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.3-dev\n" @@ -1690,7 +1690,7 @@ msgstr "İlkin açar əlavə olunur" #: libraries/db_designer.lib.php:1175 libraries/db_designer.lib.php:1244 #: libraries/db_designer.lib.php:1321 msgid "OK" -msgstr "Müveffeqiyyetle" +msgstr "Tamam" #: js/messages.php:276 msgid "Click to dismiss this notification" @@ -4255,6 +4255,8 @@ msgid "" "A variable-length (%s) string, the effective maximum length is subject to " "the maximum row size" msgstr "" +"Dəyişən uzunluq (%s) sətri, ən çox sətir ölçüsü effektiv maksimum uzunluq " +"mövzusudur" #: libraries/Types.class.php:358 msgid "" @@ -4269,12 +4271,16 @@ msgid "" "A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored " "with a two-byte prefix indicating the length of the value in bytes" msgstr "" +"Ən çox 65,535 (2^16 - 1) simvol uzunluğunda TEXT sütunu, baytlarda dəyərin " +"uzunluğunu göstərən iki-baytlıq prefiks ilə saxlanılır" #: libraries/Types.class.php:362 msgid "" "A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, " "stored with a three-byte prefix indicating the length of the value in bytes" msgstr "" +"Ən çox 16,777,215 (2^24 - 1) simvol uzunluğunda TEXT sütunu, baytlarda " +"dəyərin uzunluğunu göstərən üç-baytlıq prefiksdə saxlanır" #: libraries/Types.class.php:364 msgid "" @@ -4282,42 +4288,56 @@ msgid "" "characters, stored with a four-byte prefix indicating the length of the " "value in bytes" msgstr "" +"Ən çox 4,294,967,295 or 4GiB (2^32 - 1) simvol uzunluğunda TEXT sütunu, " +"baytlarda dəyərin uzunluğunu göstərən dörd-baytlıq prefiks ilə saxlanır" #: libraries/Types.class.php:366 msgid "" "Similar to the CHAR type, but stores binary byte strings rather than non-" "binary character strings" msgstr "" +"CHAR tipinə bənzəyir, amma ikili olmayan simvol sətirləri əvəzinə ikili bayt " +"sətirləri saxlayır" #: libraries/Types.class.php:368 msgid "" "Similar to the VARCHAR type, but stores binary byte strings rather than non-" "binary character strings" msgstr "" +"VARCHAR tipinə bənzəyir, amma ikili olmayan simvol sətirləri əvəzinə ikili " +"bayt sətirləri saxlayır" #: libraries/Types.class.php:370 msgid "" "A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a " "one-byte prefix indicating the length of the value" msgstr "" +"Ən çox 255 (2^8 - 1) bayt uzunluğunda BLOB sütünü, dəyərin uzunluğunu " +"göstərən bir-baytlıq prefiks ilə saxlanılır" #: libraries/Types.class.php:372 msgid "" "A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored " "with a three-byte prefix indicating the length of the value" msgstr "" +"Ən çox 16,777,215 (2^24 - 1) bayt uzunluğunda BLOB sütünü, dəyərin " +"uzunluğunu göstərən üç-baytlıq prefiks ilə saxlanılır" #: libraries/Types.class.php:374 libraries/Types.class.php:796 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a two-byte prefix indicating the length of the value" msgstr "" +"Ən çox 65,535 (2^16 - 1) bayt uzunluğunda BLOB sütünü, dəyərin uzunluğunu " +"göstərən iki-baytlıq prefiks ilə saxlanılır" #: libraries/Types.class.php:376 msgid "" "A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " "bytes, stored with a four-byte prefix indicating the length of the value" msgstr "" +"Ən çox 4,294,967,295 və ya 4GiB (2^32 - 1) bayt uzunluğunda BLOB sütünü, " +"dəyərin uzunluğunu göstərən dörd-baytlıq prefiks ilə saxlanılır" #: libraries/Types.class.php:378 msgid "" @@ -4327,7 +4347,7 @@ msgstr "" #: libraries/Types.class.php:380 msgid "A single value chosen from a set of up to 64 members" -msgstr "" +msgstr "64 üzvə qədər olan bir qrupdan seçilən tək bir dəyərdir" #: libraries/Types.class.php:382 msgid "A type that can store a geometry of any type" @@ -4807,7 +4827,7 @@ msgstr "Söndürülüb" #: libraries/config.values.php:98 msgid "key" -msgstr "" +msgstr "düymə" #: libraries/config.values.php:99 msgid "display column" @@ -4885,38 +4905,38 @@ msgstr "Genişlədilmiş əlavələr" #: libraries/config.values.php:195 msgid "both of the above" -msgstr "" +msgstr "yuxarıdakının ikisidə" #: libraries/config.values.php:196 msgid "neither of the above" -msgstr "" +msgstr "yuxarıdakından heç biri" #: libraries/config/FormDisplay.class.php:96 #: libraries/config/Validator.class.php:565 msgid "Not a positive number!" -msgstr "" +msgstr "Müsbət ədəd deyil!" #: libraries/config/FormDisplay.class.php:97 #: libraries/config/Validator.class.php:587 msgid "Not a non-negative number!" -msgstr "" +msgstr "Mənfi olmayan ədəd deyil!" #: libraries/config/FormDisplay.class.php:98 #: libraries/config/Validator.class.php:543 msgid "Not a valid port number!" -msgstr "" +msgstr "Uyğun port nömrəsi deyil!" #: libraries/config/FormDisplay.class.php:99 #: libraries/config/FormDisplay.class.php:609 #: libraries/config/Validator.class.php:605 msgid "Incorrect value!" -msgstr "" +msgstr "Yanlış dəyər!" #: libraries/config/FormDisplay.class.php:100 #: libraries/config/Validator.class.php:621 #, php-format msgid "Value must be equal or lower than %s!" -msgstr "" +msgstr "Dəyər %s dəyərindən az və ya bərabər olmalıdır!" #: libraries/config/FormDisplay.class.php:571 #, php-format @@ -4934,7 +4954,7 @@ msgstr "istifadə oluna bilməz" #: libraries/config/FormDisplay.class.php:774 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "\"%s\" üçün %s genişlənməsi lazımdır" #: libraries/config/FormDisplay.class.php:793 #, php-format @@ -4949,11 +4969,11 @@ msgstr "" #: libraries/config/FormDisplay.class.php:813 #, php-format msgid "maximum %s" -msgstr "" +msgstr "maksimum %s" #: libraries/config/FormDisplay.tpl.php:216 msgid "This setting is disabled, it will not be applied to your configuration." -msgstr "" +msgstr "Bu seçim deaktiv edilib, konfiqurasiyanıza tətbiq edilməyəcək." #: libraries/config/FormDisplay.tpl.php:310 #, php-format @@ -4963,11 +4983,11 @@ msgstr "" #: libraries/config/FormDisplay.tpl.php:315 #: libraries/config/messages.inc.php:541 msgid "Restore default value" -msgstr "" +msgstr "Susmaya görə olan dəyəri geri qaytar" #: libraries/config/FormDisplay.tpl.php:329 msgid "Allow users to customize this value" -msgstr "" +msgstr "Bu dəyəri fərdiləşdirmək üçün istifadəçilərə icazə ver" #: libraries/config/FormDisplay.tpl.php:393 msgid "Apply" @@ -4976,6 +4996,7 @@ msgstr "Təsdiqlə" #: libraries/config/ServerConfigChecks.class.php:168 msgid "You should use SSL connections if your database server supports it." msgstr "" +"Əgər baza serveriniz dəstəkləyirsə SSL qoşulmasını istifadə etməlisiniz." #: libraries/config/ServerConfigChecks.class.php:205 msgid "You allow for connecting to the server without a password." From f035d48b5d40107268d3b1dee55d8fadf00fe318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 14 May 2015 15:44:39 +0200 Subject: [PATCH 2/5] Translated using Weblate (Czech) Currently translated at 96.8% (2940 of 3035 strings) [CI skip] --- po/cs.po | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/po/cs.po b/po/cs.po index 30841e82e6..38f7e03a2a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-05-05 15:46-0400\n" -"PO-Revision-Date: 2015-04-17 14:32+0200\n" +"PO-Revision-Date: 2015-05-14 15:44+0200\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Czech \n" +"Language-Team: Czech " +"\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Weblate 2.3-dev\n" @@ -1915,13 +1915,12 @@ msgid "Selected partial dependencies are as follows:" msgstr "Byly zvoleny následující částečné závislosti:" #: js/messages.php:338 -#, fuzzy msgid "" "Note: a, b -> d,f implies values of columns a and b combined together can " "determine values of column d and column f." msgstr "" -"Poznámka: a,b -> d,f zahrnuje hodnoty sloupců 'a' a 'b' kombinaci dohromady " -"může určit hodnoty sloupce 'd' a sloupce 'f'." +"Poznámka: a,b -> d,f zahrnuje hodnoty sloupců a a b kombinaci dohromady může " +"určit hodnoty sloupce d a sloupce f." #: js/messages.php:339 msgid "No partial dependencies selected!" @@ -2453,11 +2452,9 @@ msgid "Ignore All" msgstr "Ignorovat vše" #: js/messages.php:548 -#, fuzzy msgid "" "As per your settings, they are being submitted currently, please be patient." -msgstr "" -"Podle vašeho nastavení jsou aktuálně předkládány, prosím buďte trpěliví." +msgstr "Podle vašeho nastavení jsou právě odesílány, prosím buďte trpěliví." #: js/messages.php:555 msgid "Execute this query again?" @@ -5876,7 +5873,6 @@ msgid "Page titles" msgstr "Jména stránek" #: libraries/config/messages.inc.php:251 -#, fuzzy #| msgid "" #| "Specify browser's title bar text. Refer to [doc@cfg_TitleTable]" #| "documentation[/doc] for magic strings that can be used to get special " @@ -5885,8 +5881,8 @@ msgid "" "Specify browser's title bar text. Refer to [doc@faq6-27]documentation[/doc] " "for magic strings that can be used to get special values." msgstr "" -"Zadejte titulek který zobrazí prohlížeč. V [doc@cfg_TitleTable]dokumentaci[/" -"doc] naleznete jaké proměnné můžete použít." +"Zadejte titulek který zobrazí prohlížeč. V [doc@faq6-27]dokumentaci[/doc] " +"naleznete jaké proměnné můžete použít." #: libraries/config/messages.inc.php:255 msgid "Query window" @@ -6631,7 +6627,6 @@ msgid "Relational display" msgstr "Relační zobrazení" #: libraries/config/messages.inc.php:544 -#, fuzzy #| msgid "Servers display options." msgid "For display Options" msgstr "Pro zobrazení Nastavení" @@ -7636,10 +7631,9 @@ msgid "Save to selected page" msgstr "Uložit k vybrané stránce" #: libraries/db_designer.lib.php:78 -#, fuzzy #| msgid "Create a page and export to it." msgid "Create a page and save to it" -msgstr "Vytvořit stránku a uložit jí" +msgstr "Vytvořit stránku a uložit do ní" #: libraries/db_designer.lib.php:102 msgid "New page name" @@ -8972,14 +8966,14 @@ msgstr "" "ovlivnit výkon. Zvažte deaktivování seskupování položek v navigačním panelu." #: libraries/navigation/NavigationTree.class.php:871 -#, fuzzy, php-format +#, php-format #| msgid "%s other result found" #| msgid_plural "%s other results found" msgid "%s result found" msgid_plural "%s results found" -msgstr[0] "nalezen %s další výsledek" -msgstr[1] "nalezeny %s další výsledky" -msgstr[2] "nalezeno %s dalších výsledků" +msgstr[0] "nalezen %s výsledek" +msgstr[1] "nalezeny %s výsledky" +msgstr[2] "nalezeno %s výsledků" #: libraries/navigation/NavigationTree.class.php:1210 msgid "Please select a database." @@ -9684,10 +9678,9 @@ msgid "Please enter correct captcha!" msgstr "Zadejte, prosím, správný kód!" #: libraries/plugins/auth/AuthenticationCookie.class.php:422 -#, fuzzy #| msgid "Cannot log in to the MySQL server" msgid "You are not allowed to log in to this MySQL server!" -msgstr "Nepodařilo se přihlášení k MySQL serveru" +msgstr "Nemáte povolení se přihlásit k tomuto MySQL serveru!" #: libraries/plugins/auth/AuthenticationHttp.class.php:101 msgid "Wrong username/password. Access denied." @@ -13810,10 +13803,9 @@ msgstr "Transformace při prohlížení" #: libraries/tbl_columns_definition_form.lib.php:379 #: transformation_overview.php:42 -#, fuzzy #| msgid "Browser transformation" msgid "Input transformation" -msgstr "Transformace při prohlížení" +msgstr "Transformace při zadávání" #: libraries/tbl_columns_definition_form.lib.php:381 #, fuzzy From f78b75130ad899540c800513667d677a17b246eb Mon Sep 17 00:00:00 2001 From: edson garcia Date: Thu, 14 May 2015 18:33:14 +0200 Subject: [PATCH 3/5] Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.7% (3028 of 3035 strings) [CI skip] --- po/pt_BR.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 65eb82e6ab..2affa4f3f0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-05-05 15:46-0400\n" -"PO-Revision-Date: 2015-04-07 05:23+0200\n" -"Last-Translator: Washington Bruno Rodrigues Cav \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2015-05-14 18:33+0200\n" +"Last-Translator: edson garcia \n" +"Language-Team: Portuguese (Brazil) " +"\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.3-dev\n" @@ -5360,9 +5360,9 @@ msgid "" "MySQL server is enabled by matching the IP or hostname of the MySQL server " "to the given regular expression." msgstr "" -"Restringe os servidores MySQL que o usuário pode entrar quando o login para " -"um servidor MySQL arbitrário está habilitado por correspondência de IP ou " -"nome de host do servidor MySQL para a expressão regular dada." +"Restringe os servidores MySQL acessíveis ao usuário quando um login a " +"qualquer servidor MySQL é habilitado por correspondência entre o nome ou " +"endereço IP do servidor MySQL e a expressão de texto entregue." #: libraries/config/messages.inc.php:25 msgid "Restrict login to MySQL server" From fdfd9ea89c64880ae47f8572edb3417c12ea5ca3 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 15 May 2015 11:13:45 +0530 Subject: [PATCH 4/5] #4906 Designer: pages from all databases Signed-off-by: Madhura Jayaratne --- js/pmd/designer_page.js | 25 ++++++++++++++++++------- js/pmd/init.js | 2 +- js/pmd/move.js | 8 ++++---- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/js/pmd/designer_page.js b/js/pmd/designer_page.js index 36bb2d0857..9c292e79da 100644 --- a/js/pmd/designer_page.js +++ b/js/pmd/designer_page.js @@ -1,6 +1,6 @@ -function Show_tables_in_landing_page() +function Show_tables_in_landing_page(db) { - Load_first_page(function (page) { + Load_first_page(db, function (page) { if (page) { Load_HTML_for_page(page.pg_nr); selected_page = page.pg_nr; @@ -59,13 +59,16 @@ function Save_table_positions(positions, callback) DesignerOfflineDB.addObject('table_coords', positions, callback); } -function Create_page_list(callback) +function Create_page_list(db, callback) { DesignerOfflineDB.loadAllObjects('pdf_pages', function (pages) { var html = ""; for (var p = 0; p < pages.length; p++) { - html += ''; + var page = pages[p]; + if (page.db_name == db) { + html += ''; + } } if (typeof callback !== 'undefined') { callback(html); @@ -85,9 +88,17 @@ function Delete_page(page_id, callback) }); } -function Load_first_page(callback) +function Load_first_page(db, callback) { - DesignerOfflineDB.loadFirstObject('pdf_pages', callback); + DesignerOfflineDB.loadAllObjects('pdf_pages', function (pages) { + for (var i = 0; i < pages.length; i++) { + var page = pages[i]; + if (page.db_name == db) { + callback(page); + return; + } + } + }); } function Show_new_page_tables(check) diff --git a/js/pmd/init.js b/js/pmd/init.js index 7adfca5a5c..2719353716 100644 --- a/js/pmd/init.js +++ b/js/pmd/init.js @@ -33,7 +33,7 @@ AJAX.registerOnload('pmd/init.js', function () { if (! pmd_tables_enabled) { DesignerOfflineDB.open(function(success) { if (success) { - Show_tables_in_landing_page(); + Show_tables_in_landing_page(db); } }); } diff --git a/js/pmd/move.js b/js/pmd/move.js index 8c13e78dee..1cef6fa4c9 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -716,7 +716,7 @@ function Edit_pages() PMA_ajaxRemoveMessage($msgbox); if (! pmd_tables_enabled) { - Create_page_list(function (options) { + Create_page_list(db, function (options) { $("#page_edit_dialog #selected_page").append(options); }); } @@ -796,7 +796,7 @@ function Delete_pages() PMA_ajaxRemoveMessage($msgbox); if (! pmd_tables_enabled) { - Create_page_list(function (options) { + Create_page_list(db, function (options) { $("#page_delete_dialog #selected_page").append(options); }); } @@ -895,7 +895,7 @@ function Save_as() PMA_ajaxRemoveMessage($msgbox); if (! pmd_tables_enabled) { - Create_page_list(function (options) { + Create_page_list(db, function (options) { $("#page_save_as_dialog #selected_page").append(options); }); } @@ -1010,7 +1010,7 @@ function Load_page(page) { .click(); } else { if (page === null) { - Show_tables_in_landing_page(); + Show_tables_in_landing_page(db); } else if (page > -1) { Load_HTML_for_page(page); } else if (page === -1) { From 23341a3458cc989eb0ae7477d67c3b5890c7f6cc Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 15 May 2015 11:17:21 +0530 Subject: [PATCH 5/5] ChangeLog entry for bug #4906 Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 0ed74f6d40..ef0d2016ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog - bug #4367 Import status infinite loop - bug #4902 Designer: Loading does not work - bug #4904 Setup: Overview > Display does not work +- bug #4906 Designer: pages from all databases 4.4.6.1 (2015-05-13) - bug #4899 [security] CSRF vulnerability in setup