Add possibility to pass extra arguments to the DHCP client commands, and use this option when a global DNS server has been set, to avoid resolv.conf being overwritten by the DHCP client when receiving a DHCP reply that contains a DNS server.

This should fix https://bugs.launchpad.net/wicd/+bug/145405. Credits for the original patch go to "Leonardo" :-) Plus, translations...
2026-01-07 06:14:16 +01:00 · 2015-02-14 11:44:03 +01:00
parent 29c12dc0d2 d7787f9068
commit be575c21df
63 changed files with 149 additions and 134 deletions
--- a/po/ar_EG.po
+++ b/po/ar_EG.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/ast.po
+++ b/po/ast.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/be.po
+++ b/po/be.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"

 #: gtk/wicd-client.py:610
 msgid ""
--- a/po/bg.po
+++ b/po/bg.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/cy.po
+++ b/po/cy.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"

 #: gtk/wicd-client.py:610
 msgid ""
--- a/po/da.po
+++ b/po/da.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/de.po
+++ b/po/de.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/el.po
+++ b/po/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/en.po
+++ b/po/en.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/eo.po
+++ b/po/eo.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/es.po
+++ b/po/es.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/es_CL.po
+++ b/po/es_CL.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/es_CO.po
+++ b/po/es_CO.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/es_GT.po
+++ b/po/es_GT.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/es_NI.po
+++ b/po/es_NI.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/es_VE.po
+++ b/po/es_VE.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/et.po
+++ b/po/et.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/eu.po
+++ b/po/eu.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/fa.po
+++ b/po/fa.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/he.po
+++ b/po/he.po
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/hr.po
+++ b/po/hr.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/id.po
+++ b/po/id.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/it.po
+++ b/po/it.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/ka.po
+++ b/po/ka.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/kk.po
+++ b/po/kk.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:43+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/ko.po
+++ b/po/ko.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/lt.po
+++ b/po/lt.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/lv.po
+++ b/po/lv.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/ml.po
+++ b/po/ml.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 05:39+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-02-13 05:59+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/nn.po
+++ b/po/nn.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/pt.po
+++ b/po/pt.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/ro.po
+++ b/po/ro.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/si.po
+++ b/po/si.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"

 #: gtk/wicd-client.py:610
 msgid ""
--- a/po/sk.po
+++ b/po/sk.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/sl.po
+++ b/po/sl.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/sr.po
+++ b/po/sr.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/te.po
+++ b/po/te.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-03 05:41+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:00+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/uk.po
+++ b/po/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-28 05:44+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
+"X-Launchpad-Export-Date: 2015-02-13 06:01+0000\n"
+"X-Generator: Launchpad (build 17336)\n"
 "Generated-By: Babel 0.9.6\n"

 #: gtk/wicd-client.py:610
--- a/wicd/networking.py
+++ b/wicd/networking.py
@@ -476,7 +476,13 @@ class ConnectThread(threading.Thread):
            else:
                hname = None
                print "Running DHCP with NO hostname"
-            dhcp_status = iface.StartDHCP(hname)
+            
+            # Check if a global DNS is configured. If it is, then let the DHCP know *not* to update resolv.conf
+            staticdns = False
+            if self.network.get('use_global_dns') or (self.network.get('use_static_dns') and (self.network.get('dns1') or self.network.get('dns2') or self.network.get('dns3'))):
+                staticdns = True
+
+            dhcp_status = iface.StartDHCP(hname, staticdns)
            if dhcp_status in ['no_dhcp_offers', 'dhcp_failed']:
                if self.connect_result != "aborted":
                    self.abort_connection(dhcp_status)
--- a/wicd/wnettools.py
+++ b/wicd/wnettools.py
@@ -296,7 +296,7 @@ class BaseInterface(object):
        return path

    
-    def _get_dhcp_command(self, flavor=None, hostname=None):
+    def _get_dhcp_command(self, flavor=None, hostname=None, staticdns=False):
        """ Returns the correct DHCP client command. 
       
        Given a type of DHCP request (create or release a lease),
@@ -333,26 +333,26 @@ class BaseInterface(object):
        
        client_dict = {
            "dhclient" : 
-                {'connect' : r"%(cmd)s -cf %(dhclientconf)s %(iface)s",
-                 'connect_with_hostname' : r"%(cmd)s -cf %(dhclientconf)s %(iface)s",
+                {'connect' : r"%(cmd)s -cf %(dhclientconf)s %(extra)s %(iface)s",
+                 'connect_with_hostname' : r"%(cmd)s -cf %(dhclientconf)s %(extra)s %(iface)s",
                 'release' : r"%(cmd)s -r %(iface)s",
                 'id' : misc.DHCLIENT, 
                 },
            "pump" : 
-                { 'connect' : r"%(cmd)s -i %(iface)s",
-                  'connect_with_hostname' : r"%(cmd)s -i %(iface)s -h %(hostname)s",
+                { 'connect' : r"%(cmd)s -i %(iface)s %(extra)s",
+                  'connect_with_hostname' : r"%(cmd)s -i %(iface)s -h %(hostname)s %(extra)s",
                  'release' : r"%(cmd)s -r -i %(iface)s",
                  'id' : misc.PUMP,
                },
            "dhcpcd" : 
-                {'connect' : r"%(cmd)s --noipv4ll %(iface)s",
-                 'connect_with_hostname' : r"%(cmd)s -h %(hostname)s --noipv4ll %(iface)s ",
+                {'connect' : r"%(cmd)s --noipv4ll %(extra)s %(iface)s",
+                 'connect_with_hostname' : r"%(cmd)s -h %(hostname)s --noipv4ll %(extra)s %(iface)s ",
                 'release' : r"%(cmd)s -k %(iface)s",
                 'id' : misc.DHCPCD,
                },
            "udhcpc":
-                {'connect' : r"%(cmd)s -n -i %(iface)s",
-                 'connect_with_hostname' : r"%(cmd)s -n -i %(iface)s -H %(hostname)s ",
+                {'connect' : r"%(cmd)s -n -i %(iface)s %(extra)s",
+                 'connect_with_hostname' : r"%(cmd)s -n -i %(iface)s -H %(hostname)s %(extra)s",
                 'release' : r"killall -SIGUSR2 %(cmd)s",
                 'id' : misc.UDHCPC,
                },
@@ -388,16 +388,25 @@ class BaseInterface(object):
            return ""
            
        if flavor == "connect":
+
+            # set up (optional) extra arguments to the dhcp client,
+            # used for disabling the resolv.conf update of dhcpd
+            extra_args = ""
+            if staticdns and client_name == "dhcpcd":
+                extra_args = "--nohook resolv.conf"
+
            if hostname:
                return client_dict[client_name]['connect_with_hostname'] % \
                    { "cmd" : cmd,
                      "iface" : self.iface,
                      "hostname" : hostname,
+                      'extra': extra_args,
                      'dhclientconf' : dhclient_conf_path }
            else:
                return client_dict[client_name]['connect'] % \
                    { "cmd" : cmd,
                      "iface" : self.iface,
+                      'extra': extra_args,
                      'dhclientconf' : dhclient_conf_path }
        elif flavor == "release":
            return client_dict[client_name]['release'] % \
@@ -655,7 +664,7 @@ class BaseInterface(object):
            return 'dhcp_failed'
            
    @neediface(False)
-    def StartDHCP(self, hostname):
+    def StartDHCP(self, hostname, staticdns):
        """ Start the DHCP client to obtain an IP address.

        Keyword Arguments:
@@ -666,7 +675,7 @@ class BaseInterface(object):
        _check_dhcp_result for the possible values.
        
        """
-        cmd = self._get_dhcp_command('connect', hostname)
+        cmd = self._get_dhcp_command('connect', hostname, staticdns)
        if self.verbose:
            print cmd
        self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=True)