From c1b4895f57e8d1c303adaf543f8ca63631734ccd Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 7 Oct 2014 11:33:37 +0200 Subject: [PATCH 1/2] Translated using Weblate (German) Currently translated at 95.2% (2636 of 2768 strings) [CI skip] --- po/de.po | 118 ++++++++++++++++++++----------------------------------- 1 file changed, 43 insertions(+), 75 deletions(-) diff --git a/po/de.po b/po/de.po index 28ec5cf685..eb28bf610f 100644 --- a/po/de.po +++ b/po/de.po @@ -4,9 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-07-29 17:30+0200\n" -"Last-Translator: Matthias Bluthardt \n" -"Language-Team: German \n" +"PO-Revision-Date: 2014-10-07 11:33+0200\n" +"Last-Translator: Michael Koch \n" +"Language-Team: German " +"\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1936,10 +1937,9 @@ msgstr "" "Sie können die meisten Werte auch bearbeiten,
indem Sie darauf klicken." #: js/messages.php:365 -#, fuzzy #| msgid "Go to link." msgid "Go to link:" -msgstr "Gehe zur Verknüpfung." +msgstr "Gehe zur Verknüpfung:" #: js/messages.php:366 msgid "Copy column name." @@ -2289,6 +2289,7 @@ msgstr "Wo" #. * or "calendar-year-month". #. #: js/messages.php:555 +#, fuzzy msgid "calendar-month-year" msgstr "calendar-month-year" @@ -5415,10 +5416,9 @@ msgid "Table structure" msgstr "Tabellenstruktur" #: libraries/config/messages.inc.php:301 -#, fuzzy #| msgid "Settings for the table structure (list of columns)" msgid "Settings for the table structure (list of columns)." -msgstr "Einstellungen für die Tabellenstruktur (Spaltenliste)" +msgstr "Einstellungen für die Tabellenstruktur (Spaltenliste)." #: libraries/config/messages.inc.php:302 msgid "Tabs" @@ -5551,10 +5551,9 @@ msgid "Import percentages as proper decimals (12.00% to .12)" msgstr "Prozentwerte als Dezimalzahlen importieren (12.00% wird zu 0.12)" #: libraries/config/messages.inc.php:356 -#, fuzzy #| msgid "Number of queries to skip from start" msgid "Number of queries to skip from start." -msgstr "Anzahl der am Anfang zu überspringenden Abfragen" +msgstr "Anzahl der am Anfang zu überspringenden Abfragen." #: libraries/config/messages.inc.php:357 msgid "Partial import: skip queries" @@ -5577,7 +5576,6 @@ msgid "Number of inserted rows" msgstr "Anzahl der eingefügten Datensätze" #: libraries/config/messages.inc.php:367 -#, fuzzy #| msgid "" #| "Maximum number of characters shown in any non-numeric column on browse " #| "view" @@ -5585,7 +5583,7 @@ msgid "" "Maximum number of characters shown in any non-numeric column on browse view." msgstr "" "Maximal dargestellte Zeichenzahl bei Anzeige einer nicht-numerischen Spalte " -"in einer SQL-Abfrage" +"in einer SQL-Abfrage." #: libraries/config/messages.inc.php:369 msgid "Limit column characters" @@ -5606,7 +5604,6 @@ msgid "Delete all cookies on logout" msgstr "All Cookies beim Logout löschen" #: libraries/config/messages.inc.php:377 -#, fuzzy #| msgid "" #| "Define whether the previous login should be recalled or not in cookie " #| "authentication mode." @@ -5614,8 +5611,8 @@ msgid "" "Define whether the previous login should be recalled or not in [kbd]cookie[/" "kbd] authentication mode." msgstr "" -"Definiert ob im Cookie Authentifizierungsmodus der vorherige Login wieder " -"aufgerufen werden soll oder nicht." +"Definiert ob im [kbd]Cookie[/kbd] Authentifizierungsmodus der vorherige " +"Login wieder aufgerufen werden soll oder nicht." #: libraries/config/messages.inc.php:380 msgid "Recall user name" @@ -5638,30 +5635,27 @@ msgid "Login cookie store" msgstr "Login Cookie Speicherung" #: libraries/config/messages.inc.php:389 -#, fuzzy #| msgid "Define how long (in seconds) a login cookie is valid" msgid "Define how long (in seconds) a login cookie is valid." -msgstr "Legt fest, wie lange (in Sekunden) ein Login Cookie gültig ist" +msgstr "Legt fest, wie lange (in Sekunden) ein Login Cookie gültig ist." #: libraries/config/messages.inc.php:390 msgid "Login cookie validity" msgstr "Login Cookie Gültigkeit" #: libraries/config/messages.inc.php:392 -#, fuzzy #| msgid "Double size of textarea for LONGTEXT columns" msgid "Double size of textarea for LONGTEXT columns." -msgstr "Verdoppele Größe für LONGTEXT Spalten" +msgstr "Verdoppele Größe für LONGTEXT Spalten." #: libraries/config/messages.inc.php:393 msgid "Bigger textarea for LONGTEXT" msgstr "Größere Textfelder für LONGTEXT" #: libraries/config/messages.inc.php:395 -#, fuzzy #| msgid "Maximum number of characters used when a SQL query is displayed" msgid "Maximum number of characters used when a SQL query is displayed." -msgstr "Maximal dargestellte Zeichenzahl bei Anzeige einer SQL-Abfrage" +msgstr "Maximal dargestellte Zeichenzahl bei Anzeige einer SQL-Abfrage." #: libraries/config/messages.inc.php:396 msgid "Maximum displayed SQL length" @@ -5673,10 +5667,9 @@ msgid "Users cannot set a higher value" msgstr "Benutzer dürfen keinen größeren Wert setzen" #: libraries/config/messages.inc.php:399 -#, fuzzy #| msgid "Maximum number of databases displayed in database list" msgid "Maximum number of databases displayed in database list." -msgstr "Maximale Anzahl der in der Datenbankliste angezeigten Datenbanken" +msgstr "Maximale Anzahl der in der Datenbankliste angezeigten Datenbanken." #: libraries/config/messages.inc.php:400 msgid "Maximum databases" @@ -5727,17 +5720,15 @@ msgid "Maximum number of rows to display" msgstr "Maximale Anzahl der angezeigten Datensätze" #: libraries/config/messages.inc.php:417 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of tables displayed in table list." -msgstr "Maximale Anzahl der in einer Tabellenliste angezeigten Tabellen" +msgstr "Maximale Anzahl der in einer Tabellenliste angezeigten Tabellen." #: libraries/config/messages.inc.php:418 msgid "Maximum tables" msgstr "Tabellen Maximum" #: libraries/config/messages.inc.php:420 -#, fuzzy #| msgid "" #| "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] " #| "([kbd]0[/kbd] for no limit)" @@ -5745,35 +5736,32 @@ msgid "" "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] " "([kbd]0[/kbd] for no limit)." msgstr "" -"Anzahl der Bytes, welche ein Script zur Ausführung benötigen darf, z.B. [kbd]" -"32M[/kbd] ([kbd]0[/kbd] für unbegrenzt)" +"Anzahl der Bytes, welche ein Script zur Ausführung benötigen darf, z.B. " +"[kbd]32M[/kbd] ([kbd]0[/kbd] .für unbegrenzt)." #: libraries/config/messages.inc.php:423 msgid "Memory limit" msgstr "Speicher Limit" #: libraries/config/messages.inc.php:424 -#, fuzzy #| msgid "Show logo in navigation panel" msgid "Show logo in navigation panel." -msgstr "Logo im Navigationspanel anzeigen" +msgstr "Logo im Navigationspanel anzeigen." #: libraries/config/messages.inc.php:425 msgid "Display logo" msgstr "Logo anzeigen" #: libraries/config/messages.inc.php:427 -#, fuzzy #| msgid "URL where logo in the navigation panel will point to" msgid "URL where logo in the navigation panel will point to." -msgstr "URL, auf die das Logo im Navigationspanel zeigt" +msgstr "URL, auf die das Logo im Navigationspanel zeigt." #: libraries/config/messages.inc.php:428 msgid "Logo link URL" msgstr "URL für Logo-Link" #: libraries/config/messages.inc.php:430 -#, fuzzy #| msgid "" #| "Open the linked page in the main window ([kbd]main[/kbd]) or in a new one " #| "([kbd]new[/kbd])" @@ -5782,17 +5770,16 @@ msgid "" "([kbd]new[/kbd])." msgstr "" "Öffne Links im aktuellen Fenster([kbd]main[/kbd]) oder in einem neuen " -"Fenster ([kbd]new[/kbd])" +"Fenster ([kbd]new[/kbd])." #: libraries/config/messages.inc.php:433 msgid "Logo link target" msgstr "Ziel für Logo-Link" #: libraries/config/messages.inc.php:435 -#, fuzzy #| msgid "Display server choice at the top of the navigation panel" msgid "Display server choice at the top of the navigation panel." -msgstr "Serverauswahl oben im Navigationspanel anzeigen" +msgstr "Serverauswahl oben im Navigationspanel anzeigen." #: libraries/config/messages.inc.php:436 msgid "Display servers selection" @@ -5820,7 +5807,6 @@ msgstr "" "Minimale Anzahl der Datenbanken, die im Datenbank-Filterfeld angezeigt werden" #: libraries/config/messages.inc.php:447 -#, fuzzy #| msgid "" #| "Group items in the navigation tree (determined by the separator defined " #| "below)" @@ -5829,29 +5815,27 @@ msgid "" "below)." msgstr "" "Elemente im Navigationsbaum gruppieren (wie vom unten definierten " -"Trennzeichen bestimmt)" +"Trennzeichen bestimmt)." #: libraries/config/messages.inc.php:449 msgid "Group items in the tree" msgstr "Elemente im Baum gruppieren" #: libraries/config/messages.inc.php:451 -#, fuzzy #| msgid "String that separates databases into different tree levels" msgid "String that separates databases into different tree levels." msgstr "" -"Zeichenkette, die Datenbanken in unterschiedliche Baum-Abschnitte unterteilt" +"Zeichenkette, die Datenbanken in unterschiedliche Baum-Abschnitte unterteilt." #: libraries/config/messages.inc.php:452 msgid "Database tree separator" msgstr "Trennzeichen für Datenbank-Baum" #: libraries/config/messages.inc.php:454 -#, fuzzy #| msgid "String that separates tables into different tree levels" msgid "String that separates tables into different tree levels." msgstr "" -"Zeichenkette, die Tabellen in unterschiedliche Baum-Abschnitte unterteilt" +"Zeichenkette, die Tabellen in unterschiedliche Baum-Abschnitte unterteilt." #: libraries/config/messages.inc.php:455 msgid "Table tree separator" @@ -5862,10 +5846,9 @@ msgid "Maximum table tree depth" msgstr "Maximale Tiefe des Tabellen-Baumes" #: libraries/config/messages.inc.php:458 -#, fuzzy #| msgid "Highlight server under the mouse cursor" msgid "Highlight server under the mouse cursor." -msgstr "Server unter Mauscursor hervorheben" +msgstr "Server unter Mauscursor hervorheben." #: libraries/config/messages.inc.php:459 msgid "Enable highlighting" @@ -5882,12 +5865,11 @@ msgid "Disable database expansion" msgstr "Datenbanken als Liste anzeigen" #: libraries/config/messages.inc.php:465 -#, fuzzy #| msgid "Maximum number of recently used tables; set 0 to disable" msgid "Maximum number of recently used tables; set 0 to disable." msgstr "" "Maximale Anzahl der kürzlichen verwendeten Tabellen, auf 0 setzen zum " -"deaktivieren" +"deaktivieren." #: libraries/config/messages.inc.php:467 #, fuzzy @@ -5902,21 +5884,19 @@ msgid "Recently used tables" msgstr "Kürzlich verwendete Tabellen" #: libraries/config/messages.inc.php:470 -#, fuzzy #| msgid "These are Edit, Copy and Delete links" msgid "These are Edit, Copy and Delete links." -msgstr "Dies sind Bearbeitungs-, Kopier- und Löschlinks" +msgstr "Dies sind Bearbeitungs-, Kopier- und Löschlinks." #: libraries/config/messages.inc.php:471 msgid "Where to show the table row links" msgstr "Wo die Datensatz-Links angezeigt werden sollen" #: libraries/config/messages.inc.php:473 -#, fuzzy #| msgid "Use natural order for sorting table and database names" msgid "Use natural order for sorting table and database names." msgstr "" -"Natürliche Sortierreihenfolge für Tabellen- und Datenbanknamen verwenden" +"Natürliche Sortierreihenfolge für Tabellen- und Datenbanknamen verwenden." #: libraries/config/messages.inc.php:474 msgid "Natural order" @@ -5924,27 +5904,24 @@ msgstr "Natürliche Reihenfolge" #: libraries/config/messages.inc.php:475 libraries/config/messages.inc.php:506 #: libraries/config/messages.inc.php:508 -#, fuzzy #| msgid "Use only icons, only text or both" msgid "Use only icons, only text or both." -msgstr "Verwende nur Icons, nur Text oder beides" +msgstr "Verwende nur Icons, nur Text oder beides." #: libraries/config/messages.inc.php:476 msgid "Table navigation bar" msgstr "Tabellen-Navigationsleiste" #: libraries/config/messages.inc.php:478 -#, fuzzy #| msgid "use GZip output buffering for increased speed in HTTP transfers" msgid "Use GZip output buffering for increased speed in HTTP transfers." -msgstr "Verwende Gzip output buffering, um HTTP transfers zu beschleunigen" +msgstr "Verwende Gzip output buffering, um HTTP transfers zu beschleunigen." #: libraries/config/messages.inc.php:479 msgid "GZip output buffering" msgstr "GZip Ausgabepufferung" #: libraries/config/messages.inc.php:481 -#, fuzzy #| msgid "" #| "[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " #| "DATETIME and TIMESTAMP, ascending order otherwise" @@ -5953,24 +5930,22 @@ msgid "" "DATETIME and TIMESTAMP, ascending order otherwise." msgstr "" "[kbd]SMART[/kbd] - d.h. absteigende Sortierung für die Feldtypen TIME, DATE, " -"DATETIME und TIMESTAMP, sonst aufsteigende Sortierung" +"DATETIME und TIMESTAMP, sonst aufsteigende Sortierung." #: libraries/config/messages.inc.php:484 msgid "Default sorting order" msgstr "Voreingestellte Sortierung" #: libraries/config/messages.inc.php:486 -#, fuzzy #| msgid "Use persistent connections to MySQL databases" msgid "Use persistent connections to MySQL databases." -msgstr "Verwende andauernde Verbindungen zu MySQL Datenbanken" +msgstr "Verwende andauernde Verbindungen zu MySQL Datenbanken." #: libraries/config/messages.inc.php:487 msgid "Persistent connections" msgstr "Persistente Verbindung" #: libraries/config/messages.inc.php:489 -#, fuzzy #| msgid "" #| "Disable the default warning that is displayed on the database details " #| "Structure page if any of the required tables for the phpMyAdmin " @@ -5981,14 +5956,14 @@ msgid "" "configuration storage could not be found." msgstr "" "Standardhinweis der Datenbankstruktur-Detailansicht unterdrücken, wenn eine " -"erforderliche Tabelle der phpMyAdmin Konfiguration nicht gefunden werden kann" +"erforderliche Tabelle der phpMyAdmin Konfiguration nicht gefunden werden " +"kann." #: libraries/config/messages.inc.php:494 msgid "Missing phpMyAdmin configuration storage tables" msgstr "Fehlende phpMyAdmin-Konfigurationsspeicher-Tabellen" #: libraries/config/messages.inc.php:496 -#, fuzzy #| msgid "" #| "Disable the default warning that is displayed if a difference between the " #| "MySQL library and server is detected" @@ -5997,14 +5972,13 @@ msgid "" "MySQL library and server is detected." msgstr "" "Standardmeldung unterdrücken, wenn die Version des Servers und der MySQL-" -"Bibliothek sich unterscheiden" +"Bibliothek sich unterscheiden." #: libraries/config/messages.inc.php:500 msgid "Server/library difference warning" msgstr "Warnung bei unterschiedlicher Server-/Bibliothek-Version" #: libraries/config/messages.inc.php:502 -#, fuzzy #| msgid "" #| "Disable the default warning that is displayed on the Structure page if " #| "column names in a table are reserved MySQL words" @@ -6013,7 +5987,7 @@ msgid "" "column names in a table are reserved MySQL words." msgstr "" "Standardhinweis der Struktur-Seite unterdrücken, wenn Spaltennamen in einer " -"Tabelle reservierte MySQL-Wörter sind" +"Tabelle reservierte MySQL-Wörter sind." #: libraries/config/messages.inc.php:505 msgid "MySQL reserved word warning" @@ -6028,10 +6002,9 @@ msgid "How to display various action links" msgstr "Wie verschiedene Aktions-Links angezeigt werden" #: libraries/config/messages.inc.php:510 -#, fuzzy #| msgid "Disallow BLOB and BINARY columns from editing" msgid "Disallow BLOB and BINARY columns from editing." -msgstr "Änderungen an BLOB und BINARY Feldern verbieten" +msgstr "Änderungen an BLOB und BINARY Feldern verbieten." #: libraries/config/messages.inc.php:511 msgid "Protect binary columns" @@ -6053,10 +6026,9 @@ msgid "Permanent query history" msgstr "Anfragelog speichern" #: libraries/config/messages.inc.php:519 -#, fuzzy #| msgid "How many queries are kept in history" msgid "How many queries are kept in history." -msgstr "Anzahl der Abfragen in der Historie" +msgstr "Anzahl der Abfragen in der Historie." #: libraries/config/messages.inc.php:520 msgid "Query history length" @@ -6093,34 +6065,31 @@ msgid "Query window width" msgstr "Breite des Abfragefensters" #: libraries/config/messages.inc.php:529 -#, fuzzy #| msgid "Select which functions will be used for character set conversion" msgid "Select which functions will be used for character set conversion." -msgstr "Wahl der Funktionen zur Zeichensatz-Konvertierung" +msgstr "Wahl der Funktionen zur Zeichensatz-Konvertierung." #: libraries/config/messages.inc.php:530 msgid "Recoding engine" msgstr "Umwandlungs Engine" #: libraries/config/messages.inc.php:532 -#, fuzzy #| msgid "When browsing tables, the sorting of each table is remembered" msgid "When browsing tables, the sorting of each table is remembered." msgstr "" -"Während des Durchsehens der Tabellen wird die Sortierung zwischengespeichert" +"Während des Durchsehens der Tabellen wird die Sortierung zwischengespeichert." #: libraries/config/messages.inc.php:533 msgid "Remember table's sorting" msgstr "Tabellensortierung zwischenspeichern" #: libraries/config/messages.inc.php:535 -#, fuzzy #| msgid "" #| "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" msgid "" "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature." msgstr "" -"Kopfzeilen alle n Zellen anzeigen, [kbd]0[/kbd] deaktiviert diese Option" +"Kopfzeilen alle n Zellen anzeigen, [kbd]0[/kbd] deaktiviert diese Option." #: libraries/config/messages.inc.php:536 msgid "Repeat headers" @@ -14525,10 +14494,9 @@ msgstr "" "Stunde sein" #: libraries/advisory_rules.txt:262 -#, fuzzy #| msgid "tmp_table_size vs. max_heap_table_size" msgid "Different tmp_table_size and max_heap_table_size" -msgstr "tmp_table_size vs. max_heap_table_size" +msgstr "Unterschiedliche Werte in tmp_table_size und max_heap_table_size" #: libraries/advisory_rules.txt:265 msgid "{tmp_table_size} and {max_heap_table_size} are not the same." From e93e128510426e7cd348f562492664ce5f2b8184 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 7 Oct 2014 19:23:39 +0530 Subject: [PATCH 2/2] Port 'bug #3120 Events are not exported when using xml' to QA_4_2 Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + export.php | 1 + libraries/config.default.php | 7 ++++ libraries/plugins/export/ExportXml.class.php | 35 ++++++++++++++++++++ 4 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index a885f70b40..31b0e2ed3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #4545 trying to favorite table while browser localStorage is disabled throws JS error - bug #4259 reCaptcha sound session expired problem - bug #4548 Inline editing a field converts tab to spaces +- bug #3120 Events are not exported when using xml 4.2.9.0 (2014-09-20) - bug ajax.js responseHandler: cannot read property of null diff --git a/export.php b/export.php index edcc8a1c9e..559d8dedf4 100644 --- a/export.php +++ b/export.php @@ -87,6 +87,7 @@ if (!defined('TESTSUITE')) { 'ods_columns', 'json_structure_or_data', 'xml_structure_or_data', + 'xml_export_events', 'xml_export_functions', 'xml_export_procedures', 'xml_export_tables', diff --git a/libraries/config.default.php b/libraries/config.default.php index cf941b13f2..7067e7fedb 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1995,6 +1995,13 @@ $cfg['Export']['xml_structure_or_data'] = 'data'; */ $cfg['Export']['xml_export_struc'] = true; +/** + * Export events + * + * @global string $cfg['Export']['xml_export_events'] + */ +$cfg['Export']['xml_export_events'] = true; + /** * Export functions * diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php index 713d86ed15..84c98b3be2 100644 --- a/libraries/plugins/export/ExportXml.class.php +++ b/libraries/plugins/export/ExportXml.class.php @@ -102,6 +102,10 @@ class ExportXml extends ExportPlugin $structure->setText(__('Object creation options (all are recommended)')); // create primary items and add them to the group if (! PMA_DRIZZLE) { + $leaf = new BoolPropertyItem(); + $leaf->setName("export_events"); + $leaf->setText(__('Events')); + $structure->addProperty($leaf); $leaf = new BoolPropertyItem(); $leaf->setName("export_functions"); $leaf->setText(__('Functions')); @@ -355,6 +359,37 @@ class ExportXml extends ExportPlugin } } + if (isset($GLOBALS['xml_export_events']) + && $GLOBALS['xml_export_events'] + ) { + if (PMA_MYSQL_INT_VERSION > 50100) { + // Export events + $events = $GLOBALS['dbi']->fetchResult( + "SELECT EVENT_NAME FROM information_schema.EVENTS " + . "WHERE EVENT_SCHEMA='" . PMA_Util::sqlAddslashes($db) . "'" + ); + if ($events) { + foreach ($events as $event) { + $head .= ' ' . $crlf; + + $sql = $GLOBALS['dbi']->getDefinition( + $db, 'EVENT', $event + ); + $sql = rtrim($sql); + $sql = " " . htmlspecialchars($sql); + $sql = str_replace("\n", "\n ", $sql); + + $head .= $sql . $crlf; + $head .= ' ' . $crlf; + } + + unset($event); + unset($events); + } + } + } + unset($result); $head .= ' ' . $crlf;