From 918b089a37e1e5562b8eb859acd21cc601c42bb2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 1 Dec 2014 13:37:18 -0500 Subject: [PATCH 1/2] Return statement not possible here Signed-off-by: Marc Delisle --- scripts/generate-mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-mo b/scripts/generate-mo index bf0251ea50..4b6bdbcb94 100755 --- a/scripts/generate-mo +++ b/scripts/generate-mo @@ -24,6 +24,6 @@ fi for x in po/*.po ; do compile $x if [ $? != 0 ] ; then - return $? + echo Error when compiling $x fi done From d0470dfea3501cf41ac631dcf3396b1ba9f7f2b1 Mon Sep 17 00:00:00 2001 From: Jan Erik Zassenhaus Date: Mon, 1 Dec 2014 16:54:22 +0100 Subject: [PATCH 2/2] Translated using Weblate (German) Currently translated at 100.0% (2978 of 2978 strings) [CI skip] --- po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index f3010ff185..c7d51af829 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ 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-11-26 08:29-0500\n" -"PO-Revision-Date: 2014-11-27 20:14+0200\n" -"Last-Translator: Ann + J.M. \n" +"PO-Revision-Date: 2014-12-01 16:54+0200\n" +"Last-Translator: Jan Erik Zassenhaus \n" "Language-Team: German " "\n" "Language: de\n" @@ -9797,7 +9797,7 @@ msgstr "Ereignis" #: libraries/rte/rte_routines.lib.php:1052 #: libraries/rte/rte_triggers.lib.php:377 msgid "Definition" -msgstr "Beschreibung" +msgstr "Definition" #: libraries/plugins/export/ExportHtmlword.class.php:544 #: libraries/plugins/export/ExportOdt.class.php:671 @@ -11835,7 +11835,7 @@ msgstr "" #: libraries/server_privileges.lib.php:1299 #: libraries/server_privileges.lib.php:2498 msgid "Login Information" -msgstr "Anmeldeinformationen" +msgstr "Anmeldeinformation" #: libraries/server_privileges.lib.php:1332 #: libraries/server_privileges.lib.php:1520 @@ -11978,7 +11978,7 @@ msgstr "… lösche den alten und lade anschließend die Benutzertabellen neu." #: libraries/server_privileges.lib.php:2499 msgid "Change Login Information / Copy User" -msgstr "Anmelde-Information ändern/Benutzer kopieren" +msgstr "Anmeldeinformation ändern/Benutzer kopieren" #: libraries/server_privileges.lib.php:2505 msgid "Create a new user with the same privileges and …"