Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
This commit is contained in:
Madhura Jayaratne
commit
ce4e1a7580
@ -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
|
||||
@ -39,6 +41,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
|
||||
|
||||
@ -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';
|
||||
|
||||
@ -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'])
|
||||
|
||||
@ -1890,6 +1890,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
|
||||
}
|
||||
if (!$is_innodb
|
||||
&& isset($showtable['Data_length'])
|
||||
&& isset($showtable['Rows'])
|
||||
&& $showtable['Rows'] > 0
|
||||
&& $mergetable == false
|
||||
) {
|
||||
|
||||
114
po/de.po
114
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 <sqrt@entless.org>\n"
|
||||
"Language-Team: German <https://hosted.weblate.org/projects/phpmyadmin/master/"
|
||||
"de/>\n"
|
||||
"Language-Team: German "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/de/>\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<b>.</b>table)"
|
||||
msgstr "Verschiebe Tabelle nach (Datenbank<b>.</b>Tabellenname):"
|
||||
msgstr "Verschiebe Tabelle nach (Datenbank<b>.</b>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<b>.</b>table)"
|
||||
msgstr "Kopiere Tabelle nach (Datenbank<b>.</b>Tabellenname):"
|
||||
msgstr "Kopiere Tabelle nach (Datenbank<b>.</b>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
|
||||
|
||||
59
po/sk.po
59
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 <martin@whistler.sk>\n"
|
||||
"Language-Team: Slovak <https://hosted.weblate.org/projects/phpmyadmin/master/"
|
||||
"sk/>\n"
|
||||
"PO-Revision-Date: 2015-04-26 15:02+0200\n"
|
||||
"Last-Translator: Jozef Pistej <pistej2@gmail.com>\n"
|
||||
"Language-Team: Slovak "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/sk/>\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
|
||||
|
||||
@ -25,44 +25,26 @@ class ConfigGenerator
|
||||
$crlf = (isset($_SESSION['eol']) && $_SESSION['eol'] == 'win')
|
||||
? "\r\n"
|
||||
: "\n";
|
||||
$c = $cf->getConfig();
|
||||
$conf = $cf->getConfig();
|
||||
|
||||
// header
|
||||
$ret = '<?php' . $crlf
|
||||
. '/*' . $crlf
|
||||
. ' * Generated configuration file' . $crlf
|
||||
. ' * Generated by: phpMyAdmin '
|
||||
. $GLOBALS['PMA_Config']->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;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
