diff -u network-manager-applet-0.6.6/debian/patches/series network-manager-applet-0.6.6/debian/patches/series
--- network-manager-applet-0.6.6/debian/patches/series
+++ network-manager-applet-0.6.6/debian/patches/series
@@ -7,4 +7,5 @@
 13_custom-network-admin.diff
 14_lp123808_dont_start_applet_on_ltsp_client.patch
+16_fix_nm_editor_i18n.patch
 
 fix_assertion_because_of_unmanaged_interfaces.patch
diff -u network-manager-applet-0.6.6/debian/changelog network-manager-applet-0.6.6/debian/changelog
--- network-manager-applet-0.6.6/debian/changelog
+++ network-manager-applet-0.6.6/debian/changelog
@@ -1,3 +1,9 @@
+network-manager-applet (0.6.6-0ubuntu3) hardy; urgency=low
+
+  * Add: 16_fix_nm_editor_i18n.patch (LP: #204155)
+
+ -- Timo Jyrinki <timo.jyrinki@iki.fi>  Fri, 04 Apr 2008 17:26:03 +0300
+
 network-manager-applet (0.6.6-0ubuntu2) hardy; urgency=low
 
   * Drop nm-editor.desktop from the package; this tool is always accessible
only in patch2:
unchanged:
--- network-manager-applet-0.6.6.orig/debian/patches/16_fix_nm_editor_i18n.patch
+++ network-manager-applet-0.6.6/debian/patches/16_fix_nm_editor_i18n.patch
@@ -0,0 +1,36 @@
+diff -urN network-manager-applet-0.6.6.orig/editor/editor-app.c network-manager-applet-0.6.6/editor/editor-app.c
+--- network-manager-applet-0.6.6.orig/editor/editor-app.c	2008-02-28 22:08:37.000000000 +0200
++++ network-manager-applet-0.6.6/editor/editor-app.c	2008-04-04 17:24:12.000000000 +0300
+@@ -1109,6 +1109,10 @@
+ 	gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
+ 					GNOME_PARAM_NONE, GNOME_PARAM_NONE);
+ 
++  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
++  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++  textdomain (GETTEXT_PACKAGE);
++
+ 	we_data = get_editor ();
+ 	if (we_data) {
+ 		gtk_widget_show_all (we_data->window);
+diff -urN network-manager-applet-0.6.6.orig/editor/Makefile.am network-manager-applet-0.6.6/editor/Makefile.am
+--- network-manager-applet-0.6.6.orig/editor/Makefile.am	2008-02-20 00:13:14.000000000 +0200
++++ network-manager-applet-0.6.6/editor/Makefile.am	2008-04-04 17:22:21.000000000 +0300
+@@ -28,6 +28,7 @@
+ 	-DGNOME_DISABLE_DEPRECATED							\
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"					\
+ 	-DVERSION=\"$(VERSION)\"								\
++	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+ 	$(NULL)
+ 
+ nm_editor_SOURCES =			\
+diff -urN network-manager-applet-0.6.6.orig/editor/Makefile.in network-manager-applet-0.6.6/editor/Makefile.in
+--- network-manager-applet-0.6.6.orig/editor/Makefile.in	2008-03-07 12:22:25.000000000 +0200
++++ network-manager-applet-0.6.6/editor/Makefile.in	2008-04-04 17:22:12.000000000 +0300
+@@ -297,6 +297,7 @@
+ 	-DGNOME_DISABLE_DEPRECATED							\
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"					\
+ 	-DVERSION=\"$(VERSION)\"								\
++	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+ 	$(NULL)
+ 
+ nm_editor_SOURCES = \