From 6bcd94f570a990b95008e905a98beee4ec546c8b Mon Sep 17 00:00:00 2001 From: Hauke Henningsen Date: Sat, 25 Apr 2015 10:46:33 +0200 Subject: [PATCH 1/7] Translated using Weblate (German) Currently translated at 100.0% (3075 of 3075 strings) [CI skip] --- po/de.po | 114 +++++++++++++++++++++++-------------------------------- 1 file changed, 48 insertions(+), 66 deletions(-) diff --git a/po/de.po b/po/de.po index 97968b5743..e888f62e9a 100644 --- a/po/de.po +++ b/po/de.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-04-10 10:21-0400\n" -"PO-Revision-Date: 2015-03-30 21:08+0200\n" +"PO-Revision-Date: 2015-04-25 10:46+0200\n" "Last-Translator: Hauke Henningsen \n" -"Language-Team: German \n" +"Language-Team: German " +"\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.3-dev\n" @@ -2811,107 +2811,91 @@ msgstr "Sekunde" #: js/messages.php:728 msgid "This field is required" -msgstr "" +msgstr "Dieses Feld muss ausgefüllt werden" #: js/messages.php:729 -#, fuzzy #| msgid "Use text field" msgid "Please fix this field" -msgstr "Textfeld verwenden" +msgstr "Bitte korrigieren Sie dieses Feld" #: js/messages.php:730 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a valid email address" -msgstr "Bitte geben Sie einen gültigen Seitennamen ein" +msgstr "Bitte geben Sie eine gültigen E-Mail-Adresse ein" #: js/messages.php:731 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid URL" -msgstr "Bitte geben Sie eine gültige Nummer ein!" +msgstr "Bitte geben Sie eine gültige URL ein" #: js/messages.php:732 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a valid date" -msgstr "Bitte geben Sie einen gültigen Seitennamen ein" +msgstr "Bitte geben Sie ein gültiges Datum ein" #: js/messages.php:733 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a valid date ( ISO )" -msgstr "Bitte geben Sie einen gültigen Seitennamen ein" +msgstr "Bitte geben Sie ein gültiges Datum (ISO) ein" #: js/messages.php:734 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid number" -msgstr "Bitte geben Sie eine gültige Nummer ein!" +msgstr "Bitte geben Sie eine gültige Zahl ein" #: js/messages.php:735 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid credit card number" -msgstr "Bitte geben Sie eine gültige Nummer ein!" +msgstr "Bitte geben Sie eine gültige Kreditkartennummer ein" #: js/messages.php:736 -#, fuzzy #| msgid "Please enter a valid length!" msgid "Please enter only digits" -msgstr "Bitte geben Sie eine gültige Länge ein!" +msgstr "Bitte geben Sie nur Ziffern ein" #: js/messages.php:737 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter the same value again" -msgstr "Bitte geben Sie einen gültigen Seitennamen ein" +msgstr "Bitte geben Sie denselben Wert nochmal ein" #: js/messages.php:738 -#, fuzzy #| msgid "Please enter correct captcha!" msgid "Please enter no more than {0} characters" -msgstr "Bitte korrektes Captcha eingeben!" +msgstr "Bitte nicht mehr als {0} Zeichen eingeben" #: js/messages.php:739 -#, fuzzy #| msgid "Please enter correct captcha!" msgid "Please enter at least {0} characters" -msgstr "Bitte korrektes Captcha eingeben!" +msgstr "Bitte geben Sie mindestens {0} Zeichen ein" #: js/messages.php:740 msgid "Please enter a value between {0} and {1} characters long" -msgstr "" +msgstr "Bitte geben Sie einen zwischen {0} und {1} Zeichen langen Wert ein" #: js/messages.php:741 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a value between {0} and {1}" -msgstr "Bitte geben Sie einen gültigen Seitennamen ein" +msgstr "Bitte geben Sie einen Wert zwischen {0} und {1} ein" #: js/messages.php:742 -#, fuzzy #| msgid "Please enter a valid length!" msgid "Please enter a value less than or equal to {0}" -msgstr "Bitte geben Sie eine gültige Länge ein!" +msgstr "Bitte geben Sie einen Wert kleiner gleich {0} ein" #: js/messages.php:743 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a value greater than or equal to {0}" -msgstr "Bitte geben Sie einen gültigen Seitennamen ein" +msgstr "Bitte geben Sie einen Wert größer gleich {0} ein" #: js/messages.php:745 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a valid date or time" -msgstr "Bitte geben Sie einen gültigen Seitennamen ein" +msgstr "Bitte geben Sie ein gültiges Datum oder eine gültige Zeitangabe ein" #: js/messages.php:746 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid HEX input" -msgstr "Bitte geben Sie eine gültige Nummer ein!" +msgstr "Bitte geben Sie einen gültige hexadezimale Eingabe ein" #: js/messages.php:747 libraries/Message.class.php:199 #: libraries/Util.class.php:624 libraries/core.lib.php:245 @@ -5974,10 +5958,10 @@ msgid "Export views as tables" msgstr "Exportiere Ansicht als Tabelle" #: libraries/config/messages.inc.php:176 -#, fuzzy #| msgid "%sCreate%s missing phpMyAdmin configuration storage tables." msgid "Export related metadata from phpMyAdmin configuration storage" -msgstr "Fehlende phpMyAdmin-Konfigurationsspeicher-Tabellen %sanlegen%s." +msgstr "" +"Verwandte Metadaten aus dem phpMyAdmin-Konfigurationsspeicher exportieren" #: libraries/config/messages.inc.php:177 libraries/config/messages.inc.php:179 #: libraries/config/messages.inc.php:180 libraries/config/messages.inc.php:181 @@ -6172,7 +6156,6 @@ msgid "Page titles" msgstr "Seitentitel" #: libraries/config/messages.inc.php:257 -#, 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 " @@ -6182,7 +6165,7 @@ msgid "" "for magic strings that can be used to get special values." msgstr "" "Text für die Browser-Titelleiste. Weitere Informationen über Schlüsselwörter " -"und Variablennamen in der [doc@cfg_TitleTable]Dokumentation[/doc]." +"und Variablennamen in der [doc@faq6-27]Dokumentation[/doc]." #: libraries/config/messages.inc.php:261 msgid "Security" @@ -7634,12 +7617,13 @@ msgid "Skip locked tables" msgstr "Überspringe gesperrte Tabellen" #: libraries/config/messages.inc.php:773 -#, fuzzy #| msgid "A warning is displayed on the main page if Suhosin is detected." msgid "" "Disable the default warning that is displayed on the main page if Suhosin is " "detected." -msgstr "Warnhinweis auf der Hauptseite, wenn Suhosin erkannt wird." +msgstr "" +"Default-Warnhinweis auf der Hauptseite deaktivieren, der angezeigt wird, " +"wenn Suhosin erkannt wird." #: libraries/config/messages.inc.php:774 msgid "Suhosin warning" @@ -7660,7 +7644,6 @@ msgid "Login cookie validity warning" msgstr "Login-Cookie Gültigkeitswarnung" #: libraries/config/messages.inc.php:779 -#, fuzzy #| msgid "" #| "Textarea size (columns) in edit mode, this value will be emphasized for " #| "SQL query textareas (*2) and for query window (*1.25)." @@ -7669,14 +7652,13 @@ msgid "" "query textareas (*2)." msgstr "" "Textfeldgröße (in Spalten) im Bearbeitungsmodus. Dieser Wert wird vergrößert " -"für Textfelder bei SQL-Abfragen (*2) und Abfragefenster (*1,25)." +"für Textfelder bei SQL-Abfragen (*2)." #: libraries/config/messages.inc.php:780 msgid "Textarea columns" msgstr "Textfeldspalten" #: libraries/config/messages.inc.php:781 -#, fuzzy #| msgid "" #| "Textarea size (rows) in edit mode, this value will be emphasized for SQL " #| "query textareas (*2) and for query window (*1.25)." @@ -7685,7 +7667,7 @@ msgid "" "query textareas (*2)." msgstr "" "Textfeldgröße (in Zeilen) im Bearbeitungsmodus. Dieser Wert wird vergrößert " -"für Textfelder bei SQL-Abfragen (*2) und Abfragefenster (*1,25)." +"für Textfelder bei SQL-Abfragen (*2)." #: libraries/config/messages.inc.php:782 msgid "Textarea rows" @@ -9822,7 +9804,7 @@ msgstr "Nur Daten" #: libraries/operations.lib.php:174 msgid "Copy database to" -msgstr "Datenbank kopieren nach:" +msgstr "Datenbank kopieren nach" #: libraries/operations.lib.php:185 msgid "CREATE DATABASE before copying" @@ -9846,7 +9828,7 @@ msgstr "(einmalig)" #: libraries/operations.lib.php:621 msgid "Move table to (database.table)" -msgstr "Verschiebe Tabelle nach (Datenbank.Tabellenname):" +msgstr "Verschiebe Tabelle nach (Datenbank.Tabellenname)" #: libraries/operations.lib.php:732 msgid "Table options" @@ -9866,7 +9848,7 @@ msgstr "Tabellenformat" #: libraries/operations.lib.php:955 msgid "Copy table to (database.table)" -msgstr "Kopiere Tabelle nach (Datenbank.Tabellenname):" +msgstr "Kopiere Tabelle nach (Datenbank.Tabellenname)" #: libraries/operations.lib.php:1010 msgid "Switch to copied table" @@ -10310,22 +10292,19 @@ msgid "Report title:" msgstr "Titel des Reports:" #: libraries/plugins/export/ExportPdf.class.php:230 -#, fuzzy #| msgid "Dumping data for table" msgid "Dumping data" -msgstr "Daten für Tabelle" +msgstr "Datendump" #: libraries/plugins/export/ExportPdf.class.php:284 -#, fuzzy #| msgid "structure" msgid "View structure" -msgstr "Struktur" +msgstr "Ansichtsstruktur" #: libraries/plugins/export/ExportPdf.class.php:287 -#, fuzzy #| msgid "and then" msgid "Stand in" -msgstr "und dann" +msgstr "Ersatz" #: libraries/plugins/export/ExportSql.class.php:91 msgid "" @@ -10350,10 +10329,9 @@ msgstr "" "geprüft wurde" #: libraries/plugins/export/ExportSql.class.php:161 -#, fuzzy #| msgid "Export method" msgid "Export metadata" -msgstr "Exportmethode" +msgstr "Metadaten exportieren" #: libraries/plugins/export/ExportSql.class.php:176 msgid "" @@ -10486,10 +10464,10 @@ msgid "It appears your database uses functions;" msgstr "Es scheint, dass Ihre Datenbank Funktionen verwendet;" #: libraries/plugins/export/ExportSql.class.php:989 -#, fuzzy, php-format +#, php-format #| msgid "Metadata Headers" msgid "Metadata for %s" -msgstr "Metadaten-Header" +msgstr "Metadaten für %s" #: libraries/plugins/export/ExportSql.class.php:1352 msgid "It appears your database uses views;" @@ -10554,13 +10532,12 @@ msgstr "Tabelle:" #: libraries/plugins/export/PMA_ExportPdf.class.php:118 msgid "Purpose:" -msgstr "" +msgstr "Zweck:" #: libraries/plugins/export/PMA_ExportPdf.class.php:494 -#, fuzzy #| msgid "MIME type" msgid "MIME" -msgstr "MIME-Typ" +msgstr "MIME" #: libraries/plugins/import/ImportCsv.class.php:63 #: libraries/plugins/import/ImportOds.class.php:75 @@ -11165,14 +11142,19 @@ msgid "" "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the " "phpMyAdmin configuration storage there." msgstr "" +"Sie haben nicht die nötigen Rechte, um eine Datenbank mit Namen „phpmyadmin“ " +"anzulegen. Sie können zum „Operationen“-Tab einer beliebigen Datenbank " +"gehen, um in dieser den phpMyAdmin-Konfigurationsspeicher einzurichten." #: libraries/relation.lib.php:2005 -#, fuzzy, php-format +#, php-format #| msgid "%sCreate%s missing phpMyAdmin configuration storage tables." msgid "" "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin " "configuration storage there." -msgstr "Fehlende phpMyAdmin-Konfigurationsspeicher-Tabellen %sanlegen%s." +msgstr "" +"Eine Datenbank mit Namen „phpmyadmin“ %sanlegen%s und dort die phpMyAdmin-" +"Konfigurationsspeicher-Tabellen einrichten." #: libraries/relation.lib.php:2013 #, php-format From d13ba710ca0b5de679eeffec2308722bce1142e0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 25 Apr 2015 08:37:30 -0400 Subject: [PATCH 2/7] Fix ambiguous return value Signed-off-by: Marc Delisle --- libraries/pmd_common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 7829bf74ec..739481d0f1 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -312,7 +312,7 @@ function PMA_deletePage($pg) { $cfgRelation = PMA_getRelationsParam(); if (! $cfgRelation['pdfwork']) { - return null; + return false; } $query = "DELETE FROM " . PMA_Util::backquote($cfgRelation['db']) From 527586ad436359c2ddfdb0b17809b852d2550343 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 25 Apr 2015 08:44:26 -0400 Subject: [PATCH 3/7] bug Undefined index: Rows Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/structure.lib.php | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index ff27ea20df..de468abe1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog - bug #4870 Inconsistency in 'Ignore' checkbox in insert page - bug #4869 Drop column action not asking to confirm - bug #4871 Error on creating table +- bug Undefined index: Rows 4.4.3.0 (2015-04-20) - bug #4851 PHP errors in login dialogue diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index ab23b27d60..60dabad94b 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -1876,6 +1876,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation, } if (!$is_innodb && isset($showtable['Data_length']) + && isset($showtable['Rows']) && $showtable['Rows'] > 0 && $mergetable == false ) { From 285e0d9b61778572252bd6f4ee69644f8c834c79 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 26 Apr 2015 06:35:06 -0400 Subject: [PATCH 4/7] 4.4.5-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index de468abe1b..604f25d843 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.4.4.0 (not yet released) +4.4.5.0 (not yet released) + +4.4.4.0 (2015-04-26) - bug #4863 Edit vs Change - bug #4859 Don't scroll (to bottom) when editing multiple rows - bug #4862 Misaligned Inline edit field diff --git a/README b/README index d37ff3f31d..485b99c0d4 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.4.4-dev +Version 4.4.5-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index a2da67cb7e..013ddf0741 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.4.4-dev' +version = '4.4.5-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index c5017cb00e..498907b580 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.4.4-dev'); + $this->set('PMA_VERSION', '4.4.5-dev'); /** * @deprecated */ From 8e0d4f19c5b7676c56db8030a49cf591468811eb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 26 Apr 2015 06:36:42 -0400 Subject: [PATCH 5/7] 4.4.4 release date Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2afe27819a..bffc523ddf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,7 +28,9 @@ phpMyAdmin - ChangeLog + rfe Option groups for 'With selected' dropdown in database structure page + rfe #1661 Support checksum table -4.4.4.0 (not yet released) +4.4.5.0 (not yet released) + +4.4.4.0 (2015-04-26) - bug #4863 Edit vs Change - bug #4859 Don't scroll (to bottom) when editing multiple rows - bug #4862 Misaligned Inline edit field From c8b6f6950d2d417067fd1afac4048eb69ee735aa Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 26 Apr 2015 20:16:35 +0200 Subject: [PATCH 6/7] Minor code refactor. Signed-off-by: Hugues Peccatte --- libraries/dbi/DBIDrizzle.class.php | 61 +++++++------------------- setup/lib/ConfigGenerator.class.php | 67 ++++++++++++++++++----------- 2 files changed, 58 insertions(+), 70 deletions(-) diff --git a/libraries/dbi/DBIDrizzle.class.php b/libraries/dbi/DBIDrizzle.class.php index 7fbbf089f4..85dae6feec 100644 --- a/libraries/dbi/DBIDrizzle.class.php +++ b/libraries/dbi/DBIDrizzle.class.php @@ -125,28 +125,27 @@ class PMA_DBI_Drizzle implements PMA_DBI_Extension $client_flags |= DRIZZLE_CAPABILITIES_SSL; } - if (! $server) { - $link = @$this->_realConnect( - $drizzle, $cfg['Server']['host'], - $server_port, $server_socket, $user, - $password, false, $client_flags - ); - // Retry with empty password if we're allowed to - if ($link == false && isset($cfg['Server']['nopassword']) - && $cfg['Server']['nopassword'] && ! $is_controluser - ) { - $link = @$this->_realConnect( - $drizzle, $cfg['Server']['host'], $server_port, $server_socket, - $user, null, false, $client_flags - ); - } - } else { - $link = @$this->_realConnect( + if ($server) { + return @$this->_realConnect( $drizzle, $server['host'], $server_port, $server_socket, $user, $password ); } + $link = @$this->_realConnect( + $drizzle, $cfg['Server']['host'], $server_port, $server_socket, $user, + $password, false, $client_flags + ); + // Retry with empty password if we're allowed to + if ($link == false && isset($cfg['Server']['nopassword']) + && $cfg['Server']['nopassword'] && ! $is_controluser + ) { + $link = @$this->_realConnect( + $drizzle, $cfg['Server']['host'], $server_port, $server_socket, + $user, null, false, $client_flags + ); + } + return $link; } @@ -395,34 +394,6 @@ class PMA_DBI_Drizzle implements PMA_DBI_Extension { // Build an associative array for a type look up $typeAr = array(); - /*$typeAr[DRIZZLE_COLUMN_TYPE_DECIMAL] = 'real'; - $typeAr[DRIZZLE_COLUMN_TYPE_NEWDECIMAL] = 'real'; - $typeAr[DRIZZLE_COLUMN_TYPE_BIT] = 'int'; - $typeAr[DRIZZLE_COLUMN_TYPE_TINY] = 'int'; - $typeAr[DRIZZLE_COLUMN_TYPE_SHORT] = 'int'; - $typeAr[DRIZZLE_COLUMN_TYPE_LONG] = 'int'; - $typeAr[DRIZZLE_COLUMN_TYPE_FLOAT] = 'real'; - $typeAr[DRIZZLE_COLUMN_TYPE_DOUBLE] = 'real'; - $typeAr[DRIZZLE_COLUMN_TYPE_NULL] = 'null'; - $typeAr[DRIZZLE_COLUMN_TYPE_TIMESTAMP] = 'timestamp'; - $typeAr[DRIZZLE_COLUMN_TYPE_LONGLONG] = 'int'; - $typeAr[DRIZZLE_COLUMN_TYPE_INT24] = 'int'; - $typeAr[DRIZZLE_COLUMN_TYPE_DATE] = 'date'; - $typeAr[DRIZZLE_COLUMN_TYPE_TIME] = 'date'; - $typeAr[DRIZZLE_COLUMN_TYPE_DATETIME] = 'datetime'; - $typeAr[DRIZZLE_COLUMN_TYPE_YEAR] = 'year'; - $typeAr[DRIZZLE_COLUMN_TYPE_NEWDATE] = 'date'; - $typeAr[DRIZZLE_COLUMN_TYPE_ENUM] = 'unknown'; - $typeAr[DRIZZLE_COLUMN_TYPE_SET] = 'unknown'; - $typeAr[DRIZZLE_COLUMN_TYPE_VIRTUAL] = 'unknown'; - $typeAr[DRIZZLE_COLUMN_TYPE_TINY_BLOB] = 'blob'; - $typeAr[DRIZZLE_COLUMN_TYPE_MEDIUM_BLOB] = 'blob'; - $typeAr[DRIZZLE_COLUMN_TYPE_LONG_BLOB] = 'blob'; - $typeAr[DRIZZLE_COLUMN_TYPE_BLOB] = 'blob'; - $typeAr[DRIZZLE_COLUMN_TYPE_VAR_STRING] = 'string'; - $typeAr[DRIZZLE_COLUMN_TYPE_VARCHAR] = 'string'; - $typeAr[DRIZZLE_COLUMN_TYPE_STRING] = 'string'; - $typeAr[DRIZZLE_COLUMN_TYPE_GEOMETRY] = 'geometry';*/ $typeAr[DRIZZLE_COLUMN_TYPE_DRIZZLE_BLOB] = 'blob'; $typeAr[DRIZZLE_COLUMN_TYPE_DRIZZLE_DATE] = 'date'; diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index af83025691..5bcf43a859 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -25,44 +25,26 @@ class ConfigGenerator $crlf = (isset($_SESSION['eol']) && $_SESSION['eol'] == 'win') ? "\r\n" : "\n"; - $c = $cf->getConfig(); + $conf = $cf->getConfig(); // header $ret = 'get('PMA_VERSION') - . ' setup script' . $crlf + . $GLOBALS['PMA_Config']->get('PMA_VERSION') + . ' setup script' . $crlf . ' * Date: ' . date(DATE_RFC1123) . $crlf . ' */' . $crlf . $crlf; - // servers - if ($cf->getServerCount() > 0) { - $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf; - foreach ($c['Servers'] as $id => $server) { - $ret .= '/* Server: ' - . strtr($cf->getServerName($id) . " [$id] ", '*/', '-') - . "*/" . $crlf - . '$i++;' . $crlf; - foreach ($server as $k => $v) { - $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); - $ret .= "\$cfg['Servers'][\$i]['$k'] = " - . (is_array($v) && self::_isZeroBasedArray($v) - ? self::_exportZeroBasedArray($v, $crlf) - : var_export($v, true)) - . ';' . $crlf; - } - $ret .= $crlf; - } - $ret .= '/* End of servers configuration */' . $crlf . $crlf; - } - unset($c['Servers']); + //servers + $ret .= self::_getServerPart($cf, $crlf, $conf['Servers']); + unset($conf['Servers']); // other settings $persistKeys = $cf->getPersistKeysMap(); - foreach ($c as $k => $v) { + foreach ($conf as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); $ret .= self::_getVarExport($k, $v, $crlf); if (isset($persistKeys[$k])) { @@ -157,5 +139,40 @@ class ConfigGenerator $ret .= ')'; return $ret; } + + /** + * Generate server part of config file + * + * @param ConfigFile $cf Config file + * @param string $crlf Carriage return char + * @param array $servers Servers list + * + * @return string + */ + protected static function _getServerPart(ConfigFile $cf, $crlf, $servers) + { + if ($cf->getServerCount() === 0) { + return null; + } + + $ret = "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf; + foreach ($servers as $id => $server) { + $ret .= '/* Server: ' + . strtr($cf->getServerName($id) . " [$id] ", '*/', '-') + . "*/" . $crlf + . '$i++;' . $crlf; + foreach ($server as $k => $v) { + $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); + $ret .= "\$cfg['Servers'][\$i]['$k'] = " + . (is_array($v) && self::_isZeroBasedArray($v) + ? self::_exportZeroBasedArray($v, $crlf) + : var_export($v, true)) + . ';' . $crlf; + } + $ret .= $crlf; + } + $ret .= '/* End of servers configuration */' . $crlf . $crlf; + return $ret; + } } ?> From 26655314e5420a4587ca2094800a65821eeed937 Mon Sep 17 00:00:00 2001 From: Jozef Pistej Date: Sun, 26 Apr 2015 15:02:09 +0200 Subject: [PATCH 7/7] Translated using Weblate (Slovak) Currently translated at 83.6% (2572 of 3075 strings) [CI skip] --- po/sk.po | 59 +++++++++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/po/sk.po b/po/sk.po index 95dd3928d5..7fb1ad23e0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-04-10 10:21-0400\n" -"PO-Revision-Date: 2015-04-05 09:31+0200\n" -"Last-Translator: Martin Lacina \n" -"Language-Team: Slovak \n" +"PO-Revision-Date: 2015-04-26 15:02+0200\n" +"Last-Translator: Jozef Pistej \n" +"Language-Team: Slovak " +"\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Weblate 2.3-dev\n" @@ -2753,102 +2753,87 @@ msgid "This field is required" msgstr "" #: js/messages.php:729 -#, fuzzy #| msgid "Use text field" msgid "Please fix this field" -msgstr "Požiť textové pole" +msgstr "Prosím opravte toto pole" #: js/messages.php:730 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a valid email address" -msgstr "Prosím zadajte platný názov stránky" +msgstr "Prosím zadajte platnú emailovú adresu" #: js/messages.php:731 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid URL" -msgstr "Prosím zdajte platné číslo!" +msgstr "Prosím zdajte platnú adresu URL" #: js/messages.php:732 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a valid date" -msgstr "Prosím zadajte platný názov stránky" +msgstr "Prosím zadajte platný dátum" #: js/messages.php:733 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a valid date ( ISO )" -msgstr "Prosím zadajte platný názov stránky" +msgstr "Prosím zadajte platný dátum ( ISO )" #: js/messages.php:734 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid number" -msgstr "Prosím zdajte platné číslo!" +msgstr "Prosím zadajte platné číslo" #: js/messages.php:735 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid credit card number" -msgstr "Prosím zdajte platné číslo!" +msgstr "Prosím zadajte platné číslo kreditnej karty" #: js/messages.php:736 -#, fuzzy #| msgid "Please enter a valid length!" msgid "Please enter only digits" -msgstr "Prosím zadajte platnú dĺžku!" +msgstr "Prosím zadajte iba čísla" #: js/messages.php:737 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter the same value again" -msgstr "Prosím zadajte platný názov stránky" +msgstr "Prosím zadajte tú istú hodnotu ešte raz" #: js/messages.php:738 msgid "Please enter no more than {0} characters" -msgstr "" +msgstr "Prosím zadajte nie viac ako {0} znakov" #: js/messages.php:739 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter at least {0} characters" -msgstr "Prosím zadajte platný názov stránky" +msgstr "Prosím zadajte najmenej {0} znakov" #: js/messages.php:740 msgid "Please enter a value between {0} and {1} characters long" -msgstr "" +msgstr "Prosím zadajte počet znakov medzi {0} a {1}" #: js/messages.php:741 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a value between {0} and {1}" -msgstr "Prosím zadajte platný názov stránky" +msgstr "Prosím zadajte hodnotu medzi {0} a {1}" #: js/messages.php:742 -#, fuzzy #| msgid "Please enter a valid length!" msgid "Please enter a value less than or equal to {0}" -msgstr "Prosím zadajte platnú dĺžku!" +msgstr "Prosím zadajte hodnotu menšiu alebo rovnú {0}" #: js/messages.php:743 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a value greater than or equal to {0}" -msgstr "Prosím zadajte platný názov stránky" +msgstr "Prosím zadajte hodnotu väčšiu alebo rovnú {0}" #: js/messages.php:745 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a valid date or time" -msgstr "Prosím zadajte platný názov stránky" +msgstr "Prosím zadajte platný dátum alebo čas" #: js/messages.php:746 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid HEX input" -msgstr "Prosím zdajte platné číslo!" +msgstr "Prosím zdajte platný HEX vstup" #: js/messages.php:747 libraries/Message.class.php:199 #: libraries/Util.class.php:624 libraries/core.lib.php:245