From 20b2fe526b316d9b3b926cd5194f55ab3e6d51d6 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Mon, 29 Dec 2014 13:17:20 +0100 Subject: [PATCH 1/5] Translated using Weblate (Slovak) Currently translated at 72.1% (2149 of 2977 strings) [CI skip] --- po/sk.po | 47 ++++++++++++++++------------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/po/sk.po b/po/sk.po index de4c0bd190..f9e28aea79 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-12-21 06:11-0500\n" -"PO-Revision-Date: 2014-12-29 13:05+0200\n" +"PO-Revision-Date: 2014-12-29 13:17+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" @@ -1912,10 +1912,9 @@ msgid "" msgstr "" #: js/messages.php:323 -#, fuzzy #| msgid "No databases selected." msgid "No partial dependencies selected!" -msgstr "Neboli vybrané žiadne databázy." +msgstr "Neboli vybrané žiadne čiastkové závislosti!" #: js/messages.php:325 msgid "Show me the possible partial dependencies based on data in the table" @@ -2155,10 +2154,9 @@ msgid "Please select a page to continue" msgstr "Prosím zvolte si Stránku, ktorú chcete upraviť" #: js/messages.php:409 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid page name" -msgstr "Prosím zdajte platné číslo!" +msgstr "Prosím zadajte platný názov stránky" #: js/messages.php:410 msgid "Do you want to save the changes to the current page?" @@ -2253,10 +2251,9 @@ msgid "" msgstr "" #: js/messages.php:436 -#, fuzzy #| msgid "Cancel" msgid "cancel" -msgstr "Zrušiť" +msgstr "zrušiť" #: js/messages.php:437 libraries/server_status.lib.php:269 msgid "Aborted" @@ -2267,20 +2264,18 @@ msgid "Success" msgstr "" #: js/messages.php:440 -#, fuzzy #| msgid "Import defaults" msgid "Import status" -msgstr "Východzie nastavenia importu" +msgstr "Stav importu" #: js/messages.php:441 libraries/navigation/Navigation.class.php:102 msgid "Drop files here" msgstr "" #: js/messages.php:442 -#, fuzzy #| msgid "Select Tables" msgid "Select database first" -msgstr "Vybrať Tabuľky" +msgstr "Najprv vyberte databázu" #: js/messages.php:447 msgid "You can also edit most values
by double-clicking directly on them." @@ -2337,16 +2332,14 @@ msgstr "Zobraziť skryté položky navigácie." #: js/messages.php:472 libraries/config/messages.inc.php:420 #: libraries/navigation/NavigationTree.class.php:1235 -#, fuzzy #| msgid "Customize main panel" msgid "Link with main panel" -msgstr "Prispôsobiť hlavný panel" +msgstr "Prepojiť s hlavným panelom" #: js/messages.php:473 libraries/navigation/NavigationTree.class.php:1238 -#, fuzzy #| msgid "Customize main panel" msgid "Unlink from main panel" -msgstr "Prispôsobiť hlavný panel" +msgstr "Zrušiť prepojenie s hlavným panelom" #: js/messages.php:476 msgid "The requested page was not found in the history, it may have expired." @@ -2421,10 +2414,9 @@ msgid "Please look at the bottom of this window." msgstr "" #: js/messages.php:513 libraries/Error_Handler.class.php:353 -#, fuzzy #| msgid "Ignore" msgid "Ignore All" -msgstr "Ignorovať" +msgstr "Ignorovať všetko" #: js/messages.php:520 msgid "" @@ -2432,10 +2424,9 @@ msgid "" msgstr "" #: js/messages.php:527 -#, fuzzy #| msgid "Show this query here again" msgid "Execute this query again?" -msgstr "Zobraziť tento dopyt znovu" +msgstr "Vykonať tento dopyt znovu?" #: js/messages.php:528 #, fuzzy @@ -2786,10 +2777,9 @@ msgid "Expand" msgstr "" #: libraries/Console.class.php:95 libraries/Console.class.php:178 -#, fuzzy #| msgid "subquery" msgid "Requery" -msgstr "poddopyt" +msgstr "Znovu spustiť dopyt" #: libraries/Console.class.php:97 libraries/DbSearch.class.php:365 #: libraries/DisplayResults.class.php:3515 @@ -2833,10 +2823,9 @@ msgid "No bookmarks" msgstr "Nová záložka" #: libraries/Console.class.php:180 -#, fuzzy #| msgid "Explain SQL" msgid "Explain" -msgstr "Vysvetliť SQL" +msgstr "Vysvetliť" #: libraries/Console.class.php:181 libraries/Util.class.php:1263 #: libraries/sql.lib.php:487 @@ -2862,10 +2851,9 @@ msgid "Queried time" msgstr "Čas behu dopytu" #: libraries/Console.class.php:195 -#, fuzzy #| msgid "SQL Query box" msgid "SQL Query Console" -msgstr "Pole pre SQL dopyty" +msgstr "Konzola pre SQL dopyty" #: libraries/Console.class.php:196 msgid "Console" @@ -2877,10 +2865,9 @@ msgid "Clear" msgstr "Vyčistiť" #: libraries/Console.class.php:202 -#, fuzzy #| msgid "SQL history" msgid "History" -msgstr "SQL história" +msgstr "História" #: libraries/Console.class.php:205 libraries/Console.class.php:300 #: libraries/DisplayResults.class.php:1631 libraries/TableSearch.class.php:788 @@ -2917,10 +2904,9 @@ msgid "Bookmarks" msgstr "Tabuľka záložiek" #: libraries/Console.class.php:218 -#, fuzzy #| msgid "Execute every" msgid "Press Ctrl+Enter to execute query" -msgstr "Spustiť každých" +msgstr "Stlačte Ctrl+Enter pre spustenie dopytu" #: libraries/Console.class.php:239 msgid "During current session" @@ -2933,10 +2919,9 @@ msgid "Refresh" msgstr "Obnoviť" #: libraries/Console.class.php:269 -#, fuzzy #| msgid "And" msgid "Add" -msgstr "A" +msgstr "Pridať" #: libraries/Console.class.php:278 #, fuzzy From e42f2e322986ff6344da40e7d69207b203be08f7 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Mon, 29 Dec 2014 15:37:25 +0100 Subject: [PATCH 2/5] Translated using Weblate (Swedish) Currently translated at 91.1% (2715 of 2977 strings) [CI skip] --- po/sv.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/sv.po b/po/sv.po index d313cd30cf..2c3067a8c0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-12-21 06:11-0500\n" -"PO-Revision-Date: 2014-10-11 00:40+0200\n" +"PO-Revision-Date: 2014-12-29 15:37+0200\n" "Last-Translator: Anders Jonsson \n" -"Language-Team: Swedish \n" +"Language-Team: Swedish " +"\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.10-dev\n" +"X-Generator: Weblate 2.2-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -33,10 +33,10 @@ msgid "Click to sort." msgstr "Klicka för att sortera." #: db_central_columns.php:125 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows %1s - %2s" msgid "Showing rows %1$s - %2$s." -msgstr "Visar raderna %1s - %2s" +msgstr "Visar raderna %1$s - %2$s." #: db_create.php:61 #, php-format From 44647b7eb62ceb89c747421740542c506e906d87 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 31 Dec 2014 16:09:49 +0530 Subject: [PATCH 3/5] bug #4677 Advanced feature checker does not check for favorite tables feature Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/relation.lib.php | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 222b525166..19eb91bbbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.3.5.0 (not yet released) - bug Auto-configuration: tables were not created automatically +- bug #4677 Advanced feature checker does not check for favorite tables feature 4.3.4.0 (2014-12-29) - bug #4653 Always connection error was shown, on /setup at tab "configuration storage" diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 61076a3ff7..328d0bba61 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -214,6 +214,17 @@ function PMA_getRelationsParamDiagnostic($cfgRelation) 'recentwork', $messages ); + $retval .= PMA_getDiagMessageForParameter( + 'favorite', + isset($cfgRelation['favorite']), + $messages, + 'favorite' + ); + $retval .= PMA_getDiagMessageForFeature( + __('Persistent favorite tables'), + 'favoritework', + $messages + ); $retval .= PMA_getDiagMessageForParameter( 'table_uiprefs', isset($cfgRelation['table_uiprefs']), @@ -414,6 +425,7 @@ function PMA_checkRelationsParam() $cfgRelation['mimework'] = false; $cfgRelation['historywork'] = false; $cfgRelation['recentwork'] = false; + $cfgRelation['favoritework'] = false; $cfgRelation['uiprefswork'] = false; $cfgRelation['trackingwork'] = false; $cfgRelation['userconfigwork'] = false; @@ -477,6 +489,8 @@ function PMA_checkRelationsParam() $cfgRelation['history'] = $curr_table[0]; } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['recent']) { $cfgRelation['recent'] = $curr_table[0]; + } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['favorite']) { + $cfgRelation['favorite'] = $curr_table[0]; } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['table_uiprefs']) { $cfgRelation['table_uiprefs'] = $curr_table[0]; } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['tracking']) { @@ -523,6 +537,10 @@ function PMA_checkRelationsParam() $cfgRelation['recentwork'] = true; } + if (isset($cfgRelation['favorite'])) { + $cfgRelation['favoritework'] = true; + } + if (isset($cfgRelation['table_uiprefs'])) { $cfgRelation['uiprefswork'] = true; } @@ -562,7 +580,7 @@ function PMA_checkRelationsParam() && $cfgRelation['trackingwork'] && $cfgRelation['userconfigwork'] && $cfgRelation['bookmarkwork'] && $cfgRelation['central_columnswork'] && $cfgRelation['menuswork'] && $cfgRelation['navwork'] - && $cfgRelation['savedsearcheswork'] + && $cfgRelation['savedsearcheswork'] && $cfgRelation['favoritework'] ) { $cfgRelation['allworks'] = true; } @@ -1774,7 +1792,7 @@ function PMA_searchColumnInForeigners($foreigners, $column) } /** - * Whether we found a set of tables in the specified db + * Whether we found a set of tables in the specified db * * @param string $db Database * @param array $tables Table names From 6485813e7200235a1870545736fde0d9acd02b7b Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 31 Dec 2014 08:54:45 +0100 Subject: [PATCH 4/5] Translated using Weblate (Slovak) Currently translated at 73.3% (2185 of 2977 strings) [CI skip] --- po/sk.po | 133 +++++++++++++++++++++---------------------------------- 1 file changed, 51 insertions(+), 82 deletions(-) diff --git a/po/sk.po b/po/sk.po index f9e28aea79..4d71999278 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-12-21 06:11-0500\n" -"PO-Revision-Date: 2014-12-29 13:17+0200\n" +"PO-Revision-Date: 2014-12-31 08:54+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" @@ -21,12 +21,12 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" -"Súbor %s nebol nájdený na tomto systéme, viac informácií nájdete na stránke " -"www.phpmyadmin.net." +"Súbor %s nie je dostupný na tomto systéme. Viac informácií nájdete na " +"stránke www.phpmyadmin.net." #: db_central_columns.php:85 msgid "The central list of columns for the current database is empty." -msgstr "" +msgstr "Ústredný zoznam stĺpcov pre aktuálnu databázu je prázdny." #: db_central_columns.php:109 msgid "Click to sort." @@ -52,7 +52,7 @@ msgstr "Komentár k databáze:" #: libraries/tbl_columns_definition_form.lib.php:73 #: libraries/tbl_printview.lib.php:577 msgid "Table comments:" -msgstr "Komentár k tabuľke:" +msgstr "Komentáre k tabuľke:" #: db_datadict.php:103 libraries/Index.class.php:569 #: libraries/TableSearch.class.php:185 libraries/TableSearch.class.php:1292 @@ -1871,10 +1871,9 @@ msgid "Primary key added." msgstr "Bol pridaný primárny kľúč." #: js/messages.php:315 libraries/normalization.lib.php:174 -#, fuzzy #| msgid "Tracking report" msgid "Taking you to next step…" -msgstr "Informácie o monitorovanie" +msgstr "Vezmeme vás na ďalší krok…" #: js/messages.php:316 #, php-format @@ -1982,22 +1981,19 @@ msgid "Show search criteria" msgstr "Zobraziť parametre vyhľadávania" #: js/messages.php:345 -#, fuzzy #| msgid "Table Search" msgid "Range search" -msgstr "Hľadať v tabuľke" +msgstr "Rozsah vyhľadávania" #: js/messages.php:346 -#, fuzzy #| msgid "Column names: " msgid "Column maximum:" -msgstr "Názvy stĺpcov: " +msgstr "Najväčšia hodnota stĺpca:" #: js/messages.php:347 -#, fuzzy #| msgid "Column names: " msgid "Column minimum:" -msgstr "Názvy stĺpcov: " +msgstr "Najmenšia hodnota stĺpca:" #: js/messages.php:348 #| msgid "Maximum tables" @@ -2148,10 +2144,9 @@ msgid "Untitled" msgstr "Nepomenovaná" #: js/messages.php:408 -#, fuzzy #| msgid "Please choose a page to edit" msgid "Please select a page to continue" -msgstr "Prosím zvolte si Stránku, ktorú chcete upraviť" +msgstr "Prosím zvoľte si stránku, kde chcete pokračovať" #: js/messages.php:409 #| msgid "Please enter a valid number!" @@ -2167,10 +2162,9 @@ msgid "Successfully deleted the page" msgstr "" #: js/messages.php:412 -#, fuzzy #| msgid "Edit or export relational schema" msgid "Export relational schema" -msgstr "Upraviť alebo exportovať relačnú schému" +msgstr "Exportovať relačnú schému" #: js/messages.php:413 msgid "Modifications have been saved" @@ -2429,10 +2423,9 @@ msgid "Execute this query again?" msgstr "Vykonať tento dopyt znovu?" #: js/messages.php:528 -#, fuzzy #| msgid "Do you really want to delete the search \"%s\"?" msgid "Do you really want to delete this bookmark?" -msgstr "Naozaj chcete odstrániť vyhľadávanie \"%s\"?" +msgstr "Naozaj chcete odstrániť túto záložku?" #: js/messages.php:556 msgctxt "Previous month" @@ -2793,13 +2786,13 @@ msgid "Delete" msgstr "Zmazať" #: libraries/Console.class.php:108 -#, fuzzy, php-format +#, php-format #| msgid "New bookmark" msgid "Total %d bookmark" msgid_plural "Total %d bookmarks" -msgstr[0] "Nová záložka" -msgstr[1] "Nová záložka" -msgstr[2] "Nová záložka" +msgstr[0] "Spolu %d záložka" +msgstr[1] "Spolu %d záložky" +msgstr[2] "Spolu %d záložiek" #: libraries/Console.class.php:116 msgid "private" @@ -2811,16 +2804,15 @@ msgstr "zdieľaný" #. l10n: First parameter will be replaced with the translation for Total and the number of bookmarks, second one with the translation for private and the third one, with the translation for shared #: libraries/Console.class.php:124 -#, fuzzy, php-format +#, php-format #| msgid "The bookmark has been deleted." msgid "%1$s, %2$s and %3$s bookmarks included" -msgstr "Záznam z obľúbených bol zmazaný." +msgstr "" #: libraries/Console.class.php:130 -#, fuzzy #| msgid "New bookmark" msgid "No bookmarks" -msgstr "Nová záložka" +msgstr "Žiadne záložky" #: libraries/Console.class.php:180 #| msgid "Explain SQL" @@ -2833,22 +2825,19 @@ msgid "Profiling" msgstr "Profilovanie" #: libraries/Console.class.php:183 -#, fuzzy #| msgid "Bookmark table" msgid "Bookmark" -msgstr "Tabuľka záložiek" +msgstr "Záložka" #: libraries/Console.class.php:184 -#, fuzzy #| msgid "Query cache" msgid "Query failed" -msgstr "Vyrovnávacia pamäť príkazov" +msgstr "Dopyt zlyhal" #: libraries/Console.class.php:188 -#, fuzzy #| msgid "Query execution time" msgid "Queried time" -msgstr "Čas behu dopytu" +msgstr "Čas behu" #: libraries/Console.class.php:195 #| msgid "SQL Query box" @@ -2898,10 +2887,9 @@ msgid "Options" msgstr "Nastavenia" #: libraries/Console.class.php:209 libraries/Console.class.php:262 -#, fuzzy #| msgid "Bookmark table" msgid "Bookmarks" -msgstr "Tabuľka záložiek" +msgstr "Záložky" #: libraries/Console.class.php:218 #| msgid "Execute every" @@ -2924,44 +2912,38 @@ msgid "Add" msgstr "Pridať" #: libraries/Console.class.php:278 -#, fuzzy #| msgid "New bookmark" msgid "Add bookmark" -msgstr "Nová záložka" +msgstr "Pridať záložku" #: libraries/Console.class.php:282 -#, fuzzy #| msgid "Label:" msgid "Label" -msgstr "Názov:" +msgstr "Názov" #: libraries/Console.class.php:284 msgid "Target database" msgstr "Cieľová databáza" #: libraries/Console.class.php:287 -#, fuzzy #| msgid "Create bookmark" msgid "Share this bookmark" -msgstr "Vytvoriť záložku" +msgstr "Zdieľať túto záložku" #: libraries/Console.class.php:304 -#, fuzzy #| msgid "Reset to default" msgid "Set default" -msgstr "Obnoviť predvolené" +msgstr "Nastaviť predvolené" #: libraries/Console.class.php:308 -#, fuzzy #| msgid "Always send error reports" msgid "Always expand query messages" -msgstr "Vždy odosielať chybové hlásenia" +msgstr "Vždy rozbaliť správy dopytu" #: libraries/Console.class.php:310 -#, fuzzy #| msgid "SQL query history table" msgid "Show query history at start" -msgstr "Tabuľka histórie SQL dopytov" +msgstr "Zobraziť históriu dopytov na začiatku" #: libraries/Console.class.php:312 msgid "Show current browsing query" @@ -3059,10 +3041,9 @@ msgid "Submit Query" msgstr "Odošli dopyt" #: libraries/DBQbe.class.php:1495 -#, fuzzy #| msgid "Search" msgid "Saved bookmarked search:" -msgstr "Hľadať" +msgstr "Uložené vyhľadávania:" #: libraries/DBQbe.class.php:1497 msgid "New bookmark" @@ -3411,10 +3392,9 @@ msgid "Too many error messages, some are not displayed." msgstr "Príliš veľa chybových správ, niektoré neboli zobrazené." #: libraries/Error_Handler.class.php:336 -#, fuzzy #| msgid "Import" msgid "Report" -msgstr "Import" +msgstr "Nahlásiť" #: libraries/Error_Handler.class.php:341 libraries/error_report.lib.php:370 msgid "Automatically send report next time" @@ -3675,10 +3655,9 @@ msgid "Designer" msgstr "Dizajnér" #: libraries/Menu.class.php:496 libraries/Util.class.php:4120 -#, fuzzy #| msgid "Textarea columns" msgid "Central columns" -msgstr "Stĺpce s textovou oblasťou" +msgstr "Centrálne stĺpce" #: libraries/Menu.class.php:535 libraries/Util.class.php:4092 #: libraries/config/messages.inc.php:228 libraries/server_common.lib.php:48 @@ -4122,10 +4101,9 @@ msgid "Replace with:" msgstr "Nahradiť za:" #: libraries/TableSearch.class.php:1370 -#, fuzzy #| msgid "as regular expression" msgid "Use regular expression" -msgstr "ako regulárny výraz" +msgstr "Použiť regulárny výraz" #: libraries/TableSearch.class.php:1472 msgid "Find and replace - preview" @@ -4700,10 +4678,9 @@ msgid "Could not add %1$s as they already exist in central list!" msgstr "" #: libraries/central_columns.lib.php:282 -#, fuzzy #| msgid "Could not save configuration" msgid "Could not add columns!" -msgstr "Nemožno uložiť nastavenie" +msgstr "Nepodarilo sa pridať stĺpce!" #: libraries/central_columns.lib.php:358 #, php-format @@ -4712,10 +4689,9 @@ msgid "" msgstr "" #: libraries/central_columns.lib.php:370 -#, fuzzy #| msgid "Could not save recent table!" msgid "Could not remove columns!" -msgstr "Nepodarilo sa uložiť najnovšiu tabuľku!" +msgstr "Nepodarilo sa odstrániť stĺpce!" #: libraries/central_columns.lib.php:511 msgid "YES" @@ -4752,36 +4728,32 @@ msgid "Extra" msgstr "Extra" #: libraries/central_columns.lib.php:662 -#, fuzzy #| msgid "Select Tables" msgid "Select a table" -msgstr "Vybrať Tabuľky" +msgstr "Vyberte tabuľku" #: libraries/central_columns.lib.php:716 libraries/structure.lib.php:1694 msgid "Add column" msgstr "Pridať stĺpec" #: libraries/central_columns.lib.php:728 -#, fuzzy #| msgid "Select two columns" msgid "Select a column." -msgstr "Zvoľte dva stĺpce" +msgstr "Zvoľte stĺpec." #: libraries/central_columns.lib.php:809 libraries/central_columns.lib.php:919 -#, fuzzy #| msgid "Autoextend increment" msgid "auto_increment" -msgstr "Navýšenie pri automatickom zväčšovaní" +msgstr "auto_increment" #: libraries/central_columns.lib.php:811 libraries/central_columns.lib.php:921 msgid "on update CURRENT_TIMESTAMP" msgstr "" #: libraries/central_columns.lib.php:888 -#, fuzzy #| msgid "Add column" msgid "Add new column" -msgstr "Pridať stĺpec" +msgstr "Pridať nový stĺpec" #: libraries/common.inc.php:582 msgid "Failed to read configuration file!" @@ -5167,10 +5139,9 @@ msgid "" msgstr "" #: libraries/config/Validator.class.php:249 -#, fuzzy #| msgid "Could not initialize Drizzle connection library" msgid "Could not initialize Drizzle connection library!" -msgstr "Nepodarilo sa inicializovať knižnicu na pripojenie k serveru Drizzle" +msgstr "Nepodarilo sa inicializovať knižnicu Drizzle!" #: libraries/config/Validator.class.php:258 #: libraries/config/Validator.class.php:266 @@ -5180,25 +5151,27 @@ msgid "Could not connect to the database server!" msgstr "Nepodarilo sa pripojiť k databázovému serveru!" #: libraries/config/Validator.class.php:316 -#, fuzzy #| msgid "Empty username while using config authentication method" msgid "Empty username while using [kbd]config[/kbd] authentication method!" msgstr "" -"Pri použití nastavenej autorizačnej metódy nebolo vyplnené užívateľské meno" +"Pri použití prihlasovacej metódy [kbd]config[/kbd] nebolo vyplnené " +"užívateľské meno!" #: libraries/config/Validator.class.php:323 -#, fuzzy #| msgid "Empty signon session name while using signon authentication method" msgid "" "Empty signon session name while using [kbd]signon[/kbd] authentication " "method!" -msgstr "Prázdny názov relácie signon pri využití autentifikačnej metódy signon" +msgstr "" +"Prázdny názov relácie signon pri použití priholasovacej metódy " +"[kbd]signon[/kbd]!" #: libraries/config/Validator.class.php:332 -#, fuzzy #| msgid "Empty signon URL while using signon authentication method" msgid "Empty signon URL while using [kbd]signon[/kbd] authentication method!" -msgstr "Prázdna signon URL pri využití autentifikačnej metódy signon" +msgstr "" +"Prázdna prihlasovacia URL adresa pri použití prihlasovacej metódy " +"[kbd]signon[/kbd]!" #: libraries/config/Validator.class.php:378 msgid "" @@ -5208,7 +5181,6 @@ msgstr "" "phpMyAdmin configuration storage!" #: libraries/config/Validator.class.php:383 -#, fuzzy #| msgid "" #| "Empty phpMyAdmin control user password while using phpMyAdmin " #| "configuration storage" @@ -5216,8 +5188,8 @@ msgid "" "Empty phpMyAdmin control user password while using phpMyAdmin configuration " "storage!" msgstr "" -"Prázdne heslo pre phpMyAdmin control užívateľa pri využití phpMyAdmin " -"configuration storage" +"Prázdne heslo pre phpMyAdmin control užívateľa pri použití úložiska " +"nastavení phpMyAdmin!" #: libraries/config/Validator.class.php:467 msgid "Incorrect value:" @@ -7553,12 +7525,9 @@ msgid "Skip locked tables" msgstr "Preskočiť zamknuté tabuľky" #: libraries/config/messages.inc.php:742 -#, fuzzy #| msgid "A warning is displayed on the main page if Suhosin is detected" msgid "A warning is displayed on the main page if Suhosin is detected." -msgstr "" -"Na hlavnej stránke je zobrazené varovanie pokiaľ je detekované rozšírenie " -"Suhosin" +msgstr "Vypne varovanie na hlavnej stránke ak sa používa Suhosin." #: libraries/config/messages.inc.php:743 msgid "Suhosin warning" From f61cf81de4abfa1d724ea84b44a79860ac0f08e9 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 31 Dec 2014 16:19:34 +0530 Subject: [PATCH 5/5] Update tests Signed-off-by: Madhura Jayaratne --- test/libraries/PMA_relation_cleanup_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/test/libraries/PMA_relation_cleanup_test.php b/test/libraries/PMA_relation_cleanup_test.php index 0e752a7e86..93a22f4b18 100644 --- a/test/libraries/PMA_relation_cleanup_test.php +++ b/test/libraries/PMA_relation_cleanup_test.php @@ -45,6 +45,7 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['Server']['pdf_pages'] = 'pdf_pages'; $GLOBALS['cfg']['Server']['history'] = 'history'; $GLOBALS['cfg']['Server']['recent'] = 'recent'; + $GLOBALS['cfg']['Server']['favorite'] = 'favorite'; $GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs'; $GLOBALS['cfg']['Server']['tracking'] = 'tracking'; $GLOBALS['cfg']['Server']['userconfig'] = 'userconfig';