plugin name translations

17 files changed, 292 insertions, 186 deletions

diff --git a/plugins/BlocklistImport/__init__.py b/plugins/BlocklistImport/__init__.py
index a9c4d97bc..1e32c87f6 100644
--- a/plugins/BlocklistImport/__init__.py
+++ b/plugins/BlocklistImport/__init__.py
@@ -3,7 +3,7 @@
 # Distributed under the same terms as Deluge
 ##
 
-plugin_name = _("Blocklist Importer")
+plugin_name = "Blocklist Importer"
 plugin_author = "Steve 'Tarka' Smith"
 plugin_version = "0.4"
 plugin_description = _("""
diff --git a/plugins/DesiredRatio/__init__.py b/plugins/DesiredRatio/__init__.py
index 9490a38b0..9c168be22 100644
--- a/plugins/DesiredRatio/__init__.py
+++ b/plugins/DesiredRatio/__init__.py
@@ -16,7 +16,7 @@
 
 ### Initialization ###
 
-plugin_name = _("Desired Ratio")
+plugin_name = "Desired Ratio"
 plugin_author = "Andrew Resch"
 plugin_version = "0.1"
 plugin_description = _("Set the desired ratio for a torrent.")
diff --git a/plugins/EventLogging/__init__.py b/plugins/EventLogging/__init__.py
index ea97b7faf..0c63da9f2 100644
--- a/plugins/EventLogging/__init__.py
+++ b/plugins/EventLogging/__init__.py
@@ -16,7 +16,7 @@
 
 ### Initialization ###
 
-plugin_name = _("Event Logging")
+plugin_name = "Event Logging"
 plugin_author = "Micah Bucy"
 plugin_version = "0.2"
 plugin_description = _("""
diff --git a/plugins/ExtraStats/__init__.py b/plugins/ExtraStats/__init__.py
index 8e3a19488..8aa0478dc 100644
--- a/plugins/ExtraStats/__init__.py
+++ b/plugins/ExtraStats/__init__.py
@@ -16,7 +16,7 @@
 
 ### Initialization ###
 
-plugin_name = _("Extra Stats")
+plugin_name = "Extra Stats"
 plugin_author = "Micah Bucy"
 plugin_version = "0.1"
 plugin_description = _("""
diff --git a/plugins/MoveTorrent/__init__.py b/plugins/MoveTorrent/__init__.py
index 701a06840..4a48e920d 100644
--- a/plugins/MoveTorrent/__init__.py
+++ b/plugins/MoveTorrent/__init__.py
@@ -16,7 +16,7 @@
 
 ### Initialization ###
 
-plugin_name = _("Move Torrent")
+plugin_name = "Move Torrent"
 plugin_author = "Marcos Pinto"
 plugin_version = "0.2"
 plugin_description = _("This plugin allows users to move the torrent to a \
diff --git a/plugins/NetworkGraph/__init__.py b/plugins/NetworkGraph/__init__.py
index ff3a16682..24d933327 100644
--- a/plugins/NetworkGraph/__init__.py
+++ b/plugins/NetworkGraph/__init__.py
@@ -30,9 +30,9 @@
 #  this exception statement from your version. If you delete this exception
 #  statement from all source files in the program, then also delete it here.
 
-plugin_name = _("Network Activity Graph")
-plugin_author = "Alon Zakai, Zach Tibbitts"
-plugin_version = "0.2"
+plugin_name = "Network Activity Graph"
+plugin_author = "Alon Zakai, Zach Tibbitts, Cinar Sahin"
+plugin_version = "0.2.1"
 plugin_description = _("Network Activity Graph plugin\n\nWritten by Kripkenstein")
 
 
@@ -134,6 +134,11 @@ class NetworkGraph:
             else:
                 self.glade.get_widget("Line_Scale").get_adjustment().set_value(2);
 
+            if (self.config.get("length") > 59) & (self.config.get("length") < 3601):
+		self.glade.get_widget("History_Scale").get_adjustment().set_value(self.config.get("length"))
+	    else:
+		self.glade_get_widget("History_Scale").get_adjustment().set_value(60);
+
             if self.config.get("colors_set"):
                 dl_color = self.config.get("down_line_color")
                 df_color = self.config.get("down_fill_color")
@@ -177,6 +182,7 @@ class NetworkGraph:
             self.glade.get_widget("Upload_Fill").set_color(gtk.gdk.Color(21627,21627,65535))
             self.glade.get_widget("Upload_Fill").set_alpha(32768)
             self.glade.get_widget("Line_Scale").get_adjustment().set_value(4);
+	    self.glade.get_widget("History_Scale").get_adjustment().set_value(60);
             self.glade.get_widget("Mean_Speed_Check").set_active(True)
             self.glade.get_widget("Max_Speed_Check").set_active(False)
             self.glade.get_widget("Legend_Check").set_active(True)
@@ -244,6 +250,11 @@ class NetworkGraph:
             else:
                 self.tab_graph.line_size = 4
 
+            if (self.config.get("length") > 59) & (self.config.get("length") < 3601):
+                self.tab_graph.length = self.config.get("length")
+            else:
+                self.tab_graph.length = 60
+
             if self.config.get("mean_selected"):
                 self.tab_graph.enable_mean()
             else:
@@ -270,6 +281,7 @@ class NetworkGraph:
             self.tab_graph.enable_mean()
             self.tab_graph.enable_legend()
             self.tab_graph.line_size = 4
+	    self.tab_graph.length = 60
 
     def reset_download(self,src):
         self.glade.get_widget("Download_Line_Check").set_active(True)
@@ -316,6 +328,7 @@ class NetworkGraph:
 
         self.config.set("colors_set",True)
         self.config.set("line_size",self.glade.get_widget("Line_Scale").get_adjustment().get_value())
+	self.config.set("length",self.glade.get_widget("History_Scale").get_adjustment().get_value())
         self.config.set("mean_selected",self.glade.get_widget("Mean_Speed_Check").get_active())
         self.config.set("max_selected",self.glade.get_widget("Max_Speed_Check").get_active())
         self.config.set("legend_selected",self.glade.get_widget("Legend_Check").get_active())
diff --git a/plugins/NetworkGraph/graph_preferences.glade b/plugins/NetworkGraph/graph_preferences.glade
index 7048ad64c..5032fe8f7 100644
--- a/plugins/NetworkGraph/graph_preferences.glade
+++ b/plugins/NetworkGraph/graph_preferences.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.2.0 on Thu Aug  9 02:38:25 2007 by root@chris-laptop-->
+<!--Generated with glade3 3.4.0 on Tue Nov 20 13:54:57 2007 -->
 <glade-interface>
   <widget class="GtkDialog" id="dialog">
     <property name="border_width">5</property>
@@ -16,7 +16,7 @@
           <widget class="GtkTable" id="table">
             <property name="visible">True</property>
             <property name="events"></property>
-            <property name="n_rows">9</property>
+            <property name="n_rows">10</property>
             <property name="n_columns">7</property>
             <property name="column_spacing">4</property>
             <child>
@@ -24,58 +24,27 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Show Legend</property>
+                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
               </widget>
               <packing>
                 <property name="right_attach">7</property>
-                <property name="top_attach">8</property>
-                <property name="bottom_attach">9</property>
+                <property name="top_attach">9</property>
+                <property name="bottom_attach">10</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHSeparator" id="hseparator5">
-                <property name="width_request">20</property>
-                <property name="visible">True</property>
-                <property name="events"></property>
-              </widget>
-              <packing>
-                <property name="left_attach">5</property>
-                <property name="right_attach">6</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-                <property name="x_padding">10</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkHSeparator" id="hseparator4">
-                <property name="width_request">20</property>
-                <property name="visible">True</property>
-                <property name="events"></property>
-              </widget>
-              <packing>
-                <property name="left_attach">5</property>
-                <property name="right_attach">6</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-                <property name="x_padding">10</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="Reset_Download">
+              <widget class="GtkButton" id="Reset_Upload">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="tooltip" translatable="yes">Reset colors to their defaults</property>
-                <property name="xalign">1</property>
-                <signal name="released" handler="on_Reset_Download_released"/>
+                <property name="response_id">0</property>
+                <signal name="released" handler="on_Reset_Upload_released"/>
                 <child>
-                  <widget class="GtkImage" id="image1">
+                  <widget class="GtkImage" id="image3">
                     <property name="visible">True</property>
                     <property name="stock">gtk-clear</property>
                   </widget>
@@ -84,133 +53,138 @@
               <packing>
                 <property name="left_attach">6</property>
                 <property name="right_attach">7</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options"></property>
                 <property name="y_options"></property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHSeparator" id="hseparator3">
-                <property name="width_request">20</property>
+              <widget class="GtkCheckButton" id="Max_Speed_Check">
                 <property name="visible">True</property>
-                <property name="events"></property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Show Max Speed</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
               </widget>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="right_attach">7</property>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
-                <property name="x_padding">10</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHSeparator" id="hseparator1">
-                <property name="width_request">20</property>
+              <widget class="GtkLabel" id="Download_Label">
                 <property name="visible">True</property>
-                <property name="events"></property>
+                <property name="xalign">0</property>
+                <property name="yalign">1</property>
+                <property name="label" translatable="yes">&lt;b&gt;Download&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="right_attach">7</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
-                <property name="x_padding">10</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label1">
+              <widget class="GtkCheckButton" id="Download_Line_Check">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Line Size</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Line</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
               </widget>
               <packing>
-                <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options"></property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHScale" id="Line_Scale">
+              <widget class="GtkLabel" id="Upload_Label">
+                <property name="height_request">30</property>
                 <property name="visible">True</property>
-                <property name="adjustment">4 1 5 0 0 0</property>
-                <property name="digits">0</property>
-                <property name="value_pos">GTK_POS_RIGHT</property>
+                <property name="events"></property>
+                <property name="xalign">0</property>
+                <property name="yalign">1</property>
+                <property name="label" translatable="yes">&lt;b&gt;Upload&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
-                <property name="left_attach">2</property>
                 <property name="right_attach">7</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="Misc_Label">
-                <property name="height_request">30</property>
+              <widget class="GtkColorButton" id="Download_Line">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;Misc&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="response_id">0</property>
+                <property name="use_alpha">True</property>
+                <property name="color">#0000c0c00000</property>
               </widget>
               <packing>
-                <property name="right_attach">7</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options"></property>
+                <property name="y_options"></property>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="Mean_Speed_Check">
+              <widget class="GtkCheckButton" id="Download_Fill_Check">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Show Mean Speed</property>
+                <property name="label" translatable="yes">Fill</property>
+                <property name="xalign">1</property>
+                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
               </widget>
               <packing>
-                <property name="right_attach">7</property>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options"></property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkColorButton" id="Upload_Fill">
+              <widget class="GtkColorButton" id="Download_Fill">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="response_id">0</property>
                 <property name="use_alpha">True</property>
-                <property name="color">#54545454ffff</property>
-                <property name="alpha">32768</property>
+                <property name="color">#8080ffff8080</property>
               </widget>
               <packing>
                 <property name="left_attach">4</property>
                 <property name="right_attach">5</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options"></property>
                 <property name="y_options"></property>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="Upload_Fill_Check">
+              <widget class="GtkCheckButton" id="Upload_Line_Check">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Fill</property>
+                <property name="label" translatable="yes">Line</property>
+                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
               </widget>
               <packing>
-                <property name="left_attach">3</property>
-                <property name="right_attach">4</property>
                 <property name="top_attach">3</property>
                 <property name="bottom_attach">4</property>
                 <property name="x_options"></property>
@@ -222,6 +196,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="response_id">0</property>
                 <property name="use_alpha">True</property>
                 <property name="color">#00000000ffff</property>
                 <property name="alpha">49153</property>
@@ -236,13 +211,16 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="Upload_Line_Check">
+              <widget class="GtkCheckButton" id="Upload_Fill_Check">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Line</property>
+                <property name="label" translatable="yes">Fill</property>
+                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
               </widget>
               <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
                 <property name="top_attach">3</property>
                 <property name="bottom_attach">4</property>
                 <property name="x_options"></property>
@@ -250,126 +228,159 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkColorButton" id="Download_Fill">
+              <widget class="GtkColorButton" id="Upload_Fill">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="response_id">0</property>
                 <property name="use_alpha">True</property>
-                <property name="color">#8080ffff8080</property>
+                <property name="color">#54545454ffff</property>
+                <property name="alpha">32768</property>
               </widget>
               <packing>
                 <property name="left_attach">4</property>
                 <property name="right_attach">5</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options"></property>
                 <property name="y_options"></property>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="Download_Fill_Check">
+              <widget class="GtkCheckButton" id="Mean_Speed_Check">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Fill</property>
-                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Show Mean Speed</property>
+                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
               </widget>
               <packing>
-                <property name="left_attach">3</property>
-                <property name="right_attach">4</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options"></property>
+                <property name="right_attach">7</property>
+                <property name="top_attach">8</property>
+                <property name="bottom_attach">9</property>
+                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkColorButton" id="Download_Line">
+              <widget class="GtkLabel" id="Misc_Label">
+                <property name="height_request">30</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_alpha">True</property>
-                <property name="color">#0000c0c00000</property>
+                <property name="xalign">0</property>
+                <property name="yalign">1</property>
+                <property name="label" translatable="yes">&lt;b&gt;Misc&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_START</property>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options"></property>
-                <property name="y_options"></property>
+                <property name="right_attach">7</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="Upload_Label">
-                <property name="height_request">30</property>
+              <widget class="GtkHScale" id="History_Scale">
                 <property name="visible">True</property>
-                <property name="events"></property>
-                <property name="xalign">0</property>
-                <property name="yalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;Upload&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="adjustment">60 60 3600 60 60 0</property>
+                <property name="digits">0</property>
+                <property name="value_pos">GTK_POS_RIGHT</property>
               </widget>
               <packing>
+                <property name="left_attach">2</property>
                 <property name="right_attach">7</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="y_options"></property>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="Download_Line_Check">
+              <widget class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Line</property>
-                <property name="draw_indicator">True</property>
+                <property name="label" translatable="yes">History (sec)</property>
               </widget>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
                 <property name="x_options"></property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="Download_Label">
+              <widget class="GtkHScale" id="Line_Scale">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;Download&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="adjustment">4 1 5 0 0 0</property>
+                <property name="digits">0</property>
+                <property name="value_pos">GTK_POS_RIGHT</property>
               </widget>
               <packing>
+                <property name="left_attach">2</property>
                 <property name="right_attach">7</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="y_options"></property>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="Max_Speed_Check">
+              <widget class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Show Max Speed</property>
-                <property name="draw_indicator">True</property>
+                <property name="label" translatable="yes">Line Size</property>
               </widget>
               <packing>
-                <property name="right_attach">7</property>
+                <property name="right_attach">2</property>
                 <property name="top_attach">6</property>
                 <property name="bottom_attach">7</property>
+                <property name="x_options"></property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHSeparator" id="hseparator1">
+                <property name="width_request">20</property>
+                <property name="visible">True</property>
+                <property name="events"></property>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
+                <property name="x_padding">10</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="Reset_Upload">
+              <widget class="GtkHSeparator" id="hseparator3">
+                <property name="width_request">20</property>
+                <property name="visible">True</property>
+                <property name="events"></property>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+                <property name="x_padding">10</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="Reset_Download">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="tooltip" translatable="yes">Reset colors to their defaults</property>
-                <signal name="released" handler="on_Reset_Upload_released"/>
+                <property name="xalign">1</property>
+                <property name="response_id">0</property>
+                <signal name="released" handler="on_Reset_Download_released"/>
                 <child>
-                  <widget class="GtkImage" id="image3">
+                  <widget class="GtkImage" id="image1">
                     <property name="visible">True</property>
                     <property name="stock">gtk-clear</property>
                   </widget>
@@ -378,12 +389,44 @@
               <packing>
                 <property name="left_attach">6</property>
                 <property name="right_attach">7</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options"></property>
                 <property name="y_options"></property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkHSeparator" id="hseparator4">
+                <property name="width_request">20</property>
+                <property name="visible">True</property>
+                <property name="events"></property>
+              </widget>
+              <packing>
+                <property name="left_attach">5</property>
+                <property name="right_attach">6</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+                <property name="x_padding">10</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHSeparator" id="hseparator5">
+                <property name="width_request">20</property>
+                <property name="visible">True</property>
+                <property name="events"></property>
+              </widget>
+              <packing>
+                <property name="left_attach">5</property>
+                <property name="right_attach">6</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+                <property name="x_padding">10</property>
+              </packing>
+            </child>
           </widget>
           <packing>
             <property name="expand">False</property>
@@ -401,6 +444,7 @@
                 <property name="visible">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
+                <property name="response_id">0</property>
                 <signal name="pressed" handler="on_button_cancel_pressed"/>
               </widget>
             </child>
diff --git a/plugins/NetworkHealth/__init__.py b/plugins/NetworkHealth/__init__.py
index 0516922fc..cd5195581 100644
--- a/plugins/NetworkHealth/__init__.py
+++ b/plugins/NetworkHealth/__init__.py
@@ -30,7 +30,7 @@
 #  this exception statement from your version. If you delete this exception
 #  statement from all source files in the program, then also delete it here.
 
-plugin_name = _("Network Health Monitor")
+plugin_name = "Network Health Monitor"
 plugin_author = "Alon Zakai, Zach Tibbitts"
 plugin_version = "0.2"
 plugin_description = _("Network Health Monitor plugin\n\nWritten by Kripkenstein")
diff --git a/plugins/Scheduler/__init__.py b/plugins/Scheduler/__init__.py
index 8becaa385..4fcd1f9f9 100644
--- a/plugins/Scheduler/__init__.py
+++ b/plugins/Scheduler/__init__.py
@@ -1,3 +1,30 @@
+# Copyright (C) Marcos Pinto 2007 <markybob@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, write to:
+#     The Free Software Foundation, Inc.,
+#     51 Franklin Street, Fifth Floor
+#     Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 # The name of the plugin
 plugin_name = "Scheduler"
diff --git a/plugins/SpeedLimiter/__init__.py b/plugins/SpeedLimiter/__init__.py
index e11553d33..d6e414db4 100644
--- a/plugins/SpeedLimiter/__init__.py
+++ b/plugins/SpeedLimiter/__init__.py
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
 
-plugin_name = _("Speed Limiter")
+plugin_name = "Speed Limiter"
 plugin_author = "Marcos Pinto"
 plugin_version = "0.1"
 plugin_description = _("Set the desired speed limit per torrent.")
diff --git a/plugins/TorrentCreator/__init__.py b/plugins/TorrentCreator/__init__.py
index 23ea32946..d0869fbbe 100644
--- a/plugins/TorrentCreator/__init__.py
+++ b/plugins/TorrentCreator/__init__.py
@@ -16,7 +16,7 @@
 
 ### Initialization ###
 
-plugin_name = _("Torrent Creator")
+plugin_name = "Torrent Creator"
 plugin_author = "Andrew Resch"
 plugin_version = "0.1"
 plugin_description = _("A torrent creator plugin")
diff --git a/plugins/TorrentFiles/__init__.py b/plugins/TorrentFiles/__init__.py
index 6176393bf..a9e391726 100644
--- a/plugins/TorrentFiles/__init__.py
+++ b/plugins/TorrentFiles/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007
+# Copyright (C) Marcos Pinto 2007 <markybob@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -9,14 +9,26 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+# along with this program.  If not, write to:
+#     The Free Software Foundation, Inc.,
+#     51 Franklin Street, Fifth Floor
+#     Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 ### Initialization ###
 
-plugin_name = _("Torrent Files")
+plugin_name = "Torrent Files"
 plugin_author = "Deluge"
 plugin_version = "0.2"
 plugin_description = _("""
diff --git a/plugins/TorrentNotification/__init__.py b/plugins/TorrentNotification/__init__.py
index afd5a4eb6..abcf68f57 100644
--- a/plugins/TorrentNotification/__init__.py
+++ b/plugins/TorrentNotification/__init__.py
@@ -16,7 +16,7 @@
 
 ### Initialization ###
 
-plugin_name = _("Torrent Notification")
+plugin_name = "Torrent Notification"
 plugin_author = "Micah Bucy"
 plugin_version = "0.1"
 plugin_description = _("Make tray icon blink when torrent finishes downloading \
diff --git a/plugins/TorrentPeers/__init__.py b/plugins/TorrentPeers/__init__.py
index 1f3ecb4b3..351ed8de7 100644
--- a/plugins/TorrentPeers/__init__.py
+++ b/plugins/TorrentPeers/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007
+# Copyright (C) Marcos Pinto 2007 <markybob@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -9,14 +9,26 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+# along with this program.  If not, write to:
+#     The Free Software Foundation, Inc.,
+#     51 Franklin Street, Fifth Floor
+#     Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 ### Initialization ###
 
-plugin_name = _("Torrent Peers")
+plugin_name = "Torrent Peers"
 plugin_author = "Deluge"
 plugin_version = "0.2"
 plugin_description = _("""
diff --git a/plugins/TorrentSearch/__init__.py b/plugins/TorrentSearch/__init__.py
index 70d94f217..bd6f949f2 100644
--- a/plugins/TorrentSearch/__init__.py
+++ b/plugins/TorrentSearch/__init__.py
@@ -30,7 +30,7 @@
 #  this exception statement from your version. If you delete this exception
 #  statement from all source files in the program, then also delete it here.
 
-plugin_name = _("Torrent Search")
+plugin_name = "Torrent Search"
 plugin_author = "Zach Tibbitts"
 plugin_version = "0.5"
 plugin_description = _("A searchbar for torrent search engines")
diff --git a/plugins/WebSeed/__init__.py b/plugins/WebSeed/__init__.py
index 0427e6238..59b7a1594 100644
--- a/plugins/WebSeed/__init__.py
+++ b/plugins/WebSeed/__init__.py
@@ -16,7 +16,7 @@
 
 ### Initialization ###
 
-plugin_name = _("Web Seed")
+plugin_name = "Web Seed"
 plugin_author = "Marcos Pinto"
 plugin_version = "0.1"
 plugin_description = _("This plugin allows users to add web seeds to their \
diff --git a/src/__init__.py b/src/__init__.py
index 56e05e0db..db0dd7bc2 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -31,24 +31,22 @@
 #  statement from all source files in the program, then also delete it here.
 
 import gettext
+import gtk.glade
 import locale
 import os
 import common
 
 APP = 'deluge'
 DIR = os.path.join(common.INSTALL_PREFIX, 'share', 'locale')
-if not common.windows_check():
+try:
+    locale.setlocale(locale.LC_ALL, '')
+except:
     try:
         locale.setlocale(locale.LC_MESSAGES, '')
-        locale.bindtextdomain(APP, DIR)
-        locale.textdomain(APP)
     except:
         pass
-else:
-    import gtk.glade
-    locale.setlocale(locale.LC_ALL, '')
-    gtk.glade.bindtextdomain(APP, DIR)
-    gtk.glade.textdomain(APP)
+gtk.glade.bindtextdomain(APP, DIR)
+gtk.glade.textdomain(APP)
 gettext.bindtextdomain(APP, DIR)
 gettext.textdomain(APP)
 gettext.install(APP, DIR, unicode=1)