From f29b12ecf042080ee37346a1ee2cabe29badc128 Mon Sep 17 00:00:00 2001 From: Jan Erik Zassenhaus Date: Mon, 26 Jan 2015 12:24:31 +0100 Subject: [PATCH 1/3] Translated using Weblate (German) Currently translated at 99.8% (2985 of 2988 strings) [CI skip] --- po/de.po | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/po/de.po b/po/de.po index 999d3cfe69..8ad31d030a 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-01-14 07:43-0500\n" -"PO-Revision-Date: 2015-01-08 21:07+0200\n" -"Last-Translator: Ann + J.M. \n" -"Language-Team: German \n" +"PO-Revision-Date: 2015-01-26 12:24+0200\n" +"Last-Translator: Jan Erik Zassenhaus \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.2-dev\n" @@ -7781,7 +7781,7 @@ msgstr "Kein Passwort" #: libraries/replication_gui.lib.php:412 libraries/replication_gui.lib.php:853 #: libraries/server_privileges.lib.php:1495 msgid "Password:" -msgstr "Kennwort:" +msgstr "Passwort:" #: libraries/display_change_password.lib.php:74 #: libraries/replication_gui.lib.php:877 @@ -7791,7 +7791,7 @@ msgstr "Wiederholen:" #: libraries/display_change_password.lib.php:83 msgid "Password Hashing:" -msgstr "Password-Verschlüsselung:" +msgstr "Passwortverschlüsselung:" #: libraries/display_change_password.lib.php:96 msgid "MySQL 4.0 compatible" @@ -10908,7 +10908,7 @@ msgstr "Benutzername" #: libraries/server_privileges.lib.php:1527 #: libraries/server_privileges.lib.php:2971 msgid "Password" -msgstr "Kennwort" +msgstr "Passwort" #: libraries/replication_gui.lib.php:435 msgid "Port:" @@ -13554,10 +13554,9 @@ msgid "Add %s column(s)" msgstr "%s Spalte(n) einfügen" #: libraries/structure.lib.php:1707 -#, fuzzy #| msgid "At Beginning of Table" msgid "Beginning of table" -msgstr "An den Anfang der Tabelle" +msgstr "Tabellenanfang" #: libraries/structure.lib.php:1717 #, fuzzy From cf9b0aa1e7ce132616061126d6a8d686e441ccd8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 26 Jan 2015 07:41:07 -0500 Subject: [PATCH 2/3] Remove dead code Signed-off-by: Marc Delisle --- libraries/structure.lib.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index af864a7ca4..45b335ba6a 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -2360,7 +2360,6 @@ function PMA_getHtmlForDisplayTableStats($showtable, $table_info_num_rows, $html_output .= PMA_getHtmlForSpaceUsageTableRow( $odd_row, __('Total'), $tot_size, $tot_unit ); - $odd_row = !$odd_row; } // Optimize link if overhead if (isset($free_size) && !PMA_DRIZZLE @@ -2509,7 +2508,6 @@ function PMA_updateColumns($db, $table) ); $regenerate = false; $field_cnt = count($_REQUEST['field_name']); - $key_fields = array(); $changes = array(); $pmatable = new PMA_Table($table, $db); From 9f25a3a560da94f1f73cb807e4da3a5a6e9a22c7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 26 Jan 2015 09:51:37 -0500 Subject: [PATCH 3/3] Fix typo Signed-off-by: Marc Delisle --- libraries/rte/rte_events.lib.php | 2 +- libraries/rte/rte_routines.lib.php | 2 +- libraries/rte/rte_triggers.lib.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index 5537b647c4..0bb2b42255 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -329,7 +329,7 @@ function PMA_EVN_getDataFromName($name) /** * Displays a form used to add/edit an event * - * @param string $mode If the editor will be used edit an event + * @param string $mode If the editor will be used to edit an event * or add a new one: 'edit' or 'add'. * @param string $operation If the editor was previously invoked with * JS turned off, this will hold the name of diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 35a04ba9d5..f9bfa2848f 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -850,7 +850,7 @@ function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '') /** * Displays a form used to add/edit a routine * - * @param string $mode If the editor will be used edit a routine + * @param string $mode If the editor will be used to edit a routine * or add a new one: 'edit' or 'add'. * @param string $operation If the editor was previously invoked with * JS turned off, this will hold the name of diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 428d14db9a..19ecccb3d4 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -279,7 +279,7 @@ function PMA_TRI_getDataFromName($name) /** * Displays a form used to add/edit a trigger * - * @param string $mode If the editor will be used edit a trigger + * @param string $mode If the editor will be used to edit a trigger * or add a new one: 'edit' or 'add'. * @param array $item Data for the trigger returned by PMA_TRI_getDataFromRequest() * or PMA_TRI_getDataFromName()