gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-01-27 09:43:02 +05:30
commit 84325103cc
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/rte/rte_events.lib.php
View File

@ -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

2
libraries/rte/rte_routines.lib.php
View File

@ -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

2
libraries/rte/rte_triggers.lib.php
View File

@ -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()

2
libraries/structure.lib.php
View File

@ -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);

19
po/de.po
View File

@ -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. <phpMyAdmin@ZweiSteinSoft.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/phpmyadmin/master/"
"de/>\n"
"PO-Revision-Date: 2015-01-26 12:24+0200\n"
"Last-Translator: Jan Erik Zassenhaus <jan.zassenhaus@jgerman.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.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