diff --git a/deluge/core/core.py b/deluge/core/core.py
index 3734bad34..414fc2444 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -36,6 +36,9 @@ import dbus
 import dbus.service
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
+import gettext
+import locale
+import pkg_resources
 
 import gobject
 
@@ -73,6 +76,19 @@ DEFAULT_PREFS = {
 
 class Core(dbus.service.Object):
     def __init__(self, path="/org/deluge_torrent/Core"):
+        # Initialize gettext
+        locale.setlocale(locale.LC_MESSAGES, '')
+        locale.bindtextdomain("deluge", 
+                    pkg_resources.resource_filename(
+                                            "deluge", "i18n"))
+        locale.textdomain("deluge")
+        gettext.bindtextdomain("deluge",
+                    pkg_resources.resource_filename(
+                                            "deluge", "i18n"))
+        gettext.textdomain("deluge")
+        gettext.install("deluge",
+                    pkg_resources.resource_filename(
+                                            "deluge", "i18n"))
         log.debug("Core init..")
         
         # Setup DBUS
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 9fc66ea97..5b3cfb99d 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -378,23 +378,23 @@ class TorrentManager:
         # Get the torrent_id
         torrent_id = str(alert.handle.info_hash())
         # Set the tracker status for the torrent
-        self.torrents[torrent_id].set_tracker_status("Announce OK")
+        self.torrents[torrent_id].set_tracker_status(_("Announce OK"))
 
     def on_alert_tracker_announce(self, alert):
         log.debug("on_alert_tracker_announce")
         # Get the torrent_id
         torrent_id = str(alert.handle.info_hash())
         # Set the tracker status for the torrent
-        self.torrents[torrent_id].set_tracker_status("Announce Sent")
+        self.torrents[torrent_id].set_tracker_status(_("Announce Sent"))
                 
     def on_alert_tracker(self, alert):
         log.debug("on_alert_tracker")
         # Get the torrent_id
         torrent_id = str(alert.handle.info_hash())
         tracker_status = "%s: %s (%s=%s, %s=%s)" % \
-            ("Alert", str(alert.msg()), 
-            "HTTP code", alert.status_code, 
-            "times in a row", alert.times_in_row)
+            (_("Alert"), str(alert.msg()), 
+            _("HTTP code"), alert.status_code, 
+            _("times in a row"), alert.times_in_row)
         # Set the tracker status for the torrent
         self.torrents[torrent_id].set_tracker_status(tracker_status)
                 
@@ -402,6 +402,6 @@ class TorrentManager:
         log.debug("on_alert_tracker_warning")
         # Get the torrent_id
         torrent_id = str(alert.handle.info_hash())
-        tracker_status = '%s: %s' % ("Warning", str(alert.msg()))
+        tracker_status = '%s: %s' % (_("Warning"), str(alert.msg()))
         # Set the tracker status for the torrent
         self.torrents[torrent_id].set_tracker_status(tracker_status)
diff --git a/deluge/i18n/POTFILES.in b/deluge/i18n/POTFILES.in
index a44469d96..50e25aa8e 100644
--- a/deluge/i18n/POTFILES.in
+++ b/deluge/i18n/POTFILES.in
@@ -2,4 +2,4 @@ deluge/ui/gtkui/glade/main_window.glade
 deluge/ui/gtkui/glade/preferences_dialog.glade
 deluge/plugins/queue/queue/gtkui.py
 deluge/ui/gtkui/torrentview.py
-deluge/ui/gtkui/torrentdetails.py
+deluge/core/torrentmanager.py
diff --git a/deluge/i18n/deluge.pot b/deluge/i18n/deluge.pot
index 16b9fc2d0..710d02109 100644
--- a/deluge/i18n/deluge.pot
+++ b/deluge/i18n/deluge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-15 18:22-0700\n"
+"POT-Creation-Date: 2007-10-01 22:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,157 +28,157 @@ msgstr ""
 msgid "Add _URL"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:49
+#: deluge/ui/gtkui/glade/main_window.glade:50
 msgid "_Clear Completed"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:69
+#: deluge/ui/gtkui/glade/main_window.glade:70
 msgid "Quit & Shutdown Daemon"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:101
+#: deluge/ui/gtkui/glade/main_window.glade:102
 msgid "_Edit"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:122
+#: deluge/ui/gtkui/glade/main_window.glade:123
 msgid "_Torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:129
+#: deluge/ui/gtkui/glade/main_window.glade:130
 msgid "_View"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:137
+#: deluge/ui/gtkui/glade/main_window.glade:138
 msgid "_Toolbar"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:145
+#: deluge/ui/gtkui/glade/main_window.glade:146
 msgid "_Details"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:153
-msgid "Columns"
+#: deluge/ui/gtkui/glade/main_window.glade:154
+msgid "_Columns"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:164
+#: deluge/ui/gtkui/glade/main_window.glade:165
 msgid "_Help"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:192
+#: deluge/ui/gtkui/glade/main_window.glade:194
 msgid "Add torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:193
+#: deluge/ui/gtkui/glade/main_window.glade:195
 msgid "Add Torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:205
+#: deluge/ui/gtkui/glade/main_window.glade:207
 msgid "Remove the selected torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:206
+#: deluge/ui/gtkui/glade/main_window.glade:208
 msgid "Remove Torrent"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:218
+#: deluge/ui/gtkui/glade/main_window.glade:220
 msgid "Remove the finished torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:219
+#: deluge/ui/gtkui/glade/main_window.glade:221
 msgid "Clear Finished"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:240
+#: deluge/ui/gtkui/glade/main_window.glade:242
 msgid "Pause the selected torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:241
+#: deluge/ui/gtkui/glade/main_window.glade:243
 msgid "Pause"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:254
+#: deluge/ui/gtkui/glade/main_window.glade:256
 msgid "Resume the selected torrents"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:255
+#: deluge/ui/gtkui/glade/main_window.glade:257
 msgid "Resume"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:275
-#: deluge/ui/gtkui/glade/main_window.glade:276
+#: deluge/ui/gtkui/glade/main_window.glade:277
+#: deluge/ui/gtkui/glade/main_window.glade:278
 msgid "Preferences"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:420
-msgid "<b>Name:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:439
-msgid "<b>Next Announce:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:465
-msgid "<b>Tracker Status:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:493
-msgid "<b>Tracker:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:516
-msgid "<b>Total Size:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:576
-msgid "<b># of files:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:595
-msgid "<b>Torrent Info</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:666
-msgid "<b>Availability:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:702
-msgid "<b>Pieces:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:719
-msgid "<b>ETA:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:740
-msgid "<b>Peers:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:761
-#: deluge/ui/gtkui/glade/main_window.glade:782
-msgid "<b>Speed:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:800
-msgid "<b>Share Ratio:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:818
-msgid "<b>Seeders:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:836
-msgid "<b>Uploaded:</b>"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/main_window.glade:854
+#: deluge/ui/gtkui/glade/main_window.glade:482
 msgid "<b>Downloaded:</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:966
+#: deluge/ui/gtkui/glade/main_window.glade:496
+msgid "<b>Uploaded:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:514
+msgid "<b>Seeders:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:532
+msgid "<b>Share Ratio:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:551
+#: deluge/ui/gtkui/glade/main_window.glade:570
+msgid "<b>Speed:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:591
+msgid "<b>Peers:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:612
+msgid "<b>ETA:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:629
+msgid "<b>Pieces:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:667
+msgid "<b>Availability:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:708
 msgid "<b>Statistics</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/main_window.glade:991
+#: deluge/ui/gtkui/glade/main_window.glade:750
+msgid "<b># of files:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:810
+msgid "<b>Total Size:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:836
+msgid "<b>Tracker:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:864
+msgid "<b>Tracker Status:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:887
+msgid "<b>Next Announce:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:909
+msgid "<b>Name:</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:967
+msgid "<b>Torrent Info</b>"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/main_window.glade:993
 msgid "Details"
 msgstr ""
 
@@ -259,188 +259,196 @@ msgstr ""
 msgid "Test Active Port"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:469
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:470
 msgid "Deluge will automatically choose a different port to use every time."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:470
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:471
 msgid "Use Random Ports"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:488
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:489
 msgid "Active Port:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:500
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:501
 msgid "0000"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:530
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:531
 msgid "<b>Ports</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:562
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:563
 msgid "Distributed hash table may improve the amount of active connections."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:563
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:564
 msgid "Enable Mainline DHT"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:576
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:577
 msgid "<b>DHT</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:609
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:610
 msgid "Universal Plug and Play"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:610
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:611
 msgid "UPnP"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:625
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:626
 msgid "NAT Port Mapping Protocol"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:626
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:627
 msgid "NAT-PMP"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:642
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:643
 msgid "µTorrent Peer-Exchange"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:643
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:644
 msgid "µTorrent-PeX"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:662
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:663
 msgid "<b>Network Extras</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:698
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:699
 msgid "Inbound:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:707
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:731
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:708
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:732
 msgid ""
-"Disabled\n"
+"Forced\n"
 "Enabled\n"
-"Forced"
+"Disabled"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:721
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:722
 msgid "Outbound:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:750
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:751
 msgid "Level:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:759
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:760
 msgid ""
 "Handshake\n"
-"Either\n"
-"Full Stream"
+"Full Stream\n"
+"Either"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:778
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:779
 msgid "Prefer to encrypt the entire stream"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:795
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:796
 msgid "<b>Encryption</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:849
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:850
 msgid "<b><i><big>Bandwidth</big></i></b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:887
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:911
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:977
-msgid "The maximum upload speed for all torrents.  Set -1 for unlimited."
-msgstr ""
-
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:889
-msgid "Maximum Upload Speed (KiB/s):"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:900
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:925
-msgid "The maximum number of connections allowed.  Set -1 for unlimited."
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:902
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1071
-msgid "Maximum Connections:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:913
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1058
-msgid "Maximum Upload Slots:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:943
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:958
-msgid "The maximum download speed for all torrents.  Set -1 for unlimited."
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:945
-msgid "Maximum Download Speed (KiB/s):"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:996
 msgid "The maximum upload slots for all torrents.  Set -1 for unlimited."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1018
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:908
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:978
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1002
+msgid "The maximum upload speed for all torrents.  Set -1 for unlimited."
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:928
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:946
+msgid "The maximum download speed for all torrents.  Set -1 for unlimited."
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:948
+msgid "Maximum Download Speed (KiB/s):"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:960
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:991
+msgid "The maximum number of connections allowed.  Set -1 for unlimited."
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:980
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1105
+msgid "Maximum Upload Slots:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:993
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1094
+msgid "Maximum Connections:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1004
+msgid "Maximum Upload Speed (KiB/s):"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1019
 msgid "<b>Global Bandwidth Usage</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1081
-msgid "The maximum number of connections per torrent.  Set -1 for unlimited."
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1097
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1058
 msgid "The maximum upload slots per torrent.  Set -1 for unlimited."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1120
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1077
+msgid "The maximum number of connections per torrent.  Set -1 for unlimited."
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1121
 msgid "<b>Per Torrent Bandwidth Usage</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1174
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1175
 msgid "<i><b><big>Other</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1208
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1209
 msgid "Enable system tray icon"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1223
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1224
 msgid "Minimize to tray on close"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1242
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1243
 msgid "Start in tray"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1263
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1264
 msgid "Password protect system tray"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1288
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1291
 msgid "Password:"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1322
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1325
 msgid "<b>System Tray</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1372
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1363
+msgid "Open folder with:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1378
+msgid "Custom:"
+msgstr ""
+
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1395
 msgid ""
 "Auto-detect (xdg-open)\n"
 "Konqueror\n"
@@ -448,59 +456,51 @@ msgid ""
 "Thunar"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1396
-msgid "Custom:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1413
-msgid "Open folder with:"
-msgstr ""
-
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1430
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1437
 msgid "<b>Desktop File Manager</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1465
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1477
 msgid ""
 "Deluge will check our servers and will tell you if a newer version has been "
 "released"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1466
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1478
 msgid "Be alerted about new releases"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1483
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1497
 msgid "<b>Updates</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1519
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1533
 msgid ""
 "Help us improve Deluge by sending us your Python version, PyGTK version, OS "
 "and processor types.  Absolutely no other information is sent."
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1538
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1552
 msgid "Yes, please send anonymous statistics"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1557
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1571
 msgid "<b>System Information</b>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1611
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1625
 msgid "<i><b><big>Plugins</big></b></i>"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1703
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1717
 msgid "gtk-cancel"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1715
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1729
 msgid "gtk-apply"
 msgstr ""
 
-#: deluge/ui/gtkui/glade/preferences_dialog.glade:1730
+#: deluge/ui/gtkui/glade/preferences_dialog.glade:1744
 msgid "gtk-ok"
 msgstr ""
 
@@ -519,3 +519,103 @@ msgstr ""
 #: deluge/plugins/queue/queue/gtkui.py:106
 msgid "Queue selected torrents down"
 msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:75
+msgid "Queued"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:76
+msgid "Checking"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:77
+msgid "Connecting"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:78
+msgid "Downloading Metadata"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:79
+msgid "Downloading"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:80
+msgid "Finished"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:81
+msgid "Seeding"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:82
+msgid "Allocating"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:83
+msgid "Paused"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:115
+msgid "Name"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:117
+msgid "Size"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:121
+msgid "Progress"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:125
+msgid "Seeders"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:130
+msgid "Peers"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:135
+msgid "Down Speed"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:139
+msgid "Up Speed"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:143
+msgid "ETA"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:147
+msgid "Ratio"
+msgstr ""
+
+#: deluge/ui/gtkui/torrentview.py:151
+msgid "Avail"
+msgstr ""
+
+#: deluge/core/torrentmanager.py:381
+msgid "Announce OK"
+msgstr ""
+
+#: deluge/core/torrentmanager.py:388
+msgid "Announce Sent"
+msgstr ""
+
+#: deluge/core/torrentmanager.py:395
+msgid "Alert"
+msgstr ""
+
+#: deluge/core/torrentmanager.py:396
+msgid "HTTP code"
+msgstr ""
+
+#: deluge/core/torrentmanager.py:397
+msgid "times in a row"
+msgstr ""
+
+#: deluge/core/torrentmanager.py:405
+msgid "Warning"
+msgstr ""
diff --git a/deluge/ui/gtkui/torrentdetails.py b/deluge/ui/gtkui/torrentdetails.py
index 96f205806..507998830 100644
--- a/deluge/ui/gtkui/torrentdetails.py
+++ b/deluge/ui/gtkui/torrentdetails.py
@@ -130,20 +130,7 @@ class TorrentDetails:
             self.eta.set_text(deluge.common.ftime(status["eta"]))
             self.share_ratio.set_text("%.3f" % status["ratio"])
             self.tracker.set_text(status["tracker"])
-            if status["tracker_status"] == "Announce OK":
-                tracker_msg = _("Announce OK")
-            elif status["tracker_status"] == "Announce Sent":
-                tracker_msg = _("Announce Sent")
-            elif 'Alert' in status["tracker_status"]:
-                tracker_msg = status["tracker_status"].replace("Alert", \
-                    _("Alert"))
-                tracker_msg = tracker_msg.replace("HTTP code", _("HTTP code"))
-                tracker_msg = tracker_msg.replace("times in a row", \
-                    _("times in a row"))
-            elif 'Warning' in status["tracker_status"]:
-                tracker_msg = status["tracker_status"].replace("Warning", \
-                    _("Warning"))
-            self.tracker_status.set_text(tracker_msg)
+            self.tracker_status.set_text(status["tracker_status"])
             self.next_announce.set_text(
                 deluge.common.ftime(status["next_announce"]))