From 34c95a08a3e23a597f7268786768097223d7a54a Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Fri, 3 Jun 2011 19:01:20 +0100
Subject: [PATCH] Fix translations texts in glade and python files

---
 .../deluge/plugins/autoadd/data/autoadd_options.glade     | 8 ++++----
 .../Label/deluge/plugins/label/data/label_options.glade   | 5 +----
 deluge/ui/gtkui/createtorrentdialog.py                    | 2 +-
 deluge/ui/gtkui/glade/dgtkpopups.glade                    | 2 +-
 deluge/ui/gtkui/glade/preferences_dialog.glade            | 4 ++--
 deluge/ui/gtkui/menubar.py                                | 2 +-
 deluge/ui/gtkui/systemtray.py                             | 6 +++---
 7 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade
index ea7167e9d..adde185ed 100644
--- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade
+++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade
@@ -1096,7 +1096,7 @@ also delete the .torrent file used to add it.</property>
                                     <property name="homogeneous">True</property>
                                     <child>
                                       <widget class="GtkRadioButton" id="auto_managed">
-                                        <property name="label" translatable="yes">Yes</property>
+                                        <property name="label" translatable="no">gtk-yes</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -1112,7 +1112,7 @@ also delete the .torrent file used to add it.</property>
                                     </child>
                                     <child>
                                       <widget class="GtkRadioButton" id="isnt_auto_managed">
-                                        <property name="label" translatable="yes">No</property>
+                                        <property name="label" translatable="no">gtk-no</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -1173,7 +1173,7 @@ also delete the .torrent file used to add it.</property>
                                     <property name="homogeneous">True</property>
                                     <child>
                                       <widget class="GtkRadioButton" id="add_paused">
-                                        <property name="label" translatable="yes">Yes</property>
+                                        <property name="label" translatable="no">gtk-yes</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -1189,7 +1189,7 @@ also delete the .torrent file used to add it.</property>
                                     </child>
                                     <child>
                                       <widget class="GtkRadioButton" id="isnt_add_paused">
-                                        <property name="label" translatable="yes">No</property>
+                                        <property name="label" translatable="no">gtk-no</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
diff --git a/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade b/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade
index 0316d2205..db13b57cb 100644
--- a/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade
+++ b/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade
@@ -549,10 +549,7 @@
                               <widget class="GtkTextView" id="auto_add_trackers">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="text" translatable="yes">tracker1.org
-tracker2.com
-this doesn't do anything yet..
-</property>
+                                <property name="text" translatable="no">tracker1.org</property>
                               </widget>
                             </child>
                           </widget>
diff --git a/deluge/ui/gtkui/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py
index 6c13f4534..ce74f6db8 100644
--- a/deluge/ui/gtkui/createtorrentdialog.py
+++ b/deluge/ui/gtkui/createtorrentdialog.py
@@ -371,7 +371,7 @@ class CreateTorrentDialog:
     def _on_create_torrent_progress(self, value, num_pieces):
         percent = float(value)/float(num_pieces)
         pbar = self.glade.get_widget("progressbar")
-        pbar.set_text(_("%.2f%%") % (percent*100))
+        pbar.set_text("%.2f%%" % (percent*100))
         if percent >= 0 and percent <= 1.0:
             pbar.set_fraction(percent)
 
diff --git a/deluge/ui/gtkui/glade/dgtkpopups.glade b/deluge/ui/gtkui/glade/dgtkpopups.glade
index 78e4a48ff..68f2c4b0a 100644
--- a/deluge/ui/gtkui/glade/dgtkpopups.glade
+++ b/deluge/ui/gtkui/glade/dgtkpopups.glade
@@ -34,7 +34,7 @@
               <widget class="GtkLabel" id="label_header">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">label</property>
+                <property name="label" translatable="no">label</property>
                 <property name="use_markup">True</property>
               </widget>
               <packing>
diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade
index 8aec4c9e6..e3f645903 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.glade
+++ b/deluge/ui/gtkui/glade/preferences_dialog.glade
@@ -741,7 +741,7 @@ used sparingly.</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">0000</property>
+                                                    <property name="label" translatable="no">0000</property>
                                                     <property name="width_chars">5</property>
                                                   </widget>
                                                   <packing>
@@ -1146,7 +1146,7 @@ used sparingly.</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="width_chars">4</property>
-                                                <property name="text" translatable="yes">0x00</property>
+                                                <property name="text">0x00</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
                                                 <property name="primary_icon_sensitive">True</property>
diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py
index a29350597..d0a844b3c 100644
--- a/deluge/ui/gtkui/menubar.py
+++ b/deluge/ui/gtkui/menubar.py
@@ -81,7 +81,7 @@ class MenuBar(component.Component):
             item.set_name(menuitem)
             item.connect("activate", self.on_menuitem_set_unlimited)
             submenu.append(item)
-            item = gtk.MenuItem(_("Other.."))
+            item = gtk.MenuItem(_("Other..."))
             item.set_name(menuitem)
             item.connect("activate", self.on_menuitem_set_other)
             submenu.append(item)
diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py
index 542a56db1..b12feb2c5 100644
--- a/deluge/ui/gtkui/systemtray.py
+++ b/deluge/ui/gtkui/systemtray.py
@@ -200,7 +200,7 @@ class SystemTray(component.Component):
             except Exception, e:
                 log.debug("Unable to hide system tray menu widgets: %s", e)
 
-            self.tray.set_tooltip(_("Deluge\nNot Connected.."))
+            self.tray.set_tooltip(_("Deluge") + "\n" + _("Not Connected..."))
 
     def shutdown(self):
         if self.config["enable_system_tray"]:
@@ -469,13 +469,13 @@ class SystemTray(component.Component):
         vbox = gtk.VBox(spacing=5)
         hbox.pack_start(vbox, False)
 
-        label = gtk.Label(_("<b><big>Deluge is password protected!</big></b>"))
+        label = gtk.Label("<b><big>%s</big></b>" % _("Deluge is password protected!"))
         label.set_use_markup(True)
         label.set_alignment(0.0, 0.5)
         label.set_line_wrap(True)
         vbox.pack_start(label, False)
 
-        tlabel = gtk.Label(_("<i>Enter your password to continue</i>"))
+        tlabel = gtk.Label("<i>%s</i>" % _("Enter your password to continue"))
         tlabel.set_use_markup(True)
         tlabel.set_alignment(0.0, 0.5)
         tlabel.set_line_wrap(True)