From 3ce95caf4ca88ddc602d988951321cfc126e34c4 Mon Sep 17 00:00:00 2001 From: Klaus Ethgen Date: Tue, 11 Feb 2020 13:07:09 +0100 Subject: [PATCH 1/2] Launchpad translations ar such stupid They destroy correct translations. This reverts commit 26e7eb46ce853dc332b09bb364dbe9c3063867a6. --- po/de.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/po/de.po b/po/de.po index d72d518..3edb99f 100644 --- a/po/de.po +++ b/po/de.po @@ -3,18 +3,19 @@ # /translator/edit/54/ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-09-26 17:26+0200\n" -"PO-Revision-Date: 2018-03-29 02:14+0000\n" -"Last-Translator: Gorden Scholz \n" +"PO-Revision-Date: 2020-02-11 13:06+0100\n" +"Last-Translator: Klaus Ethgen \n" "Language-Team: de \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2018-03-30 05:24+0000\n" -"X-Generator: Launchpad (build 18599)\n" +"X-Generator: Poedit 2.3\n" "Generated-By: Babel 0.9.6\n" +"Language: de\n" #: gtk/wicd-client.py:610 msgid "" @@ -44,7 +45,7 @@ msgstr "" #: curses/wicd-curses.py:612 msgid "About" -msgstr "Etwa" +msgstr "Über" #: curses/wicd-curses.py:200 msgid "About Wicd" @@ -64,7 +65,7 @@ msgstr "Neues Kabelprofil hinzufügen" #: curses/prefs_curses.py:52 data/wicd.ui:1679 msgid "Advanced Settings" -msgstr "Erweiterte Einstellung" +msgstr "Erweiterte Einstellungen" #: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:966 msgid "Always show wired interface" From fffaa7da2d26c8b9c537d70612dce0add07e16d7 Mon Sep 17 00:00:00 2001 From: Klaus Ethgen Date: Tue, 11 Feb 2020 13:10:06 +0100 Subject: [PATCH 2/2] Fix an issue with dhclient With PIPE, dhclient will not work. See also: https://bugs.launchpad.net/wicd/+bug/950865 --- wicd/misc.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wicd/misc.py b/wicd/misc.py index cd72a2b..9c3ea2b 100644 --- a/wicd/misc.py +++ b/wicd/misc.py @@ -140,10 +140,7 @@ def Run(cmd, include_stderr=False, return_pipe=False, else: err = None fds = False - if return_obj: - std_in = PIPE - else: - std_in = None + std_in = None # We need to make sure that the results of the command we run # are in English, so we set up a temporary environment.