From a8a3cc00fdad74029966c057e078d89c6444c8a7 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Sun, 31 Mar 2013 12:27:46 +0400
Subject: [PATCH 1/6] wicd: fix dhclient interaction

wicd used to write dhclient config file into $out/var/lib/wicd directory attempting
to change nix-store. That didn't work and thats why we couldn't use dhclient.
With this patch wicd will generate temporary file name for this purpose. File is
generated each time the daemon starts.
---
 pkgs/tools/networking/wicd/default.nix    |   9 +-
 pkgs/tools/networking/wicd/dhclient.patch | 101 ++++++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/wicd/dhclient.patch

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 6cacfc14ffc..9bb4d6461fa 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -16,7 +16,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ python ];
 
-  patches = [ ./no-var-install.patch ./no-trans.patch ./mkdir-networks.patch ./pygtk.patch ./no-optimization.patch ];
+  patches = [
+    ./no-var-install.patch
+    ./no-trans.patch 
+    #./mkdir-networks.patch
+    ./pygtk.patch
+    ./no-optimization.patch
+    ./dhclient.patch 
+    ];
 
   # Should I be using pygtk's propogated build inputs?
   # !!! Should use makeWrapper.
diff --git a/pkgs/tools/networking/wicd/dhclient.patch b/pkgs/tools/networking/wicd/dhclient.patch
new file mode 100644
index 00000000000..52d91846518
--- /dev/null
+++ b/pkgs/tools/networking/wicd/dhclient.patch
@@ -0,0 +1,101 @@
+diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py
+--- wicd-1.7.2.4.orig/wicd/wnettools.py	2013-03-30 21:47:19.804907552 +0000
++++ wicd-1.7.2.4/wicd/wnettools.py	2013-03-31 08:44:37.572792110 +0000
+@@ -37,6 +37,7 @@
+ import time
+ from string import maketrans, translate
+ 
++import tempfile
+ import wpath
+ import misc
+ from misc import find_path 
+@@ -216,6 +217,7 @@
+         self.flush_tool = None
+         self.link_detect = None       
+         self.dhcp_object = None
++        self.dhclient_conf_path = None;
+     
+     def SetDebugMode(self, value):
+         """ If True, verbose output is enabled. """
+@@ -277,12 +279,6 @@
+                 cmd = ""
+             return (client, cmd)
+ 
+-                # probably /var/lib/wicd/dhclient.conf with defaults
+-        dhclient_conf_path = os.path.join(
+-                    wpath.varlib,
+-                    'dhclient.conf'
+-                )
+-        
+         client_dict = {
+             "dhclient" : 
+                 {'connect' : r"%(cmd)s -cf %(dhclientconf)s %(iface)s",
+@@ -307,41 +303,44 @@
+         }
+         (client_name, cmd) = get_client_name(self.DHCP_CLIENT)
+ 
+-        # cause dhclient doesn't have a handy dandy argument
+-        # for specifing the hostname to be sent
+-        if client_name == "dhclient" and flavor:
+-            if hostname == None:
+-                # <hostname> will use the system hostname
+-                # we'll use that if there is hostname passed
+-                # that shouldn't happen, though
+-                hostname = '<hostname>'
+-            print 'attempting to set hostname with dhclient'
+-            print 'using dhcpcd or another supported client may work better'
+-            dhclient_template = \
+-                open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r')
+-
+-            output_conf = open(dhclient_conf_path, 'w')
+-
+-            for line in dhclient_template.readlines():
+-                line = line.replace('$_HOSTNAME', hostname)
+-                output_conf.write(line)
+-
+-            output_conf.close()
+-            dhclient_template.close()
+-            os.chmod(dhclient_conf_path, 0644)
+-
+         if not client_name or not cmd:
+             print "WARNING: Failed to find a valid dhcp client!"
+             return ""
+             
+         if flavor == "connect":
++            # cause dhclient doesn't have a handy dandy argument
++            # for specifing the hostname to be sent
++            if client_name == "dhclient" and flavor:
++                if hostname == None:
++                    # <hostname> will use the system hostname
++                    # we'll use that if there is hostname passed
++                    # that shouldn't happen, though
++                    hostname = '<hostname>'
++                print 'attempting to set hostname with dhclient'
++                print 'using dhcpcd or another supported client may work better'
++                if not self.dhclient_conf_path:
++                    _,self.dhclient_conf_path = tempfile.mkstemp()
++                    print 'New dhclient conf path: %s ' % self.dhclient_conf_path
++                dhclient_template = \
++                    open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r')
++
++                output_conf = open(self.dhclient_conf_path, 'w')
++
++                for line in dhclient_template.readlines():
++                    line = line.replace('$_HOSTNAME', hostname)
++                    output_conf.write(line)
++
++                output_conf.close()
++                dhclient_template.close()
++                os.chmod(self.dhclient_conf_path, 0644)
++
+             if not hostname:
+                 hostname = os.uname()[1]
+             return client_dict[client_name]['connect'] % \
+                     { "cmd" : cmd,
+                       "iface" : self.iface,
+                       "hostname" : hostname,
+-                      'dhclientconf' : dhclient_conf_path }
++                      'dhclientconf' : self.dhclient_conf_path }
+         elif flavor == "release":
+             return client_dict[client_name]['release'] % {"cmd":cmd, "iface":self.iface}
+         else:

From f7efab5fd83e5b28c5e5f54dff057be7a33b0d39 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Sun, 31 Mar 2013 12:56:34 +0400
Subject: [PATCH 2/6] wicd: bring translations back.

---
 pkgs/tools/networking/wicd/default.nix        |    8 +-
 .../tools/networking/wicd/no-ast-transl.patch | 1040 +++++++++++++++++
 2 files changed, 1044 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/tools/networking/wicd/no-ast-transl.patch

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 9bb4d6461fa..b080018f1cb 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, 
  wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, iputils,
- locale ? "C" }:
+ pythonPackages, locale ? "C" }:
 
 # Wicd has a ncurses interface that we do not build because it depends
 # on urwid which has not been packaged at this time (2009-12-27).
@@ -14,15 +14,16 @@ stdenv.mkDerivation rec {
     sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python pythonPackages.Babel ];
 
   patches = [
     ./no-var-install.patch
-    ./no-trans.patch 
+    #./no-trans.patch 
     #./mkdir-networks.patch
     ./pygtk.patch
     ./no-optimization.patch
     ./dhclient.patch 
+    ./no-ast-transl.patch
     ];
 
   # Should I be using pygtk's propogated build inputs?
@@ -35,7 +36,6 @@ stdenv.mkDerivation rec {
 
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/sbin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
-    sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in
diff --git a/pkgs/tools/networking/wicd/no-ast-transl.patch b/pkgs/tools/networking/wicd/no-ast-transl.patch
new file mode 100644
index 00000000000..eafb0ecf8c5
--- /dev/null
+++ b/pkgs/tools/networking/wicd/no-ast-transl.patch
@@ -0,0 +1,1040 @@
+Remove asturian translation since it causes failure in pybabel.
+
+diff -ruN wicd-1.7.2.4.orig/po/ast.po wicd-1.7.2.4/po/ast.po
+--- wicd-1.7.2.4.orig/po/ast.po	2013-03-30 21:47:19.799907554 +0000
++++ wicd-1.7.2.4/po/ast.po	1970-01-01 00:00:00.000000000 +0000
+@@ -1,1033 +0,0 @@
+-# Asturian translation for wicd
+-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+-# This file is distributed under the same license as the wicd package.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+-#
+-msgid ""
+-msgstr ""
+-"Project-Id-Version: wicd\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2011-12-07 23:04+0100\n"
+-"PO-Revision-Date: 2012-01-17 22:23+0000\n"
+-"Last-Translator: ASTUR2000 <Unknown>\n"
+-"Language-Team: Asturian <ast@li.org>\n"
+-"MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=UTF-8\n"
+-"Content-Transfer-Encoding: 8bit\n"
+-"X-Launchpad-Export-Date: 2012-04-25 05:02+0000\n"
+-"X-Generator: Launchpad (build 15139)\n"
+-"Language: ast\n"
+-
+-#: gtk/wicd-client.py:610
+-msgid ""
+-"$A\n"
+-"$B\n"
+-"$C\n"
+-"$D\n"
+-"$E KB/s\n"
+-"$F KB/s"
+-msgstr ""
+-"$A\n"
+-"$B\n"
+-"$C\n"
+-"$D\n"
+-"$E KB/s\n"
+-"$F KB/s"
+-
+-#: gtk/wicd-client.py:603
+-msgid ""
+-"$A\n"
+-"$B KB/s\n"
+-"$C KB/s"
+-msgstr ""
+-"$A\n"
+-"$B KB/s\n"
+-"$C KB/s"
+-
+-#: curses/wicd-curses.py:564
+-msgid "About"
+-msgstr "Tocante a"
+-
+-#: curses/wicd-curses.py:201
+-msgid "About Wicd"
+-msgstr "Tocantes a Wicd"
+-
+-#: curses/wicd-curses.py:465 gtk/gui.py:272
+-msgid "Activate Internet Connection Sharing"
+-msgstr "Activar compartición de conexón"
+-
+-#: curses/wicd-curses.py:378
+-msgid "Add a new profile"
+-msgstr "Añader un perfil"
+-
+-#: curses/wicd-curses.py:411
+-msgid "Add a new wired profile"
+-msgstr "Añader un perfil cableáu"
+-
+-#: curses/prefs_curses.py:52 data/wicd.ui:1669
+-msgid "Advanced Settings"
+-msgstr "Configuración avanzao"
+-
+-#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956
+-msgid "Always show wired interface"
+-msgstr "Amosar siempres perfil cableáu"
+-
+-#: curses/prefs_curses.py:70
+-msgid "Always switch to wired connection when available"
+-msgstr "Camudar siempres pa una conexón cableada cuando tean disponibles"
+-
+-#: wicd/translations.py:77
+-msgid "Authentication"
+-msgstr "Identificación"
+-
+-#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352
+-#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082
+-#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319
+-msgid "Automatic (recommended)"
+-msgstr "Automático (encamentao)"
+-
+-#: curses/prefs_curses.py:86
+-msgid "Automatic Reconnection"
+-msgstr "Reconexón automática"
+-
+-#: curses/netentry_curses.py:257 gtk/netentry.py:817
+-msgid "Automatically connect to this network"
+-msgstr "Coneutar namás pa esta rede"
+-
+-#: curses/prefs_curses.py:87 gtk/prefs.py:331
+-msgid "Automatically reconnect on connection loss"
+-msgstr "Reconeutar namás perder la conexón"
+-
+-#: curses/prefs_curses.py:113 curses/prefs_curses.py:114
+-msgid "Backend"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:195
+-msgid "Brought to you by:"
+-msgstr "Sofitáu por:"
+-
+-#: curses/wicd-curses.py:1029
+-msgid "Can't connect to the daemon, trying to start it automatically..."
+-msgstr "Nun pue coneutase col degorriu, tentando pa entamalo automáticamente"
+-
+-#: curses/configscript_curses.py:74 curses/curses_misc.py:535
+-#: curses/netentry_curses.py:65 curses/wicd-curses.py:490
+-#: curses/wicd-curses.py:605 curses/wicd-curses.py:607
+-msgid "Cancel"
+-msgstr "Atayar"
+-
+-#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966
+-#: gtk/netentry.py:1088
+-msgid "Channel"
+-msgstr "Canal"
+-
+-#: gtk/gui.py:188 data/wicd.ui:173
+-msgid "Choose from the networks below:"
+-msgstr "Esbilla dende les redes d'emabxo"
+-
+-#: curses/wicd-curses.py:556
+-msgid "Config"
+-msgstr "Config"
+-
+-#: curses/wicd-curses.py:225
+-msgid "Configure selected network"
+-msgstr "Configurar rede esbillada"
+-
+-#: curses/netentry_curses.py:196
+-msgid "Configuring preferences for wired profile \"$A\""
+-msgstr "Configurando preferencies pal perfil cableáu \"$A\""
+-
+-#: curses/netentry_curses.py:272
+-msgid "Configuring preferences for wireless network \"$A\" ($B)"
+-msgstr "Configurando preferencies pal perfil inalámbricu \"$A\" ($B)"
+-
+-#: wicd/misc.py:80
+-msgid "Configuring wireless interface..."
+-msgstr "Configurando rede inalámbrica"
+-
+-#: curses/wicd-curses.py:559 gtk/wicd-client.py:498
+-msgid "Connect"
+-msgstr "Coneutase"
+-
+-#: curses/wicd-curses.py:215
+-msgid "Connect to selected network"
+-msgstr "Coneutase a la rede esbillada"
+-
+-#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215
+-msgid "Connected to $A at $B (IP: $C)"
+-msgstr "Coneutáu a $A en $B (IP: $C)"
+-
+-#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220
+-msgid "Connected to wired network (IP: $A)"
+-msgstr "Coneutáu a la rede cableada (IP: $A)"
+-
+-#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641
+-msgid "Connecting"
+-msgstr "Coneutando"
+-
+-#: wicd/misc.py:77
+-msgid "Connection Cancelled"
+-msgstr "Conexón atayada"
+-
+-#: wicd/misc.py:83
+-msgid "Connection Failed."
+-msgstr "Conexón fallía."
+-
+-#: wicd/misc.py:79
+-msgid "Connection Failed: Bad password"
+-msgstr "Conexón fallía: conseña mala"
+-
+-#: wicd/misc.py:89
+-msgid "Connection Failed: No DHCP offers received."
+-msgstr "Conexón fallía: ensin ufiertes DHCP recivies."
+-
+-#: wicd/misc.py:81
+-msgid "Connection Failed: Unable to Get IP Address"
+-msgstr "Conexón fallía: Nun pue consiguise una direición IP"
+-
+-#: gtk/wicd-client.py:269 gtk/wicd-client.py:299
+-msgid "Connection established"
+-msgstr "Conexón establecida"
+-
+-#: wicd/misc.py:78
+-msgid "Connection failed: Could not contact the wireless access point."
+-msgstr "Conexón fallía: Nun pudo contautase col puntu d'accesu inalámbricu."
+-
+-#: wicd/misc.py:95
+-msgid "Connection successful."
+-msgstr "Conexón correcha."
+-
+-#: gtk/gui.py:65 gtk/wicd-client.py:955
+-msgid ""
+-"Could not connect to wicd's D-Bus interface. Check the wicd log for error "
+-"messages."
+-msgstr ""
+-"Nun pudo coneutase a la interfaz D-Bus de Wicd. Agüeya'l log de Wicd pa "
+-"mensaxes d'erros"
+-
+-#: gtk/netentry.py:303 gtk/netentry.py:411
+-msgid ""
+-"Could not find a graphical sudo program. The script editor could not be "
+-"launched.  You'll have to edit scripts directly your configuration file."
+-msgstr ""
+-"Nun pudo alcontrase un programa gráficu sudo. L'editor de scripts nun "
+-"s'anició. Tienes d'editar los scripts direutamente dende l'archivu de "
+-"configuración."
+-
+-#: curses/wicd-curses.py:488 gtk/gui.py:258
+-msgid "Create an Ad-Hoc Network"
+-msgstr "Criar una rede Ad-Hoc"
+-
+-#: curses/wicd-curses.py:99
+-msgid ""
+-"DBus failure! This is most likely caused by the wicd daemon stopping while "
+-"wicd-curses is running. Please restart the daemon, and then restart wicd-"
+-"curses."
+-msgstr ""
+-
+-#: curses/prefs_curses.py:92
+-msgid "DHCP Client"
+-msgstr "Cliente DHCP"
+-
+-#: curses/netentry_curses.py:63
+-msgid "DHCP Hostname"
+-msgstr "Viesu d'agospiu DHCP"
+-
+-#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79
+-msgid "DNS domain"
+-msgstr "Dominiu DNS"
+-
+-#: curses/netentry_curses.py:58 curses/netentry_curses.py:59
+-#: curses/netentry_curses.py:60 curses/prefs_curses.py:76
+-#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80
+-#: gtk/netentry.py:81 gtk/netentry.py:82
+-msgid "DNS server"
+-msgstr "Sirvidor DNS"
+-
+-#: curses/prefs_curses.py:117
+-msgid "Debugging"
+-msgstr "Depuración"
+-
+-#: curses/wicd-curses.py:560
+-msgid "Disconn"
+-msgstr "Descon"
+-
+-#: curses/wicd-curses.py:216
+-msgid "Disconnect from all networks"
+-msgstr "Desconeutar toles redes"
+-
+-#: gtk/wicd-client.py:340 gtk/wicd-client.py:643
+-msgid "Disconnected"
+-msgstr "Desconeutáu"
+-
+-#: gtk/gui.py:725
+-msgid "Disconnecting active connections..."
+-msgstr ""
+-
+-#: curses/wicd-curses.py:226
+-msgid "Display 'about' dialog"
+-msgstr "Amosar dialogu 'tocante a'"
+-
+-#: gtk/prefs.py:349 data/wicd.ui:992
+-msgid "Display notifications about connection status"
+-msgstr "Amosar notificaciones sobro l'estáu conexón"
+-
+-#: curses/wicd-curses.py:214
+-msgid "Display this help dialog"
+-msgstr "Amosar esti dialogu d'aida"
+-
+-#: wicd/translations.py:78
+-msgid "Domain"
+-msgstr "Dominiu"
+-
+-#: wicd/misc.py:82
+-msgid "Done connecting..."
+-msgstr ""
+-
+-#: curses/wicd-curses.py:1053
+-msgid ""
+-"ERROR: wicd-curses was denied access to the wicd daemon: please check that "
+-"your user is in the \"$A\" group."
+-msgstr ""
+-"ERRU: wicd-curses denegóse-y l'accesu al degorriu wicd: por favor compreba "
+-"que'l to usuariu ta nel grupu \"$A'"
+-
+-#: curses/wicd-curses.py:461 gtk/gui.py:266
+-msgid "ESSID"
+-msgstr ""
+-
+-#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511
+-msgid "Enable debug mode"
+-msgstr "Activar mou depuración"
+-
+-#: gtk/wicd-client.py:320 gtk/wicd-client.py:324
+-msgid "Establishing connection..."
+-msgstr "Coneutándose..."
+-
+-#: curses/prefs_curses.py:51 data/wicd.ui:1398
+-msgid "External Programs"
+-msgstr "Programes esternos"
+-
+-#: wicd/misc.py:84
+-msgid "Flushing the routing table..."
+-msgstr ""
+-
+-#: curses/wicd-curses.py:210
+-msgid "For more detailed help, consult the wicd-curses(8) man page."
+-msgstr ""
+-"P'aida más detallada, consulta les maldiciones wicd-curses(8) del manual."
+-
+-#: curses/netentry_curses.py:52 gtk/netentry.py:77
+-msgid "Gateway"
+-msgstr "Puerta d'enllaz"
+-
+-#: curses/prefs_curses.py:50 data/wicd.ui:1018
+-msgid "General Settings"
+-msgstr "Axustes xenerales"
+-
+-#: wicd/misc.py:85
+-msgid "Generating PSK..."
+-msgstr "Xenerando PSK..."
+-
+-#: wicd/misc.py:86
+-msgid "Generating WPA configuration file..."
+-msgstr "Xenerando archivu configuración de WPA"
+-
+-#: gtk/netentry.py:233
+-msgid "Global DNS has not been enabled in general preferences."
+-msgstr "Les DNS globales nun foron activaes nes preferencies xenerales."
+-
+-#: curses/prefs_curses.py:72
+-msgid "Global DNS servers"
+-msgstr "Sirvidores globales DNS"
+-
+-#: curses/wicd-curses.py:555
+-msgid "Help"
+-msgstr "Aida"
+-
+-#: curses/wicd-curses.py:563
+-msgid "Hidden"
+-msgstr "Anubríu"
+-
+-#: gtk/gui.py:357
+-msgid "Hidden Network ESSID"
+-msgstr "Rede ESSID anubría"
+-
+-#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265
+-#: gtk/netentry.py:74
+-msgid "IP"
+-msgstr "IP"
+-
+-#: wicd/translations.py:79
+-msgid "Identity"
+-msgstr "Identidá"
+-
+-#: gtk/wicd-client.py:500
+-msgid "Information about the current connection"
+-msgstr "Información tocante la conexón actual"
+-
+-#: gtk/netentry.py:167
+-msgid "Invalid IP address entered."
+-msgstr "Puesta direición IP inválida"
+-
+-#: gtk/gui.py:631 gtk/gui.py:639
+-msgid "Invalid address in $A entry."
+-msgstr "Direición inválida na entrada $A."
+-
+-#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80
+-msgid "Key"
+-msgstr "Clave"
+-
+-#: curses/netentry_curses.py:51 gtk/netentry.py:76
+-msgid "Netmask"
+-msgstr "Mázcara de rede"
+-
+-#: curses/prefs_curses.py:66
+-msgid "Network Interfaces"
+-msgstr "Interfaces de rede"
+-
+-#: gtk/netentry.py:818
+-msgid "Never connect to this network"
+-msgstr "Tanina coneutar pa esta rede"
+-
+-#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797
+-msgid "No wireless networks found."
+-msgstr "Nun s'alcontró rede inalámbrica dala."
+-
+-#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213
+-#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338
+-msgid "Not connected"
+-msgstr "Non coneutáu"
+-
+-#: curses/configscript_curses.py:73 curses/curses_misc.py:527
+-#: curses/netentry_curses.py:66 curses/wicd-curses.py:490
+-#: curses/wicd-curses.py:602 curses/wicd-curses.py:606
+-msgid "OK"
+-msgstr "Val"
+-
+-#: wicd/misc.py:91
+-msgid "Obtaining IP address..."
+-msgstr "Obteniendo direición IP"
+-
+-#: curses/wicd-curses.py:278
+-msgid ""
+-"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", "
+-"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to "
+-"change the preconnect, postconnect, predisconnect and postdisconnect scripts "
+-"respectively.  Note that you will be specifying the full path to the scripts "
+-"- not the actual script contents.  You will need to add/edit the script "
+-"contents separately.  Refer to the wicd manual page for more information."
+-msgstr ""
+-
+-#: wicd/translations.py:81
+-msgid "Passphrase"
+-msgstr "Fras de pasu"
+-
+-#: wicd/translations.py:82
+-msgid "Password"
+-msgstr "Conseña"
+-
+-#: wicd/translations.py:83
+-msgid "Path to CA cert"
+-msgstr "Parchear pal certificáu CA"
+-
+-#: wicd/translations.py:85
+-msgid "Path to PAC file"
+-msgstr "Parchear pal archivu PAC"
+-
+-#: wicd/translations.py:84
+-msgid "Path to client cert"
+-msgstr "Parchear pal certificáu de cliente"
+-
+-#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644
+-msgid "Ping static gateways after connecting to verify association"
+-msgstr ""
+-
+-#: curses/configscript_curses.py:57 gtk/configscript.py:129
+-msgid "Post-connection Script"
+-msgstr ""
+-
+-#: curses/configscript_curses.py:59 gtk/configscript.py:132
+-msgid "Post-disconnection Script"
+-msgstr ""
+-
+-#: curses/configscript_curses.py:56 gtk/configscript.py:128
+-msgid "Pre-connection Script"
+-msgstr ""
+-
+-#: curses/configscript_curses.py:58 gtk/configscript.py:130
+-msgid "Pre-disconnection Script"
+-msgstr ""
+-
+-#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318
+-msgid "Preferences"
+-msgstr "Preferencies"
+-
+-#: curses/wicd-curses.py:219
+-msgid "Preferences dialog"
+-msgstr "Diálogu preferencies"
+-
+-#: curses/wicd-curses.py:562
+-msgid "Prefs"
+-msgstr "Prefs"
+-
+-#: wicd/translations.py:86
+-msgid "Preshared key"
+-msgstr "Preshared key"
+-
+-#: curses/wicd-curses.py:229
+-msgid "Press any key to return."
+-msgstr "Primi cualaquier tecla pa tornar."
+-
+-#: wicd/translations.py:87
+-msgid "Private key"
+-msgstr "Cnoseña acutada"
+-
+-#: wicd/translations.py:88
+-msgid "Private key password"
+-msgstr "Llave la conseña acutada"
+-
+-#: curses/prefs_curses.py:83 gtk/prefs.py:343
+-msgid "Prompt for profile on wired autoconnect"
+-msgstr ""
+-
+-#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598
+-msgid "Properties"
+-msgstr "Propiedaes"
+-
+-#: wicd/misc.py:87
+-msgid "Putting interface down..."
+-msgstr ""
+-
+-#: wicd/misc.py:88
+-msgid "Putting interface up..."
+-msgstr "Poniendo la interfaz a..."
+-
+-#: curses/wicd-curses.py:565
+-msgid "Quit"
+-msgstr "Colar"
+-
+-#: curses/wicd-curses.py:227
+-msgid "Quit wicd-curses"
+-msgstr "Colar de wicd-curses"
+-
+-#: gtk/wicd-client.py:502
+-msgid "Quit wicd-tray-icon"
+-msgstr "Colar del iconu la bandexa"
+-
+-#: curses/wicd-curses.py:561
+-msgid "Refresh"
+-msgstr "Anovar"
+-
+-#: curses/wicd-curses.py:218
+-msgid "Refresh network list"
+-msgstr "Anovar llista de rede"
+-
+-#: curses/wicd-curses.py:441
+-msgid "Rename wired profile"
+-msgstr "Renomar perfil cableáu"
+-
+-#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486
+-msgid "Required encryption information is missing."
+-msgstr "La información d'encriptación requería ta perdía"
+-
+-#: wicd/misc.py:90
+-msgid "Resetting IP address..."
+-msgstr "Reaniciando direición IP"
+-
+-#: curses/wicd-curses.py:558
+-msgid "RfKill"
+-msgstr "RfKill"
+-
+-#: curses/prefs_curses.py:103
+-msgid "Route Table Flushing"
+-msgstr "Tables de ruta Flushing"
+-
+-#: curses/wicd-curses.py:629
+-msgid "Scan"
+-msgstr "Desaminar"
+-
+-#: curses/wicd-curses.py:222
+-msgid "Scan for hidden networks"
+-msgstr "Desaminar por redes anubríes"
+-
+-#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810
+-msgid "Scanning"
+-msgstr "Desaminando"
+-
+-#: curses/wicd-curses.py:526
+-msgid "Scanning networks... stand by..."
+-msgstr "Desaminando redes... aparar..."
+-
+-#: gtk/netentry.py:102
+-msgid "Scripts"
+-msgstr "Scripts"
+-
+-#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78
+-msgid "Search domain"
+-msgstr "Guetar dominiu"
+-
+-#: gtk/netentry.py:960 gtk/netentry.py:1082
+-msgid "Secured"
+-msgstr "Seguro"
+-
+-#: curses/wicd-curses.py:629
+-msgid "Select Hidden Network ESSID"
+-msgstr "Esbillar rede ESSID anubría"
+-
+-#: gtk/gui.py:103
+-msgid "Select or create a wired profile to connect with"
+-msgstr "Esbillar o criar un perfil cableáu con conexón con"
+-
+-#: curses/wicd-curses.py:223
+-msgid "Select scripts"
+-msgstr "Esbillar sripts"
+-
+-#: curses/wicd-curses.py:224
+-msgid "Set up Ad-hoc network"
+-msgstr ""
+-
+-#: wicd/misc.py:92
+-msgid "Setting broadcast address..."
+-msgstr ""
+-
+-#: wicd/misc.py:93
+-msgid "Setting static DNS servers..."
+-msgstr ""
+-
+-#: wicd/misc.py:94
+-msgid "Setting static IP addresses..."
+-msgstr ""
+-
+-#: gtk/prefs.py:333 data/wicd.ui:571
+-msgid "Show never connect networks"
+-msgstr ""
+-
+-#: gtk/gui.py:104
+-msgid "Stop Showing Autoconnect pop-up temporarily"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:217
+-msgid "Stop a connection in progress"
+-msgstr ""
+-
+-#: gtk/gui.py:315
+-msgid "Switch Off Wi-Fi"
+-msgstr ""
+-
+-#: gtk/gui.py:312
+-msgid "Switch On Wi-Fi"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:603
+-msgid "Tab Left"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:604
+-msgid "Tab Right"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:94
+-msgid "Terminated by user"
+-msgstr ""
+-
+-#: gtk/gui.py:85 gtk/wicd-client.py:984
+-msgid ""
+-"The wicd daemon has shut down. The UI will not function properly until it is "
+-"restarted."
+-msgstr ""
+-
+-#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497
+-msgid "This network requires encryption to be enabled."
+-msgstr ""
+-
+-#: curses/wicd-curses.py:272
+-msgid ""
+-"To avoid various complications, wicd-curses does not support directly "
+-"editing the scripts. However, you can edit them manually. First, (as root), "
+-"open the \"$A\" config file, and look for the section labeled by the $B in "
+-"question. In this case, this is:"
+-msgstr ""
+-
+-#: gtk/netentry.py:635
+-msgid ""
+-"To connect to a wired network, you must create a network profile. To create "
+-"a network profile, type a name that describes this network, and press Add."
+-msgstr ""
+-
+-#: gtk/wicd-client.py:94
+-msgid ""
+-"Unable to contact the Wicd daemon due to an access denied error from DBus. "
+-"Please check that your user is in the $A group."
+-msgstr ""
+-
+-#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084
+-msgid "Unsecured"
+-msgstr ""
+-
+-#: curses/netentry_curses.py:62
+-msgid "Use DHCP Hostname"
+-msgstr ""
+-
+-#: curses/netentry_curses.py:256 gtk/netentry.py:356
+-msgid "Use Encryption"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:466 gtk/gui.py:263
+-msgid "Use Encryption (WEP only)"
+-msgstr ""
+-
+-#: curses/netentry_curses.py:54 gtk/netentry.py:89
+-msgid "Use Static DNS"
+-msgstr ""
+-
+-#: curses/netentry_curses.py:49 gtk/netentry.py:88
+-msgid "Use Static IPs"
+-msgstr ""
+-
+-#: curses/netentry_curses.py:190 gtk/netentry.py:636
+-msgid "Use as default profile (overwrites any previous default)"
+-msgstr ""
+-
+-#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490
+-msgid "Use dBm to measure signal strength"
+-msgstr ""
+-
+-#: curses/prefs_curses.py:82 gtk/prefs.py:341
+-msgid "Use default profile on wired autoconnect"
+-msgstr ""
+-
+-#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90
+-#: data/wicd.ui:882
+-msgid "Use global DNS servers"
+-msgstr ""
+-
+-#: curses/prefs_curses.py:84 gtk/prefs.py:345
+-msgid "Use last used profile on wired autoconnect"
+-msgstr ""
+-
+-#: curses/netentry_curses.py:255 gtk/netentry.py:357
+-msgid "Use these settings for all networks sharing this essid"
+-msgstr ""
+-
+-#: wicd/translations.py:89
+-msgid "Username"
+-msgstr ""
+-
+-#: wicd/misc.py:96
+-msgid "Validating authentication..."
+-msgstr ""
+-
+-#: wicd/misc.py:97
+-msgid "Verifying access point association..."
+-msgstr ""
+-
+-#: curses/prefs_curses.py:108
+-msgid "WPA Supplicant"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:528
+-msgid "Wicd Curses Interface"
+-msgstr ""
+-
+-#: gtk/wicd-client.py:226 gtk/wicd-client.py:333
+-msgid "Wicd daemon unreachable"
+-msgstr ""
+-
+-#: wicd/misc.py:196
+-msgid "Wicd needs to access your computer's network cards."
+-msgstr ""
+-
+-#: gtk/wicd-client.py:628
+-msgid ""
+-"Wired\n"
+-"IP:\n"
+-"RX:\n"
+-"TX:"
+-msgstr ""
+-
+-#: curses/prefs_curses.py:81
+-msgid "Wired Autoconnect Settings"
+-msgstr ""
+-
+-#: curses/prefs_curses.py:67
+-msgid "Wired Interface"
+-msgstr ""
+-
+-#: curses/prefs_curses.py:99
+-msgid "Wired Link Detection"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286
+-#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309
+-msgid "Wired Network"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:533
+-msgid "Wired Networks"
+-msgstr ""
+-
+-#: gtk/gui.py:97
+-msgid "Wired connection detected"
+-msgstr ""
+-
+-#: gtk/wicd-client.py:633
+-msgid ""
+-"Wireless\n"
+-"SSID:\n"
+-"Speed:\n"
+-"IP:\n"
+-"Strength:\n"
+-"RX:\n"
+-"TX:"
+-msgstr ""
+-
+-#: curses/prefs_curses.py:68 curses/prefs_curses.py:120
+-msgid "Wireless Interface"
+-msgstr ""
+-
+-#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336
+-msgid "Wireless Kill Switch Enabled"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:535
+-msgid "Wireless Networks"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:277
+-msgid ""
+-"You can also configure the wireless networks by looking for the "
+-"\"[<ESSID>]\" field in the config file."
+-msgstr ""
+-
+-#: gtk/netentry.py:300 gtk/netentry.py:408
+-msgid "You must enter your password to configure scripts"
+-msgstr ""
+-
+-#: curses/prefs_curses.py:111
+-msgid "You should almost always use wext as the WPA supplicant driver"
+-msgstr ""
+-
+-#: gtk/wicd-client.py:499
+-msgid "_Connection Info"
+-msgstr ""
+-
+-#: gtk/wicd-client.py:502 data/wicd.ui:151
+-msgid "_Quit"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:428
+-msgid ""
+-"wicd-curses does not support deleting the last wired profile.  Try renaming "
+-"it (\"F2\")"
+-msgstr ""
+-
+-#: curses/wicd-curses.py:206
+-msgid "wicd-curses help"
+-msgstr ""
+-
+-#: data/wicd.ui:9
+-msgid "Wicd Network Manager"
+-msgstr ""
+-
+-#: data/wicd.ui:46
+-msgid "Create an ad-hoc network"
+-msgstr ""
+-
+-#: data/wicd.ui:55
+-msgid "Find a hidden network"
+-msgstr ""
+-
+-#: data/wicd.ui:57
+-msgid "Enter a hidden network to try to locate."
+-msgstr ""
+-
+-#: data/wicd.ui:79
+-msgid "_Switch Off Wi-Fi"
+-msgstr ""
+-
+-#: data/wicd.ui:94
+-msgid "_Disconnect All"
+-msgstr ""
+-
+-#: data/wicd.ui:108
+-msgid "_Refresh"
+-msgstr ""
+-
+-#: data/wicd.ui:122
+-msgid "_Preferences"
+-msgstr ""
+-
+-#: data/wicd.ui:136
+-msgid "_About"
+-msgstr ""
+-
+-#: data/wicd.ui:213 data/wicd.ui:215
+-msgid "Connecting..."
+-msgstr ""
+-
+-#: data/wicd.ui:228
+-msgid "Cancel the current connection attempt"
+-msgstr ""
+-
+-#: data/wicd.ui:260
+-msgid "Configure Scripts"
+-msgstr ""
+-
+-#: data/wicd.ui:279
+-msgid "Configure scripts to run for this network:"
+-msgstr ""
+-
+-#: data/wicd.ui:296
+-msgid "Pre-connection Script:"
+-msgstr ""
+-
+-#: data/wicd.ui:329
+-msgid "Post-connection Script:"
+-msgstr ""
+-
+-#: data/wicd.ui:362
+-msgid "Pre-disconnection Script:"
+-msgstr ""
+-
+-#: data/wicd.ui:395
+-msgid "Post-disconnection Script:"
+-msgstr ""
+-
+-#: data/wicd.ui:514
+-msgid "Always switch to a wired connection when available"
+-msgstr ""
+-
+-#: data/wicd.ui:519
+-msgid ""
+-"If selected, wicd will automatically connect to a wired network\n"
+-"as soon as a cable is plugged in, even if a wireless connection \n"
+-"is already active."
+-msgstr ""
+-
+-#: data/wicd.ui:542
+-msgid "DNS domain:"
+-msgstr ""
+-
+-#: data/wicd.ui:590
+-msgid "<b>Never Connect</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:606
+-msgid "Automatically reconnect on network connection loss"
+-msgstr ""
+-
+-#: data/wicd.ui:625
+-msgid "<b>Automatic Reconnection</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:641
+-msgid "Use last wired network profile"
+-msgstr ""
+-
+-#: data/wicd.ui:663
+-msgid "Prompt for wired network profile"
+-msgstr ""
+-
+-#: data/wicd.ui:686
+-msgid "Use default wired network profile"
+-msgstr ""
+-
+-#: data/wicd.ui:707
+-msgid "<b>Wired automatic connection</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:725
+-msgid "Wired interface:"
+-msgstr ""
+-
+-#: data/wicd.ui:743
+-msgid "Wireless interface:"
+-msgstr ""
+-
+-#: data/wicd.ui:783
+-msgid "<b>Network Interfaces</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:799
+-msgid "DNS server 3:"
+-msgstr ""
+-
+-#: data/wicd.ui:830
+-msgid "DNS server 2:"
+-msgstr ""
+-
+-#: data/wicd.ui:848
+-msgid "DNS server 1:"
+-msgstr ""
+-
+-#: data/wicd.ui:866
+-msgid "Search domain:"
+-msgstr ""
+-
+-#: data/wicd.ui:901
+-msgid "<b>Global DNS Servers</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:960
+-msgid ""
+-"If enabled, the wired network interface will always be displayed in the main "
+-"window. This can be useful if your wired network card does not detect when "
+-"the interface is connected to a cable."
+-msgstr ""
+-
+-#: data/wicd.ui:976
+-msgid "<b>Notifications</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:1050
+-msgid "<b>Route Table Flushing</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:1063
+-msgid "<b>Wired Link Detection</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:1289
+-msgid "<b>DHCP Client</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:1300
+-msgid "<b>Graphical Sudo Application</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:1421
+-msgid ""
+-"Hover your mouse over the selected backend \n"
+-"to read its description."
+-msgstr ""
+-
+-#: data/wicd.ui:1474
+-msgid "Driver:"
+-msgstr ""
+-
+-#: data/wicd.ui:1530
+-msgid "<b>Wireless Interface</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:1544
+-msgid "<b>WPA Supplicant</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:1556
+-msgid "<b>Debugging</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:1574
+-msgid "Backend:"
+-msgstr ""
+-
+-#: data/wicd.ui:1601
+-msgid "<b>Backend</b>"
+-msgstr ""
+-
+-#: data/wicd.ui:1615
+-msgid ""
+-"You should almost always use wext as the\n"
+-"WPA supplicant driver."
+-msgstr ""
+

From ee921d9df413b7634229e79630b7ca9217a1cb2d Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Sun, 31 Mar 2013 12:57:28 +0400
Subject: [PATCH 3/6] wicd: fix missing application icon

---
 pkgs/tools/networking/wicd/default.nix        |  1 +
 pkgs/tools/networking/wicd/fix-app-icon.patch | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/tools/networking/wicd/fix-app-icon.patch

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index b080018f1cb..0b63f40a95b 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     ./no-optimization.patch
     ./dhclient.patch 
     ./no-ast-transl.patch
+    ./fix-app-icon.patch
     ];
 
   # Should I be using pygtk's propogated build inputs?
diff --git a/pkgs/tools/networking/wicd/fix-app-icon.patch b/pkgs/tools/networking/wicd/fix-app-icon.patch
new file mode 100644
index 00000000000..154d7da3510
--- /dev/null
+++ b/pkgs/tools/networking/wicd/fix-app-icon.patch
@@ -0,0 +1,19 @@
+Someone forgot to pack wicd.png icon. We will replace it with existing one.
+
+diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py
+--- wicd-1.7.2.4.orig/gtk/gui.py	2013-03-30 21:47:19.802907553 +0000
++++ wicd-1.7.2.4/gtk/gui.py	2013-03-31 08:13:32.876871673 +0000
+@@ -205,8 +205,10 @@
+ 
+         self.status_area.hide_all()
+ 
+-        if os.path.exists(os.path.join(wpath.images, "wicd.png")):
+-            self.window.set_icon_from_file(os.path.join(wpath.images, "wicd.png"))
++        if os.path.exists(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")):
++            self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png"))
++        else:
++            print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")
+         self.statusID = None
+         self.first_dialog_load = True
+         self.is_visible = True
+

From 6901f6346dedac38ca2b11ce17de2c9f3d03aa4d Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Sun, 31 Mar 2013 18:07:40 +0000
Subject: [PATCH 4/6] wicd: [HACK] fix various gtk issues

* hack around s.translate situation
* fix KeyError exception in error dialog
* fix Russian translation
---
 pkgs/tools/networking/wicd/default.nix        |  1 +
 .../networking/wicd/fix-gtk-issues.patch      | 47 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/tools/networking/wicd/fix-gtk-issues.patch

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 0b63f40a95b..f8d3186f3a9 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     ./dhclient.patch 
     ./no-ast-transl.patch
     ./fix-app-icon.patch
+    ./fix-gtk-issues.patch
     ];
 
   # Should I be using pygtk's propogated build inputs?
diff --git a/pkgs/tools/networking/wicd/fix-gtk-issues.patch b/pkgs/tools/networking/wicd/fix-gtk-issues.patch
new file mode 100644
index 00000000000..31e553b46b5
--- /dev/null
+++ b/pkgs/tools/networking/wicd/fix-gtk-issues.patch
@@ -0,0 +1,47 @@
+diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py
+--- wicd-1.7.2.4.orig/gtk/gui.py	2013-03-31 17:01:29.367001288 +0000
++++ wicd-1.7.2.4/gtk/gui.py	2013-03-31 17:55:20.826028396 +0000
+@@ -35,7 +35,7 @@
+ from wicd import misc
+ from wicd import wpath
+ from wicd import dbusmanager
+-from wicd.misc import noneToString
++from wicd.misc import noneToString, _status_dict
+ from wicd.translations import _, language
+ import prefs
+ from prefs import PreferencesDialog
+@@ -250,7 +250,7 @@
+         
+     def handle_connection_results(self, results):
+         if results not in ['success', 'aborted'] and self.is_visible:
+-            error(self.window, language[results], block=False)
++            error(self.window, misc._status_dict[results], block=False)
+ 
+     def create_adhoc_network(self, widget=None):
+         """ Shows a dialog that creates a new adhoc network. """
+diff -ruN wicd-1.7.2.4.orig/po/ru.po wicd-1.7.2.4/po/ru.po
+--- wicd-1.7.2.4.orig/po/ru.po	2013-03-31 17:01:29.362001288 +0000
++++ wicd-1.7.2.4/po/ru.po	2013-03-31 17:43:37.909022515 +0000
+@@ -173,7 +173,7 @@
+ 
+ #: wicd/misc.py:79
+ msgid "Connection Failed: Bad password"
+-msgstr "Ошибка соединения: Неверный пароль:"
++msgstr "Ошибка соединения: Неверный пароль"
+ 
+ #: wicd/misc.py:89
+ msgid "Connection Failed: No DHCP offers received."
+diff -ruN wicd-1.7.2.4.orig/wicd/misc.py wicd-1.7.2.4/wicd/misc.py
+--- wicd-1.7.2.4.orig/wicd/misc.py	2013-03-31 17:01:29.369001288 +0000
++++ wicd-1.7.2.4/wicd/misc.py	2013-03-31 17:23:56.822012593 +0000
+@@ -430,7 +430,9 @@
+     """ Sanitize property names to be used in config-files. """
+     allowed = string.ascii_letters + '_' + string.digits
+     table = string.maketrans(allowed, ' ' * len(allowed))
+-    return s.translate(None, table)
++    #return s.translate(None, table)
++    #return s.translate(table)
++    return s
+ 
+ def sanitize_escaped(s):
+     """ Sanitize double-escaped unicode strings. """

From 18681ae58e678a1bb61d264d5cfad1464ea07d08 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Thu, 4 Apr 2013 13:43:09 +0400
Subject: [PATCH 5/6] wicd: remove unused patches, remove ast with plain rm

---
 pkgs/tools/networking/wicd/default.nix        |    4 +-
 .../networking/wicd/mkdir-networks.patch      |   12 -
 .../tools/networking/wicd/no-ast-transl.patch | 1040 -----------------
 pkgs/tools/networking/wicd/no-trans.patch     |   15 -
 4 files changed, 1 insertion(+), 1070 deletions(-)
 delete mode 100644 pkgs/tools/networking/wicd/mkdir-networks.patch
 delete mode 100644 pkgs/tools/networking/wicd/no-ast-transl.patch
 delete mode 100644 pkgs/tools/networking/wicd/no-trans.patch

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index f8d3186f3a9..ff3df9efb74 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -18,12 +18,9 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-var-install.patch
-    #./no-trans.patch 
-    #./mkdir-networks.patch
     ./pygtk.patch
     ./no-optimization.patch
     ./dhclient.patch 
-    ./no-ast-transl.patch
     ./fix-app-icon.patch
     ./fix-gtk-issues.patch
     ];
@@ -44,6 +41,7 @@ stdenv.mkDerivation rec {
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
+    rm po/ast.po
   '';
 
   configurePhase = ''
diff --git a/pkgs/tools/networking/wicd/mkdir-networks.patch b/pkgs/tools/networking/wicd/mkdir-networks.patch
deleted file mode 100644
index 01563fd55da..00000000000
--- a/pkgs/tools/networking/wicd/mkdir-networks.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-wicd normally makes the NETWORKS directory and install the dhclient.conf.template.default at install time, 
-but we cannot do that, so we make it at runtime instead.
-
---- wicd-1.7.0/in/scripts=wicd.in       2010-01-14 23:49:11.000000000 -0500
-+++ wicd-1.7.0/in/scripts=wicd.in       2010-11-16 22:35:50.272555487 -0500
-@@ -1,3 +1,6 @@
- #!/bin/bash
- 
-+mkdir -p %NETWORKS%
-+ln -sf @TEMPLATE-DEFAULT@ %ETC%dhclient.conf.template.default
-+
- exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@
diff --git a/pkgs/tools/networking/wicd/no-ast-transl.patch b/pkgs/tools/networking/wicd/no-ast-transl.patch
deleted file mode 100644
index eafb0ecf8c5..00000000000
--- a/pkgs/tools/networking/wicd/no-ast-transl.patch
+++ /dev/null
@@ -1,1040 +0,0 @@
-Remove asturian translation since it causes failure in pybabel.
-
-diff -ruN wicd-1.7.2.4.orig/po/ast.po wicd-1.7.2.4/po/ast.po
---- wicd-1.7.2.4.orig/po/ast.po	2013-03-30 21:47:19.799907554 +0000
-+++ wicd-1.7.2.4/po/ast.po	1970-01-01 00:00:00.000000000 +0000
-@@ -1,1033 +0,0 @@
--# Asturian translation for wicd
--# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
--# This file is distributed under the same license as the wicd package.
--# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
--#
--msgid ""
--msgstr ""
--"Project-Id-Version: wicd\n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2011-12-07 23:04+0100\n"
--"PO-Revision-Date: 2012-01-17 22:23+0000\n"
--"Last-Translator: ASTUR2000 <Unknown>\n"
--"Language-Team: Asturian <ast@li.org>\n"
--"MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=UTF-8\n"
--"Content-Transfer-Encoding: 8bit\n"
--"X-Launchpad-Export-Date: 2012-04-25 05:02+0000\n"
--"X-Generator: Launchpad (build 15139)\n"
--"Language: ast\n"
--
--#: gtk/wicd-client.py:610
--msgid ""
--"$A\n"
--"$B\n"
--"$C\n"
--"$D\n"
--"$E KB/s\n"
--"$F KB/s"
--msgstr ""
--"$A\n"
--"$B\n"
--"$C\n"
--"$D\n"
--"$E KB/s\n"
--"$F KB/s"
--
--#: gtk/wicd-client.py:603
--msgid ""
--"$A\n"
--"$B KB/s\n"
--"$C KB/s"
--msgstr ""
--"$A\n"
--"$B KB/s\n"
--"$C KB/s"
--
--#: curses/wicd-curses.py:564
--msgid "About"
--msgstr "Tocante a"
--
--#: curses/wicd-curses.py:201
--msgid "About Wicd"
--msgstr "Tocantes a Wicd"
--
--#: curses/wicd-curses.py:465 gtk/gui.py:272
--msgid "Activate Internet Connection Sharing"
--msgstr "Activar compartición de conexón"
--
--#: curses/wicd-curses.py:378
--msgid "Add a new profile"
--msgstr "Añader un perfil"
--
--#: curses/wicd-curses.py:411
--msgid "Add a new wired profile"
--msgstr "Añader un perfil cableáu"
--
--#: curses/prefs_curses.py:52 data/wicd.ui:1669
--msgid "Advanced Settings"
--msgstr "Configuración avanzao"
--
--#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956
--msgid "Always show wired interface"
--msgstr "Amosar siempres perfil cableáu"
--
--#: curses/prefs_curses.py:70
--msgid "Always switch to wired connection when available"
--msgstr "Camudar siempres pa una conexón cableada cuando tean disponibles"
--
--#: wicd/translations.py:77
--msgid "Authentication"
--msgstr "Identificación"
--
--#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352
--#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082
--#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319
--msgid "Automatic (recommended)"
--msgstr "Automático (encamentao)"
--
--#: curses/prefs_curses.py:86
--msgid "Automatic Reconnection"
--msgstr "Reconexón automática"
--
--#: curses/netentry_curses.py:257 gtk/netentry.py:817
--msgid "Automatically connect to this network"
--msgstr "Coneutar namás pa esta rede"
--
--#: curses/prefs_curses.py:87 gtk/prefs.py:331
--msgid "Automatically reconnect on connection loss"
--msgstr "Reconeutar namás perder la conexón"
--
--#: curses/prefs_curses.py:113 curses/prefs_curses.py:114
--msgid "Backend"
--msgstr ""
--
--#: curses/wicd-curses.py:195
--msgid "Brought to you by:"
--msgstr "Sofitáu por:"
--
--#: curses/wicd-curses.py:1029
--msgid "Can't connect to the daemon, trying to start it automatically..."
--msgstr "Nun pue coneutase col degorriu, tentando pa entamalo automáticamente"
--
--#: curses/configscript_curses.py:74 curses/curses_misc.py:535
--#: curses/netentry_curses.py:65 curses/wicd-curses.py:490
--#: curses/wicd-curses.py:605 curses/wicd-curses.py:607
--msgid "Cancel"
--msgstr "Atayar"
--
--#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966
--#: gtk/netentry.py:1088
--msgid "Channel"
--msgstr "Canal"
--
--#: gtk/gui.py:188 data/wicd.ui:173
--msgid "Choose from the networks below:"
--msgstr "Esbilla dende les redes d'emabxo"
--
--#: curses/wicd-curses.py:556
--msgid "Config"
--msgstr "Config"
--
--#: curses/wicd-curses.py:225
--msgid "Configure selected network"
--msgstr "Configurar rede esbillada"
--
--#: curses/netentry_curses.py:196
--msgid "Configuring preferences for wired profile \"$A\""
--msgstr "Configurando preferencies pal perfil cableáu \"$A\""
--
--#: curses/netentry_curses.py:272
--msgid "Configuring preferences for wireless network \"$A\" ($B)"
--msgstr "Configurando preferencies pal perfil inalámbricu \"$A\" ($B)"
--
--#: wicd/misc.py:80
--msgid "Configuring wireless interface..."
--msgstr "Configurando rede inalámbrica"
--
--#: curses/wicd-curses.py:559 gtk/wicd-client.py:498
--msgid "Connect"
--msgstr "Coneutase"
--
--#: curses/wicd-curses.py:215
--msgid "Connect to selected network"
--msgstr "Coneutase a la rede esbillada"
--
--#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215
--msgid "Connected to $A at $B (IP: $C)"
--msgstr "Coneutáu a $A en $B (IP: $C)"
--
--#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220
--msgid "Connected to wired network (IP: $A)"
--msgstr "Coneutáu a la rede cableada (IP: $A)"
--
--#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641
--msgid "Connecting"
--msgstr "Coneutando"
--
--#: wicd/misc.py:77
--msgid "Connection Cancelled"
--msgstr "Conexón atayada"
--
--#: wicd/misc.py:83
--msgid "Connection Failed."
--msgstr "Conexón fallía."
--
--#: wicd/misc.py:79
--msgid "Connection Failed: Bad password"
--msgstr "Conexón fallía: conseña mala"
--
--#: wicd/misc.py:89
--msgid "Connection Failed: No DHCP offers received."
--msgstr "Conexón fallía: ensin ufiertes DHCP recivies."
--
--#: wicd/misc.py:81
--msgid "Connection Failed: Unable to Get IP Address"
--msgstr "Conexón fallía: Nun pue consiguise una direición IP"
--
--#: gtk/wicd-client.py:269 gtk/wicd-client.py:299
--msgid "Connection established"
--msgstr "Conexón establecida"
--
--#: wicd/misc.py:78
--msgid "Connection failed: Could not contact the wireless access point."
--msgstr "Conexón fallía: Nun pudo contautase col puntu d'accesu inalámbricu."
--
--#: wicd/misc.py:95
--msgid "Connection successful."
--msgstr "Conexón correcha."
--
--#: gtk/gui.py:65 gtk/wicd-client.py:955
--msgid ""
--"Could not connect to wicd's D-Bus interface. Check the wicd log for error "
--"messages."
--msgstr ""
--"Nun pudo coneutase a la interfaz D-Bus de Wicd. Agüeya'l log de Wicd pa "
--"mensaxes d'erros"
--
--#: gtk/netentry.py:303 gtk/netentry.py:411
--msgid ""
--"Could not find a graphical sudo program. The script editor could not be "
--"launched.  You'll have to edit scripts directly your configuration file."
--msgstr ""
--"Nun pudo alcontrase un programa gráficu sudo. L'editor de scripts nun "
--"s'anició. Tienes d'editar los scripts direutamente dende l'archivu de "
--"configuración."
--
--#: curses/wicd-curses.py:488 gtk/gui.py:258
--msgid "Create an Ad-Hoc Network"
--msgstr "Criar una rede Ad-Hoc"
--
--#: curses/wicd-curses.py:99
--msgid ""
--"DBus failure! This is most likely caused by the wicd daemon stopping while "
--"wicd-curses is running. Please restart the daemon, and then restart wicd-"
--"curses."
--msgstr ""
--
--#: curses/prefs_curses.py:92
--msgid "DHCP Client"
--msgstr "Cliente DHCP"
--
--#: curses/netentry_curses.py:63
--msgid "DHCP Hostname"
--msgstr "Viesu d'agospiu DHCP"
--
--#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79
--msgid "DNS domain"
--msgstr "Dominiu DNS"
--
--#: curses/netentry_curses.py:58 curses/netentry_curses.py:59
--#: curses/netentry_curses.py:60 curses/prefs_curses.py:76
--#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80
--#: gtk/netentry.py:81 gtk/netentry.py:82
--msgid "DNS server"
--msgstr "Sirvidor DNS"
--
--#: curses/prefs_curses.py:117
--msgid "Debugging"
--msgstr "Depuración"
--
--#: curses/wicd-curses.py:560
--msgid "Disconn"
--msgstr "Descon"
--
--#: curses/wicd-curses.py:216
--msgid "Disconnect from all networks"
--msgstr "Desconeutar toles redes"
--
--#: gtk/wicd-client.py:340 gtk/wicd-client.py:643
--msgid "Disconnected"
--msgstr "Desconeutáu"
--
--#: gtk/gui.py:725
--msgid "Disconnecting active connections..."
--msgstr ""
--
--#: curses/wicd-curses.py:226
--msgid "Display 'about' dialog"
--msgstr "Amosar dialogu 'tocante a'"
--
--#: gtk/prefs.py:349 data/wicd.ui:992
--msgid "Display notifications about connection status"
--msgstr "Amosar notificaciones sobro l'estáu conexón"
--
--#: curses/wicd-curses.py:214
--msgid "Display this help dialog"
--msgstr "Amosar esti dialogu d'aida"
--
--#: wicd/translations.py:78
--msgid "Domain"
--msgstr "Dominiu"
--
--#: wicd/misc.py:82
--msgid "Done connecting..."
--msgstr ""
--
--#: curses/wicd-curses.py:1053
--msgid ""
--"ERROR: wicd-curses was denied access to the wicd daemon: please check that "
--"your user is in the \"$A\" group."
--msgstr ""
--"ERRU: wicd-curses denegóse-y l'accesu al degorriu wicd: por favor compreba "
--"que'l to usuariu ta nel grupu \"$A'"
--
--#: curses/wicd-curses.py:461 gtk/gui.py:266
--msgid "ESSID"
--msgstr ""
--
--#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511
--msgid "Enable debug mode"
--msgstr "Activar mou depuración"
--
--#: gtk/wicd-client.py:320 gtk/wicd-client.py:324
--msgid "Establishing connection..."
--msgstr "Coneutándose..."
--
--#: curses/prefs_curses.py:51 data/wicd.ui:1398
--msgid "External Programs"
--msgstr "Programes esternos"
--
--#: wicd/misc.py:84
--msgid "Flushing the routing table..."
--msgstr ""
--
--#: curses/wicd-curses.py:210
--msgid "For more detailed help, consult the wicd-curses(8) man page."
--msgstr ""
--"P'aida más detallada, consulta les maldiciones wicd-curses(8) del manual."
--
--#: curses/netentry_curses.py:52 gtk/netentry.py:77
--msgid "Gateway"
--msgstr "Puerta d'enllaz"
--
--#: curses/prefs_curses.py:50 data/wicd.ui:1018
--msgid "General Settings"
--msgstr "Axustes xenerales"
--
--#: wicd/misc.py:85
--msgid "Generating PSK..."
--msgstr "Xenerando PSK..."
--
--#: wicd/misc.py:86
--msgid "Generating WPA configuration file..."
--msgstr "Xenerando archivu configuración de WPA"
--
--#: gtk/netentry.py:233
--msgid "Global DNS has not been enabled in general preferences."
--msgstr "Les DNS globales nun foron activaes nes preferencies xenerales."
--
--#: curses/prefs_curses.py:72
--msgid "Global DNS servers"
--msgstr "Sirvidores globales DNS"
--
--#: curses/wicd-curses.py:555
--msgid "Help"
--msgstr "Aida"
--
--#: curses/wicd-curses.py:563
--msgid "Hidden"
--msgstr "Anubríu"
--
--#: gtk/gui.py:357
--msgid "Hidden Network ESSID"
--msgstr "Rede ESSID anubría"
--
--#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265
--#: gtk/netentry.py:74
--msgid "IP"
--msgstr "IP"
--
--#: wicd/translations.py:79
--msgid "Identity"
--msgstr "Identidá"
--
--#: gtk/wicd-client.py:500
--msgid "Information about the current connection"
--msgstr "Información tocante la conexón actual"
--
--#: gtk/netentry.py:167
--msgid "Invalid IP address entered."
--msgstr "Puesta direición IP inválida"
--
--#: gtk/gui.py:631 gtk/gui.py:639
--msgid "Invalid address in $A entry."
--msgstr "Direición inválida na entrada $A."
--
--#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80
--msgid "Key"
--msgstr "Clave"
--
--#: curses/netentry_curses.py:51 gtk/netentry.py:76
--msgid "Netmask"
--msgstr "Mázcara de rede"
--
--#: curses/prefs_curses.py:66
--msgid "Network Interfaces"
--msgstr "Interfaces de rede"
--
--#: gtk/netentry.py:818
--msgid "Never connect to this network"
--msgstr "Tanina coneutar pa esta rede"
--
--#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797
--msgid "No wireless networks found."
--msgstr "Nun s'alcontró rede inalámbrica dala."
--
--#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213
--#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338
--msgid "Not connected"
--msgstr "Non coneutáu"
--
--#: curses/configscript_curses.py:73 curses/curses_misc.py:527
--#: curses/netentry_curses.py:66 curses/wicd-curses.py:490
--#: curses/wicd-curses.py:602 curses/wicd-curses.py:606
--msgid "OK"
--msgstr "Val"
--
--#: wicd/misc.py:91
--msgid "Obtaining IP address..."
--msgstr "Obteniendo direición IP"
--
--#: curses/wicd-curses.py:278
--msgid ""
--"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", "
--"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to "
--"change the preconnect, postconnect, predisconnect and postdisconnect scripts "
--"respectively.  Note that you will be specifying the full path to the scripts "
--"- not the actual script contents.  You will need to add/edit the script "
--"contents separately.  Refer to the wicd manual page for more information."
--msgstr ""
--
--#: wicd/translations.py:81
--msgid "Passphrase"
--msgstr "Fras de pasu"
--
--#: wicd/translations.py:82
--msgid "Password"
--msgstr "Conseña"
--
--#: wicd/translations.py:83
--msgid "Path to CA cert"
--msgstr "Parchear pal certificáu CA"
--
--#: wicd/translations.py:85
--msgid "Path to PAC file"
--msgstr "Parchear pal archivu PAC"
--
--#: wicd/translations.py:84
--msgid "Path to client cert"
--msgstr "Parchear pal certificáu de cliente"
--
--#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644
--msgid "Ping static gateways after connecting to verify association"
--msgstr ""
--
--#: curses/configscript_curses.py:57 gtk/configscript.py:129
--msgid "Post-connection Script"
--msgstr ""
--
--#: curses/configscript_curses.py:59 gtk/configscript.py:132
--msgid "Post-disconnection Script"
--msgstr ""
--
--#: curses/configscript_curses.py:56 gtk/configscript.py:128
--msgid "Pre-connection Script"
--msgstr ""
--
--#: curses/configscript_curses.py:58 gtk/configscript.py:130
--msgid "Pre-disconnection Script"
--msgstr ""
--
--#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318
--msgid "Preferences"
--msgstr "Preferencies"
--
--#: curses/wicd-curses.py:219
--msgid "Preferences dialog"
--msgstr "Diálogu preferencies"
--
--#: curses/wicd-curses.py:562
--msgid "Prefs"
--msgstr "Prefs"
--
--#: wicd/translations.py:86
--msgid "Preshared key"
--msgstr "Preshared key"
--
--#: curses/wicd-curses.py:229
--msgid "Press any key to return."
--msgstr "Primi cualaquier tecla pa tornar."
--
--#: wicd/translations.py:87
--msgid "Private key"
--msgstr "Cnoseña acutada"
--
--#: wicd/translations.py:88
--msgid "Private key password"
--msgstr "Llave la conseña acutada"
--
--#: curses/prefs_curses.py:83 gtk/prefs.py:343
--msgid "Prompt for profile on wired autoconnect"
--msgstr ""
--
--#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598
--msgid "Properties"
--msgstr "Propiedaes"
--
--#: wicd/misc.py:87
--msgid "Putting interface down..."
--msgstr ""
--
--#: wicd/misc.py:88
--msgid "Putting interface up..."
--msgstr "Poniendo la interfaz a..."
--
--#: curses/wicd-curses.py:565
--msgid "Quit"
--msgstr "Colar"
--
--#: curses/wicd-curses.py:227
--msgid "Quit wicd-curses"
--msgstr "Colar de wicd-curses"
--
--#: gtk/wicd-client.py:502
--msgid "Quit wicd-tray-icon"
--msgstr "Colar del iconu la bandexa"
--
--#: curses/wicd-curses.py:561
--msgid "Refresh"
--msgstr "Anovar"
--
--#: curses/wicd-curses.py:218
--msgid "Refresh network list"
--msgstr "Anovar llista de rede"
--
--#: curses/wicd-curses.py:441
--msgid "Rename wired profile"
--msgstr "Renomar perfil cableáu"
--
--#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486
--msgid "Required encryption information is missing."
--msgstr "La información d'encriptación requería ta perdía"
--
--#: wicd/misc.py:90
--msgid "Resetting IP address..."
--msgstr "Reaniciando direición IP"
--
--#: curses/wicd-curses.py:558
--msgid "RfKill"
--msgstr "RfKill"
--
--#: curses/prefs_curses.py:103
--msgid "Route Table Flushing"
--msgstr "Tables de ruta Flushing"
--
--#: curses/wicd-curses.py:629
--msgid "Scan"
--msgstr "Desaminar"
--
--#: curses/wicd-curses.py:222
--msgid "Scan for hidden networks"
--msgstr "Desaminar por redes anubríes"
--
--#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810
--msgid "Scanning"
--msgstr "Desaminando"
--
--#: curses/wicd-curses.py:526
--msgid "Scanning networks... stand by..."
--msgstr "Desaminando redes... aparar..."
--
--#: gtk/netentry.py:102
--msgid "Scripts"
--msgstr "Scripts"
--
--#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78
--msgid "Search domain"
--msgstr "Guetar dominiu"
--
--#: gtk/netentry.py:960 gtk/netentry.py:1082
--msgid "Secured"
--msgstr "Seguro"
--
--#: curses/wicd-curses.py:629
--msgid "Select Hidden Network ESSID"
--msgstr "Esbillar rede ESSID anubría"
--
--#: gtk/gui.py:103
--msgid "Select or create a wired profile to connect with"
--msgstr "Esbillar o criar un perfil cableáu con conexón con"
--
--#: curses/wicd-curses.py:223
--msgid "Select scripts"
--msgstr "Esbillar sripts"
--
--#: curses/wicd-curses.py:224
--msgid "Set up Ad-hoc network"
--msgstr ""
--
--#: wicd/misc.py:92
--msgid "Setting broadcast address..."
--msgstr ""
--
--#: wicd/misc.py:93
--msgid "Setting static DNS servers..."
--msgstr ""
--
--#: wicd/misc.py:94
--msgid "Setting static IP addresses..."
--msgstr ""
--
--#: gtk/prefs.py:333 data/wicd.ui:571
--msgid "Show never connect networks"
--msgstr ""
--
--#: gtk/gui.py:104
--msgid "Stop Showing Autoconnect pop-up temporarily"
--msgstr ""
--
--#: curses/wicd-curses.py:217
--msgid "Stop a connection in progress"
--msgstr ""
--
--#: gtk/gui.py:315
--msgid "Switch Off Wi-Fi"
--msgstr ""
--
--#: gtk/gui.py:312
--msgid "Switch On Wi-Fi"
--msgstr ""
--
--#: curses/wicd-curses.py:603
--msgid "Tab Left"
--msgstr ""
--
--#: curses/wicd-curses.py:604
--msgid "Tab Right"
--msgstr ""
--
--#: curses/wicd-curses.py:94
--msgid "Terminated by user"
--msgstr ""
--
--#: gtk/gui.py:85 gtk/wicd-client.py:984
--msgid ""
--"The wicd daemon has shut down. The UI will not function properly until it is "
--"restarted."
--msgstr ""
--
--#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497
--msgid "This network requires encryption to be enabled."
--msgstr ""
--
--#: curses/wicd-curses.py:272
--msgid ""
--"To avoid various complications, wicd-curses does not support directly "
--"editing the scripts. However, you can edit them manually. First, (as root), "
--"open the \"$A\" config file, and look for the section labeled by the $B in "
--"question. In this case, this is:"
--msgstr ""
--
--#: gtk/netentry.py:635
--msgid ""
--"To connect to a wired network, you must create a network profile. To create "
--"a network profile, type a name that describes this network, and press Add."
--msgstr ""
--
--#: gtk/wicd-client.py:94
--msgid ""
--"Unable to contact the Wicd daemon due to an access denied error from DBus. "
--"Please check that your user is in the $A group."
--msgstr ""
--
--#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084
--msgid "Unsecured"
--msgstr ""
--
--#: curses/netentry_curses.py:62
--msgid "Use DHCP Hostname"
--msgstr ""
--
--#: curses/netentry_curses.py:256 gtk/netentry.py:356
--msgid "Use Encryption"
--msgstr ""
--
--#: curses/wicd-curses.py:466 gtk/gui.py:263
--msgid "Use Encryption (WEP only)"
--msgstr ""
--
--#: curses/netentry_curses.py:54 gtk/netentry.py:89
--msgid "Use Static DNS"
--msgstr ""
--
--#: curses/netentry_curses.py:49 gtk/netentry.py:88
--msgid "Use Static IPs"
--msgstr ""
--
--#: curses/netentry_curses.py:190 gtk/netentry.py:636
--msgid "Use as default profile (overwrites any previous default)"
--msgstr ""
--
--#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490
--msgid "Use dBm to measure signal strength"
--msgstr ""
--
--#: curses/prefs_curses.py:82 gtk/prefs.py:341
--msgid "Use default profile on wired autoconnect"
--msgstr ""
--
--#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90
--#: data/wicd.ui:882
--msgid "Use global DNS servers"
--msgstr ""
--
--#: curses/prefs_curses.py:84 gtk/prefs.py:345
--msgid "Use last used profile on wired autoconnect"
--msgstr ""
--
--#: curses/netentry_curses.py:255 gtk/netentry.py:357
--msgid "Use these settings for all networks sharing this essid"
--msgstr ""
--
--#: wicd/translations.py:89
--msgid "Username"
--msgstr ""
--
--#: wicd/misc.py:96
--msgid "Validating authentication..."
--msgstr ""
--
--#: wicd/misc.py:97
--msgid "Verifying access point association..."
--msgstr ""
--
--#: curses/prefs_curses.py:108
--msgid "WPA Supplicant"
--msgstr ""
--
--#: curses/wicd-curses.py:528
--msgid "Wicd Curses Interface"
--msgstr ""
--
--#: gtk/wicd-client.py:226 gtk/wicd-client.py:333
--msgid "Wicd daemon unreachable"
--msgstr ""
--
--#: wicd/misc.py:196
--msgid "Wicd needs to access your computer's network cards."
--msgstr ""
--
--#: gtk/wicd-client.py:628
--msgid ""
--"Wired\n"
--"IP:\n"
--"RX:\n"
--"TX:"
--msgstr ""
--
--#: curses/prefs_curses.py:81
--msgid "Wired Autoconnect Settings"
--msgstr ""
--
--#: curses/prefs_curses.py:67
--msgid "Wired Interface"
--msgstr ""
--
--#: curses/prefs_curses.py:99
--msgid "Wired Link Detection"
--msgstr ""
--
--#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286
--#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309
--msgid "Wired Network"
--msgstr ""
--
--#: curses/wicd-curses.py:533
--msgid "Wired Networks"
--msgstr ""
--
--#: gtk/gui.py:97
--msgid "Wired connection detected"
--msgstr ""
--
--#: gtk/wicd-client.py:633
--msgid ""
--"Wireless\n"
--"SSID:\n"
--"Speed:\n"
--"IP:\n"
--"Strength:\n"
--"RX:\n"
--"TX:"
--msgstr ""
--
--#: curses/prefs_curses.py:68 curses/prefs_curses.py:120
--msgid "Wireless Interface"
--msgstr ""
--
--#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336
--msgid "Wireless Kill Switch Enabled"
--msgstr ""
--
--#: curses/wicd-curses.py:535
--msgid "Wireless Networks"
--msgstr ""
--
--#: curses/wicd-curses.py:277
--msgid ""
--"You can also configure the wireless networks by looking for the "
--"\"[<ESSID>]\" field in the config file."
--msgstr ""
--
--#: gtk/netentry.py:300 gtk/netentry.py:408
--msgid "You must enter your password to configure scripts"
--msgstr ""
--
--#: curses/prefs_curses.py:111
--msgid "You should almost always use wext as the WPA supplicant driver"
--msgstr ""
--
--#: gtk/wicd-client.py:499
--msgid "_Connection Info"
--msgstr ""
--
--#: gtk/wicd-client.py:502 data/wicd.ui:151
--msgid "_Quit"
--msgstr ""
--
--#: curses/wicd-curses.py:428
--msgid ""
--"wicd-curses does not support deleting the last wired profile.  Try renaming "
--"it (\"F2\")"
--msgstr ""
--
--#: curses/wicd-curses.py:206
--msgid "wicd-curses help"
--msgstr ""
--
--#: data/wicd.ui:9
--msgid "Wicd Network Manager"
--msgstr ""
--
--#: data/wicd.ui:46
--msgid "Create an ad-hoc network"
--msgstr ""
--
--#: data/wicd.ui:55
--msgid "Find a hidden network"
--msgstr ""
--
--#: data/wicd.ui:57
--msgid "Enter a hidden network to try to locate."
--msgstr ""
--
--#: data/wicd.ui:79
--msgid "_Switch Off Wi-Fi"
--msgstr ""
--
--#: data/wicd.ui:94
--msgid "_Disconnect All"
--msgstr ""
--
--#: data/wicd.ui:108
--msgid "_Refresh"
--msgstr ""
--
--#: data/wicd.ui:122
--msgid "_Preferences"
--msgstr ""
--
--#: data/wicd.ui:136
--msgid "_About"
--msgstr ""
--
--#: data/wicd.ui:213 data/wicd.ui:215
--msgid "Connecting..."
--msgstr ""
--
--#: data/wicd.ui:228
--msgid "Cancel the current connection attempt"
--msgstr ""
--
--#: data/wicd.ui:260
--msgid "Configure Scripts"
--msgstr ""
--
--#: data/wicd.ui:279
--msgid "Configure scripts to run for this network:"
--msgstr ""
--
--#: data/wicd.ui:296
--msgid "Pre-connection Script:"
--msgstr ""
--
--#: data/wicd.ui:329
--msgid "Post-connection Script:"
--msgstr ""
--
--#: data/wicd.ui:362
--msgid "Pre-disconnection Script:"
--msgstr ""
--
--#: data/wicd.ui:395
--msgid "Post-disconnection Script:"
--msgstr ""
--
--#: data/wicd.ui:514
--msgid "Always switch to a wired connection when available"
--msgstr ""
--
--#: data/wicd.ui:519
--msgid ""
--"If selected, wicd will automatically connect to a wired network\n"
--"as soon as a cable is plugged in, even if a wireless connection \n"
--"is already active."
--msgstr ""
--
--#: data/wicd.ui:542
--msgid "DNS domain:"
--msgstr ""
--
--#: data/wicd.ui:590
--msgid "<b>Never Connect</b>"
--msgstr ""
--
--#: data/wicd.ui:606
--msgid "Automatically reconnect on network connection loss"
--msgstr ""
--
--#: data/wicd.ui:625
--msgid "<b>Automatic Reconnection</b>"
--msgstr ""
--
--#: data/wicd.ui:641
--msgid "Use last wired network profile"
--msgstr ""
--
--#: data/wicd.ui:663
--msgid "Prompt for wired network profile"
--msgstr ""
--
--#: data/wicd.ui:686
--msgid "Use default wired network profile"
--msgstr ""
--
--#: data/wicd.ui:707
--msgid "<b>Wired automatic connection</b>"
--msgstr ""
--
--#: data/wicd.ui:725
--msgid "Wired interface:"
--msgstr ""
--
--#: data/wicd.ui:743
--msgid "Wireless interface:"
--msgstr ""
--
--#: data/wicd.ui:783
--msgid "<b>Network Interfaces</b>"
--msgstr ""
--
--#: data/wicd.ui:799
--msgid "DNS server 3:"
--msgstr ""
--
--#: data/wicd.ui:830
--msgid "DNS server 2:"
--msgstr ""
--
--#: data/wicd.ui:848
--msgid "DNS server 1:"
--msgstr ""
--
--#: data/wicd.ui:866
--msgid "Search domain:"
--msgstr ""
--
--#: data/wicd.ui:901
--msgid "<b>Global DNS Servers</b>"
--msgstr ""
--
--#: data/wicd.ui:960
--msgid ""
--"If enabled, the wired network interface will always be displayed in the main "
--"window. This can be useful if your wired network card does not detect when "
--"the interface is connected to a cable."
--msgstr ""
--
--#: data/wicd.ui:976
--msgid "<b>Notifications</b>"
--msgstr ""
--
--#: data/wicd.ui:1050
--msgid "<b>Route Table Flushing</b>"
--msgstr ""
--
--#: data/wicd.ui:1063
--msgid "<b>Wired Link Detection</b>"
--msgstr ""
--
--#: data/wicd.ui:1289
--msgid "<b>DHCP Client</b>"
--msgstr ""
--
--#: data/wicd.ui:1300
--msgid "<b>Graphical Sudo Application</b>"
--msgstr ""
--
--#: data/wicd.ui:1421
--msgid ""
--"Hover your mouse over the selected backend \n"
--"to read its description."
--msgstr ""
--
--#: data/wicd.ui:1474
--msgid "Driver:"
--msgstr ""
--
--#: data/wicd.ui:1530
--msgid "<b>Wireless Interface</b>"
--msgstr ""
--
--#: data/wicd.ui:1544
--msgid "<b>WPA Supplicant</b>"
--msgstr ""
--
--#: data/wicd.ui:1556
--msgid "<b>Debugging</b>"
--msgstr ""
--
--#: data/wicd.ui:1574
--msgid "Backend:"
--msgstr ""
--
--#: data/wicd.ui:1601
--msgid "<b>Backend</b>"
--msgstr ""
--
--#: data/wicd.ui:1615
--msgid ""
--"You should almost always use wext as the\n"
--"WPA supplicant driver."
--msgstr ""
-
diff --git a/pkgs/tools/networking/wicd/no-trans.patch b/pkgs/tools/networking/wicd/no-trans.patch
deleted file mode 100644
index a4c5018e181..00000000000
--- a/pkgs/tools/networking/wicd/no-trans.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- wicd-1.7.2.4/setup.py     2013-03-14 21:28:21.360580941 +0100
-+++ wicd-1.7.2.4/setup.py  2013-03-14 21:22:50.125721943 +0100
-@@ -599,12 +599,6 @@
-     if not wpath.no_install_pmutils:
-         data.append((wpath.pmutils, ['other/55wicd']))
-     print 'Using pid path', os.path.basename(wpath.pidfile)
--    print 'Language support for',
--    for pofile in glob('po/*.po'):
--        language = pofile.replace('po/', '').replace('.po', '')
--        print language,
--        data.append((wpath.translations + language + '/LC_MESSAGES/',
--                    ['translations/' + language + '/LC_MESSAGES/wicd.mo']))
-     print
- except Exception, e:
-     print str(e)

From 8b3b208f3380a1c7c5524d2f170dd2714832588a Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Tue, 9 Apr 2013 09:26:31 +0400
Subject: [PATCH 6/6] wicd: rename icons/hicolour to icons/hicolor

---
 pkgs/tools/networking/wicd/default.nix        | 2 +-
 pkgs/tools/networking/wicd/fix-app-icon.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index ff3df9efb74..0297ab29591 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     --systemd=$out/lib/systemd/ \
     --logrotate=$out/etc/logrotate.d/ \
     --desktop=$out/share/applications/ \
-    --icons=$out/share/icons/hicolour/ \
+    --icons=$out/share/icons/hicolor/ \
     --translations=$out/share/locale/ \
     --autostart=$out/etc/xdg/autostart/ \
     --varlib=$out/var/lib/ \
diff --git a/pkgs/tools/networking/wicd/fix-app-icon.patch b/pkgs/tools/networking/wicd/fix-app-icon.patch
index 154d7da3510..31b47bb4588 100644
--- a/pkgs/tools/networking/wicd/fix-app-icon.patch
+++ b/pkgs/tools/networking/wicd/fix-app-icon.patch
@@ -10,9 +10,9 @@ diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py
 -        if os.path.exists(os.path.join(wpath.images, "wicd.png")):
 -            self.window.set_icon_from_file(os.path.join(wpath.images, "wicd.png"))
 +        if os.path.exists(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")):
-+            self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png"))
++            self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png"))
 +        else:
-+            print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")
++            print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png")
          self.statusID = None
          self.first_dialog_load = True
          self.is_visible = True