lang update

po/POTFILES.in

@@ -1,6 +1,5 @@
 glade/delugegtk.glade
 glade/dgtkpopups.glade
-glade/dgtkpref.glade
 glade/preferences_dialog.glade
 glade/torrent_menu.glade
 src/common.py

po/deluge.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-17 20:08-0500\n"
+"POT-Creation-Date: 2007-05-29 23:10-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"
@@ -97,7 +97,7 @@ msgid "Details"
 msgstr ""
 
 #: glade/delugegtk.glade:588 glade/delugegtk.glade:868
-#: glade/dgtkpopups.glade:37 src/interface.py:310
+#: glade/dgtkpopups.glade:37 src/interface.py:349
 msgid "Peers"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "_Torrent"
 msgstr ""
 
-#: glade/delugegtk.glade:698 glade/delugegtk.glade:979 src/interface.py:201
+#: glade/delugegtk.glade:698 glade/delugegtk.glade:979 src/interface.py:200
 msgid "Add Torrent"
 msgstr ""
 
@@ -134,8 +134,7 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: glade/delugegtk.glade:787 glade/dgtkpopups.glade:221
+#: glade/delugegtk.glade:787 glade/dgtkpopups.glade:221 src/interface.py:203
-#: glade/dgtkpref.glade:697 src/interface.py:204
 msgid "Plugins"
 msgstr ""
 
@@ -151,30 +150,30 @@ msgstr ""
 msgid "Columns"
 msgstr ""
 
-#: glade/delugegtk.glade:841 glade/dgtkpopups.glade:10 src/interface.py:307
+#: glade/delugegtk.glade:841 glade/dgtkpopups.glade:10 src/interface.py:346
-#: src/interface.py:444
+#: src/interface.py:483
 msgid "Size"
 msgstr ""
 
-#: glade/delugegtk.glade:850 glade/dgtkpopups.glade:19 src/interface.py:308
+#: glade/delugegtk.glade:850 glade/dgtkpopups.glade:19 src/interface.py:347
 msgid "Status"
 msgstr ""
 
-#: glade/delugegtk.glade:859 glade/dgtkpopups.glade:28 src/interface.py:309
+#: glade/delugegtk.glade:859 glade/dgtkpopups.glade:28 src/interface.py:348
 msgid "Seeders"
 msgstr ""
 
-#: glade/delugegtk.glade:877 glade/torrent_menu.glade:160 src/interface.py:311
+#: glade/delugegtk.glade:877 glade/torrent_menu.glade:160 src/interface.py:350
-#: src/interface.py:442 src/interface.py:588 src/interface.py:600
+#: src/interface.py:481 src/interface.py:637 src/interface.py:649
 msgid "Download"
 msgstr ""
 
-#: glade/delugegtk.glade:886 glade/torrent_menu.glade:130 src/interface.py:312
+#: glade/delugegtk.glade:886 glade/torrent_menu.glade:130 src/interface.py:351
-#: src/interface.py:589 src/interface.py:601
+#: src/interface.py:638 src/interface.py:650
 msgid "Upload"
 msgstr ""
 
-#: glade/delugegtk.glade:895 glade/dgtkpopups.glade:64 src/interface.py:313
+#: glade/delugegtk.glade:895 glade/dgtkpopups.glade:64
 msgid "Time Remaining"
 msgstr ""
 
@@ -227,11 +226,11 @@ msgstr ""
 msgid "Add a Torrent..."
 msgstr ""
 
-#: glade/dgtkpopups.glade:191 src/interface.py:202
+#: glade/dgtkpopups.glade:191 src/interface.py:201
 msgid "Clear Finished"
 msgstr ""
 
-#: glade/dgtkpopups.glade:212 glade/dgtkpref.glade:672
+#: glade/dgtkpopups.glade:212
 msgid "gtk-preferences"
 msgstr ""
 
@@ -239,133 +238,18 @@ msgstr ""
 msgid "gtk-quit"
 msgstr ""
 
-#: glade/dgtkpref.glade:8
+#: glade/preferences_dialog.glade:8
-msgid "Preferences Dialog"
+msgid "Deluge Preferences"
 msgstr ""
 
-#: glade/dgtkpref.glade:53 glade/preferences_dialog.glade:924
+#: glade/preferences_dialog.glade:73
-msgid "Enable system tray icon"
-msgstr ""
-
-#: glade/dgtkpref.glade:65 glade/preferences_dialog.glade:935
-msgid "Minimize to tray on close"
-msgstr ""
-
-#: glade/dgtkpref.glade:80
-msgid "Options"
-msgstr ""
-
-#: glade/dgtkpref.glade:115 glade/preferences_dialog.glade:73
 msgid "Save all downloads to:"
 msgstr ""
 
-#: glade/dgtkpref.glade:127 glade/preferences_dialog.glade:85
+#: glade/preferences_dialog.glade:85
 msgid "Ask me where to save each download"
 msgstr ""
 
-#: glade/dgtkpref.glade:139
-msgid "Save Location"
-msgstr ""
-
-#: glade/dgtkpref.glade:180
-msgid ""
-"Stop seeding torrents when\n"
-"their share ratio reaches:"
-msgstr ""
-
-#: glade/dgtkpref.glade:190
-msgid "Seeding"
-msgstr ""
-
-#: glade/dgtkpref.glade:209 glade/preferences_dialog.glade:188
-msgid "Use compact storage allocation"
-msgstr ""
-
-#: glade/dgtkpref.glade:216
-msgid "Storage"
-msgstr ""
-
-#: glade/dgtkpref.glade:246
-msgid "General"
-msgstr ""
-
-#: glade/dgtkpref.glade:280 glade/preferences_dialog.glade:365
-msgid "Try from:"
-msgstr ""
-
-#: glade/dgtkpref.glade:286 glade/preferences_dialog.glade:371
-msgid "to:"
-msgstr ""
-
-#: glade/dgtkpref.glade:320 glade/preferences_dialog.glade:405
-msgid "Active port:"
-msgstr ""
-
-#: glade/dgtkpref.glade:332 glade/preferences_dialog.glade:417
-msgid "0000"
-msgstr ""
-
-#: glade/dgtkpref.glade:343 glade/preferences_dialog.glade:429
-msgid "Test Port"
-msgstr ""
-
-#: glade/dgtkpref.glade:357
-msgid "TCP Port"
-msgstr ""
-
-#: glade/dgtkpref.glade:380 glade/preferences_dialog.glade:676
-msgid "<i>(-1 is unlimited)</i>"
-msgstr ""
-
-#: glade/dgtkpref.glade:390 glade/dgtkpref.glade:511
-#: glade/preferences_dialog.glade:686 glade/preferences_dialog.glade:807
-msgid "KB/s"
-msgstr ""
-
-#: glade/dgtkpref.glade:436 glade/preferences_dialog.glade:732
-msgid "Maximum Download Rate:"
-msgstr ""
-
-#: glade/dgtkpref.glade:447 glade/preferences_dialog.glade:743
-msgid "Upload Slots"
-msgstr ""
-
-#: glade/dgtkpref.glade:458 glade/preferences_dialog.glade:754
-msgid "Maximum Connections"
-msgstr ""
-
-#: glade/dgtkpref.glade:485 glade/preferences_dialog.glade:781
-msgid "Maximum Upload Rate:"
-msgstr ""
-
-#: glade/dgtkpref.glade:548
-msgid "Bandwidth "
-msgstr ""
-
-#: glade/dgtkpref.glade:576 glade/preferences_dialog.glade:631
-msgid "Network"
-msgstr ""
-
-#: glade/dgtkpref.glade:598 glade/preferences_dialog.glade:1078
-msgid "gtk-cancel"
-msgstr ""
-
-#: glade/dgtkpref.glade:605 glade/preferences_dialog.glade:1085
-msgid "gtk-ok"
-msgstr ""
-
-#: glade/dgtkpref.glade:625
-msgid "Plugin Manager"
-msgstr ""
-
-#: glade/dgtkpref.glade:718
-msgid "gtk-close"
-msgstr ""
-
-#: glade/preferences_dialog.glade:8
-msgid "Deluge Preferences"
-msgstr ""
-
 #: glade/preferences_dialog.glade:100
 msgid "<b>Download Location</b>"
 msgstr ""
@@ -378,6 +262,10 @@ msgstr ""
 msgid "<b>Torrents</b>"
 msgstr ""
 
+#: glade/preferences_dialog.glade:188
+msgid "Use compact storage allocation"
+msgstr ""
+
 #: glade/preferences_dialog.glade:198
 msgid "<b>Compact Allocation</b>"
 msgstr ""
@@ -394,76 +282,144 @@ msgstr ""
 msgid "<b>Seeding</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:305
+#: glade/preferences_dialog.glade:306
 msgid "Downloads"
 msgstr ""
 
-#: glade/preferences_dialog.glade:334
+#: glade/preferences_dialog.glade:335
 msgid ""
 "<b>Warning - Changes to these settings will only be applied the next time "
 "Deluge is restarted</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:446
+#: glade/preferences_dialog.glade:366
+msgid "Try from:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:372
+msgid "to:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:406
+msgid "Active port:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:418
+msgid "0000"
+msgstr ""
+
+#: glade/preferences_dialog.glade:430
+msgid "Test Port"
+msgstr ""
+
+#: glade/preferences_dialog.glade:447
 msgid "<b>TCP Port</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:475
+#: glade/preferences_dialog.glade:482
-msgid "Enable UPnP support"
-msgstr ""
-
-#: glade/preferences_dialog.glade:485
-msgid "<b>UPnP</b>"
-msgstr ""
-
-#: glade/preferences_dialog.glade:535
-msgid "Max number of DHT connections:"
-msgstr ""
-
-#: glade/preferences_dialog.glade:547
 msgid "Enable Mainline DHT"
 msgstr ""
 
-#: glade/preferences_dialog.glade:562
+#: glade/preferences_dialog.glade:493
+msgid "Max number of DHT connections:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:524
 msgid "<b>DHT</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:591
+#: glade/preferences_dialog.glade:561
-msgid "Enable Peer Exchange"
+msgid "UPnP"
 msgstr ""
 
-#: glade/preferences_dialog.glade:601
+#: glade/preferences_dialog.glade:571
-msgid "<b>PEX</b>"
+msgid "NAT-PMP"
 msgstr ""
 
-#: glade/preferences_dialog.glade:847
+#: glade/preferences_dialog.glade:584
+msgid "UT PeX"
+msgstr ""
+
+#: glade/preferences_dialog.glade:600
+msgid "<b>Network extras</b> - Always on"
+msgstr ""
+
+#: glade/preferences_dialog.glade:642
+msgid "Network"
+msgstr ""
+
+#: glade/preferences_dialog.glade:687
+msgid "<i>(-1 is unlimited)</i>"
+msgstr ""
+
+#: glade/preferences_dialog.glade:697 glade/preferences_dialog.glade:818
+msgid "KB/s"
+msgstr ""
+
+#: glade/preferences_dialog.glade:743
+msgid "Maximum Download Rate:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:754
+msgid "Upload Slots"
+msgstr ""
+
+#: glade/preferences_dialog.glade:765
+msgid "Maximum Connections"
+msgstr ""
+
+#: glade/preferences_dialog.glade:792
+msgid "Maximum Upload Rate:"
+msgstr ""
+
+#: glade/preferences_dialog.glade:858
 msgid "<b>Bandwidth Usage</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:879
+#: glade/preferences_dialog.glade:890
 msgid "Bandwidth"
 msgstr ""
 
-#: glade/preferences_dialog.glade:953
+#: glade/preferences_dialog.glade:937
+msgid "Password protect system tray"
+msgstr ""
+
+#: glade/preferences_dialog.glade:948
+msgid "Enable system tray icon"
+msgstr ""
+
+#: glade/preferences_dialog.glade:959
+msgid "Minimize to tray on close"
+msgstr ""
+
+#: glade/preferences_dialog.glade:991
 msgid "<b>System Tray</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:986
+#: glade/preferences_dialog.glade:1024
 msgid "seconds"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1015
+#: glade/preferences_dialog.glade:1053
 msgid "GUI update interval"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1026
+#: glade/preferences_dialog.glade:1064
 msgid "<b>Performance</b>"
 msgstr ""
 
-#: glade/preferences_dialog.glade:1056
+#: glade/preferences_dialog.glade:1095
 msgid "Other"
 msgstr ""
 
+#: glade/preferences_dialog.glade:1117
+msgid "gtk-cancel"
+msgstr ""
+
+#: glade/preferences_dialog.glade:1124
+msgid "gtk-ok"
+msgstr ""
+
 #: glade/torrent_menu.glade:11
 msgid "StartPause"
 msgstr ""
@@ -500,7 +456,7 @@ msgstr ""
 msgid "menuitem11"
 msgstr ""
 
-#: src/common.py:44 src/interface.py:288
+#: src/common.py:44 src/interface.py:327
 msgid "Infinity"
 msgstr ""
 
@@ -512,134 +468,148 @@ msgstr ""
 msgid "File was not found"
 msgstr ""
 
-#: src/interface.py:200
+#: src/interface.py:199
 msgid "Show / Hide Window"
 msgstr ""
 
-#: src/interface.py:298
+#: src/interface.py:241
+msgid "Deluge is locked"
+msgstr ""
+
+#: src/interface.py:243
+msgid ""
+"Deluge is password protected.\n"
+"To show the Deluge window, please enter your password"
+msgstr ""
+
+#: src/interface.py:337
 msgid "Unknown"
 msgstr ""
 
-#: src/interface.py:306
+#: src/interface.py:345
 msgid "Name"
 msgstr ""
 
-#: src/interface.py:314
+#: src/interface.py:352
+msgid "ETA"
+msgstr ""
+
+#: src/interface.py:353
 msgid "Ratio"
 msgstr ""
 
-#: src/interface.py:383
+#: src/interface.py:422
 msgid "Start"
 msgstr ""
 
-#: src/interface.py:386
+#: src/interface.py:425 src/interface.py:693
 msgid "Pause"
 msgstr ""
 
-#: src/interface.py:430
+#: src/interface.py:469
 msgid "IP Address"
 msgstr ""
 
-#: src/interface.py:431
+#: src/interface.py:470
 msgid "Client"
 msgstr ""
 
-#: src/interface.py:432
+#: src/interface.py:471
 msgid "Percent Complete"
 msgstr ""
 
-#: src/interface.py:433
+#: src/interface.py:472
 msgid "Download Rate"
 msgstr ""
 
-#: src/interface.py:434
+#: src/interface.py:473
 msgid "Upload Rate"
 msgstr ""
 
-#: src/interface.py:443
+#: src/interface.py:482
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:445
+#: src/interface.py:484
 msgid "Offset"
 msgstr ""
 
-#: src/interface.py:446
+#: src/interface.py:485
 msgid "Progress"
 msgstr ""
 
-#: src/interface.py:571
+#: src/interface.py:620
 msgid ""
 "For some reason, the previous state could not be loaded, so a blank state "
 "has been loaded for you."
 msgstr ""
 
-#: src/interface.py:573
+#: src/interface.py:622
 msgid "Would you like to attempt to reload the previous session's downloads?"
 msgstr ""
 
-#: src/interface.py:588 src/interface.py:600
+#: src/interface.py:637 src/interface.py:649
 msgid "Connections"
 msgstr ""
 
-#: src/interface.py:599
+#: src/interface.py:648
 msgid "Deluge Bittorrent Client"
 msgstr ""
 
-#: src/interface.py:783
+#: src/interface.py:835
 msgid ""
 "An error occured while trying to add the torrent. It's possible your ."
 "torrent file is corrupted."
 msgstr ""
 
-#: src/interface.py:785
+#: src/interface.py:837
 msgid "The torrent you've added seems to already be in Deluge."
 msgstr ""
 
-#: src/interface.py:789
+#: src/interface.py:841
 msgid "There is not enough free disk space to complete your download."
 msgstr ""
 
-#: src/interface.py:790
+#: src/interface.py:842
 msgid "Space Needed:"
 msgstr ""
 
-#: src/interface.py:791
+#: src/interface.py:843
 msgid "Available Space:"
 msgstr ""
 
-#: src/interface.py:804
+#: src/interface.py:856
 msgid "Add torrent from URL"
 msgstr ""
 
-#: src/interface.py:808
+#: src/interface.py:860
 msgid "Enter the URL of the .torrent to download"
 msgstr ""
 
-#: src/interface.py:872
+#: src/interface.py:924
 msgid "Warning - all downloaded files for this torrent will be deleted!"
 msgstr ""
 
-#: src/dialogs.py:116
+#: src/dialogs.py:115
 msgid "Plugin"
 msgstr ""
 
-#: src/dialogs.py:118
+#: src/dialogs.py:117
 msgid "Enabled"
 msgstr ""
 
-#: src/dialogs.py:224
+#: src/dialogs.py:223
 msgid "Choose a .torrent file"
 msgstr ""
 
-#: src/dialogs.py:229
+#: src/dialogs.py:228
 msgid "Torrent files"
 msgstr ""
 
-#: src/dialogs.py:233
+#: src/dialogs.py:232
 msgid "All files"
 msgstr ""
 
-#: src/dialogs.py:250
+#: src/dialogs.py:249
 msgid "Choose a download directory"
 msgstr ""

src/interface.py

@@ -349,7 +349,7 @@ class DelugeGTK:
 		self.peer_column 	=	dgtk.add_func_column(self.torrent_view, _("Peers"), peer, (8, 9))
 		self.dl_column 		=	dgtk.add_func_column(self.torrent_view, _("Download"), rate, 10)
 		self.ul_column 		=	dgtk.add_func_column(self.torrent_view, _("Upload"), rate, 11)
-		self.eta_column 	=	dgtk.add_func_column(self.torrent_view, _("Time Remaining"), time, 12)
+		self.eta_column 	=	dgtk.add_func_column(self.torrent_view, _("ETA"), time, 12)
 		self.share_column 	= 	dgtk.add_func_column(self.torrent_view, _("Ratio"), ratio, 13)
 		
 		self.status_column.set_expand(True)