Bug#448624: nicotine: "Abort & Delete" button mislabeled (LP bug: #137279)

[Andrea Colangelo]

Package: nicotine
Version: 1.2.8+dfsg-1
Severity: minor
Tags: patch, origin-ubuntu, ubuntu-patch, hardy

The "Abort & Delete" button in the "Downloads" tab in Nicotine should be
labeled "Abort and Remove File(s)", like the context menu item for the
same function.
This bug has been first reported in Launchpad as bug #137279.
(https://bugs.edge.launchpad.net/ubuntu/+source/nicotine/+bug/137279).
I have provided a patch that fixes this bug. The debdiff has been built,
installed and tested and is attached to this bug report.


diff -u nicotine-1.2.8+dfsg/debian/control nicotine-1.2.8+dfsg/debian/control
--- nicotine-1.2.8+dfsg/debian/control
+++ nicotine-1.2.8+dfsg/debian/control
@@ -1,7 +1,8 @@
 Source: nicotine
 Section: net
 Priority: optional
-Maintainer: Josselin Mouette <[EMAIL PROTECTED]>
+XSBC-Original-Maintainer: Josselin Mouette <[EMAIL PROTECTED]>
+Maintainer: Ubuntu MOTU Developers <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5), gettext, python-support (>= 0.4)
 Standards-Version: 3.7.2
 
diff -u nicotine-1.2.8+dfsg/debian/changelog 
nicotine-1.2.8+dfsg/debian/changelog
--- nicotine-1.2.8+dfsg/debian/changelog
+++ nicotine-1.2.8+dfsg/debian/changelog
@@ -1,3 +1,10 @@
+nicotine (1.2.8+dfsg-1ubuntu1) hardy; urgency=low
+
+  * Fixed "Abort & Delete" button mislabeled (LP: #137279)
+  * Changed Mantainer to Ubuntu MOTU Developers <[EMAIL PROTECTED]>
+
+ -- Andrea Colangelo <[EMAIL PROTECTED]>  Sun, 28 Oct 2007 22:26:08 +0100
+
 nicotine (1.2.8+dfsg-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- nicotine-1.2.8+dfsg.orig/pynicotine/gtkgui/nicotine_glade.py
+++ nicotine-1.2.8+dfsg/pynicotine/gtkgui/nicotine_glade.py
@@ -583,7 +583,7 @@
         self.image9.show()
         self.hbox29.pack_start(self.image9, False, False, 0)
 
-        self.label38 = gtk.Label(_("Abort & Delete"))
+        self.label38 = gtk.Label(_("Abort & Remove File(s)"))
         self.label38.show()
         self.hbox29.pack_start(self.label38, False, False, 0)
 
only in patch2:
unchanged:
--- nicotine-1.2.8+dfsg.orig/pynicotine/gtkgui/nicotine.glade
+++ nicotine-1.2.8+dfsg/pynicotine/gtkgui/nicotine.glade
@@ -991,7 +991,7 @@
                                     <child>
                                       <widget class="GtkLabel" id="label38">
                                         <property 
name="visible">True</property>
-                                        <property name="label" 
translatable="yes">Abort &amp; Delete</property>
+                                        <property name="label" 
translatable="yes">Abort &amp; Remove File(s)</property>
                                         <property 
name="use_underline">True</property>
                                       </widget>
                                       <packing>