gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-03-13 04:55:46 +01:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source 
This should fix https://bugs.launchpad.net/wicd/+bug/145405.
Credits for the original patch go to "Leonardo" :-)

Plus, translations...
This commit is contained in:
Tom Van Braeckel
2015-02-14 11:44:03 +01:00
parent 29c12dc0d2 d7787f9068
commit be575c21df
63 changed files with 149 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
po/ar_EG.po
View File

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

4
po/ast.po
View File

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

4
po/be.po
View File

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

4
po/bg.po
View File

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

4
po/ca.po
View File

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

4
po/cs.po
View File

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

4
po/cy.po
View File

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

4
po/da.po
View File

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

4
po/de.po
View File

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

4
po/el.po
View File

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

4
po/en.po
View File

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

4
po/en_CA.po
View File

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

4
po/en_GB.po
View File

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

4
po/eo.po
View File

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

4
po/es.po
View File

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

4
po/es_AR.po
View File

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

4
po/es_CL.po
View File

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

4
po/es_CO.po
View File

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

4
po/es_GT.po
View File

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

4
po/es_MX.po
View File

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

4
po/es_NI.po
View File

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

4
po/es_VE.po
View File

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

4
po/et.po
View File

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

4
po/eu.po
View File

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

4
po/fa.po
View File

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

4
po/fi.po
View File

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

4
po/fr.po
View File

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

4
po/fr_CA.po
View File

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

4
po/gl.po
View File

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

4
po/he.po
View File

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

4
po/hr.po
View File

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

4
po/hu.po
View File

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

4
po/id.po
View File

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

4
po/it.po
View File

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

4
po/ja.po
View File

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

4
po/ka.po
View File

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

4
po/kk.po
View File

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

4
po/ko.po
View File

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

4
po/lt.po
View File

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

4
po/lv.po
View File

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

4
po/ml.po
View File

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

4
po/nb.po
View File

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

4
po/nl.po
View File

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

4
po/nn.po
View File

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

4
po/pl.po
View File

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

4
po/pt.po
View File

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

4
po/pt_BR.po
View File

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

4
po/ro.po
View File

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

4
po/ru.po
View File

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

4
po/si.po
View File

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

4
po/sk.po
View File

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

4
po/sl.po
View File

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

4
po/sr.po
View File

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

4
po/sv.po
View File

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

4
po/te.po
View File

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

4
po/tr.po
View File

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

4
po/uk.po
View File

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

4
po/vi.po
View File

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

4
po/zh_CN.po
View File

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

4
po/zh_HK.po
View File

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

4
po/zh_TW.po
View File

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

8
wicd/networking.py
View File

@@ -476,7 +476,13 @@ class ConnectThread(threading.Thread):
else: else:
hname = None hname = None
print "Running DHCP with NO hostname" 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 dhcp_status in ['no_dhcp_offers', 'dhcp_failed']:
if self.connect_result != "aborted": if self.connect_result != "aborted":
self.abort_connection(dhcp_status) self.abort_connection(dhcp_status)

31
wicd/wnettools.py
View File

@@ -296,7 +296,7 @@ class BaseInterface(object):
return path 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. """ Returns the correct DHCP client command.
Given a type of DHCP request (create or release a lease), Given a type of DHCP request (create or release a lease),
@@ -333,26 +333,26 @@ class BaseInterface(object):
client_dict = { client_dict = {
"dhclient" : "dhclient" :
{'connect' : 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 %(iface)s", 'connect_with_hostname' : r"%(cmd)s -cf %(dhclientconf)s %(extra)s %(iface)s",
'release' : r"%(cmd)s -r %(iface)s", 'release' : r"%(cmd)s -r %(iface)s",
'id' : misc.DHCLIENT, 'id' : misc.DHCLIENT,
}, },
"pump" : "pump" :
{ 'connect' : r"%(cmd)s -i %(iface)s", { 'connect' : r"%(cmd)s -i %(iface)s %(extra)s",
'connect_with_hostname' : r"%(cmd)s -i %(iface)s -h %(hostname)s", 'connect_with_hostname' : r"%(cmd)s -i %(iface)s -h %(hostname)s %(extra)s",
'release' : r"%(cmd)s -r -i %(iface)s", 'release' : r"%(cmd)s -r -i %(iface)s",
'id' : misc.PUMP, 'id' : misc.PUMP,
}, },
"dhcpcd" : "dhcpcd" :
{'connect' : r"%(cmd)s --noipv4ll %(iface)s", {'connect' : r"%(cmd)s --noipv4ll %(extra)s %(iface)s",
'connect_with_hostname' : r"%(cmd)s -h %(hostname)s --noipv4ll %(iface)s ", 'connect_with_hostname' : r"%(cmd)s -h %(hostname)s --noipv4ll %(extra)s %(iface)s ",
'release' : r"%(cmd)s -k %(iface)s", 'release' : r"%(cmd)s -k %(iface)s",
'id' : misc.DHCPCD, 'id' : misc.DHCPCD,
}, },
"udhcpc": "udhcpc":
{'connect' : r"%(cmd)s -n -i %(iface)s", {'connect' : r"%(cmd)s -n -i %(iface)s %(extra)s",
'connect_with_hostname' : r"%(cmd)s -n -i %(iface)s -H %(hostname)s ", 'connect_with_hostname' : r"%(cmd)s -n -i %(iface)s -H %(hostname)s %(extra)s",
'release' : r"killall -SIGUSR2 %(cmd)s", 'release' : r"killall -SIGUSR2 %(cmd)s",
'id' : misc.UDHCPC, 'id' : misc.UDHCPC,
}, },
@@ -388,16 +388,25 @@ class BaseInterface(object):
return "" return ""
if flavor == "connect": 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: if hostname:
return client_dict[client_name]['connect_with_hostname'] % \ return client_dict[client_name]['connect_with_hostname'] % \
{ "cmd" : cmd, { "cmd" : cmd,
"iface" : self.iface, "iface" : self.iface,
"hostname" : hostname, "hostname" : hostname,
'extra': extra_args,
'dhclientconf' : dhclient_conf_path } 'dhclientconf' : dhclient_conf_path }
else: else:
return client_dict[client_name]['connect'] % \ return client_dict[client_name]['connect'] % \
{ "cmd" : cmd, { "cmd" : cmd,
"iface" : self.iface, "iface" : self.iface,
'extra': extra_args,
'dhclientconf' : dhclient_conf_path } 'dhclientconf' : dhclient_conf_path }
elif flavor == "release": elif flavor == "release":
return client_dict[client_name]['release'] % \ return client_dict[client_name]['release'] % \
@@ -655,7 +664,7 @@ class BaseInterface(object):
return 'dhcp_failed' return 'dhcp_failed'
@neediface(False) @neediface(False)
def StartDHCP(self, hostname): def StartDHCP(self, hostname, staticdns):
""" Start the DHCP client to obtain an IP address. """ Start the DHCP client to obtain an IP address.
Keyword Arguments: Keyword Arguments:
@@ -666,7 +675,7 @@ class BaseInterface(object):
_check_dhcp_result for the possible values. _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: if self.verbose:
print cmd print cmd
self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=True) self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=True)