From b60ff5fa9808bdacb30006b5d6797c933273207f Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Thu, 22 Jan 2015 13:37:42 +0100 Subject: [PATCH 1/2] Translated using Weblate (Slovak) Currently translated at 81.5% (2429 of 2979 strings) [CI skip] --- po/sk.po | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/po/sk.po b/po/sk.po index 3a10dae14103..607247f70a09 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-01-21 15:58+0200\n" -"Last-Translator: Jozef Pistej \n" +"PO-Revision-Date: 2015-01-22 13:37+0200\n" +"Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" "Language: sk\n" @@ -1821,7 +1821,7 @@ msgstr "Zobraziť viac" #: js/messages.php:308 msgid "Are you sure?" -msgstr "Ste si istý?" +msgstr "Ste si istí?" #: js/messages.php:309 msgid "" @@ -1838,7 +1838,7 @@ msgstr "Pokračovať" #: js/messages.php:313 libraries/structure.lib.php:2168 #: libraries/structure.lib.php:2171 msgid "Add primary key" -msgstr "Pridanie primárneho kľúča" +msgstr "Pridať primárny kľúč" #: js/messages.php:314 msgid "Primary key added." @@ -1851,7 +1851,7 @@ msgstr "Vezmeme vás na ďalší krok…" #: js/messages.php:316 #, php-format msgid "The first step of normalization is complete for table '%s'." -msgstr "Prvý krok normalizácie je kompletný pre tabuľku %s." +msgstr "Prvý krok normalizácie je kompletný pre tabuľku '%s'." #: js/messages.php:317 libraries/normalization.lib.php:422 #: libraries/normalization.lib.php:469 libraries/normalization.lib.php:552 @@ -1870,7 +1870,7 @@ msgstr "Hotovo" #: js/messages.php:320 msgid "Confirm partial dependencies" -msgstr "Potvrď čiastočné závislostí" +msgstr "Potvrdiť čiastočné závislosti" #: js/messages.php:321 msgid "Selected partial dependencies are as follows:" @@ -1911,9 +1911,9 @@ msgid "The following actions will be performed:" msgstr "Vykonajú sa nasledovné akcie:" #: js/messages.php:330 -#, fuzzy, php-format +#, php-format msgid "DROP columns %s from the table %s" -msgstr "DROP stĺpce %s z tabuľky %s" +msgstr "Odstrániť stĺpce %s z tabuľky %s" #: js/messages.php:331 msgid "Create the following table" @@ -1925,11 +1925,11 @@ msgstr "Tretí krok normalizácie (3NF)" #: js/messages.php:335 msgid "Confirm transitive dependencies" -msgstr "Potvrď tranzitívne závislostí" +msgstr "Potvrdiť prechodné závislostí" #: js/messages.php:336 msgid "Selected dependencies are as follows:" -msgstr "Vybrané závislostí sú nasledovné:" +msgstr "Boli zvolené nasledujúce závislosti:" #: js/messages.php:337 msgid "No dependencies selected!" @@ -2051,7 +2051,7 @@ msgstr "Vonkajší obrys" #: js/messages.php:389 msgid "Shift + Click on function name to apply to all rows." -msgstr "Shift + kliknutie na názov funkcie sa vzťahuje na všetky riadky." +msgstr "Shift + kliknutie na názov funkcie pre nastavenie všetkých riadkov." #: js/messages.php:391 msgid "Do you want to copy encryption key?" @@ -6938,6 +6938,7 @@ msgstr "" "tabuliek počas sedenia. Odporúčaná hodnota: [kbd]pma__favorite[/kbd]." #: libraries/config/messages.inc.php:644 +#, fuzzy #| msgid "Favorite tables" msgid "Favorites table" msgstr "Obľúbené tabuľky" @@ -10707,7 +10708,7 @@ msgstr "Slave replikácia" #: libraries/replication_gui.lib.php:143 #| msgid "Master configuration" msgid "Master connection:" -msgstr "Master pripojenie:" +msgstr "Master spojenie:" #: libraries/replication_gui.lib.php:209 msgid "Slave SQL Thread not running!" @@ -10934,21 +10935,21 @@ msgstr "Replikácia bola úspešne zastavená." #: libraries/replication_gui.lib.php:928 #| msgid "Master replication" msgid "Error stopping replication." -msgstr "Chyba zastavenia replikácie." +msgstr "Chyba pri zastavovaní replikácie." #: libraries/replication_gui.lib.php:931 #| msgid "Replication status" msgid "Replication resetting successfully." -msgstr "Obnovenie replikácie úspešné." +msgstr "Replikácie bola úspešne obnovená." #: libraries/replication_gui.lib.php:932 #| msgid "Master replication" msgid "Error resetting replication." -msgstr "Chyba obnovenia replikácie." +msgstr "Chyba pri obnovovaní replikácie." #: libraries/replication_gui.lib.php:935 msgid "Success." -msgstr "" +msgstr "Úspech." #: libraries/replication_gui.lib.php:936 msgid "Error." @@ -11008,7 +11009,7 @@ msgstr "Udalosť %1$s bola vytvorená." #| msgid "" #| "One or more errors have occured while processing your request:" msgid "One or more errors have occurred while processing your request:" -msgstr "Pri spracovaní požiadavky došlo k niekoľkým chybám:" +msgstr "Pri spracovaní požiadavky došlo k jednej alebo viacerým chybám:" #: libraries/rte/rte_events.lib.php:231 msgid "Edit event" @@ -11069,7 +11070,7 @@ msgstr "" #: libraries/rte/rte_events.lib.php:553 #| msgid "You must provide a valid table name" msgid "You must provide an event name!" -msgstr "Musíte zadať názov akcie!" +msgstr "Musíte zadať názov udalosti!" #: libraries/rte/rte_events.lib.php:568 msgid "You must provide a valid interval value for the event." @@ -11279,12 +11280,12 @@ msgstr "Čas" #: libraries/rte/rte_triggers.lib.php:429 #| msgid "You must provide a valid table name" msgid "You must provide a trigger name!" -msgstr "Musíte zadať platný názov spúšťača!" +msgstr "Musíte zadať názov spúšťača!" #: libraries/rte/rte_triggers.lib.php:436 #| msgid "You must provide a valid table name" msgid "You must provide a valid timing for the trigger!" -msgstr "Musíte zadať správne časovanie spúšťača!" +msgstr "Musíte zadať platné časovanie spúšťača!" #: libraries/rte/rte_triggers.lib.php:443 #| msgid "You must provide a valid table name" @@ -12265,8 +12266,8 @@ msgid "" "Note: Enabling the auto refresh here might cause heavy traffic between the " "web server and the MySQL server." msgstr "" -"Poznámka: Zapnutie automatického obnovenia môže spôsobiť značné zvýšenie " -"sieťovej prevádzky medzi databázou a web serverom." +"Poznámka: Zapnutie automatického obnovovania môže spôsobiť vysokú sieťovú " +"prevádzku medzi databázou a web serverom." #: libraries/server_status_processes.lib.php:69 msgid "ID" @@ -13413,7 +13414,7 @@ msgstr "Navrhnúť štruktúru tabuľky" #: libraries/structure.lib.php:1661 #| msgid "Propose table structure" msgid "Improve table structure" -msgstr "Zlepšenie štruktúry tabuľky" +msgstr "Zlepšiť štruktúry tabuľky" #: libraries/structure.lib.php:1700 #: libraries/tbl_columns_definition_form.lib.php:173 @@ -13524,7 +13525,7 @@ msgstr "" #: libraries/structure.lib.php:2921 #| msgid "Add this series" msgid "Add to Favorites" -msgstr "Pridať k Obľúbeným" +msgstr "Pridať k obľúbeným" #: libraries/structure.lib.php:2967 msgid "Favorite List is full!" @@ -13533,7 +13534,7 @@ msgstr "Zoznam obľúbených je plný!" #: libraries/structure.lib.php:3057 #| msgid "Show SQL queries" msgid "Showing create queries" -msgstr "Zobrazovanie SQL dopytov" +msgstr "Zobrazovanie SQL dopytov pre vytvorenie" #: libraries/tbl_chart.lib.php:39 msgctxt "Chart type" @@ -13847,10 +13848,9 @@ msgid "" msgstr "" #: libraries/tbl_relation.lib.php:371 -#, fuzzy #| msgid "Foreign key limit" msgid "Foreign key constraints" -msgstr "Obmedzenie cudzieho kľúča" +msgstr "Obmedzenia cudzieho kľúča" #: libraries/tbl_relation.lib.php:374 msgid "Actions" From 2eab3b588051a7fd3934be472e7e861b498c0cb7 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 23 Jan 2015 17:31:03 +0530 Subject: [PATCH 2/2] bug #4727 Collation column missing in database list when DisableIS is true Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/DatabaseInterface.class.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5edcfc78e4e2..50d60c77858c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - bug #4716 Collapse all in navigation panel is sometimes broken - bug #4724 Cannot navigate in filtered table list - bug #4717 Database navigation menu broken when resolution/screen is changing +- bug #4727 Collation column missing in database list when DisableIS is true 4.3.7.0 (2015-01-15) - bug #4694 js error on marking table as favorite in Safari (in private mode) diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php index a93f1d26b2d1..1162c968fd90 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -1014,11 +1014,11 @@ public function getDatabasesFull($database = null, $force_stats = false, // MySQL 5.0 or higher is required for current PMA version $databases[$database_name]['SCHEMA_NAME'] = $database_name; - if ($force_stats) { - include_once './libraries/mysql_charsets.inc.php'; + include_once './libraries/mysql_charsets.inc.php'; + $databases[$database_name]['DEFAULT_COLLATION_NAME'] + = PMA_getDbCollation($database_name); - $databases[$database_name]['DEFAULT_COLLATION_NAME'] - = PMA_getDbCollation($database_name); + if ($force_stats) { // get additional info about tables $databases[$database_name]['SCHEMA_TABLES'] = 0;