From 0cd1ebb0092259016644d5add92869a682913cbb Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Wed, 27 Jun 2007 22:59:45 +0000
Subject: [PATCH] Fixes for translations. #383, #384 rpmfarm@free.fr Did not
 include the fr.po patch because I believe it is out-of-date.

---
 glade/aboutdialog.glade   |  1 +
 glade/delugegtk.glade     | 16 ++++++++--------
 glade/dgtkpopups.glade    |  4 ++--
 glade/plugin_dialog.glade |  4 ++--
 po/POTFILES.in            |  3 +++
 src/common.py             |  7 +++----
 src/dialogs.py            |  1 +
 7 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/glade/aboutdialog.glade b/glade/aboutdialog.glade
index 21c46bd89..c8799dc0d 100644
--- a/glade/aboutdialog.glade
+++ b/glade/aboutdialog.glade
@@ -10,6 +10,7 @@
     <property name="has_separator">False</property>
     <property name="website"></property>
     <property name="authors"></property>
+    <property name="translator-credits"></property>
     <property name="documenters"></property>
     <property name="artists"></property>
     <child internal-child="vbox">
diff --git a/glade/delugegtk.glade b/glade/delugegtk.glade
index 0cfd578e4..e28ae076e 100644
--- a/glade/delugegtk.glade
+++ b/glade/delugegtk.glade
@@ -1005,7 +1005,7 @@
               <widget class="GtkToolButton" id="toolbutton_add">
                 <property name="visible">True</property>
                 <property name="tooltip" translatable="yes">Add Torrent</property>
-                <property name="label">Add Torrent</property>
+                <property name="label" translatable="yes">Add Torrent</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-add</property>
                 <signal name="clicked" handler="add_torrent"/>
@@ -1019,7 +1019,7 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="tooltip" translatable="yes">Remove Torrent</property>
-                <property name="label">Remove Torrent</property>
+                <property name="label" translatable="yes">Remove Torrent</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-remove</property>
                 <signal name="clicked" handler="remove_torrent"/>
@@ -1032,7 +1032,7 @@
               <widget class="GtkToolButton" id="toolbutton3">
                 <property name="visible">True</property>
                 <property name="tooltip" translatable="yes">Clear Finished Torrents</property>
-                <property name="label">Clear Finished</property>
+                <property name="label" translatable="yes">Clear Finished</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-clear</property>
                 <signal name="clicked" handler="clear_finished"/>
@@ -1055,7 +1055,7 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="tooltip" translatable="yes">Start / Pause</property>
-                <property name="label">Start</property>
+                <property name="label" translatable="yes">Start</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-media-play</property>
                 <signal name="clicked" handler="start_pause"/>
@@ -1069,7 +1069,7 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="tooltip" translatable="yes">Queue Torrent Up</property>
-                <property name="label">Move Up</property>
+                <property name="label" translatable="yes">Move Up</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-go-up</property>
                 <signal name="clicked" handler="queue_up"/>
@@ -1083,7 +1083,7 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="tooltip" translatable="yes">Queue Torrent Down</property>
-                <property name="label">Move Down</property>
+                <property name="label" translatable="yes">Move Down</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-go-down</property>
                 <signal name="clicked" handler="queue_down"/>
@@ -1105,7 +1105,7 @@
               <widget class="GtkToolButton" id="toolbutton1">
                 <property name="visible">True</property>
                 <property name="tooltip" translatable="yes">Preferences</property>
-                <property name="label">Preferences</property>
+                <property name="label" translatable="yes">Preferences</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-preferences</property>
                 <signal name="clicked" handler="pref_clicked"/>
@@ -1118,7 +1118,7 @@
               <widget class="GtkToolButton" id="toolbutton2">
                 <property name="visible">True</property>
                 <property name="tooltip" translatable="yes">Plugins</property>
-                <property name="label">Plugins</property>
+                <property name="label" translatable="yes">Plugins</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-disconnect</property>
                 <signal name="clicked" handler="plugins_clicked"/>
diff --git a/glade/dgtkpopups.glade b/glade/dgtkpopups.glade
index 642cddddb..c9a6584e8 100644
--- a/glade/dgtkpopups.glade
+++ b/glade/dgtkpopups.glade
@@ -272,7 +272,7 @@
     <child>
       <widget class="GtkImageMenuItem" id="menuitem12">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">gtk-preferences</property>
+        <property name="label">gtk-preferences</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="preferences"/>
@@ -302,7 +302,7 @@
     <child>
       <widget class="GtkImageMenuItem" id="menuitem14">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">gtk-quit</property>
+        <property name="label">gtk-quit</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="quit"/>
diff --git a/glade/plugin_dialog.glade b/glade/plugin_dialog.glade
index d9d680e30..68fa97357 100644
--- a/glade/plugin_dialog.glade
+++ b/glade/plugin_dialog.glade
@@ -52,7 +52,7 @@
                           <widget class="GtkButton" id="plugin_conf">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
-                            <property name="label" translatable="yes">gtk-preferences</property>
+                            <property name="label">gtk-preferences</property>
                             <property name="use_stock">True</property>
                             <signal name="clicked" handler="plugin_pref"/>
                           </widget>
@@ -98,7 +98,7 @@
             <child>
               <widget class="GtkButton" id="button10">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
               </widget>
             </child>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d2c9f30e..5b1eaddd2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,10 @@
 glade/delugegtk.glade
 glade/dgtkpopups.glade
+glade/file_tab_menu.glade
+glade/plugin_dialog.glade
 glade/preferences_dialog.glade
 glade/torrent_menu.glade
+glade/tray_menu.glade
 src/common.py
 src/core.py
 src/interface.py
diff --git a/src/common.py b/src/common.py
index 0bf246727..399cfaf0d 100644
--- a/src/common.py
+++ b/src/common.py
@@ -64,12 +64,12 @@ def get_eta(size, done, rate):
 def fsize(fsize_b):
 	fsize_kb = float (fsize_b / 1024.0)
 	if fsize_kb < 1000:
-		return '%.1f KiB'%fsize_kb
+		return _("%.1f KiB")%fsize_kb
 	fsize_mb = float (fsize_kb / 1024.0)
 	if fsize_mb < 1000:
-		return '%.1f MiB'%fsize_mb
+		return _("%.1f MiB")%fsize_mb
 	fsize_gb = float (fsize_mb / 1024.0)
-	return '%.1f GiB'%fsize_gb
+	return _("%.1f GiB")%fsize_gb
 
 # Returns a formatted string representing a percentage
 def fpcnt(dec):
@@ -114,7 +114,6 @@ def get_pixmap(fname):
 	return os.path.join(PIXMAP_DIR, fname)
 	
 def open_url_in_browser(dialog, link):
-	print "link: ", link
 	try:
 		webbrowser.open(link)
 	except webbrowser.Error:
diff --git a/src/dialogs.py b/src/dialogs.py
index c9422ff28..b7209ccf3 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -226,6 +226,7 @@ def show_about_dialog(parent=None):
 		abt.set_version(common.PROGRAM_VERSION)
 		abt.set_authors(["Zach Tibbitts", "Alon Zakai", "Marcos Pinto", "Andrew Resch"])
 		abt.set_artists(["Andrew Wedderburn"])
+		abt.set_translator_credits(_("translator-credits"))
 		abt.set_website("http://deluge-torrent.org")
 		abt.set_website_label("http://deluge-torrent.org")
 		abt.set_icon_from_file(common.get_pixmap("deluge32.png"))