From df5a724e3126563711f0d8d1e6887a5317120ba7 Mon Sep 17 00:00:00 2001 From: Kelvin Lee Date: Wed, 4 Nov 2015 16:31:46 +0100 Subject: [PATCH 1/5] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/zh_TW.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 70e9377e3b..cccb1bdedc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-26 19:59-0400\n" -"PO-Revision-Date: 2015-10-31 16:37+0200\n" +"PO-Revision-Date: 2015-11-04 16:31+0000\n" "Last-Translator: Kelvin Lee \n" "Language-Team: Chinese (Taiwan) " "\n" @@ -5492,7 +5492,7 @@ msgstr "設定檔案" msgid "" "Whether a warning (\"Are your really sure…\") should be displayed when " "you're about to lose data." -msgstr "是否顯示確認訊息，當查詢可能造成資料遺失時 (\"您真的要…\")。" +msgstr "是否在當查詢會造成資料丟失時顯示一個「您真的要……」的警告訊息。" #: libraries/config/messages.inc.php:95 msgid "Confirm DROP queries" @@ -15007,11 +15007,11 @@ msgstr "說明" #: url.php:36 #| msgid "Taking you to next step…" msgid "Taking you to the target site." -msgstr "帶您至目標地點。" +msgstr "帶您至目標網站。" #: user_password.php:34 msgid "You don't have sufficient privileges to be here right now!" -msgstr "權限不足！" +msgstr "您現時還沒有足夠的權限！" #: user_password.php:112 msgid "The profile has been updated." From 03df86f8ad594190dc9395c34505f7773d3d23ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Kate=C5=99i=C5=88=C3=A1k?= Date: Wed, 4 Nov 2015 12:51:05 +0100 Subject: [PATCH 2/5] Translated using Weblate (Czech) Currently translated at 95.7% (3076 of 3211 strings) [CI skip] --- po/cs.po | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/po/cs.po b/po/cs.po index 665d5ce476..47df9985d0 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-26 19:59-0400\n" -"PO-Revision-Date: 2015-11-03 07:59+0200\n" +"PO-Revision-Date: 2015-11-04 12:51+0200\n" "Last-Translator: Petr Kateřiňák \n" "Language-Team: Czech " "\n" @@ -7541,7 +7541,6 @@ msgstr "" "Zobrazit nebo skrýt sloupec zobrazující čas vytvoření pro všechny tabulky." #: libraries/config/messages.inc.php:853 -#, fuzzy #| msgid "Show Creation timestamp" msgid "Show creation timestamp" msgstr "Zobrazit čas vytvoření" @@ -7554,7 +7553,6 @@ msgstr "" "tabulky." #: libraries/config/messages.inc.php:857 -#, fuzzy #| msgid "Show Last update timestamp" msgid "Show last update timestamp" msgstr "Zobrazit čas poslední změny" @@ -7567,7 +7565,6 @@ msgstr "" "tabulky." #: libraries/config/messages.inc.php:861 -#, fuzzy #| msgid "Show Last check timestamp" msgid "Show last check timestamp" msgstr "Zobrazit čas poslední kontroly" @@ -8139,6 +8136,8 @@ msgid "" "connection that encrypts the password using RSA'; while connecting to " "the server." msgstr "" +"Tato metoda připojení k serveru vyžaduje použití 'SSL spojení' nebo " +"'nešifrovaného spojení s podporou šifrování hesla pomocí RSA'." #: libraries/display_create_database.lib.php:23 msgid "Create database" @@ -8428,7 +8427,6 @@ msgstr "" "Například: .sql.zip" #: libraries/display_import.lib.php:224 -#, fuzzy #| msgid "File to Import:" msgid "File to import:" msgstr "Soubor pro importování:" @@ -8442,7 +8440,6 @@ msgid "File uploads are not allowed on this server." msgstr "Upload souborů není na tomto serveru povolen." #: libraries/display_import.lib.php:278 -#, fuzzy #| msgid "Partial Import:" msgid "Partial import:" msgstr "Částečný import:" @@ -8474,7 +8471,6 @@ msgstr "" "počínaje od:" #: libraries/display_import.lib.php:340 -#, fuzzy #| msgid "Other Options:" msgid "Other options:" msgstr "Další možnosti:" @@ -9202,8 +9198,9 @@ msgid "Romanian" msgstr "Rumunština" #: libraries/mysql_charsets.lib.php:239 +#, fuzzy msgid "Sinhalese" -msgstr "" +msgstr "Sinhálština" #: libraries/mysql_charsets.lib.php:242 msgid "Slovak" @@ -9700,10 +9697,10 @@ msgid "The third step of normalization is complete." msgstr "Třetí krok normalizace je dokončený." #: libraries/normalization.lib.php:676 -#, fuzzy, php-format +#, php-format #| msgid "Selected target tables have been synchronized with source tables." msgid "Selected repeating group has been moved to the table '%s'" -msgstr "Vybrané cílové tabulky byly synchronizovány se zdrojovými." +msgstr "Vybraná opakující se skupina byla přesunuta do tabulky '%s'" #: libraries/normalization.lib.php:723 msgid "Step 3." @@ -9726,6 +9723,8 @@ msgid "" "No Transitive dependencies possible as the table doesn't have any non " "primary key columns" msgstr "" +"Tranzitivní závislosti nejsou možny, pokud tabulka neobsahuje žádné sloupce " +"bez primárního klíče" #: libraries/normalization.lib.php:781 msgid "Table is already in Third normal form!" @@ -9772,18 +9771,18 @@ msgstr "Přejmenovat databázi na" #: libraries/operations.lib.php:873 libraries/operations.lib.php:967 #: libraries/operations.lib.php:1321 #: templates/columns_definitions/column_adjust_privileges.phtml:16 -#, fuzzy #| msgid "You don't have sufficient privileges to be here right now!" msgid "" "You don't have sufficient privileges to perform this operation; Please refer " "to the documentation for more details" -msgstr "Nemáte dostatečná práva na provedení této akce!" +msgstr "" +"Nemáte dostatečná práva k provedení této akce; Prohlédněte si dokumentaci " +"pro více detailů" #: libraries/operations.lib.php:102 libraries/operations.lib.php:249 #: libraries/operations.lib.php:879 libraries/operations.lib.php:973 #: libraries/operations.lib.php:1327 libraries/rte/rte_routines.lib.php:998 #: templates/columns_definitions/table_fields_definitions.phtml:47 -#, fuzzy #| msgid "Adjust Privileges" msgid "Adjust privileges" msgstr "Upravit oprávnění" @@ -9861,10 +9860,9 @@ msgid "Storage Engine" msgstr "Úložiště" #: libraries/operations.lib.php:1096 -#, fuzzy #| msgid "Make all columns atomic" msgid "Change all column collations" -msgstr "Převést všechny sloupce na atomické" +msgstr "Změnit kódování všech sloupců" #: libraries/operations.lib.php:1264 msgid "Copy table to (database.table)" @@ -9891,10 +9889,9 @@ msgstr "Zkontrolovat tabulku" #: libraries/operations.lib.php:1438 #: templates/database/structure/check_all_tables.phtml:22 -#, fuzzy #| msgid "Check table" msgid "Checksum table" -msgstr "Zkontrolovat tabulku" +msgstr "Tabulka kontrolních součtů" #: libraries/operations.lib.php:1453 msgid "Defragment table" @@ -9962,13 +9959,13 @@ msgstr "Opravit" #: libraries/operations.lib.php:1609 #: templates/table/structure/display_structure.phtml:186 msgid "Truncate" -msgstr "" +msgstr "Vyprázdnit" #: libraries/operations.lib.php:1619 #, fuzzy #| msgid "Collapse" msgid "Coalesce" -msgstr "Sbalit" +msgstr "Vyhledat první platný záznam" #: libraries/operations.lib.php:1628 msgid "Partition maintenance" @@ -10237,7 +10234,7 @@ msgstr "Zástupná struktura pro pohled" #: libraries/plugins/export/ExportJson.class.php:71 msgid "Output pretty-printed JSON (Use human-readable formatting)" -msgstr "" +msgstr "Vytvořit pěkný JSON (snadno čitelné formátování)" #: libraries/plugins/export/ExportLatex.class.php:43 msgid "Content of table @TABLE@" @@ -10352,7 +10349,7 @@ msgstr "Zobrazit strukturu" #, fuzzy #| msgid "and then" msgid "Stand in" -msgstr "a poté" +msgstr "Zůstat" #: libraries/plugins/export/ExportSql.class.php:91 msgid "" From 9cb51e7bb13447bbee315a7355875a6fee178423 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 8 Nov 2015 05:17:23 -0800 Subject: [PATCH 3/5] Remove dead code Signed-off-by: Marc Delisle --- libraries/controllers/table/TableSearchController.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/controllers/table/TableSearchController.php index 93d0288749..57b61fa885 100644 --- a/libraries/controllers/table/TableSearchController.php +++ b/libraries/controllers/table/TableSearchController.php @@ -204,10 +204,7 @@ class TableSearchController extends TableController $GLOBALS['cfg']['DefaultTabTable'], 'table' ); } - // Defines the url to return to in case of error in the next sql - // statement - $params = array('db' => $this->db, 'table' => $this->table); - $err_url = $goto . '?' . PMA_URL_getCommon($params); + // Displays the find and replace form $this->response->addHTML( Template::get('table/search/selection_form') From 711fab59d1be39d666e105eb67c4fa4f9917f213 Mon Sep 17 00:00:00 2001 From: John Homerstad Date: Sun, 8 Nov 2015 05:37:46 -0800 Subject: [PATCH 4/5] Fixes #11648 Notice in ./export.php#214 Undefined index: quick_or_custom Signed-off-by: Marc Delisle --- export.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/export.php b/export.php index 2795cfc26e..b7942a34ac 100644 --- a/export.php +++ b/export.php @@ -211,7 +211,7 @@ if (!defined('TESTSUITE')) { $separate_files = ''; // Is it a quick or custom export? - if ($_REQUEST['quick_or_custom'] == 'quick') { + if (isset($_REQUEST['quick_or_custom']) && $_REQUEST['quick_or_custom'] == 'quick') { $quick_export = true; } else { $quick_export = false; From 0065a028540b35352429dcb88cd814146c4ec169 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 8 Nov 2015 05:38:24 -0800 Subject: [PATCH 5/5] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 8a61e7353c..e4ec259885 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog - issue #11639 Bug with the MainBackground Color - issue Profiling checkbox is missing - issue #11642 Properly handle session expiry after POST requests +- issue #11648 Notice in ./export.php#214 Undefined index: quick_or_custom 4.5.1.0 (2015-10-23) - issue Invalid argument supplied for foreach()