Tag 1.1.2 release

version bump
lang sync for release
2009-01-31 22:18:11 +00:00 · 2009-01-31 21:27:50 +00:00 · 2009-01-31 21:14:26 +00:00 · 2009-01-31 20:58:29 +00:00 · 2009-01-28 16:19:36 +00:00 · 2009-01-28 00:36:33 +00:00
137 changed files with 4851 additions and 1549 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+Deluge 1.1.2 - (31 January 2009)
+ Core:
+  * Fix issue where torrents get stuck Checking
+
+ GtkUI:
+  * Fix #761 use proper theme colours in sidebar
+  * Fix saving files/peers tab state when no column is sorted
+
 Deluge 1.1.1 - (24 January 2009)
 Core:
  * Fix oldstateupgrader for those upgrading from 0.5.x
--- a/debian/changelog
+++ b/debian/changelog
@ -1,5 +1,5 @@
-deluge-torrent (1.1.1-1) unstable; urgency=low
+deluge-torrent (1.1.2-1) unstable; urgency=low

-  * 1.1.1 final
+  * 1.1.2 final

- -- Andrew Resch (andar) <andrewresch@gmail.com>  Sat, 24 Jan 2008 16:31:14 -0800
+ -- Andrew Resch (andar) <andrewresch@gmail.com>  Sat, 31 Jan 2008 16:31:14 -0800
--- a/deluge/i18n/POTFILES.in
+++ b/deluge/i18n/POTFILES.in
@ -138,7 +138,6 @@ deluge/ui/webui/lib/webpy022/webapi.py
 deluge/ui/webui/lib/webpy022/form.py
 deluge/ui/webui/lib/json.py
 deluge/ui/webui/lib/newforms_plus.py
-deluge/ui/webui/lib/pythonize.py
 deluge/ui/webui/lib/egg_render.py
 deluge/ui/webui/lib/static_handler.py
 deluge/ui/webui/lib/__init__.py
@ -191,4 +190,3 @@ deluge/xmlrpclib.py
 deluge/scripts/deluge_remote.py
 deluge/scripts/wiki_docgen.py
 deluge/scripts/create_plugin.py
-deluge/scripts/state_upgrade.py
--- a/deluge/i18n/ar.po
+++ b/deluge/i18n/ar.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/ast.po
+++ b/deluge/i18n/ast.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/be.po
+++ b/deluge/i18n/be.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/bg.po
+++ b/deluge/i18n/bg.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/bn.po
+++ b/deluge/i18n/bn.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/bs.po
+++ b/deluge/i18n/bs.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/ca.po
+++ b/deluge/i18n/ca.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/cs.po
+++ b/deluge/i18n/cs.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: deluge\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-01-06 21:52-0600\n"
-"PO-Revision-Date: 2008-12-29 19:51+0000\n"
+"PO-Revision-Date: 2009-01-29 07:29+0000\n"
 "Last-Translator: Jan Kaláb <pitel@nomi.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
@ -98,7 +98,7 @@ msgstr ""
 #: deluge/ui/gtkui/preferences.py:61 deluge/ui/webui/config_tabs_deluge.py:150
 #: deluge/ui/webui/scripts/template_strings.py:83
 msgid "Queue"
-msgstr ""
+msgstr "Fronta"

 #: deluge/plugins/label/label/data/label_options.glade:465
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:246
@ -111,7 +111,7 @@ msgstr ""

 #: deluge/plugins/label/label/data/label_options.glade:509
 msgid "Location"
-msgstr ""
+msgstr "Umístění"

 #: deluge/plugins/label/label/data/label_options.glade:541
 msgid ""
@ -132,11 +132,11 @@ msgstr ""
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:462
 #: deluge/ui/webui/register_menu.py:39
 msgid "Trackers"
-msgstr ""
+msgstr "Trackery"

 #: deluge/plugins/label/label/data/label_options.glade:638
 msgid "Add Label"
-msgstr ""
+msgstr "Přidat štítek"

 #: deluge/plugins/label/label/data/label_options.glade:672
 msgid "<b>Add Label</b>"
@ -171,7 +171,7 @@ msgstr ""

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:286
 msgid "_Remove"
-msgstr ""
+msgstr "_Smazat"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:319
 msgid "<b>Torrents</b>"
@ -179,7 +179,7 @@ msgstr "<b>Torrenty</b>"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:373
 msgid "Fi_les"
-msgstr ""
+msgstr "Sou_bory"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:414
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:156
@ -1154,7 +1154,7 @@ msgstr ""

 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:229
 msgid "<b>Files</b>"
-msgstr ""
+msgstr "<b>Soubory</b>"

 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:292
 msgid "Comments:"
@ -1505,7 +1505,7 @@ msgstr "_Podrobnosti"

 #: deluge/ui/gtkui/glade/main_window.glade:1579
 msgid "_Files"
-msgstr ""
+msgstr "_Soubory"

 #: deluge/ui/gtkui/glade/main_window.glade:1628
 msgid "_Peers"
--- a/deluge/i18n/cy.po
+++ b/deluge/i18n/cy.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/da.po
+++ b/deluge/i18n/da.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/de.po
+++ b/deluge/i18n/de.po
@ -8,30 +8,31 @@ msgstr ""
 "Project-Id-Version: deluge\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-01-06 21:52-0600\n"
-"PO-Revision-Date: 2008-12-30 22:12+0000\n"
-"Last-Translator: Bengt Lüers <Bengt.Lueers@gmail.com>\n"
+"PO-Revision-Date: 2009-01-31 02:39+0000\n"
+"Last-Translator: Marcos Pinto <markybob@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
 msgid "<i>Use the sidebar to add,edit and remove labels. </i>\n"
-msgstr "<i>Benutze die Seitenleiste um die Lesezeichen zu bearbeiten.</i>\n"
+msgstr ""
+"<i>Benutzen Sie die Seitenleiste um Markierungen zu bearbeiten.</i>\n"

 #: deluge/plugins/label/label/data/label_pref.glade:32
 msgid "<b>Labels</b>"
-msgstr "<b>Lesezeichen</b>"
+msgstr "<b>Markierungen</b>"

 #: deluge/plugins/label/label/data/label_options.glade:7
 msgid "Label Options"
-msgstr "Lesezeichen-Optionen"
+msgstr "Markierungsoptionen"

 #: deluge/plugins/label/label/data/label_options.glade:36
 msgid "<b>Label Options</b>"
-msgstr "<b>Lesezeichen-Optionen</b>"
+msgstr "<b>Markierungsoptionen</b>"

 #: deluge/plugins/label/label/data/label_options.glade:132
 #: deluge/plugins/label/label/data/label_options.glade:195
@ -49,15 +50,15 @@ msgstr "KiB/s"

 #: deluge/plugins/label/label/data/label_options.glade:158
 msgid "Upload Slots:\t"
-msgstr "Sende-Kanäle:\t"
+msgstr "Uploadverbindungen:\t"

 #: deluge/plugins/label/label/data/label_options.glade:171
 msgid "Upload Speed:"
-msgstr "Upload Geschwindigkeit:"
+msgstr "Upload-Geschwindigkeit:"

 #: deluge/plugins/label/label/data/label_options.glade:184
 msgid "Download Speed:"
-msgstr "Download Geschwindigkeit:"
+msgstr "Download-Geschwindigkeit:"

 #: deluge/plugins/label/label/data/label_options.glade:226
 msgid "Connections:"
@ -65,11 +66,11 @@ msgstr "Verbindungen:"

 #: deluge/plugins/label/label/data/label_options.glade:270
 msgid "Apply per torrent max settings:"
-msgstr "Verwende Beschränkung pro Torrent:"
+msgstr "Beschränkungen auf einzelne Torrents anwenden"

 #: deluge/plugins/label/label/data/label_options.glade:283
 msgid "Maximum"
-msgstr "Maximum"
+msgstr "Limits"

 #: deluge/plugins/label/label/data/label_options.glade:336
 #: deluge/ui/gtkui/glade/main_window.glade:1860
@ -81,7 +82,7 @@ msgstr "Automatisch verwaltet"
 #: deluge/plugins/label/label/data/label_options.glade:349
 #: deluge/ui/gtkui/glade/main_window.glade:1880
 msgid "Stop seed at ratio:"
-msgstr "Verteilen stoppen, bei Verhältnis:"
+msgstr "Verteilen stoppen bei Verhältnis:"

 #: deluge/plugins/label/label/data/label_options.glade:364
 #: deluge/ui/gtkui/glade/main_window.glade:1919
@ -91,7 +92,7 @@ msgstr "Entfernen bei Verhältnis"

 #: deluge/plugins/label/label/data/label_options.glade:410
 msgid "Apply Queue settings:"
-msgstr "Verwende Einstellungen der Warteliste:"
+msgstr "Warteschlangen-Einstellungen festlegen:"

 #: deluge/plugins/label/label/data/label_options.glade:426
 #: deluge/ui/gtkui/preferences.py:61 deluge/ui/webui/config_tabs_deluge.py:150
@ -106,11 +107,11 @@ msgstr "Verschiebe fertige nach:"

 #: deluge/plugins/label/label/data/label_options.glade:493
 msgid "Apply location settings:"
-msgstr "Verwende Einstellungen vom Standort:"
+msgstr "Verzeichnis festlegen:"

 #: deluge/plugins/label/label/data/label_options.glade:509
 msgid "Location"
-msgstr "Standort"
+msgstr "Verzeichnis"

 #: deluge/plugins/label/label/data/label_options.glade:541
 msgid ""
@ -120,7 +121,7 @@ msgid ""
 msgstr ""
 "tracker-name.org\n"
 "tracker.index.com\n"
-"Das hier macht noch nichts ...\n"
+"Dies hat noch keine Funktion...\n"

 #: deluge/plugins/label/label/data/label_options.glade:552
 msgid "<i>(1 line per tracker)</i>"
@ -128,7 +129,7 @@ msgstr "<i>(Je eine Zeile pro Tracker)</i>"

 #: deluge/plugins/label/label/data/label_options.glade:568
 msgid "Automatically apply label:"
-msgstr "Verwende automatisch folgendes Lesezeichen:"
+msgstr "Automatisch folgende Markierung verwenden:"

 #: deluge/plugins/label/label/data/label_options.glade:585
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:462
@ -138,11 +139,11 @@ msgstr "Tracker"

 #: deluge/plugins/label/label/data/label_options.glade:638
 msgid "Add Label"
-msgstr "Label Hinzufügen"
+msgstr "Markierung hinzufügen"

 #: deluge/plugins/label/label/data/label_options.glade:672
 msgid "<b>Add Label</b>"
-msgstr "<b>Reiter hinzufügen</b>"
+msgstr "<b>Markierung hinzufügen</b>"

 #: deluge/plugins/label/label/data/label_options.glade:703
 msgid "Name:"
@ -169,7 +170,7 @@ msgstr "_URL"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:240
 msgid "Info_hash"
-msgstr "Datei-Quersumme"
+msgstr "_Hash"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:286
 msgid "_Remove"
@ -198,11 +199,11 @@ msgstr "<b>Download-Ziel</b>"
 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:473
 #: deluge/ui/webui/config_tabs_deluge.py:81
 msgid "Full"
-msgstr "Voll"
+msgstr "Vollständig"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:487
 msgid "Compact"
-msgstr "Kompakt"
+msgstr "Dynamisch"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:506
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:374
@ -249,7 +250,7 @@ msgstr "<b>Allgemein</b>"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:793
 msgid "Revert To Defaults"
-msgstr "Auf Standard-Werte zurücksetzten"
+msgstr "Auf Standardwerte zurücksetzten"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:847
 msgid "Apply To All"
@ -274,15 +275,15 @@ msgstr "URL:"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1117
 msgid "Add Infohash"
-msgstr "Datei-Quersumme hinzufügen"
+msgstr "Torrent-Hash hinzufügen"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1153
 msgid "<b>From Infohash</b>"
-msgstr "<b>Nach Datei-Quersumme</b>"
+msgstr "<b>Von Hash</b>"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1187
 msgid "Infohash:"
-msgstr "Datei-Quersumme"
+msgstr "Hash:"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:1222
 #: deluge/ui/gtkui/glade/edit_trackers.glade:296
@ -337,7 +338,7 @@ msgstr "_Neu-Prüfung erzwingen"

 #: deluge/ui/gtkui/glade/torrent_menu.glade:191
 msgid "Move _Storage"
-msgstr "_Speicher verschieben"
+msgstr "Torrent ver_schieben"

 #: deluge/ui/gtkui/glade/torrent_menu.glade:212
 #: deluge/ui/gtkui/glade/tray_menu.glade:87
@ -347,7 +348,7 @@ msgstr "Maximale Downloadgeschwindigkeit"
 #: deluge/ui/gtkui/glade/torrent_menu.glade:227
 #: deluge/ui/gtkui/glade/tray_menu.glade:103
 msgid "_Upload Speed Limit"
-msgstr "Maximale Uploadgeschwindigkeit"
+msgstr "_Upload Limit"

 #: deluge/ui/gtkui/glade/torrent_menu.glade:242
 msgid "_Connection Limit"
@ -355,7 +356,7 @@ msgstr "_Verbindungslimit"

 #: deluge/ui/gtkui/glade/torrent_menu.glade:258
 msgid "Upload _Slot Limit"
-msgstr "Limit für Upload-Kanäle"
+msgstr "Upload-_Slot Limit"

 #: deluge/ui/gtkui/glade/torrent_menu.glade:273
 msgid "_Auto Managed"
@ -367,15 +368,15 @@ msgstr "<big><b>Ausgewähltes Torrent wirklich entfernen?</b></big>"

 #: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:57
 msgid "If you remove the data, it will be lost permanently."
-msgstr "Das Entfernen dieser Daten ist unwiderruflich."
+msgstr "Beim Entfernen der Daten werden diese unwiderruflich gelöscht."

 #: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:117
 msgid "Remove With _Data"
-msgstr "Mit _Daten entfernen."
+msgstr "Torrent und _Daten entfernen"

 #: deluge/ui/gtkui/glade/remove_torrent_dialog.glade:155
 msgid "Remove _Torrent"
-msgstr "_Torrent entfernen"
+msgstr "Nur _Torrent entfernen"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:8
 #: deluge/ui/gtkui/glade/main_window.glade:422
@ -389,7 +390,7 @@ msgstr "<b><i><big>Downloads</big></i></b>"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:216
 msgid "Auto add .torrents from:"
-msgstr "Automatisches Hinzufügen von .torrents von:"
+msgstr "Automatisches Hinzufügen von .torrents aus:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:231
 msgid "Copy of .torrent files to:"
@ -408,27 +409,29 @@ msgid ""
 "Full allocation preallocates all of the space that is needed for the torrent "
 "and prevents disk fragmentation"
 msgstr ""
-"Die volle Zuweisung belegt den gesamten Speicherplatz, der für den Torrent "
-"benötigt wird, auf einmal und verhindert die Fragmentierung des Dateisystems."
+"Die Methode \"Vollständig\" reserviert den benötigten Speicherplatz für den "
+"Torrent bereits vorher und verhindert so die Fragmentierung des Dateisystems"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:340
 msgid "Use Full Allocation"
-msgstr "Volle Zuweisung verwenden"
+msgstr "Vollständig zuweisen"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:355
 msgid "Compact allocation only allocates space as needed"
 msgstr ""
-"Die kompakte Zuweisung belegt nur soviel Speicherplatz, wie gerade benötigt "
-"wird."
+"Die Methode \"Dynamisch\" belegt nur so viel Speicherplatz wie Daten "
+"heruntergeladen wurden."

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:356
 #: deluge/ui/webui/config_tabs_deluge.py:135
 msgid "Use Compact Allocation"
-msgstr "Kompakte Zuweisung verwenden"
+msgstr "Dynamisch zuweisen"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:408
 msgid "Prioritize first and last pieces of files in torrent"
-msgstr "Erste und letzte Stücke von Dateien in Torrents bevorzugen"
+msgstr ""
+"Erste und letzte Stücke von Dateien in Torrents bevorzugen um so z.B. eine "
+"frühe Vorschau von Videodateien zu ermöglichen"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:409
 msgid "Prioritize first and last pieces of torrent"
@ -453,7 +456,7 @@ msgstr "Deluge wählt automatisch jedes Mal einen anderen Port."
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:521
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:709
 msgid "Use Random Ports"
-msgstr "Benutze Zufallsports"
+msgstr "Benutze zufällige Ports"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:539
 msgid "Active Port:"
@ -479,20 +482,19 @@ msgstr "Aktiven Port testen"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:677
 msgid "<b>Incoming Ports</b>"
-msgstr "<b>Ankommende Kanäle</b>"
+msgstr "Eingehende Ports"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:792
 msgid "<b>Outgoing Ports</b>"
-msgstr "<b>Ausgehende Kanäle</b>"
+msgstr "Ausgehende Ports"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:827
 msgid ""
 "The TOS byte set in the IP header of every packet sent to peers (including "
 "web seeds).  Expects a Hex value."
 msgstr ""
-"Das TOS-Byte beschreibt die Art der gesendeten Daten mit einem Hex-Wert. Es "
-"wird in der IP-Kopfzeile jedes Paketes an die Gegenstellen (einschließlich "
-"Web-Seeds) gesendet."
+"Das TOS-Byte (im Hex-Format), das im IP-Header an die Peers (einschließlich "
+"Webseeds) gesendet wird."

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:828
 msgid "Peer TOS Byte:"
@ -526,11 +528,11 @@ msgstr "NAT-PMP"
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:927
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:928
 msgid "Peer Exchange"
-msgstr "Austausch von Gegenstellen"
+msgstr "Peer-Austausch"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:945
 msgid "Local Service Discovery finds local peers on your network."
-msgstr "Lokale Dienst-Suche findet Gegenstellen in Ihrem lokalen Netzwerk."
+msgstr "Local Service Discovery (LSD) findet Peers im lokalen Netzwerk."

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:946
 #: deluge/ui/webui/config_tabs_deluge.py:73
@ -576,8 +578,8 @@ msgid ""
 "Full Stream\n"
 "Either"
 msgstr ""
-"Protokoll\n"
-"Daten\n"
+"Protokollinformationen\n"
+"Datenstrom\n"
 "Beides"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1080
@ -613,17 +615,17 @@ msgstr "Maximale Anzahl halboffener Verbindungen"
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1381
 msgid "The maximum upload speed for all torrents.  Set -1 for unlimited."
 msgstr ""
-"Die maximale Upload-Rate für alle Torrents. Auf -1 setzen für unendlich."
+"Die maximale Uploadrate für alle Torrents. Auf -1 setzen für unendlich."

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1293
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1575
 msgid "Maximum Upload Speed (KiB/s):"
-msgstr "Maximale Upload-Rate (KiB/s):"
+msgstr "Maximale Uploadrate (KiB/s):"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1304
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1329
 msgid "The maximum number of connections allowed.  Set -1 for unlimited."
-msgstr "max. Anzahl von Verbindungen. Setze -1 für unendlich."
+msgstr "max. Anzahl von Verbindungen. Auf -1 setzen für unendlich."

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1306
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1538
@ -1051,7 +1053,7 @@ msgstr "<b>Information</b>"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:4337
 msgid "_Install Plugin"
-msgstr "_Installiere Pulgin"
+msgstr "Installiere Plugin"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:4379
 msgid "_Rescan Plugins"
--- a/deluge/i18n/deluge.pot
+++ b/deluge/i18n/deluge.pot
--- a/deluge/i18n/el.po
+++ b/deluge/i18n/el.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/en_AU.po
+++ b/deluge/i18n/en_AU.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/en_CA.po
+++ b/deluge/i18n/en_CA.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/en_GB.po
+++ b/deluge/i18n/en_GB.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/eo.po
+++ b/deluge/i18n/eo.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/es.po
+++ b/deluge/i18n/es.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: deluge\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-01-06 21:52-0600\n"
-"PO-Revision-Date: 2008-12-27 19:50+0000\n"
-"Last-Translator: Franco Sabbatini <fsabbatini@gmail.com>\n"
+"PO-Revision-Date: 2009-01-29 08:58+0000\n"
+"Last-Translator: Rafael Muñoz Rodríguez <rmunozrodriguez@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
@ -1949,12 +1949,12 @@ msgstr "Deluge"
 #: deluge/ui/gtkui/systemtray.py:197
 #: deluge/ui/webui/scripts/template_strings.py:37
 msgid "Down"
-msgstr "Abajo"
+msgstr "Bajada"

 #: deluge/ui/gtkui/systemtray.py:198
 #: deluge/ui/webui/scripts/template_strings.py:116
 msgid "Up"
-msgstr "Arriba"
+msgstr "Subida"

 #: deluge/ui/gtkui/systemtray.py:366
 msgid "Deluge is locked"
@ -2116,7 +2116,7 @@ msgstr "Ancho de banda"

 #: deluge/ui/gtkui/preferences.py:60
 msgid "Interface"
-msgstr "Interfaz:"
+msgstr "Interfaz"

 #: deluge/ui/gtkui/preferences.py:61
 #: deluge/ui/webui/scripts/template_strings.py:74
@ -2133,7 +2133,7 @@ msgstr "Proxy"

 #: deluge/ui/gtkui/preferences.py:61
 msgid "Notification"
-msgstr "Aviso"
+msgstr "Notificación"

 #: deluge/ui/gtkui/preferences.py:61
 msgid "Plugins"
--- a/deluge/i18n/et.po
+++ b/deluge/i18n/et.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/eu.po
+++ b/deluge/i18n/eu.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/fa.po
+++ b/deluge/i18n/fa.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/fi.po
+++ b/deluge/i18n/fi.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/fr.po
+++ b/deluge/i18n/fr.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: deluge\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-01-06 21:52-0600\n"
-"PO-Revision-Date: 2009-01-24 22:42+0000\n"
-"Last-Translator: zero <vincelepapibrossard@hotmail.com>\n"
+"PO-Revision-Date: 2009-01-27 03:58+0000\n"
+"Last-Translator: Kaïs Bejaoui <kaisoun@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
@ -1941,20 +1941,23 @@ msgid ""
 "General Public License along with this program; if not, see "
 "<http://www.gnu.org/licenses>."
 msgstr ""
-"Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le
-\n"
-"  modifier suivant les termes de la “GNU General Public License” telle que
-\n"
-"  publiée par la Free Software Foundation : soit la version 3 de cette
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le\r\n"
+"  modifier suivant les termes de la “GNU General Public License” telle "
+"que\r\n"
+"  publiée par la Free Software Foundation : soit la version 3 de cette\r\n"
+"  licence, soit (à votre gré) toute version ultérieure.\r\n"
+"  \r\n"
 "  Ce programme est distribué dans l’espoir qu’il vous sera utile, mais "
-"  licence, soit (à votre gré) toute version ultérieure.
-\n"
-"  
-\n"
-"  Ce programme est distribué dans l’espoir qu’il vous sera utile, mais "
+"SANS\r\n"
+"  AUCUNE GARANTIE : sans même la garantie implicite de "
+"COMMERCIALISABILITÉ\r\n"
+"  ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence "
+"Générale\r\n"
+"  Publique GNU pour plus de détails.\r\n"
+"  \r\n"
 "  Vous devriez avoir reçu une copie de la Licence Générale Publique GNU "
-\n"
-"  AUCUNE GARANTIE : sans même la garantie implicite de COMMERCIALISABILITÉ
+"avec\r\n"
+"  ce programme ; si ce n’est pas le cas, consultez :\r\n"
 "  <http://www.gnu.org/licenses/>."

 #: deluge/ui/gtkui/systemtray.py:197
@ -2003,12 +2006,12 @@ msgstr "Autre..."

 #: deluge/ui/gtkui/menubar.py:78
 msgid "On"
-msgstr "Priorité"
+msgstr "Activé"

 #: deluge/ui/gtkui/menubar.py:81
 #: deluge/ui/webui/scripts/template_strings.py:71
 msgid "Off"
-
+msgstr "Désactivé"

 #: deluge/ui/gtkui/menubar.py:301
 msgid "Choose a directory to move files to"
@ -2045,7 +2048,7 @@ msgstr "Torrent terminé"
 #: deluge/ui/gtkui/notification.py:68
 #, python-format
 msgid "Including %i files"
-#: deluge/ui/gtkui/peers_tab.py:142 deluge/ui/gtkui/torrentview.py:159
+msgstr "Inclure %i fichiers"

 #: deluge/ui/gtkui/notification.py:96
 #, python-format
@ -2088,11 +2091,11 @@ msgstr " Torrent rajouté à la queue"

 #: deluge/ui/gtkui/mainwindow.py:209
 msgid "Down:"
-msgstr "Sans étiquette"
+msgstr "Descendant:"

 #: deluge/ui/gtkui/mainwindow.py:209
 msgid "Up:"
-msgstr " Torrents en file d'attente"
+msgstr "Montant :"

 #: deluge/ui/gtkui/removetorrentdialog.py:66
 msgid "Torrents"
@ -2109,7 +2112,7 @@ msgstr "Le torrent a depassé le ratio"
 #: deluge/ui/gtkui/edittrackersdialog.py:74
 #: deluge/ui/gtkui/createtorrentdialog.py:88
 msgid "Tier"
-
+msgstr "Ranger"

 #: deluge/ui/gtkui/edittrackersdialog.py:76 deluge/ui/gtkui/torrentview.py:179
 #: deluge/ui/gtkui/createtorrentdialog.py:90
@ -2140,7 +2143,7 @@ msgstr "Autre"

 #: deluge/ui/gtkui/preferences.py:61 deluge/ui/webui/config_tabs_deluge.py:142
 msgid "Daemon"
-
+msgstr "Démon"

 #: deluge/ui/gtkui/preferences.py:61 deluge/ui/webui/config_tabs_deluge.py:91
 msgid "Proxy"
@ -2152,7 +2155,7 @@ msgstr "Notification"

 #: deluge/ui/gtkui/preferences.py:61
 msgid "Plugins"
-msgstr ""
+msgstr "Greffons"

 #: deluge/ui/gtkui/preferences.py:73 deluge/ui/webui/config_tabs_deluge.py:80
 msgid "Enabled"
@ -2160,7 +2163,7 @@ msgstr "Activé"

 #: deluge/ui/gtkui/preferences.py:75
 msgid "Plugin"
-msgstr "Notification"
+msgstr "Greffon"

 #: deluge/ui/gtkui/preferences.py:832
 msgid "Select the Plugin"
@ -2201,7 +2204,7 @@ msgstr "Disp."

 #: deluge/ui/gtkui/torrentview.py:175
 msgid "Added"
-
+msgstr "Ajouté"

 #: deluge/ui/gtkui/createtorrentdialog.py:117
 msgid "Choose a file"
@ -2240,7 +2243,7 @@ msgstr "Configuration"
 #: deluge/ui/webui/register_menu.py:32
 #: deluge/ui/webui/scripts/template_strings.py:21
 msgid "Connect"
-#: deluge/ui/webui/config_forms.py:96
+msgstr "Connecter"

 #: deluge/ui/webui/register_menu.py:33
 #: deluge/ui/webui/scripts/template_strings.py:5
@ -2278,20 +2281,20 @@ msgstr "Supprimer"
 #: deluge/ui/webui/register_menu.py:45
 #: deluge/ui/webui/scripts/template_strings.py:106
 msgid "Stop"
-
+msgstr "Arrêter"

 #: deluge/ui/webui/register_menu.py:46
 #: deluge/ui/webui/scripts/template_strings.py:104
 msgid "Start"
-#: deluge/ui/webui/register_menu.py:44
+msgstr "Démarrer"

 #: deluge/ui/webui/register_menu.py:49
 msgid "Queue Top"
-#: deluge/ui/webui/register_menu.py:45
+msgstr "Haut de la queue"

 #: deluge/ui/webui/register_menu.py:50
 msgid "Queue Bottom"
-
+msgstr "Bas de la queue"

 #: deluge/ui/webui/register_menu.py:52
 #: deluge/ui/webui/scripts/template_strings.py:61
@ -2328,7 +2331,7 @@ msgstr ""

 #: deluge/ui/webui/config_tabs_deluge.py:69
 msgid "Mainline DHT"
-msgstr ""
+msgstr "Table de hachage distribuée principale"

 #: deluge/ui/webui/config_tabs_deluge.py:70
 msgid "UpNP"
@ -2336,7 +2339,7 @@ msgstr "UpNP"

 #: deluge/ui/webui/config_tabs_deluge.py:72
 msgid "Peer-Exchange"
-msgstr ""
+msgstr "Échange-Pair"

 #: deluge/ui/webui/config_tabs_deluge.py:78
 msgid "Encryption"
@ -2372,11 +2375,11 @@ msgstr "Niveau"

 #: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "Socksv4"
-msgstr "Entrant"
+msgstr "Socksv4"

 #: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "Socksv5"
-msgstr "Sortant"
+msgstr "Socksv5"

 #: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "Socksv5 W/ Auth"
@ -2416,7 +2419,7 @@ msgstr "Mot de passe"

 #: deluge/ui/webui/config_tabs_deluge.py:104
 msgid "Global"
-#: deluge/ui/webui/config_tabs_deluge.py:98
+msgstr "Global"

 #: deluge/ui/webui/config_tabs_deluge.py:105
 #: deluge/ui/webui/config_tabs_deluge.py:121
@ -2427,7 +2430,7 @@ msgstr "-1 = Illimité"
 #: deluge/ui/webui/config_tabs_deluge.py:122
 #: deluge/ui/webui/torrent_options.py:41 deluge/ui/webui/torrent_add.py:43
 msgid "Maximum Connections"
-msgid "Global"
+msgstr "Connexions maximum"

 #: deluge/ui/webui/config_tabs_deluge.py:107
 #: deluge/ui/webui/config_tabs_deluge.py:123
@ -2451,7 +2454,7 @@ msgstr ""

 #: deluge/ui/webui/config_tabs_deluge.py:112
 msgid "Maximum Connection Attempts per Second"
-#: deluge/ui/webui/config_tabs_deluge.py:109
+msgstr "Tentatives de connexions maximales par seconde"

 #: deluge/ui/webui/config_tabs_deluge.py:114
 msgid "Rate Limit IP Overhead"
@ -2459,12 +2462,12 @@ msgstr ""

 #: deluge/ui/webui/config_tabs_deluge.py:120
 msgid "Per Torrent"
-msgstr ""
+msgstr "Par torrent"

 #: deluge/ui/webui/config_tabs_deluge.py:130
 #: deluge/ui/webui/scripts/template_strings.py:39
 msgid "Download"
-
+msgstr "Téléchargement"

 #: deluge/ui/webui/config_tabs_deluge.py:131
 msgid "Store all downoads in"
@ -2476,11 +2479,11 @@ msgstr "Sauvegarder les fichiers .torrent dans"

 #: deluge/ui/webui/config_tabs_deluge.py:133
 msgid "Auto Add folder"
-msgstr ""
+msgstr "Ajout automatique de dossiers"

 #: deluge/ui/webui/config_tabs_deluge.py:134
 msgid "Auto Add enabled"
-msgstr "Enregistrer tous les téléchargements dans"
+msgstr "Ajout automatique activé"

 #: deluge/ui/webui/config_tabs_deluge.py:136 deluge/ui/webui/torrent_add.py:47
 msgid "Prioritize first and last pieces"
@ -2497,11 +2500,11 @@ msgstr "-1 = Illimité"

 #: deluge/ui/webui/config_tabs_deluge.py:157
 msgid "Total active torrents"
-
+msgstr "Torrents actifs totaux"

 #: deluge/ui/webui/config_tabs_deluge.py:158
 msgid "Total active downloading"
-"Redémarrer le démon et l'interface web  après le changement des paramètres"
+msgstr "Téléchargement actifs totaux"

 #: deluge/ui/webui/config_tabs_deluge.py:159
 msgid "Total active seeding"
--- a/deluge/i18n/fy.po
+++ b/deluge/i18n/fy.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/gl.po
+++ b/deluge/i18n/gl.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/he.po
+++ b/deluge/i18n/he.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: Hebrew\n"

--- a/deluge/i18n/hi.po
+++ b/deluge/i18n/hi.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/hr.po
+++ b/deluge/i18n/hr.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/hu.po
+++ b/deluge/i18n/hu.po
@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/id.po
+++ b/deluge/i18n/id.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: deluge\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-01-06 21:52-0600\n"
-"PO-Revision-Date: 2008-12-24 06:11+0000\n"
-"Last-Translator: Marcos Pinto <markybob@gmail.com>\n"
+"PO-Revision-Date: 2009-01-25 06:50+0000\n"
+"Last-Translator: Rahman Yusri Aftian <aftian@yahoo.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
@ -45,7 +45,7 @@ msgstr "<b>Pengaturan Label</b>"
 #: deluge/ui/gtkui/systemtray.py:216 deluge/ui/gtkui/systemtray.py:334
 #: deluge/ui/gtkui/systemtray.py:339
 msgid "KiB/s"
-msgstr "KiB/detik"
+msgstr "KiB/s"

 #: deluge/plugins/label/label/data/label_options.glade:158
 msgid "Upload Slots:\t"
@ -57,7 +57,7 @@ msgstr "Kecepatan mengunggah:"

 #: deluge/plugins/label/label/data/label_options.glade:184
 msgid "Download Speed:"
-msgstr "Kecepatan mengunduh:"
+msgstr "Kecepatan pengunduhan:"

 #: deluge/plugins/label/label/data/label_options.glade:226
 msgid "Connections:"
@ -110,7 +110,7 @@ msgstr ""

 #: deluge/plugins/label/label/data/label_options.glade:509
 msgid "Location"
-msgstr "Lokasi"
+msgstr "_Lokasi:"

 #: deluge/plugins/label/label/data/label_options.glade:541
 msgid ""
--- a/deluge/i18n/is.po
+++ b/deluge/i18n/is.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/it.po
+++ b/deluge/i18n/it.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/iu.po
+++ b/deluge/i18n/iu.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/ja.po
+++ b/deluge/i18n/ja.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/jv.po
+++ b/deluge/i18n/jv.po
--- a/deluge/i18n/ka.po
+++ b/deluge/i18n/ka.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/kk.po
+++ b/deluge/i18n/kk.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/kn.po
+++ b/deluge/i18n/kn.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/ko.po
+++ b/deluge/i18n/ko.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/ku.po
+++ b/deluge/i18n/ku.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/la.po
+++ b/deluge/i18n/la.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/lt.po
+++ b/deluge/i18n/lt.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/lv.po
+++ b/deluge/i18n/lv.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/mk.po
+++ b/deluge/i18n/mk.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/ms.po
+++ b/deluge/i18n/ms.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/nb.po
+++ b/deluge/i18n/nb.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: deluge\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-01-06 21:52-0600\n"
-"PO-Revision-Date: 2009-01-24 22:44+0000\n"
-"Last-Translator: Kimme Utsi <kimmeu@gmail.com>\n"
+"PO-Revision-Date: 2009-01-25 21:02+0000\n"
+"Last-Translator: Adrian Dvergsdal <Unknown>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
@ -170,7 +170,7 @@ msgstr "_URL"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:240
 msgid "Info_hash"
-msgstr ""
+msgstr "Sjekksum"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:286
 msgid "_Remove"
--- a/deluge/i18n/nds.po
+++ b/deluge/i18n/nds.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/nl.po
+++ b/deluge/i18n/nl.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: deluge\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-01-06 21:52-0600\n"
-"PO-Revision-Date: 2009-01-02 15:12+0000\n"
-"Last-Translator: Henri De Veene <Unknown>\n"
+"PO-Revision-Date: 2009-01-29 19:40+0000\n"
+"Last-Translator: Grietje <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
@ -302,7 +302,7 @@ msgstr "Geselecteerde torrents voortzetten."

 #: deluge/ui/gtkui/glade/filtertree_menu.glade:42
 msgid "Resu_me All"
-msgstr ""
+msgstr "_Alle Voortzetten"

 #: deluge/ui/gtkui/glade/torrent_menu.glade:11
 msgid "_Open Folder"
@ -703,7 +703,7 @@ msgid ""
 msgstr ""
 "Classic Mode zal het meeste van de daemon-functionaliteit verbergen en laat "
 "Deluge er uit zien als een enkel programma. Gebruik dit als u geen voordeel "
-"wil nemen met het draaien van Deluge als daemon.
+"wil nemen met het draaien van Deluge als daemon.\r\n"
 "Herstart Deluge om deze instelling te activeren."

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1721
@ -1053,7 +1053,7 @@ msgstr "_Installeer Plugin"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:4379
 msgid "_Rescan Plugins"
-msgid "_Rescan Plugins"
+msgstr "_Opnieuw scannen naar Plugins"

 #: deluge/ui/gtkui/glade/edit_trackers.glade:9
 #: deluge/ui/webui/scripts/template_strings.py:42
--- a/deluge/i18n/nn.po
+++ b/deluge/i18n/nn.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/pl.po
+++ b/deluge/i18n/pl.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/pms.po
+++ b/deluge/i18n/pms.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/pt.po
+++ b/deluge/i18n/pt.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: deluge\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-01-06 21:52-0600\n"
-"PO-Revision-Date: 2009-01-19 12:05+0000\n"
-"Last-Translator: Tony Manco <Unknown>\n"
+"PO-Revision-Date: 2009-01-30 15:36+0000\n"
+"Last-Translator: Major Kong <major.t.kong@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
@ -62,11 +62,11 @@ msgstr "Velocidade de Recepção:"

 #: deluge/plugins/label/label/data/label_options.glade:226
 msgid "Connections:"
-msgstr "Conecções:"
+msgstr "Ligações:"

 #: deluge/plugins/label/label/data/label_options.glade:270
 msgid "Apply per torrent max settings:"
-msgstr "Adicionar por torrent máximas definições:"
+msgstr "Aplicar definições máx. por torrent"

 #: deluge/plugins/label/label/data/label_options.glade:283
 msgid "Maximum"
@ -77,12 +77,12 @@ msgstr "Máximo"
 #: deluge/ui/webui/torrent_options.py:48
 #: deluge/ui/webui/scripts/template_strings.py:12
 msgid "Auto Managed"
-msgstr "Auto gestão"
+msgstr "Auto Gerir"

 #: deluge/plugins/label/label/data/label_options.glade:349
 #: deluge/ui/gtkui/glade/main_window.glade:1880
 msgid "Stop seed at ratio:"
-msgstr "Parar semente ao rácio de:"
+msgstr ""

 #: deluge/plugins/label/label/data/label_options.glade:364
 #: deluge/ui/gtkui/glade/main_window.glade:1919
@ -103,7 +103,7 @@ msgstr "Fila"
 #: deluge/plugins/label/label/data/label_options.glade:465
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:246
 msgid "Move completed to:"
-msgstr "Mover completos para:"
+msgstr "Mover terminados para:"

 #: deluge/plugins/label/label/data/label_options.glade:493
 msgid "Apply location settings:"
@ -143,7 +143,7 @@ msgstr "Adicionar Etiqueta"

 #: deluge/plugins/label/label/data/label_options.glade:672
 msgid "<b>Add Label</b>"
-msgstr "<b>Adicionar etiqueta</b>"
+msgstr "<b>Adicionar Etiqueta</b>"

 #: deluge/plugins/label/label/data/label_options.glade:703
 msgid "Name:"
@ -190,7 +190,7 @@ msgstr "Fi_cheiros"
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:268
 #: deluge/ui/gtkui/glade/main_window.glade:1955
 msgid "Select A Folder"
-msgstr "Seleccione Uma Pasta"
+msgstr "Seleccionar Uma Pasta"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:434
 msgid "<b>Download Location</b>"
@ -212,21 +212,21 @@ msgstr "<b>Alocação</b>"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:558
 msgid "Max Down Speed:"
-msgstr "Velocidade Máxima de Recepção"
+msgstr "Velocidade Máxima de Recepção:"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:570
 msgid "Max Up Speed:"
-msgstr "Velocidade Máxima de Envio"
+msgstr "Velocidade Máxima de Envio:"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:584
 #: deluge/ui/gtkui/glade/main_window.glade:1734
 msgid "Max Connections:"
-msgstr "Máximo de Ligações:"
+msgstr "Número Máx. de Ligações"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:598
 #: deluge/ui/gtkui/glade/main_window.glade:1797
 msgid "Max Upload Slots:"
-msgstr "Número máximo de envios:"
+msgstr "Número Máx. de Envios:"

 #: deluge/ui/gtkui/glade/add_torrent_dialog.glade:667
 #: deluge/ui/gtkui/glade/main_window.glade:1830
@ -292,7 +292,7 @@ msgstr "Trackers:"

 #: deluge/ui/gtkui/glade/filtertree_menu.glade:10
 msgid "_Select All"
-msgstr "_Seleccionar Tudo"
+msgstr "_Seleccionar Todos"

 #: deluge/ui/gtkui/glade/filtertree_menu.glade:41
 #: deluge/ui/gtkui/glade/torrent_menu.glade:48
@ -343,7 +343,7 @@ msgstr "Mover _Armazenamento"
 #: deluge/ui/gtkui/glade/torrent_menu.glade:212
 #: deluge/ui/gtkui/glade/tray_menu.glade:87
 msgid "_Download Speed Limit"
-msgstr "_Limite de Velocidade de Download"
+msgstr "_Limite de Velocidade de Recepção"

 #: deluge/ui/gtkui/glade/torrent_menu.glade:227
 #: deluge/ui/gtkui/glade/tray_menu.glade:103
@ -352,11 +352,11 @@ msgstr "_Limite de Velocidade de Envio"

 #: deluge/ui/gtkui/glade/torrent_menu.glade:242
 msgid "_Connection Limit"
-msgstr "_Ligação Limite"
+msgstr "Número Máx. de _Ligações"

 #: deluge/ui/gtkui/glade/torrent_menu.glade:258
 msgid "Upload _Slot Limit"
-msgstr "Limite _Quotas de Envio"
+msgstr "Quota_s de Envio"

 #: deluge/ui/gtkui/glade/torrent_menu.glade:273
 msgid "_Auto Managed"
@ -386,7 +386,7 @@ msgstr "Preferências"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:74
 msgid "<b><i><big>Downloads</big></i></b>"
-msgstr "<b><i><big>Downloads</big></i></b>"
+msgstr "<b><i><big>Transferências</big></i></b>"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:216
 msgid "Auto add .torrents from:"
@ -398,7 +398,7 @@ msgstr "Copiar ficheiros .torrent para:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:290
 msgid "Download to:"
-msgstr "Descarregar para:"
+msgstr "Transferir para:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:303
 msgid "<b>Folders</b>"
@ -431,7 +431,7 @@ msgstr "Dar prioridade às primeiros e últimas peças dos ficheiros no torrent"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:409
 msgid "Prioritize first and last pieces of torrent"
-msgstr "Dar prioridade ás primeiras e ultimas peças do torrent"
+msgstr "Dar prioridade às primeiras e ultimas peças do torrent"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:424
 msgid "<b>Options</b>"
@ -448,7 +448,7 @@ msgstr "<b><i><big>Rede</big></i></b>"
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:520
 msgid "Deluge will automatically choose a different port to use every time."
 msgstr ""
-"O Deluge irá escolher automaticamente uma porta diferente todas as vezes."
+"O Deluge irá escolher automaticamente uma porta diferente de cada vez."

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:521
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:709
@ -515,7 +515,7 @@ msgstr "UPnP"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:910
 msgid "NAT Port Mapping Protocol"
-msgstr "NAT Protocolo de Mapeamento de Portas"
+msgstr "Protocolo NAT de Mapeamento de Portas"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:911
 #: deluge/ui/webui/config_tabs_deluge.py:71
@ -551,7 +551,7 @@ msgstr "<b>Extras de Rede</b>"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1019
 msgid "Inbound:"
-msgstr "Entrada"
+msgstr "Entrada:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1026
 msgid "Level:"
@ -604,7 +604,7 @@ msgstr "Número Máximo de Tentativas de Ligação por Segundo:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1280
 msgid "Maximum Half-Open Connections:"
-msgstr "Máximo de ligações meias-abertas:"
+msgstr "Número Máx. de Ligações Meio-Abertas:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1291
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1315
@ -616,7 +616,7 @@ msgstr ""
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1293
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1575
 msgid "Maximum Upload Speed (KiB/s):"
-msgstr "Velocidade Máxima de Envio (KB/s):"
+msgstr "Velocidade Máxima de Envio (KiB/s):"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1304
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1329
@ -626,7 +626,7 @@ msgstr "Número máximo de ligações permitidas. -1 para ilimitado."
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1306
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1538
 msgid "Maximum Connections:"
-msgstr "Ligações Máximas:"
+msgstr "Número Máximo de Ligações:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1317
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1549
@ -642,7 +642,7 @@ msgstr ""
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1349
 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1562
 msgid "Maximum Download Speed (KiB/s):"
-msgstr "Velocidade máxima de download (KiB/s):"
+msgstr "Velocidade máxica de recepção (KiB/s):"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1400
 msgid "The maximum upload slots for all torrents.  Set -1 for unlimited."
@ -667,7 +667,7 @@ msgstr ""

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1463
 msgid "<b>Global Bandwidth Usage</b>"
-msgstr "<b>Uso da Largura de Banda Global</b>"
+msgstr "<b>Uso de Largura de Banda Global</b>"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1502
 msgid "The maximum upload slots per torrent.  Set -1 for unlimited."
@ -698,7 +698,7 @@ msgid ""
 "advantage of running Deluge as a daemon. You need to restart Deluge for this "
 "setting to take effect."
 msgstr ""
-"O Modo Clássico irá esconder a maioria das funcionalidades de serviço e irá "
+"O Modo Clássico irá esconder a maioria das funcionalidades do serviço e irá "
 "fazer com que o Deluge pareça uma única aplicação. Use isto se não quiser "
 "tirar partido das vantagens de correr o Deluge como um serviço. Precisa de "
 "reiniciar o Deluge para que esta definição tenha efeito."
@ -731,19 +731,19 @@ msgstr "Trazer a caixa de diálogo para a frente"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1849
 msgid "<b>Add Torrents Dialog</b>"
-msgstr "<b>Adicionar Diálogo de Torrents</b>"
+msgstr "Janela de Adição de Torrents"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1881
 msgid "Enable system tray icon"
-msgstr "Activar o ícone na barra de sistema"
+msgstr "Activar o ícone na área de notificação"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1896
 msgid "Minimize to tray on close"
-msgstr "Minimizar para a barra de sistema ao fechar"
+msgstr "Minimizar para a área de notificação"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1915
 msgid "Start in tray"
-msgstr "Iniciar na barra de sistema"
+msgstr "Iniciar na área de notificação"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1936
 msgid "Password protect system tray"
@ -761,7 +761,7 @@ msgstr "Palavra-passe:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:1998
 msgid "<b>System Tray</b>"
-msgstr "<b>Barra do Sistema</b>"
+msgstr "<b>Área de Notificação</b>"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2024
 msgid "page 10"
@ -776,7 +776,7 @@ msgid ""
 "Deluge will check our servers and will tell you if a newer version has been "
 "released"
 msgstr ""
-"O Deluge irá verificar os nossos servidores e irá dizer-lhe se alguma nova "
+"O Deluge irá verificar os nossos servidores e dizer-lhe se alguma nova "
 "versão foi lançada."

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2098
@ -848,15 +848,15 @@ msgstr "Colocar torrents novos no topo da fila"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2600
 msgid "Total active seeding:"
-msgstr "Total activos a semear:"
+msgstr "Total de torrents activos a semear:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2613
 msgid "Total active:"
-msgstr "Total activo:"
+msgstr "Total de torrents activos:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2642
 msgid "Total active downloading:"
-msgstr "Total activos a descarregar:"
+msgstr "Total de torrents activos a receber:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2656
 msgid "Do not count slow torrents"
@ -868,11 +868,11 @@ msgstr "<b>Torrents Activos</b>"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2713
 msgid "Share Ratio Limit:"
-msgstr "Limite de Partilha de Rácio:"
+msgstr "Limite de Rácio de Partilha:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2723
 msgid "Seed Time Ratio:"
-msgstr "Tempo de Semente de Rácio:"
+msgstr "Rácio de Tempo de Semente:"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:2735
 msgid "Seed Time (m):"
@ -1049,7 +1049,7 @@ msgstr "_Instalar Plugin"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:4379
 msgid "_Rescan Plugins"
-msgstr ""
+msgstr "Volta_r a Procurar por Plugins"

 #: deluge/ui/gtkui/glade/edit_trackers.glade:9
 #: deluge/ui/webui/scripts/template_strings.py:42
@ -1094,7 +1094,7 @@ msgstr "<big><b>Adicionar Torrents em Espera</b></big>"

 #: deluge/ui/gtkui/glade/queuedtorrents.glade:127
 msgid "Automatically add torrents on connect"
-msgstr "Automaticamente adicionar torrents ao ligar"
+msgstr "Adicionar automaticamente torrents ao ligar"

 #: deluge/ui/gtkui/glade/move_storage_dialog.glade:9
 #: deluge/ui/webui/scripts/template_strings.py:62
@ -1133,15 +1133,15 @@ msgstr "_Iniciar serviço local"

 #: deluge/ui/gtkui/glade/connection_manager.glade:394
 msgid "Automatically connect to selected host on start-up"
-msgstr "Ligar automaticamente ao anfitrião seleccionado no arranque"
+msgstr "Ligar automaticamente ao anfitrião seleccionado ao iniciar"

 #: deluge/ui/gtkui/glade/connection_manager.glade:405
 msgid "Automatically start localhost if needed"
-msgstr "Automaticamente arrancar com o anfitrião local se necessário"
+msgstr "Arrancar automaticamente anfitrião local se necessário"

 #: deluge/ui/gtkui/glade/connection_manager.glade:419
 msgid "Do not show this dialog on start-up"
-msgstr "Não mostrar este diálogo no arranque"
+msgstr "Não mostrar esta janela ao iniciar"

 #: deluge/ui/gtkui/glade/connection_manager.glade:436
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:618
@ -1208,7 +1208,7 @@ msgstr ""
 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:574
 #: deluge/ui/webui/torrent_add.py:49
 msgid "Set Private Flag"
-msgstr "Definir Parâmetro Privado"
+msgstr "Definir como Privado"

 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:588
 msgid "Add this torrent to the session"
@ -1229,7 +1229,7 @@ msgstr "Localização:"

 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:831
 msgid "Creating Torrent"
-msgstr "A criar Torrent"
+msgstr "A Criar Torrent"

 #: deluge/ui/gtkui/glade/create_torrent_dialog.glade:868
 msgid "Save .torrent as"
@ -1293,7 +1293,7 @@ msgstr "_Editar"

 #: deluge/ui/gtkui/glade/main_window.glade:111
 msgid "_Connection Manager"
-msgstr "_Ligação Gestor"
+msgstr "Gestor de _Ligações"

 #: deluge/ui/gtkui/glade/main_window.glade:128
 msgid "_Torrent"
@ -1313,11 +1313,11 @@ msgstr "_Barra Lateral"

 #: deluge/ui/gtkui/glade/main_window.glade:162
 msgid "Status_bar"
-msgstr "Barra_estado"
+msgstr "Barra de E_stado"

 #: deluge/ui/gtkui/glade/main_window.glade:176
 msgid "T_abs"
-msgstr "A_bas"
+msgstr "Separa_dores"

 #: deluge/ui/gtkui/glade/main_window.glade:183
 msgid "_Columns"
@ -1325,11 +1325,11 @@ msgstr "_Colunas"

 #: deluge/ui/gtkui/glade/main_window.glade:191
 msgid "S_idebar"
-msgstr ""
+msgstr "Barra _Lateral"

 #: deluge/ui/gtkui/glade/main_window.glade:200
 msgid "Show _Zero Hits"
-msgstr ""
+msgstr "Ver Resultados Va_zios"

 #: deluge/ui/gtkui/glade/main_window.glade:209
 msgid "Show _Trackers"
@ -1341,7 +1341,7 @@ msgstr "_Ajuda"

 #: deluge/ui/gtkui/glade/main_window.glade:234
 msgid "Homepage"
-msgstr "Página inicial"
+msgstr "Página Web"

 #: deluge/ui/gtkui/glade/main_window.glade:251
 msgid "Frequently Asked Questions"
@ -1349,7 +1349,7 @@ msgstr "Perguntas Mais Frequentes"

 #: deluge/ui/gtkui/glade/main_window.glade:252
 msgid "FAQ"
-msgstr "PMF"
+msgstr "FAQ"

 #: deluge/ui/gtkui/glade/main_window.glade:269
 msgid "Community"
@ -1390,7 +1390,7 @@ msgstr "Continuar"

 #: deluge/ui/gtkui/glade/main_window.glade:386
 msgid "Queue Torrent Up"
-msgstr "Mover o torrent para cima na fila"
+msgstr "Mover o Torrent Para Cima na Fila"

 #: deluge/ui/gtkui/glade/main_window.glade:387
 #: deluge/ui/webui/register_menu.py:47
@ -1399,7 +1399,7 @@ msgstr "Subir na Fila"

 #: deluge/ui/gtkui/glade/main_window.glade:400
 msgid "Queue Torrent Down"
-msgstr "Mover o torrent para baixo na fila"
+msgstr "Mover o Torrent Para Baixo na Fila"

 #: deluge/ui/gtkui/glade/main_window.glade:401
 #: deluge/ui/webui/register_menu.py:48
@ -1412,7 +1412,7 @@ msgstr "_Expandir Todas"

 #: deluge/ui/gtkui/glade/main_window.glade:571
 msgid "_Do Not Download"
-msgstr "_Não Descarregar"
+msgstr "Não _Transferir"

 #: deluge/ui/gtkui/glade/main_window.glade:586
 msgid "_Normal Priority"
@ -1420,7 +1420,7 @@ msgstr "_Normal Prioridade"

 #: deluge/ui/gtkui/glade/main_window.glade:601
 msgid "_High Priority"
-msgstr "_Alta Prioridade"
+msgstr "Prioridade _Elevada"

 #: deluge/ui/gtkui/glade/main_window.glade:616
 msgid "Hi_ghest Priority"
@ -1448,7 +1448,7 @@ msgstr "<b>Estado do Tracker:</b>"

 #: deluge/ui/gtkui/glade/main_window.glade:863
 msgid "<b>Availability:</b>"
-msgstr "<b>Disponibilidade</b>"
+msgstr "<b>Disponibilidade:</b>"

 #: deluge/ui/gtkui/glade/main_window.glade:917
 msgid "<b>Peers:</b>"
@ -1489,7 +1489,7 @@ msgstr "<b>Recebidos:</b>"

 #: deluge/ui/gtkui/glade/main_window.glade:1164
 msgid "<b>Date Added:</b>"
-msgstr "<b>Data adicionado:</b>"
+msgstr "<b>Adicionado em:</b>"

 #: deluge/ui/gtkui/glade/main_window.glade:1219
 msgid "_Status"
@ -1537,15 +1537,15 @@ msgstr "_Pares"

 #: deluge/ui/gtkui/glade/main_window.glade:1747
 msgid "Max Upload Speed:"
-msgstr "Máxima Velocidade de Envio:"
+msgstr "Velocidade Máx. de Envio:"

 #: deluge/ui/gtkui/glade/main_window.glade:1760
 msgid "Max Download Speed:"
-msgstr "Velocidade máxima de download:"
+msgstr "Velocidade Máx. de Recepção:"

 #: deluge/ui/gtkui/glade/main_window.glade:1935
 msgid "Move completed:"
-msgstr "Mover completos:"
+msgstr "Mover terminados:"

 #: deluge/ui/gtkui/glade/main_window.glade:1992
 msgid "<b>Queue</b>"
@ -1569,7 +1569,7 @@ msgstr "Remover Torrent?"
 msgid ""
 "<big><b>Are you sure you want to remove the selected torrent?</b></big>"
 msgstr ""
-"<big><b>Tem a certeza que pretende remover o torrent seleccionado?</b></big>"
+"<big><b>Têm a certeza que pretende remover o torrent seleccionado?</b></big>"

 #: deluge/ui/gtkui/glade/main_window.glade:2289
 msgid "<i>The associated .torrent will be deleted!</i>"
@ -1577,7 +1577,7 @@ msgstr "<i>O .torrent associado será eliminado!</i>"

 #: deluge/ui/gtkui/glade/main_window.glade:2328
 msgid "<i>The downloaded data will be deleted!</i>"
-msgstr "<i>A informação descarregada será eliminada!</i>"
+msgstr "<i>A informação transferida será eliminada!</i>"

 #: deluge/ui/gtkui/glade/main_window.glade:2372
 msgid "Remove Selected Torrent"
@ -1589,7 +1589,7 @@ msgstr "Novo Lançamento"

 #: deluge/ui/gtkui/glade/main_window.glade:2421
 msgid "<b><big>New Release Available!</big></b>"
-msgstr "<b><big>Novo Lançamento disponível!</big></b>"
+msgstr "<b><big>Novo Lançamento Disponível!</big></b>"

 #: deluge/ui/gtkui/glade/main_window.glade:2472
 msgid "<i>Available Version:</i>"
@ -1601,11 +1601,11 @@ msgstr "<i>Versão Actual:</i>"

 #: deluge/ui/gtkui/glade/main_window.glade:2517
 msgid "Do not show this dialog in the future"
-msgstr "Não mostrar este diálogo no futuro"
+msgstr "Não mostrar esta janela no futuro"

 #: deluge/ui/gtkui/glade/main_window.glade:2557
 msgid "_Goto Website"
-msgstr "_Ir a Wesite"
+msgstr "_Ir a Website"

 #: deluge/ui/gtkui/glade/main_window.glade:2583
 msgid "Add a peer by its IP"
@ -1617,7 +1617,7 @@ msgstr "Anúncio OK"

 #: deluge/core/torrentmanager.py:689
 msgid "Announce Sent"
-msgstr "Anúncio enviado"
+msgstr "Anúncio Enviado"

 #: deluge/core/torrentmanager.py:698
 msgid "Alert"
@ -1642,11 +1642,11 @@ msgstr "aplicar_máximo"

 #: deluge/plugins/label/label/webui.py:132
 msgid "max_download_speed"
-msgstr ""
+msgstr "velocidade_máxima_de_recepção"

 #: deluge/plugins/label/label/webui.py:133
 msgid "max_upload_speed"
-msgstr "velocidade_máxima_upload"
+msgstr "velocidade_máxima_de_envio"

 #: deluge/plugins/label/label/webui.py:134
 msgid "max_upload_slots"
@ -1712,7 +1712,7 @@ msgstr ""

 #: deluge/plugins/label/label/gtkui/sidebar_menu.py:55
 msgid "Label _Options"
-msgstr "Etiqueta _Opções"
+msgstr "_Opções de Etiquetas"

 #: deluge/plugins/label/label/gtkui/sidebar_menu.py:56
 msgid "_Remove Label"
@ -1787,7 +1787,7 @@ msgstr "Importar ao iniciar o serviço"

 #: deluge/plugins/blocklist/blocklist/webui.py:76
 msgid "Download Now"
-msgstr "Descarregar Agora"
+msgstr "Transferir Agora"

 #: deluge/plugins/blocklist/blocklist/webui.py:77
 msgid "Import Now"
@ -1796,7 +1796,7 @@ msgstr "Importar Agora"
 #: deluge/plugins/blocklist/blocklist/webui.py:84
 #, python-format
 msgid "Downloading %.2f%%"
-msgstr "A descarregar %.2f%%"
+msgstr "A Transferir %.2f%%"

 #: deluge/plugins/blocklist/blocklist/webui.py:86
 #, python-format
@ -1835,7 +1835,7 @@ msgstr "Versão inválida"

 #: deluge/ui/gtkui/statusbar.py:129
 msgid "Not Connected"
-msgstr "Não ligado"
+msgstr "Desligado"

 #: deluge/ui/gtkui/statusbar.py:144
 #: deluge/ui/webui/scripts/template_strings.py:25
@ -1844,11 +1844,11 @@ msgstr "Ligações"

 #: deluge/ui/gtkui/statusbar.py:149
 msgid "Download Speed"
-msgstr "Velocidade de download"
+msgstr "Velocidade de Recepção"

 #: deluge/ui/gtkui/statusbar.py:154
 msgid "Upload Speed"
-msgstr "Velocidade de envio"
+msgstr "Velocidade de Envio"

 #: deluge/ui/gtkui/statusbar.py:159
 msgid "Protocol Traffic Download/Upload"
@ -1856,7 +1856,7 @@ msgstr ""

 #: deluge/ui/gtkui/statusbar.py:167
 msgid "No Incoming Connections!"
-msgstr "Sem ligações a entrar!"
+msgstr "Sem Ligações de Entrada!"

 #: deluge/ui/gtkui/statusbar.py:366 deluge/ui/gtkui/statusbar.py:394
 #: deluge/ui/gtkui/statusbar.py:421 deluge/ui/gtkui/systemtray.py:188
@ -1876,16 +1876,16 @@ msgstr "Outro..."
 #: deluge/ui/gtkui/statusbar.py:370 deluge/ui/gtkui/systemtray.py:325
 #: deluge/ui/gtkui/menubar.py:407
 msgid "Set Maximum Download Speed"
-msgstr ""
+msgstr "Definir Velocidade Máx. de Recepção"

 #: deluge/ui/gtkui/statusbar.py:398 deluge/ui/gtkui/systemtray.py:329
 #: deluge/ui/gtkui/menubar.py:408
 msgid "Set Maximum Upload Speed"
-msgstr ""
+msgstr "Definir Velocidade Máx. de Envio"

 #: deluge/ui/gtkui/statusbar.py:425 deluge/ui/gtkui/menubar.py:409
 msgid "Set Maximum Connections"
-msgstr ""
+msgstr "Definir Número Máx. de Ligações"

 #: deluge/ui/gtkui/addtorrentdialog.py:83 deluge/ui/gtkui/queuedtorrents.py:64
 msgid "Torrent"
@ -1894,7 +1894,7 @@ msgstr "Torrent"
 #: deluge/ui/gtkui/addtorrentdialog.py:91 deluge/ui/gtkui/files_tab.py:98
 #: deluge/ui/gtkui/createtorrentdialog.py:65
 msgid "Filename"
-msgstr "Nome do ficheiro"
+msgstr "Nome do Ficheiro"

 #: deluge/ui/gtkui/addtorrentdialog.py:102 deluge/ui/gtkui/files_tab.py:118
 #: deluge/ui/gtkui/torrentview.py:137
@ -1929,14 +1929,14 @@ msgid ""
 "General Public License along with this program; if not, see "
 "<http://www.gnu.org/licenses>."
 msgstr ""
-"Este programa é software livre: você pode redistribui-lo e/ou modificá-lo "
-"sobre os termos da GNU General Public License assim publicado pela Free "
-"Software Foundation; tanto a versão 3 da licença, ou (como opção sua) "
-"qualquer outra versão posterior. Este programa é distribuído com a esperança "
-"de que será útil, mas sem QUALQUER GARANTIA; mesmo sem a garantia implícita "
-"de MERCANTIBILIDADE ou ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Veja a GNU "
-"General Public License para mais detalhes. Você deve receber uma cópia da "
-"GNU General Public License em conjunto com este programa; senão veja "
+"Este programa é software livre: pode redistribui-lo e/ou modificá-lo dentro "
+"dos termos da GNU General Public License como publicada pela Free Software "
+"Foundation; tanto a versão 3 da licença, ou (por opção sua) qualquer outra "
+"versão posterior. Este programa é distribuído com a esperança de que será "
+"útil, mas sem QUALQUER GARANTIA; mesmo sem a garantia implícita de "
+"MERCANTIBILIDADE ou ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Veja a GNU General "
+"Public License para mais detalhes. Deve receber uma cópia da GNU General "
+"Public License em conjunto com este programa; senão veja "
 "<http://www.gnu.org/licenses>."

 #: deluge/ui/gtkui/systemtray.py:197
@ -1977,7 +1977,7 @@ msgstr "Prioridade"

 #: deluge/ui/gtkui/menubar.py:66
 msgid "Set Unlimited"
-msgstr "Ajustar Ilimitado"
+msgstr "Definir como Ilimitado"

 #: deluge/ui/gtkui/menubar.py:70
 msgid "Other.."
@ -2013,7 +2013,7 @@ msgstr "Cliente"
 #: deluge/ui/gtkui/peers_tab.py:129 deluge/ui/gtkui/torrentview.py:155
 #: deluge/ui/webui/scripts/template_strings.py:38
 msgid "Down Speed"
-msgstr "Velocidade de recepção"
+msgstr "Velocidade de Recepção"

 #: deluge/ui/gtkui/peers_tab.py:142 deluge/ui/gtkui/torrentview.py:159
 #: deluge/ui/webui/scripts/template_strings.py:117
@ -2040,7 +2040,7 @@ msgid ""
 "Thank you,\n"
 "Deluge"
 msgstr ""
-"Este email é para informar que o Deluge acabou de descarregar %s, que inclui "
+"Este email é para informar que o Deluge acabou de transferir %s, que inclui "
 "%i ficheiros.\n"
 "Para parar de receber estas alertas, simplesmente desligue a notificação por "
 "email nas preferências do Deluge.\n"
@ -2101,7 +2101,7 @@ msgstr "Tracker"

 #: deluge/ui/gtkui/preferences.py:60
 msgid "Downloads"
-msgstr ""
+msgstr "Transferências"

 #: deluge/ui/gtkui/preferences.py:60
 msgid "Network"
@ -2183,7 +2183,7 @@ msgstr "Disp."

 #: deluge/ui/gtkui/torrentview.py:175
 msgid "Added"
-msgstr "Adicionado"
+msgstr "Adicionado em"

 #: deluge/ui/gtkui/createtorrentdialog.py:117
 msgid "Choose a file"
@ -2322,7 +2322,7 @@ msgstr "Troca de utilizadores (peers)"

 #: deluge/ui/webui/config_tabs_deluge.py:78
 msgid "Encryption"
-msgstr "Crifragem"
+msgstr "Encriptação"

 #: deluge/ui/webui/config_tabs_deluge.py:80
 msgid "Forced"
--- a/deluge/i18n/pt_BR.po
+++ b/deluge/i18n/pt_BR.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: deluge\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-01-06 21:52-0600\n"
-"PO-Revision-Date: 2009-01-18 22:06+0000\n"
-"Last-Translator: Alexandre Sapata Carbonell <alexandrenescau@gmail.com>\n"
+"PO-Revision-Date: 2009-01-29 00:28+0000\n"
+"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
@ -491,6 +491,8 @@ msgid ""
 "The TOS byte set in the IP header of every packet sent to peers (including "
 "web seeds).  Expects a Hex value."
 msgstr ""
+"O byte TOS definido no cabeçalho IP de cada pacote enviado para os peers "
+"(incluindo web seeds). Espera que seja usado um valor em hexadecimal."

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:828
 msgid "Peer TOS Byte:"
@ -1055,7 +1057,7 @@ msgstr "_Instalar Plugin"

 #: deluge/ui/gtkui/glade/preferences_dialog.glade:4379
 msgid "_Rescan Plugins"
-msgstr ""
+msgstr "_Atualizar Plugins"

 #: deluge/ui/gtkui/glade/edit_trackers.glade:9
 #: deluge/ui/webui/scripts/template_strings.py:42
@ -1261,7 +1263,7 @@ msgstr "<b>Adicionar Peer</b>"

 #: deluge/ui/gtkui/glade/dgtkpopups.glade:211
 msgid "hostname:port"
-msgstr ""
+msgstr "servidor:porta"

 #: deluge/ui/gtkui/glade/tray_menu.glade:12
 msgid "_Show Deluge"
@ -1335,7 +1337,7 @@ msgstr "Barra lateral"

 #: deluge/ui/gtkui/glade/main_window.glade:200
 msgid "Show _Zero Hits"
-msgstr ""
+msgstr "Mostrar _Vazios"

 #: deluge/ui/gtkui/glade/main_window.glade:209
 msgid "Show _Trackers"
@ -1651,39 +1653,39 @@ msgstr "velocidade_máxima_de_download"

 #: deluge/plugins/label/label/webui.py:133
 msgid "max_upload_speed"
-msgstr ""
+msgstr "velocidade_máxima_de_upload"

 #: deluge/plugins/label/label/webui.py:134
 msgid "max_upload_slots"
-msgstr ""
+msgstr "máximo_de_vagas_de_upload"

 #: deluge/plugins/label/label/webui.py:135
 msgid "max_connections"
-msgstr ""
+msgstr "máximo_de_conexões"

 #: deluge/plugins/label/label/webui.py:138
 msgid "apply_queue"
-msgstr ""
+msgstr "aplicar_fila"

 #: deluge/plugins/label/label/webui.py:139
 msgid "is_auto_managed"
-msgstr ""
+msgstr "é_auto_gerenciado"

 #: deluge/plugins/label/label/webui.py:140
 msgid "stop_at_ratio"
-msgstr ""
+msgstr "parar_na_proporção"

 #: deluge/plugins/label/label/webui.py:141
 msgid "stop_ratio"
-msgstr ""
+msgstr "proporção_máxima"

 #: deluge/plugins/label/label/webui.py:142
 msgid "remove_at_ratio"
-msgstr ""
+msgstr "remover_na_proporção"

 #: deluge/plugins/label/label/webui.py:145
 msgid "apply_move_completed"
-msgstr ""
+msgstr "aplicar_mover_completados"

 #: deluge/plugins/label/label/webui.py:146
 msgid "move_completed"
@ -1691,15 +1693,15 @@ msgstr "mover_completados"

 #: deluge/plugins/label/label/webui.py:147
 msgid "move_completed_path"
-msgstr ""
+msgstr "caminho_mover_completados"

 #: deluge/plugins/label/label/webui.py:150
 msgid "auto_add"
-msgstr ""
+msgstr "adicionar_automaticamente"

 #: deluge/plugins/label/label/webui.py:151
 msgid "auto_add_trackers"
-msgstr ""
+msgstr "adicionar_trackers_automaticamente"

 #: deluge/plugins/label/label/webui.py:162
 #: deluge/plugins/label/label/gtkui/label_config.py:48
@ -1713,7 +1715,7 @@ msgstr "Rótulo"

 #: deluge/plugins/label/label/webui.py:163
 msgid "Work in progress.."
-msgstr ""
+msgstr "Ainda não está pronto..."

 #: deluge/plugins/label/label/gtkui/sidebar_menu.py:55
 msgid "Label _Options"
@ -1826,7 +1828,7 @@ msgstr "Atualizar Estado"
 #: deluge/plugins/blocklist/blocklist/gtkui.py:55
 #: deluge/plugins/blocklist/blocklist/gtkui.py:194
 msgid "Blocklist"
-msgstr ""
+msgstr "Lista de bloqueios"

 #: deluge/plugins/blocklist/blocklist/peerguardian.py:31
 msgid "Invalid leader"
@ -1859,7 +1861,7 @@ msgstr "Velocidade de Envio"

 #: deluge/ui/gtkui/statusbar.py:159
 msgid "Protocol Traffic Download/Upload"
-msgstr ""
+msgstr "Trafico de download/upload do protocolo"

 #: deluge/ui/gtkui/statusbar.py:167
 msgid "No Incoming Connections!"
@ -1883,16 +1885,16 @@ msgstr "Outro..."
 #: deluge/ui/gtkui/statusbar.py:370 deluge/ui/gtkui/systemtray.py:325
 #: deluge/ui/gtkui/menubar.py:407
 msgid "Set Maximum Download Speed"
-msgstr ""
+msgstr "Definir velocidade máxima de download"

 #: deluge/ui/gtkui/statusbar.py:398 deluge/ui/gtkui/systemtray.py:329
 #: deluge/ui/gtkui/menubar.py:408
 msgid "Set Maximum Upload Speed"
-msgstr ""
+msgstr "Definir velocidade máxima de upload"

 #: deluge/ui/gtkui/statusbar.py:425 deluge/ui/gtkui/menubar.py:409
 msgid "Set Maximum Connections"
-msgstr ""
+msgstr "Definir número máximo de conexões"

 #: deluge/ui/gtkui/addtorrentdialog.py:83 deluge/ui/gtkui/queuedtorrents.py:64
 msgid "Torrent"
@ -2005,7 +2007,7 @@ msgstr "Escolha um diretório para mover os arquivos"

 #: deluge/ui/gtkui/menubar.py:410
 msgid "Set Maximum Upload Slots"
-msgstr ""
+msgstr "Definir máximo de vagas para upload"

 #: deluge/ui/gtkui/peers_tab.py:87
 #: deluge/ui/webui/scripts/template_strings.py:10
@ -2065,7 +2067,7 @@ msgstr "Estado"

 #: deluge/ui/gtkui/filtertreeview.py:214
 msgid "no label"
-msgstr ""
+msgstr "Sem rótulos"

 #: deluge/ui/gtkui/queuedtorrents.py:124
 msgid " Torrents Queued"
@ -2077,11 +2079,11 @@ msgstr " Torrent Enfileirado"

 #: deluge/ui/gtkui/mainwindow.py:209
 msgid "Down:"
-msgstr ""
+msgstr "Download:"

 #: deluge/ui/gtkui/mainwindow.py:209
 msgid "Up:"
-msgstr ""
+msgstr "Upload:"

 #: deluge/ui/gtkui/removetorrentdialog.py:66
 msgid "Torrents"
@ -2121,7 +2123,7 @@ msgstr "Largura de Banda"

 #: deluge/ui/gtkui/preferences.py:60
 msgid "Interface"
-msgstr ""
+msgstr "Interface"

 #: deluge/ui/gtkui/preferences.py:61
 #: deluge/ui/webui/scripts/template_strings.py:74
@ -2158,7 +2160,7 @@ msgstr "Selecione o plugin"

 #: deluge/ui/gtkui/preferences.py:843
 msgid "Plugin Eggs"
-msgstr ""
+msgstr "Eggs do Plugin"

 #: deluge/ui/gtkui/torrentview.py:135
 #: deluge/ui/webui/scripts/template_strings.py:64
@ -2363,15 +2365,15 @@ msgstr "Nível"

 #: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "Socksv4"
-msgstr ""
+msgstr "Socksv4"

 #: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "Socksv5"
-msgstr ""
+msgstr "Socksv5"

 #: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "Socksv5 W/ Auth"
-msgstr ""
+msgstr "Socksv5 C/ Autenticação"

 #: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "HTTP"
@ -2379,7 +2381,7 @@ msgstr "HTTP"

 #: deluge/ui/webui/config_tabs_deluge.py:93
 msgid "HTTP W/ Auth"
-msgstr ""
+msgstr "HTTP C/ Autenticação"

 #: deluge/ui/webui/config_tabs_deluge.py:95
 msgid "Type"
@ -2387,7 +2389,7 @@ msgstr "Tipo"

 #: deluge/ui/webui/config_tabs_deluge.py:96
 msgid "Host"
-msgstr ""
+msgstr "Servidor"

 #: deluge/ui/webui/config_tabs_deluge.py:97
 #: deluge/ui/webui/config_tabs_deluge.py:144
@ -2446,7 +2448,7 @@ msgstr "Limite de Tentativas de Conexões por Segundo"

 #: deluge/ui/webui/config_tabs_deluge.py:114
 msgid "Rate Limit IP Overhead"
-msgstr ""
+msgstr "Limite da taxa de sobrecarga de IP"

 #: deluge/ui/webui/config_tabs_deluge.py:120
 msgid "Per Torrent"
@ -2471,7 +2473,7 @@ msgstr "Adicionar diretório automaticamente"

 #: deluge/ui/webui/config_tabs_deluge.py:134
 msgid "Auto Add enabled"
-msgstr ""
+msgstr "Adição Automática habilitada"

 #: deluge/ui/webui/config_tabs_deluge.py:136 deluge/ui/webui/torrent_add.py:47
 msgid "Prioritize first and last pieces"
@ -2705,7 +2707,7 @@ msgstr "Estilo do botão"

 #: deluge/ui/webui/config_tabs_webui.py:49
 msgid "Auto refresh (seconds)"
-msgstr ""
+msgstr "Atualização automática"

 #: deluge/ui/webui/config_tabs_webui.py:50
 msgid "Cache templates"
@ -2717,7 +2719,7 @@ msgstr "Servidor"

 #: deluge/ui/webui/config_tabs_webui.py:58
 msgid "Manually restart webui to apply changes."
-msgstr ""
+msgstr "Reinicie a webui manualmente para aplicar as configurações."

 #: deluge/ui/webui/config_tabs_webui.py:61
 msgid "Https"
@ -2726,12 +2728,12 @@ msgstr "Https"
 #: deluge/ui/webui/config_tabs_webui.py:70
 #, python-format
 msgid "Certificate not found at '%s'"
-msgstr ""
+msgstr "Certificado não encontrado em '%s'"

 #: deluge/ui/webui/config_tabs_webui.py:73
 #, python-format
 msgid "Key not found at '%s'"
-msgstr ""
+msgstr "Chave não encontrada em '%s'"

 #: deluge/ui/webui/config_tabs_webui.py:84
 msgid "Current Password"
@ -2755,23 +2757,23 @@ msgstr "A nova senha e sua confirmação não são iguais"

 #: deluge/ui/webui/config_tabs_webui.py:103
 msgid "Sidebar"
-msgstr ""
+msgstr "Barra lateral"

 #: deluge/ui/webui/config_tabs_webui.py:104
 msgid "Show sidebar"
-msgstr ""
+msgstr "Mostrar barra lateral"

 #: deluge/ui/webui/config_tabs_webui.py:105
 msgid "Show zero hits"
-msgstr ""
+msgstr "Mostrar vazias"

 #: deluge/ui/webui/config_tabs_webui.py:106
 msgid "Show trackers"
-msgstr ""
+msgstr "Mostrar trackers"

 #: deluge/ui/webui/config_tabs_webui.py:107
 msgid "Show keyword search"
-msgstr ""
+msgstr "Mostrar busca por palavra"

 #: deluge/ui/webui/torrent_options.py:38 deluge/ui/webui/torrent_add.py:40
 msgid "Maximum Down Speed"
@ -2823,11 +2825,11 @@ msgstr "... e apagar todos os arquivos"

 #: deluge/ui/webui/scripts/template_strings.py:3
 msgid "... and delete Downloaded files"
-msgstr ""
+msgstr "... e deletar arquivos recebidos"

 #: deluge/ui/webui/scripts/template_strings.py:4
 msgid "... and delete Torrent file"
-msgstr ""
+msgstr "... e deletar arquivo .torrent"

 #: deluge/ui/webui/scripts/template_strings.py:6
 msgid "Active time"
@ -2851,11 +2853,11 @@ msgstr "Disponibilidade"

 #: deluge/ui/webui/scripts/template_strings.py:16
 msgid "Bottom"
-msgstr ""
+msgstr "Em baixo"

 #: deluge/ui/webui/scripts/template_strings.py:17
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"

 #: deluge/ui/webui/scripts/template_strings.py:18
 msgid "Clear"
@ -2871,11 +2873,11 @@ msgstr "Conecto em"

 #: deluge/ui/webui/scripts/template_strings.py:24
 msgid "Connection Limit"
-msgstr ""
+msgstr "Limite de conexão"

 #: deluge/ui/webui/scripts/template_strings.py:27
 msgid "D/L Speed Limit"
-msgstr ""
+msgstr "Limite de velocidade do Download"

 #: deluge/ui/webui/scripts/template_strings.py:28
 msgid "DHT Nodes"
@ -2907,7 +2909,7 @@ msgstr "Espaço em Disco"

 #: deluge/ui/webui/scripts/template_strings.py:36
 msgid "Do not download"
-msgstr ""
+msgstr "Não baixar"

 #: deluge/ui/webui/scripts/template_strings.py:40
 msgid "Downloaded"
@ -2931,7 +2933,7 @@ msgstr "Filtrar no teclado"

 #: deluge/ui/webui/scripts/template_strings.py:50
 msgid "Force Recheck"
-msgstr ""
+msgstr "Forçar verificação"

 #: deluge/ui/webui/scripts/template_strings.py:51
 msgid "From Session"
@ -2939,7 +2941,7 @@ msgstr "Da Sessão"

 #: deluge/ui/webui/scripts/template_strings.py:52
 msgid "From Url"
-msgstr ""
+msgstr "Da URL"

 #: deluge/ui/webui/scripts/template_strings.py:53
 msgid "General"
@ -2947,11 +2949,11 @@ msgstr "Geral"

 #: deluge/ui/webui/scripts/template_strings.py:54
 msgid "High priority"
-msgstr ""
+msgstr "Prioridade alta"

 #: deluge/ui/webui/scripts/template_strings.py:55
 msgid "Highest priority"
-msgstr ""
+msgstr "Prioridade total"

 #: deluge/ui/webui/scripts/template_strings.py:56
 msgid "Keyword"
@ -2975,15 +2977,15 @@ msgstr "Próximo Anúncio"

 #: deluge/ui/webui/scripts/template_strings.py:66
 msgid "No Incoming Connections"
-msgstr ""
+msgstr "Sem conexões vindas de fora"

 #: deluge/ui/webui/scripts/template_strings.py:67
 msgid "No Label"
-msgstr ""
+msgstr "Sem rótulos"

 #: deluge/ui/webui/scripts/template_strings.py:69
 msgid "Normal priority"
-msgstr ""
+msgstr "Prioridade normal"

 #: deluge/ui/webui/scripts/template_strings.py:70
 msgid "Not Connected to a daemon"
@ -2991,7 +2993,7 @@ msgstr "Não conectado ao daemon"

 #: deluge/ui/webui/scripts/template_strings.py:72
 msgid "Ok"
-msgstr ""
+msgstr "OK"

 #: deluge/ui/webui/scripts/template_strings.py:76
 msgid "Password is invalid,try again"
@ -3035,7 +3037,7 @@ msgstr "Salvar"

 #: deluge/ui/webui/scripts/template_strings.py:94
 msgid "Search"
-msgstr ""
+msgstr "Pesquisar"

 #: deluge/ui/webui/scripts/template_strings.py:95
 msgid "Seed rank"
@ -3071,7 +3073,7 @@ msgstr "Enviar"

 #: deluge/ui/webui/scripts/template_strings.py:108
 msgid "Top"
-msgstr ""
+msgstr "Topo"

 #: deluge/ui/webui/scripts/template_strings.py:109
 msgid "Torrent list"
@ -3091,7 +3093,7 @@ msgstr "Verdadeiro"

 #: deluge/ui/webui/scripts/template_strings.py:114
 msgid "U/L Speed Limit"
-msgstr ""
+msgstr "Velocidade limite de upload"

 #: deluge/ui/webui/scripts/template_strings.py:118
 msgid "Update"
@ -3107,7 +3109,7 @@ msgstr "Upload"

 #: deluge/ui/webui/scripts/template_strings.py:121
 msgid "Upload Slot Limit"
-msgstr ""
+msgstr "Limite de vagas de upload"

 #: deluge/ui/webui/scripts/template_strings.py:122
 msgid "Uploaded"
--- a/deluge/i18n/ro.po
+++ b/deluge/i18n/ro.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/ru.po
+++ b/deluge/i18n/ru.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
--- a/deluge/i18n/si.po
+++ b/deluge/i18n/si.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/sk.po
+++ b/deluge/i18n/sk.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/sl.po
+++ b/deluge/i18n/sl.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-Language: Slovenian\n"
--- a/deluge/i18n/sr.po
+++ b/deluge/i18n/sr.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/sv.po
+++ b/deluge/i18n/sv.po
@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/ta.po
+++ b/deluge/i18n/ta.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/th.po
+++ b/deluge/i18n/th.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/tl.po
+++ b/deluge/i18n/tl.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/tlh.po
+++ b/deluge/i18n/tlh.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/tr.po
+++ b/deluge/i18n/tr.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/uk.po
+++ b/deluge/i18n/uk.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: deluge\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-01-06 21:52-0600\n"
-"PO-Revision-Date: 2009-01-13 14:45+0000\n"
-"Last-Translator: MFX <Unknown>\n"
+"PO-Revision-Date: 2009-01-25 14:25+0000\n"
+"Last-Translator: Dimaxwell <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
@ -1931,7 +1931,7 @@ msgstr ""
 "ЧИ ТИХ ЯКІ МАЛИСЬ НА УВАЗІ. Для отримання додаткових відомостей звернітся до "
 "Універсальної Публічної Ліцензії GNU. Ви повинні були отримати копію "
 "Універсальної Публічної Ліцензії GNU з цією програмою, якщо це не так , то "
-"ви можете найти її текст за адресою 
+"ви можете найти її текст за адресою \r\n"
 "<http://www.gnu.org/licenses>"

 #: deluge/ui/gtkui/systemtray.py:197
--- a/deluge/i18n/vi.po
+++ b/deluge/i18n/vi.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/zh_CN.po
+++ b/deluge/i18n/zh_CN.po
--- a/deluge/i18n/zh_HK.po
+++ b/deluge/i18n/zh_HK.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: deluge/plugins/label/label/data/label_pref.glade:22
--- a/deluge/i18n/zh_TW.po
+++ b/deluge/i18n/zh_TW.po
@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-25 03:12+0000\n"
+"X-Launchpad-Export-Date: 2009-01-31 21:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: Taiwan\n"
 "X-Poedit-Language: Chinese\n"
--- a/deluge/plugins/label/label/data/label.js
+++ b/deluge/plugins/label/label/data/label.js
@ -1,6 +1,22 @@
 /*
-# Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
-# License : GPL v3.
+# Copyright (C) Martijn Voncken 2008 <mvoncken@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 3, 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.
+#
 */


@ -77,4 +93,3 @@ Plugins.Label = {
 window.addEvent('domready', function(e) {
 	Plugins.Label.initialize();
 });
-
--- a/deluge/plugins/label/label/gtkui/init.py
+++ b/deluge/plugins/label/label/gtkui/init.py
@ -1,5 +1,5 @@
 #
-# blocklist/gtkui.py
+# __init__.py
 #
 # Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
 #
--- a/deluge/plugins/label/label/gtkui/ui.py
+++ b/deluge/plugins/label/label/gtkui/ui.py
@ -1,5 +1,5 @@
 #
-# blocklist/ui.py
+# ui.py
 #
 # Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com>
 # Copyright (C) 2008 Mark Stahler ('kramed') <markstahler@gmail.com>
@ -41,4 +41,3 @@ class UI:

    def disable(self):
        pass
-
--- a/deluge/plugins/label/label/webui.py
+++ b/deluge/plugins/label/label/webui.py
@ -25,14 +25,6 @@
 # 	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

 import os
 from deluge.common import fspeed
--- a/deluge/scripts/state_upgrade.py
+++ b/deluge/scripts/state_upgrade.py
@ -1,87 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) Martijn Voncken 2008 <mvoncken@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.
-#
-
-
-import sys, pickle , shutil , os
-from deluge.ui.client import sclient
-
-options = {
-    "new_torrents_dir" :"~/torrents06",
-    "state05":"~/.config/deluge/persistent.state",
-    "all_paused":True
-}
-
-#start : http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/286203
-def makeFakeClass(module, name):
-    class FakeThing(object):
-        pass
-    FakeThing.__name__ = name
-    FakeThing.__module__ = '(fake)' + module
-    return FakeThing
-
-class PickleUpgrader(pickle.Unpickler):
-    def find_class(self, module, cname):
-        # Pickle tries to load a couple things like copy_reg and
-        # __builtin__.object even though a pickle file doesn't
-        # explicitly reference them (afaict): allow them to be loaded
-        # normally.
-        if module in ('copy_reg', '__builtin__'):
-            thing = pickle.Unpickler.find_class(self, module, cname)
-            return thing
-        return makeFakeClass(module, cname)
-# end: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/286203
-
-def load_05(state_05_file, new_torrent_dir,all_paused):
-    state5 = PickleUpgrader(open(state_05_file)).load()
-    for torrent in state5.torrents:
-        #print [x for x in dir(torrent) if not x.startswith("_")]
-        print("file:%s, save_dir:%s, compact:%s, paused:%s " % (torrent.filename,torrent.save_dir,torrent.compact,torrent.user_paused))
-
-        new_file = os.path.join(new_torrent_dir,os.path.basename(torrent.filename))
-        print("copy" , torrent.filename , new_file)
-        shutil.copyfile(torrent.filename , new_file)
-
-        sclient.add_torrent_file([torrent.filename],[{
-            "add_paused" : (all_paused or torrent.user_paused),
-            "compact_allocation":torrent.compact,
-            "download_location":torrent.save_dir
-        }])
-
-if __name__ == "__main__":
-    sclient.set_core_uri()
-    new_torrents_dir = os.path.expanduser(options["new_torrents_dir"])
-    state_05_file = os.path.expanduser(options['state05']);
-    load_05(state_05_file, new_torrents_dir, options["all_paused"])
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/deluge/ui/gtkui/aboutdialog.py
+++ b/deluge/ui/gtkui/aboutdialog.py
@ -48,7 +48,7 @@ class AboutDialog:
        version = deluge.common.get_version()
        if rev != "":
            version = version + "r" + rev
-        self.about.set_copyright(u'Copyright \u00A9 2007-2008 Andrew Resch')
+        self.about.set_copyright(u'Copyright \u00A9 2007-2009 Andrew Resch')
        self.about.set_comments("A peer-to-peer file sharing program\nutilizing the Bittorrent protocol.")
        self.about.set_version(version)
        self.about.set_authors(["Andrew Resch", "Marcos Pinto", "",
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@ -212,7 +212,7 @@ class FilesTab(Tab):
        state = {
            "columns": {},
            "sort_id": column_id,
-            "sort_order": int(sort_order)
+            "sort_order": int(sort_order) if sort_order else None
        }

        for index, column in enumerate(self.listview.get_columns()):
@ -249,7 +249,7 @@ class FilesTab(Tab):
        if state == None:
            return

-        if state["sort_id"] and state["sort_order"]:
+        if state["sort_id"] and state["sort_order"] is not None:
            self.treestore.set_sort_column_id(state["sort_id"], state["sort_order"])

        for (index, column) in enumerate(self.listview.get_columns()):
@ -258,7 +258,7 @@ class FilesTab(Tab):
                cstate = state["columns"][cname]
                column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
                column.set_fixed_width(cstate["width"] if cstate["width"] > 0 else 10)
-                if state["sort_id"] == index:
+                if state["sort_id"] == index and state["sort_order"] is not None:
                    column.set_sort_indicator(True)
                    column.set_sort_order(state["sort_order"])
                if cstate["position"] != index:
--- a/deluge/ui/gtkui/filtertreeview.py
+++ b/deluge/ui/gtkui/filtertreeview.py
@ -122,8 +122,8 @@ class FilterTreeView(component.Component):

        #colors using current theme.
        style = self.window.window.get_style()
-        self.color_insensitive = style.base[gtk.STATE_INSENSITIVE]
-        self.color_sensitive = style.base[gtk.STATE_NORMAL]
+        self.colour_background = style.bg[gtk.STATE_NORMAL]
+        self.colour_foreground = style.fg[gtk.STATE_NORMAL]

    def start(self):
        #add Cat nodes:
@ -218,17 +218,16 @@ class FilterTreeView(component.Component):
        else:
            self.renderpix.set_property("visible", False)

-        #cell.set_property('editable', False)
        if cat == "cat":
            txt = label
-            col = self.color_insensitive
+            cell.set_property("cell-background-gdk", self.colour_background)
+            cell.set_property("foreground-gdk", self.colour_foreground)
        else:
            txt = "%s (%s)"  % (label, count)
-            col = self.color_sensitive
+            cell.set_property("cell-background", None)
+            cell.set_property("foreground", None)

        cell.set_property('text', txt)
-        cell.set_property("cell-background-gdk",col)
-        self.renderpix.set_property("cell-background-gdk",col)

    def get_pixmap(self, cat, value):
        if cat == "state":
--- a/deluge/ui/gtkui/peers_tab.py
+++ b/deluge/ui/gtkui/peers_tab.py
@ -166,7 +166,7 @@ class PeersTab(Tab):
        state = {
            "columns": {},
            "sort_id": column_id,
-            "sort_order": int(sort_order)
+            "sort_order": int(sort_order) if sort_order else None
        }

        for index, column in enumerate(self.listview.get_columns()):
@ -207,7 +207,7 @@ class PeersTab(Tab):
            log.warning("peers_tab.state is not compatible! rejecting..")
            return

-        if state["sort_id"] and state["sort_order"]:
+        if state["sort_id"] and state["sort_order"] is not None:
            self.liststore.set_sort_column_id(state["sort_id"], state["sort_order"])

        for (index, column) in enumerate(self.listview.get_columns()):
@ -216,7 +216,7 @@ class PeersTab(Tab):
                cstate = state["columns"][cname]
                column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
                column.set_fixed_width(cstate["width"] if cstate["width"] > 0 else 10)
-                if state["sort_id"] == index:
+                if state["sort_id"] == index and state["sort_order"] is not None:
                    column.set_sort_indicator(True)
                    column.set_sort_order(state["sort_order"])
                if cstate["position"] != index:
--- a/deluge/ui/webui/lib/pythonize.py
+++ b/deluge/ui/webui/lib/pythonize.py
@ -1,38 +0,0 @@
-"""
-some dbus to python type conversions
-decorator for interface
-wrapper class for proxy
-"""
-def pythonize(var):
-    """translates dbus types back to basic python  types."""
-    if isinstance(var, list):
-        return [pythonize(value) for value in var]
-    if isinstance(var, tuple):
-        return tuple([pythonize(value) for value in var])
-    if isinstance(var, dict):
-        return dict(
-        [(pythonize(key), pythonize(value)) for key, value in var.iteritems()]
-        )
-
-    for klass in [unicode, str, bool, int, float, long]:
-        if isinstance(var,klass):
-            return klass(var)
-    return var
-
-def pythonize_call(func):
-    def deco(*args,**kwargs):
-        return pythonize(func(*args, **kwargs))
-    return deco
-
-def pythonize_interface(func):
-    def deco(*args, **kwargs):
-        args = pythonize(args)
-        kwargs = pythonize(kwargs)
-        return func(*args, **kwargs)
-    return deco
-
-class PythonizeProxy(object):
-    def __init__(self,proxy):
-        self.proxy = proxy
-    def __getattr__(self, key):
-        return pythonize_call(getattr(self.proxy, key))
--- a/deluge/ui/webui/static/deluge-moo.js
+++ b/deluge/ui/webui/static/deluge-moo.js
@ -1,6 +1,22 @@
 /*
-(c) Martijn Voncken mvoncken@gmail.com
-License: GPL v3
+# Copyright (C) Martijn Voncken 2008 <mvoncken@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 3, 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.
+#
 */


@ -57,6 +73,3 @@ var InputSensitivitySetter = new Class({
 	},this);
    }
 });
-
-
-
--- a/deluge/ui/webui/static/refresh.js
+++ b/deluge/ui/webui/static/refresh.js
@ -20,7 +20,7 @@

 quick and dirty auto-refresh timer.
 Our users have waited too long for a new auto-refresh.
-I need to get things done (even if it's ot pretty). ;with the least dependencies for a backport to 1.05
+I need to get things done (even if it's not pretty). ;with the least dependencies for a backport to 1.05
 */
 var seconds=0;
 var refresh_secs = 10;
--- a/deluge/ui/webui/templates/ajax/static/js/Rpc.js
+++ b/deluge/ui/webui/templates/ajax/static/js/Rpc.js
@ -2,12 +2,29 @@
 Script: Rpc.js
    A JSON-RPC proxy built ontop of mootools.

-Copyright:
-    Damien Churchill (c) 2008 <damoxc@gmail.com>
+ *
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *

    Class: JSON.RPC
        Class to create a proxy to a json-rpc interface on a server.
-    
+
    Example:
        client = new JSON.RPC('/json/rpc');
        client.hello_world({
@ -21,18 +38,18 @@ Copyright:
                alert(result);
            }
        });
-    
+
    Returns:
        The proxy that can be used to directly call methods on the server.
 */
 JSON.RPC = new Class({
 	Implements: Options,
-	
+
 	options: {
 		async: true,
 		methods: []
 	},
-	
+
 	initialize: function(url, options) {
 		this.setOptions(options)
 		this.url = url
@ -45,23 +62,23 @@ JSON.RPC = new Class({
 		}, this)
 		}
 	},
-	
+
 	/*
 	    Property: _parseargs
 	        Internal method for parsing the arguments given to the method
-        
+
        Arguments:
            args - A list of the methods arguments
-        
+
        Returns:
            An options object with the arguments set as options.params
-	    
+
 	*/
 	_parseargs: function(args) {
 		var params = $A(args), options = params.getLast()
 		if ($type(options) == 'object') {
 			var option_keys = ['async', 'onRequest', 'onComplete',
-			'onSuccess', 'onFailure', 'onException', 'onCancel'], keys = 
+			'onSuccess', 'onFailure', 'onException', 'onCancel'], keys =
 				new Hash(options).getKeys(), is_option = false

 			option_keys.each(function(key) {
@ -69,7 +86,7 @@ JSON.RPC = new Class({
 					is_option = true
 				}
 			})
-			
+
 			if (is_option) {
 				params.erase(options)
 			} else {
@ -79,19 +96,19 @@ JSON.RPC = new Class({
 		options.params = params
 		return options
 	},
-	
+
 	/*
 	    Property: _execute
 	        An internal method to make the call to the rpc page
-        
+
        Arguements:
            method - the name of the method
            options - An options dict providing any additional options for the
                      call.
-        
+
        Example:
            alert(client.hello_world({async: false;}));
-      
+
        Returns:
            If not async returns the json result
    */
@ -99,7 +116,7 @@ JSON.RPC = new Class({
 		options = $pick(options, {})
 		options.params = $pick(options.params, [])
 		options.async = $pick(options.async, this.options.async)
-		
+
 		data = JSON.encode({
 			method: method,
 			params: options.params,
--- a/deluge/ui/webui/templates/ajax/static/js/deluge-add.js
+++ b/deluge/ui/webui/templates/ajax/static/js/deluge-add.js
@ -1,12 +1,25 @@
 /*
 Script: deluge-add.js
    Contains the add torrent window and the torrent creator window.
-
-License:
-    General Public License v3
-
-Copyright:
-    Damien Churchill (c) 2008 <damoxc@gmail.com>
+ *
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *
 */

 Deluge.Widgets.AddWindow = new Class({
@ -17,7 +30,7 @@ Deluge.Widgets.AddWindow = new Class({
        title: _('Add Torrents'),
        url: '/template/render/html/window_add_torrent.html'
    },
-    
+
    initialize: function() {
        this.parent();
        this.bound = {
@ -32,7 +45,7 @@ Deluge.Widgets.AddWindow = new Class({
        this.addEvent('loaded', this.bound.onLoad);
        this.addEvent('show', this.bound.onShow);
    },
-    
+
    onLoad: function(e) {
        this.content.id = 'addTorrent';
        this.torrents = this.content.getElement('select');
@ -43,28 +56,28 @@ Deluge.Widgets.AddWindow = new Class({
        this.optionsTab = new Deluge.Widgets.AddTorrent.OptionsTab();
        this.tabs.addPage(this.filesTab);
        this.tabs.addPage(this.optionsTab);
-        
+
        this.fileWindow = new Deluge.Widgets.AddTorrent.File();
        this.fileWindow.addEvent('torrentAdded', this.bound.onTorrentAdded);
        this.fileButton = this.content.getElement('button.file');
        this.fileButton.addEvent('click', function(e) {
            this.fileWindow.show();
        }.bindWithEvent(this));
-        
+
        this.urlWindow = new Deluge.Widgets.AddTorrent.Url();
-        this.urlWindow.addEvent('torrentAdded', this.bound.onTorrentAdded);     
+        this.urlWindow.addEvent('torrentAdded', this.bound.onTorrentAdded);
        this.urlButton = this.content.getElement('button.url');
        this.urlButton.addEvent('click', function(e) {
            this.urlWindow.show();
        }.bindWithEvent(this));
-        
+
        this.removeButton = this.content.getElement('button.remove');
        this.removeButton.addEvent('click', this.bound.onRemoveClick);
-        
+
        this.content.getElement('button.add').addEvent('click', this.bound.onAdd);
        this.content.getElement('button.cancel').addEvent('click', this.bound.onCancel);
    },
-    
+
    onTorrentAdded: function(torrentInfo) {
        var option = new Element('option');
        option.set('value', torrentInfo['info_hash']);
@ -74,11 +87,11 @@ Deluge.Widgets.AddWindow = new Class({
        this.torrents.grab(option);
        this.torrentInfo[torrentInfo['info_hash']] = torrentInfo;
    },
-    
+
    onTorrentChanged: function(e) {
        this.filesTab.setTorrent(this.torrentInfo[this.torrents.value]);
    },
-    
+
    onAdd: function(e) {
        torrents = new Array();
        $each(this.torrentInfo, function(torrent) {
@ -90,18 +103,18 @@ Deluge.Widgets.AddWindow = new Class({
        Deluge.Client.add_torrents(torrents);
        this.onCancel()
    },
-    
+
    onShow: function(e) {
        this.optionsTab.getDefaults();
    },
-    
+
    onCancel: function(e) {
        this.hide();
        this.torrents.empty();
        this.torrentInfo.empty();
        this.filesTab.table.empty();
    },
-    
+
    onRemoveClick: function(e) {
        delete this.torrentInfo[this.torrents.value];
        this.torrents.options[this.torrents.selectedIndex].dispose();
@ -113,13 +126,13 @@ Deluge.Widgets.AddTorrent = {}

 Deluge.Widgets.AddTorrent.File = new Class({
    Extends: Widgets.Window,
-    
+
    options: {
        width: 400,
        height: 100,
        title: _('From File')
    },
-    
+
    initialize: function() {
        this.parent();
        this.bound = {
@ -147,35 +160,35 @@ Deluge.Widgets.AddTorrent.File = new Class({
        this.content.grab(this.iframe);
        this.iframe.addEvent('load', this.bound.onLoad);
    },
-    
+
    onLoad: function(e) {
        var body = $(this.iframe.contentDocument.body);
        var form = body.getElement('form');
        var cancelButton = form.getElement('button.cancel');
        cancelButton.addEvent('click', this.bound.onCancel);
-        
+
        var fileInputs = form.getElement('div.fileInputs');
        var fileInput = fileInputs.getElement('input');
        fileInput.set('opacity', 0.000001);
        var fakeFile = fileInputs.getElement('div').getElement('input');
-        
+
        fileInput.addEvent('change', function(e) {
            fakeFile.value = fileInput.value;
        });
-        
+
        form.addEvent('submit', this.bound.onSubmit);
        this.iframe.removeEvent('load', this.bound.onLoad);
    },
-    
+
    onCancel: function(e) {
        this.hide();
    },
-    
+
    onSubmit: function(e) {
        this.iframe.addEvent('load', this.bound.onComplete);
        this.iframe.set('opacity', 0);
    },
-    
+
    onComplete: function(e) {
        filename = $(this.iframe.contentDocument.body).get('text');
        this.hide();
@ -183,7 +196,7 @@ Deluge.Widgets.AddTorrent.File = new Class({
            onSuccess: this.bound.onGetInfoSuccess
        });
    },
-    
+
    onGetInfoSuccess: function(info) {
        if (info) this.fireEvent('torrentAdded', info);
    }
@ -191,13 +204,13 @@ Deluge.Widgets.AddTorrent.File = new Class({

 Deluge.Widgets.AddTorrent.Url = new Class({
    Extends: Widgets.Window,
-    
+
    options: {
        width: 300,
        height: 100,
        title: _('From Url')
    },
-    
+
    initialize: function() {
        this.parent();
        this.bound = {
@ -206,7 +219,7 @@ Deluge.Widgets.AddTorrent.Url = new Class({
            onDownloadSuccess: this.onDownloadSuccess.bindWithEvent(this),
            onGetInfoSuccess: this.onGetInfoSuccess.bindWithEvent(this)
        };
-        
+
        this.form = new Element('form');
        this.urlInput = new Element('input', {
            'type': 'text',
@ -224,11 +237,11 @@ Deluge.Widgets.AddTorrent.Url = new Class({
        this.form.grab(this.urlInput).grab(new Element('br'));
        this.form.grab(this.okButton).grab(this.cancelButton);
        this.content.grab(this.form);
-        
+
        this.okButton.addEvent('click', this.bound.onOkClick);
        this.cancelButton.addEvent('click', this.bound.onCancelClick);
    },
-    
+
    onOkClick: function(e) {
        e.stop();
        var url = this.urlInput.get('value');
@ -237,19 +250,19 @@ Deluge.Widgets.AddTorrent.Url = new Class({
        });
        this.hide();
    },
-    
+
    onCancelClick: function(e) {
        e.stop();
        this.urlInput.set('value', '');
        this.hide();
    },
-    
+
    onDownloadSuccess: function(filename) {
        Deluge.Client.get_torrent_info(filename, {
            onSuccess: this.bound.onGetInfoSuccess
        });
    },
-    
+
    onGetInfoSuccess: function(info) {
        this.fireEvent('torrentAdded', info);
    }
@ -257,20 +270,20 @@ Deluge.Widgets.AddTorrent.Url = new Class({

 Deluge.Widgets.AddTorrent.FilesTab = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/add_torrent_files.html'
    },
-    
+
    initialize: function() {
        this.addEvent('loaded', this.onLoad.bindWithEvent(this));
        this.parent('Files');
    },
-    
+
    onLoad: function(e) {
-        this.table = this.element.getElement('table');    
+        this.table = this.element.getElement('table');
    },
-    
+
    setTorrent: function(torrent) {
        this.table.empty();
        if (!torrent) return;
@ -292,19 +305,19 @@ Deluge.Widgets.AddTorrent.FilesTab = new Class({

 Deluge.Widgets.AddTorrent.OptionsTab = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/add_torrent_options.html'
    },
-    
+
    initialize: function() {
        this.parent('Options');
        this.addEvent('loaded', this.onLoad.bindWithEvent(this));
    },
-    
+
    onLoad: function(e) {
        this.form = this.element.getElement('form');
-        
+
        new Widgets.Spinner(this.form.max_download_speed_per_torrent, {
            step: 10,
            precision: 1,
@ -313,7 +326,7 @@ Deluge.Widgets.AddTorrent.OptionsTab = new Class({
                low: -1
            }
        });
-        
+
        new Widgets.Spinner(this.form.max_upload_speed_per_torrent, {
            step: 10,
            precision: 1,
@ -322,7 +335,7 @@ Deluge.Widgets.AddTorrent.OptionsTab = new Class({
                low: -1
            }
        });
-        
+
        new Widgets.Spinner(this.form.max_connections_per_torrent, {
            step: 1,
            precision: 0,
@ -331,7 +344,7 @@ Deluge.Widgets.AddTorrent.OptionsTab = new Class({
                low: -1
            }
        });
-        
+
        new Widgets.Spinner(this.form.max_upload_slots_per_torrent, {
            step: 1,
            precision: 0,
@ -341,7 +354,7 @@ Deluge.Widgets.AddTorrent.OptionsTab = new Class({
            }
        });
    },
-    
+
    getDefaults: function() {
        var keys = [
            'add_paused',
@ -357,12 +370,12 @@ Deluge.Widgets.AddTorrent.OptionsTab = new Class({
            onSuccess: this.onGetConfigSuccess.bindWithEvent(this)
        });
    },
-    
+
    onGetConfigSuccess: function(config) {
        this.default_config = config;
        this.setFormToDefault();
    },
-    
+
    setFormToDefault: function() {
        this.form.add_paused.checked = config['add_paused'];
        $each(this.form.compact_allocation, function(el) {
@ -378,22 +391,22 @@ Deluge.Widgets.AddTorrent.OptionsTab = new Class({
        $$W(this.form.max_connections_per_torrent).setValue(config['max_connections_per_torrent']);
        $$W(this.form.max_upload_slots_per_torrent).setValue(config['max_upload_slots_per_torrent']);
    },
-    
+
    setTorrent: function(torrent) {
-        
+
    }
 });

 Deluge.Widgets.CreateTorrent = new Class({
    Extends: Widgets.Window,
-    
+
    options: {
        width: 400,
        height: 400,
        title: _('Create Torrent'),
        url: '/template/render/html/window_create_torrent.html'
    },
-    
+
    initialize: function() {
        this.parent();
        this.bound = {
@ -403,21 +416,21 @@ Deluge.Widgets.CreateTorrent = new Class({
        }
        this.addEvent('loaded', this.bound.onLoad);
    },
-    
+
    onLoad: function(e) {
        this.tabs = new Deluge.Widgets.CreateTorrent.Tabs(this.content.getElement('.moouiTabs'));
        this.fileButton = this.content.getElement('button.file');
        this.folderButton = this.content.getElement('button.folder');
        this.content.id = 'createTorrent';
-        
+
        this.fileButton.addEvent('click', this.bound.onFileClick);
    },
-    
+
    onFileClick: function(e) {
        var desktop = google.gears.factory.create('beta.desktop');
        desktop.openFiles(this.onFilesPicked.bind(this));
    },
-    
+
    onFilesPicked: function(files) {
        for (var i = 0; i < files.length; i++) {
            alert(files[i].blob);
@ -427,7 +440,7 @@ Deluge.Widgets.CreateTorrent = new Class({

 Deluge.Widgets.CreateTorrent.Tabs = new Class({
    Extends: Widgets.Tabs,
-    
+
    initialize: function(element) {
        this.parent(element);
        this.info = new Deluge.Widgets.CreateTorrent.InfoTab();
@ -443,11 +456,11 @@ Deluge.Widgets.CreateTorrent.Tabs = new Class({

 Deluge.Widgets.CreateTorrent.InfoTab = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/create_torrent_info.html'
    },
-    
+
    initialize: function() {
        this.parent('Info');
    }
@ -455,11 +468,11 @@ Deluge.Widgets.CreateTorrent.InfoTab = new Class({

 Deluge.Widgets.CreateTorrent.TrackersTab = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/create_torrent_trackers.html'
    },
-    
+
    initialize: function() {
        this.parent('Trackers');
    }
@ -467,11 +480,11 @@ Deluge.Widgets.CreateTorrent.TrackersTab = new Class({

 Deluge.Widgets.CreateTorrent.WebseedsTab = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/create_torrent_webseeds.html'
    },
-    
+
    initialize: function() {
        this.parent('Webseeds');
    }
@ -479,11 +492,11 @@ Deluge.Widgets.CreateTorrent.WebseedsTab = new Class({

 Deluge.Widgets.CreateTorrent.OptionsTab = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/create_torrent_options.html'
    },
-    
+
    initialize: function() {
        this.parent('Options');
    }
--- a/deluge/ui/webui/templates/ajax/static/js/deluge-bars.js
+++ b/deluge/ui/webui/templates/ajax/static/js/deluge-bars.js
@ -2,11 +2,25 @@
 Script: deluge-bars.js
    Contains the various bars (Sidebar, Toolbar, Statusbar) used within Deluge.

-License:
-    General Public License v3
-
-Copyright:
-    Damien Churchill (c) 2008 <damoxc@gmail.com>
+ *
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *


    Class: Deluge.Widgets.Toolbar
@ -22,7 +36,7 @@ Copyright:
 Deluge.Widgets.Toolbar = new Class({
    Implements: Events,
    Extends: Widgets.Base,
-    
+
    initialize: function() {
        this.parent($('toolbar'));
        this.buttons = this.element.getFirst();
@ -39,54 +53,54 @@ Deluge.Widgets.Toolbar = new Class({
 /*
    Class: Deluge.Widgets.StatusBar
        Class to manage the bottom status bar
-    
+
    Example:
        status = new Deluge.Widgets.StatusBar();
-    
+
    Returns:
        An instance of the class wrapped about the status div
 */
 Deluge.Widgets.StatusBar = new Class({
    Extends: Widgets.Base,
-    
+
    initialize: function() {
        this.parent($('status'));
        this.bound = {
            onContextMenu: this.onContextMenu.bindWithEvent(this)
        };
-        
+
        this.element.getElements('li').each(function(el) {
            this[el.id] = el;
        }, this);
        this.incoming_connections.setStyle('display', 'none');
-        
+
        this.connections.addEvent('contextmenu', this.bound.onContextMenu);
        var menu = new Widgets.PopupMenu();
        menu.add(Deluge.Menus.Connections);
        menu.addEvent('action', this.onMenuAction);
        this.connections.store('menu', menu);
-        
+
        this.downspeed.addEvent('contextmenu', this.bound.onContextMenu);
        menu = new Widgets.PopupMenu();
        menu.add(Deluge.Menus.Download);
        menu.addEvent('action', this.onMenuAction);
        this.downspeed.store('menu', menu);
-        
+
        this.upspeed.addEvent('contextmenu', this.bound.onContextMenu);
        menu = new Widgets.PopupMenu();
        menu.add(Deluge.Menus.Upload);
        menu.addEvent('action', this.onMenuAction);
        this.upspeed.store('menu', menu);
    },
-    
+
    /*
        Property: update
            Takes thes stats part of the update_ui rpc call and
            performs the required changes on the statusbar.
-        
+
        Arguments:
            stats - A dictionary of the returned stats
-        
+
        Example:
            statusbar.update(data['stats']);
    */
@ -97,20 +111,20 @@ Deluge.Widgets.StatusBar = new Class({
        this.dht.set('text', stats.dht_nodes);
        this.free_space.set('text', stats.free_space.toBytes());
        if (stats.has_incoming_connections) {
-            this.incoming_connections.setStyle('display', 'none');    
+            this.incoming_connections.setStyle('display', 'none');
        } else {
            this.incoming_connections.setStyle('display', 'inline');
        }
    },
-    
+
    /*
        Property: onContextMenu
            Event handler for when certain parts of the statusbar have been
            right clicked.
-        
+
        Arguments:
            e - The event args
-        
+
        Example:
            el.addEvent('contextmenu', this.onContextMenu.bindWithEvent(this));
    */
@ -119,16 +133,16 @@ Deluge.Widgets.StatusBar = new Class({
        var menu = e.target.retrieve('menu');
        if (menu) menu.show(e);
    },
-    
+
    /*
        Property: onMenuAction
            Event handler for when an item in one of the menus is clicked.
            Note that it does not need to be bound as it doesn't use `this`
            anywhere within the method.
-        
+
        Arguments:
            e - The event args
-        
+
        Example:
            menu.addEvent('action', this.onMenuAction);
    */
@ -145,17 +159,17 @@ Deluge.Widgets.StatusBar = new Class({
 /*
    Class: Deluge.Wdigets.Labels
        Class to manage the filtering labels in the sidebar
-    
+
    Example:
        labels = new Deluge.Widgets.Labels();
-    
+
    Returns:
        An instance of the class wrapped about the labels div
 */
 Deluge.Widgets.Labels = new Class({
-    
+
    Extends: Widgets.Base,
-    
+
    initialize: function() {
        this.parent($('labels'));
        this.bound = {
@ -163,15 +177,15 @@ Deluge.Widgets.Labels = new Class({
        };
        this.filters = {};
    },
-    
+
    /*
        Property: update
            Takes thes filters part of the update_ui rpc call and
            performs the required changes on the filtering
-        
+
        Arguments:
            filters - A dictionary of the available filters
-        
+
        Example:
            labels.update({'state': [['All', '3'], ['Downloading', '2']]);
    */
@ -194,13 +208,13 @@ Deluge.Widgets.Labels = new Class({
            }
        }, this);
    },
-    
+
    /*
        Property: labelClicked
-        
+
        Arguments:
            e - The event args
-        
+
        Example:
            labelSection.addEvent('labelClicked', this.bound.labelClicked);
    */
@ -217,26 +231,26 @@ Deluge.Widgets.Labels = new Class({
 /*
    Class: Deluge.Widgets.LabelSection
        Class to manage a section of filters within the labels block
-    
+
    Arguments:
        string (the name of the section)
-    
+
    Returns:
        A widget with the ability to manage the filters
 */
 Deluge.Widgets.LabelSection = new Class({
-    
+
    Extends: Widgets.Base,
-    
+
    regex: /([\w]+)\s\((\d)\)/,
-    
+
    initialize: function(name) {
        this.parent(new Element('div'));
        this.name = name;
        this.bound = {
            'clicked': this.clicked.bindWithEvent(this)
        }
-        
+
        name = name.replace('_', ' ');
        parts = name.split(' ');
        name = '';
@ -246,21 +260,21 @@ Deluge.Widgets.LabelSection = new Class({
            part = firstLetter + part.substring(1);
            name += part + ' ';
        });
-        
+
        this.header = new Element('h3').set('text', name);
        this.list = new Element('ul');
-        
+
        this.element.grab(this.header);
        this.element.grab(this.list);
    },
-    
+
    /*
        Property: update
            Updates the filters list
-        
+
        Arguments:
            values - a list of name/count values for the filters
-        
+
        Example:
            labelSection.update([['All', '3'], ['Downloading', '2']]);
    */
@ -283,7 +297,7 @@ Deluge.Widgets.LabelSection = new Class({
            }
            el.set('text', name + ' (' + count +')');
        }, this);
-        
+
        // Clean out any labels that are no longer returned
        this.list.getElements('li').each(function(el) {
            var hasName = false;
@ -291,20 +305,20 @@ Deluge.Widgets.LabelSection = new Class({
                if (hasName) return;
                hasName = el.hasClass(name);
            });
-            
+
            if (!hasName) {
                el.destroy();
            }
        });
    },
-    
+
    /*
        Property: clicked
            Event handler for when a list item is clicked
-        
+
        Arguments:
            e - The event args
-        
+
        Example:
            listItem.addEvent('click', this.clicked.bindWithEvent(this));
    */
--- a/deluge/ui/webui/templates/ajax/static/js/deluge-details.js
+++ b/deluge/ui/webui/templates/ajax/static/js/deluge-details.js
@ -2,25 +2,39 @@
 Script: deluge-details.js
    Contains the tabs for the torrent details.

-License:
-    General Public License v3
-
-Copyright:
-    Damien Churchill (c) 2008 <damoxc@gmail.com>
+ *
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *
 */

 Deluge.Widgets.Details = new Class({
    Extends: Widgets.Tabs,
-    
+
    initialize: function() {
        this.parent($$('#details .mooui-tabs')[0]);
-        
+
        this.statistics = new Deluge.Widgets.StatisticsPage();
        this.details = new Deluge.Widgets.DetailsPage();
        this.files = new Deluge.Widgets.FilesPage();
        this.peers = new Deluge.Widgets.PeersPage();
        this.options = new Deluge.Widgets.OptionsPage();
-        
+
        this.addPage(this.statistics);
        this.addPage(this.details);
        this.addPage(this.files);
@ -30,7 +44,7 @@ Deluge.Widgets.Details = new Class({
            this.update(this.torrentId);
        }.bindWithEvent(this));
        this.addEvent('resize', this.resized.bindWithEvent(this));
-        
+
        this.files.addEvent('menuAction', function(e) {
            files = [];
            this.files.grid.getSelected().each(function(file) {
@ -40,7 +54,7 @@ Deluge.Widgets.Details = new Class({
            this.fireEvent('filesAction', e);
        }.bindWithEvent(this));
    },
-    
+
    keys: {
        0: Deluge.Keys.Statistics,
        1: Deluge.Keys.Details,
@ -48,7 +62,7 @@ Deluge.Widgets.Details = new Class({
        3: Deluge.Keys.Peers,
        4: Deluge.Keys.Options
    },
-    
+
    clear: function() {
        this.pages.each(function(page) {
            page.element.getChildren().each(function(el) {
@ -57,7 +71,7 @@ Deluge.Widgets.Details = new Class({
            if (page.clear) page.clear();
        });
    },
-    
+
    update: function(torrentId) {
        this.torrentId = torrentId;
        if (!this.torrentId) {
@ -75,7 +89,7 @@ Deluge.Widgets.Details = new Class({
            }.bindWithEvent(this)
        });
    },
-    
+
    resized: function(event) {
        this.pages.each(function(page) {
            page.getSizeModifiers();
@ -89,16 +103,16 @@ Deluge.Widgets.Details = new Class({

 Deluge.Widgets.StatisticsPage = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/tab_statistics.html'
    },
-    
+
    initialize: function() {
        this.parent(_('Statistics'));
        this.addEvent('loaded', this.onLoad.bindWithEvent(this));
    },
-    
+
    onLoad: function(e) {
        this.element.id = 'statistics';
        this.bar = new Widgets.ProgressBar();
@ -107,19 +121,19 @@ Deluge.Widgets.StatisticsPage = new Class({
        this.bar.update('', 0);
        this.addEvent('resize', this.onResize.bindWithEvent(this));
    },
-    
+
    onResize: function(e) {
        if (!$defined(this.bar)) return;
        this.bar.set('width', this.getWidth() - 12);
    },
-    
+
    clear: function() {
        if (this.bar) this.bar.update('', 0);
        this.element.getElements('dd').each(function(item) {
            item.set('text', '');
        }, this);
    },
-    
+
    update: function(torrent) {
        var data = {
            downloaded: torrent.total_done.toBytes()+' ('+torrent.total_payload_download.toBytes()+')',
@ -140,10 +154,10 @@ Deluge.Widgets.StatisticsPage = new Class({
        }
        var text = torrent.state + ' ' + torrent.progress.toFixed(2) + '%';
        this.bar.update(text, torrent.progress);
-        
+
        if (torrent.is_auto_managed) {data.auto_managed = 'True'}
        else {data.auto_managed = 'False'};
-        
+
        this.element.getElements('dd').each(function(item) {
            item.set('text', data[item.getProperty('class')]);
        }, this);
@ -152,21 +166,21 @@ Deluge.Widgets.StatisticsPage = new Class({

 Deluge.Widgets.DetailsPage = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/tab_details.html'
    },
-    
+
    initialize: function() {
        this.parent(_('Details'));
    },
-    
+
    clear: function() {
        this.element.getElements('dd').each(function(item) {
            item.set('text', '');
        }, this);
    },
-    
+
    update: function(torrent) {
        var data = {
            torrent_name: torrent.name,
@ -185,7 +199,7 @@ Deluge.Widgets.DetailsPage = new Class({

 Deluge.Widgets.FilesGrid = new Class({
    Extends: Widgets.DataGrid,
-    
+
    options: {
        columns: [
            {name: 'filename',text: 'Filename',type:'text',width: 350},
@ -194,21 +208,21 @@ Deluge.Widgets.FilesGrid = new Class({
            {name: 'priority',text: 'Priority',type:'icon',width: 150}
        ]
    },
-    
+
    priority_texts: {
        0: 'Do Not Download',
        1: 'Normal Priority',
        2: 'High Priority',
        5: 'Highest Priority'
    },
-    
+
    priority_icons: {
        0: '/static/images/16/process-stop.png',
        1: '/template/static/icons/16/gtk-yes.png',
        2: '/static/images/16/queue-down.png',
        5: '/static/images/16/go-bottom.png'
    },
-    
+
    initialize: function(element, options) {
        this.parent(element, options);
        var menu = new Widgets.PopupMenu();
@ -220,7 +234,7 @@ Deluge.Widgets.FilesGrid = new Class({
                icon: this.priority_icons[index]
            });
        }, this);
-        
+
        menu.addEvent('action', function(e) {
            e = {
                action: e.action,
@ -228,20 +242,20 @@ Deluge.Widgets.FilesGrid = new Class({
            };
            this.fireEvent('menuAction', e);
        }.bind(this));
-        
+
        this.addEvent('rowMenu', function(e) {
            e.stop();
            menu.row = e.row;
            menu.show(e);
        })
    },
-    
+
    clear: function() {
        this.rows.empty();
        this.body.empty();
        this.render();
    },
-    
+
    updateFiles: function(torrent) {
        torrent.files.each(function(file) {
            var p = torrent.file_priorities[file.index];
@ -249,7 +263,7 @@ Deluge.Widgets.FilesGrid = new Class({
                text:this.priority_texts[p],
                icon:this.priority_icons[p]
            };
-            
+
            var percent = torrent.file_progress[file.index]*100.0;
            row = {
                id: torrent.id + '-' + file.index,
@ -261,7 +275,7 @@ Deluge.Widgets.FilesGrid = new Class({
                },
                fileIndex: file.index,
                torrentId: torrent.id
-                
+
            };
            if (this.has(row.id)) {
                this.updateRow(row, true);
@ -275,49 +289,49 @@ Deluge.Widgets.FilesGrid = new Class({

 Deluge.Widgets.FilesPage = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/tab_files.html'
    },
-    
+
    initialize: function(el) {
        this.parent(_('Files'));
        this.torrentId = -1;
        this.addEvent('loaded', this.loaded.bindWithEvent(this));
        this.addEvent('resize', this.resized.bindWithEvent(this));
    },
-    
+
    loaded: function(event) {
        this.grid = new Deluge.Widgets.FilesGrid('files');
        this.grid.addEvent('menuAction', this.menuAction.bindWithEvent(this));
-        
+
        if (this.beenResized) {
            this.resized(this.beenResized);
            delete this.beenResized;
        };
    },
-    
+
    clear: function() {
        if (this.grid) this.grid.clear();
    },
-    
+
    resized: function(e) {
        if (!this.grid) {
            this.beenResized = e;
            return;
        };
-        
+
        this.element.getPadding();
        this.grid.sets({
            width: e.width - this.element.padding.x,
            height: e.height - this.element.padding.y
        });
    },
-    
+
    menuAction: function(e) {
        this.fireEvent('menuAction', e);
    },
-    
+
    update: function(torrent) {
        if (this.torrentId != torrent.id) {
            this.torrentId = torrent.id;
@ -330,17 +344,17 @@ Deluge.Widgets.FilesPage = new Class({

 Deluge.Widgets.PeersPage = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/tab_peers.html'
    },
-    
+
    initialize: function(el) {
        this.parent(_('Peers'));
        this.addEvent('resize', this.resized.bindWithEvent(this));
        this.addEvent('loaded', this.loaded.bindWithEvent(this));
    },
-    
+
    loaded: function(event) {
        this.grid = new Widgets.DataGrid($('peers'), {
            columns: [
@ -356,26 +370,26 @@ Deluge.Widgets.PeersPage = new Class({
            delete this.been_resized;
        };
    },
-    
+
    resized: function(e) {
        if (!this.grid) {
            this.been_resized = e;
            return;
        };
-        
+
        this.element.getPadding();
        this.grid.sets({
            width: e.width - this.element.padding.x,
            height: e.height - this.element.padding.y
        });
    },
-    
+
    clear: function() {
        if (!this.grid) return;
        this.grid.rows.empty();
        this.grid.body.empty();
    },
-    
+
    update: function(torrent) {
        if (this.torrentId != torrent.id) {
            this.torrentId = torrent.id;
@ -406,7 +420,7 @@ Deluge.Widgets.PeersPage = new Class({
            }
            peers.include(peer.ip);
        }, this);
-        
+
        this.grid.rows.each(function(row) {
            if (!peers.contains(row.id)) {
                row.element.destroy();
@ -419,11 +433,11 @@ Deluge.Widgets.PeersPage = new Class({

 Deluge.Widgets.OptionsPage = new Class({
    Extends: Widgets.TabPage,
-    
+
    options: {
        url: '/template/render/html/tab_options.html'
    },
-    
+
    initialize: function() {
        if (!this.element)
            this.parent(_('Options'));
@ -431,7 +445,7 @@ Deluge.Widgets.OptionsPage = new Class({
            this.loaded(event);
        }.bindWithEvent(this));
    },
-    
+
    loaded: function(event) {
        this.bound = {
            apply: this.apply.bindWithEvent(this),
@ -457,7 +471,7 @@ Deluge.Widgets.OptionsPage = new Class({
                el.focused = false;
            });
        }, this);
-        
+
        new Widgets.Spinner(this.form.max_download_speed, {
            step: 10,
            precision: 1,
@ -465,7 +479,7 @@ Deluge.Widgets.OptionsPage = new Class({
                high: null,
                low: -1
            }
-        });    
+        });
        new Widgets.Spinner(this.form.max_upload_speed, {
            step: 10,
            precision: 1,
@ -473,7 +487,7 @@ Deluge.Widgets.OptionsPage = new Class({
                high: null,
                low: -1
            }
-        });        
+        });
        new Widgets.Spinner(this.form.max_connections, {
            step: 1,
            precision: 0,
@ -481,7 +495,7 @@ Deluge.Widgets.OptionsPage = new Class({
                high: null,
                low: -1
            }
-        });        
+        });
        new Widgets.Spinner(this.form.max_upload_slots, {
            step: 1,
            precision: 0,
@ -489,7 +503,7 @@ Deluge.Widgets.OptionsPage = new Class({
                high: null,
                low: -1
            }
-        });        
+        });
        new Widgets.Spinner(this.form.stop_ratio, {
            step: 1,
            precision: 1,
@ -498,11 +512,11 @@ Deluge.Widgets.OptionsPage = new Class({
                low: -1
            }
        });
-        
+
        this.form.apply_options.addEvent('click', this.bound.apply);
        this.form.reset_options.addEvent('click', this.bound.reset);
    },
-    
+
    apply: function(event) {
        if (!this.torrentId) return;
        var changed = this.changed[this.torrentId];
@ -516,7 +530,7 @@ Deluge.Widgets.OptionsPage = new Class({
            }.bindWithEvent(this)
        });
    },
-    
+
    clear: function() {
        if (!this.form) return;
        $$W(this.form.max_download_speed).setValue(0);
@ -531,7 +545,7 @@ Deluge.Widgets.OptionsPage = new Class({
        this.form.private.disabled = false;
        this.form.prioritize_first_last.checked = false;
    },
-    
+
    reset: function(event) {
        if (this.torrentId) {
            delete this.changed[this.torrentId];
@ -543,7 +557,7 @@ Deluge.Widgets.OptionsPage = new Class({
            }.bindWithEvent(this)
        });
    },
-    
+
    update: function(torrent) {
        this.torrentId = torrent.id;
        $each(torrent, function(value, key) {
--- a/deluge/ui/webui/templates/ajax/static/js/deluge-menus.js
+++ b/deluge/ui/webui/templates/ajax/static/js/deluge-menus.js
@ -2,11 +2,25 @@
 Script: deluge-menus.js
    Contains the layout for all the popup menus used within the ajax ui.

-License:
-    General Public License v3
-
-Copyright:
-    Damien Churchill (c) 2008 <damoxc@gmail.com>
+ *
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *
 */

 Deluge.Menus = {
@ -240,7 +254,7 @@ Deluge.Menus = {
                }
            ]
        },
-        {type: 'seperator'}, 
+        {type: 'seperator'},
        {
            type: 'text',
            action: 'update_tracker',
@ -301,7 +315,7 @@ Deluge.Menus = {
            icon: '/static/images/16/move.png'
        }
    ],
-    
+
    Connections: [
        {
            type: 'text',
@ -340,7 +354,7 @@ Deluge.Menus = {
            text: _('Unlimited')
        }
    ],
-    
+
    Download: [
        {
            type: 'text',
@ -379,7 +393,7 @@ Deluge.Menus = {
            text: _('Unlimited')
        }
    ],
-    
+
    Upload: [
        {
            type: 'text',
--- a/deluge/ui/webui/templates/ajax/static/js/deluge-mime.js
+++ b/deluge/ui/webui/templates/ajax/static/js/deluge-mime.js
@ -2,11 +2,25 @@
 Script: deluge-mime.js
    Library for converting mimetypes to extensions and vica versa.

-License:
-    General Public License v3
-
-Copyright:
-    Damien Churchill (c) 2008 <damoxc@gmail.com>
+ *
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *


    Object: Deluge.Mime
@ -136,12 +150,12 @@ Deluge.Mime = {
        '.avi':      'video/x-msvideo',
        '.movie':    'video/x-sgi-movie'
    }),
-    
+
    getMimeType: function(filename) {
        var extension = filename.match(/^.*(\.\w+)$/)
        if (extension) extension = extension[1]
        else return null;
-        
+
        if (this.types_map.has(extension)) return this.types_map[extension];
        else return null;
    }
--- a/deluge/ui/webui/templates/ajax/static/js/deluge-preferences.js
+++ b/deluge/ui/webui/templates/ajax/static/js/deluge-preferences.js
@ -3,11 +3,25 @@ Script: deluge-preferences.js
    Contains the classes that provides the preferences window with
    functionality

-License:
-    General Public License v3
-
-Copyright:
-    Damien Churchill (c) 2008 <damoxc@gmail.com>
+ *
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *
 */

 Deluge.Widgets.PreferencesCategory = new Class({
@ -20,7 +34,7 @@ Deluge.Widgets.PluginPreferencesCategory = new Class({

 Deluge.Widgets.GenericPreferences = new Class({
    Extends: Deluge.Widgets.PreferencesCategory,
-    
+
    initialize: function(name, options) {
        this.parent(name, options)
        this.core = true;
@ -41,16 +55,16 @@ Deluge.Widgets.GenericPreferences = new Class({
            });
        }.bindWithEvent(this));
    },
-    
+
    update: function(config) {
        this.fireEvent('beforeUpdate');
-        this.original = config; 
+        this.original = config;
        this.changed = new Hash();
        this.inputs = this.form.getElements('input, select');
        this.inputs.each(function(input) {
            if (!input.name) return;
            if (!$defined(config[input.name])) return;
-            
+
            widget = $$W(input);
            if (widget) {
                widget.setValue(config[input.name]);
@ -71,7 +85,7 @@ Deluge.Widgets.GenericPreferences = new Class({
                    input.checked = true;
                }
            }
-            
+
            input.addEvent('change', function(el) {
                if (input.type == 'checkbox') {
                    if (this.original[input.name] == input.checked) {
@ -111,18 +125,18 @@ Deluge.Widgets.GenericPreferences = new Class({

 Deluge.Widgets.WebUIPreferences = new Class({
    Extends: Deluge.Widgets.GenericPreferences,
-    
+
    options: {
        url: '/template/render/html/preferences_webui.html'
    },
-    
+
    initialize: function() {
        this.parent('Web UI');
        this.core = false;
        this.addEvent('beforeUpdate', this.beforeUpdate.bindWithEvent(this));
        this.addEvent('update', this.updated.bindWithEvent(this));
    },
-    
+
    beforeUpdate: function(event) {
        var templates = Deluge.Client.get_webui_templates({async: false});
        this.form.template.empty();
@ -132,16 +146,16 @@ Deluge.Widgets.WebUIPreferences = new Class({
            this.form.template.grab(option);
        }, this);
    },
-    
+
    updated: function(event) {
        if (this.form.template.value != 'ajax')
            this.form.theme.disabled = true;
        else
            this.form.theme.disabled = false;
-            
+
        var theme = this.form.theme.getElement('option[value="' + Cookie.read('theme') + '"]')
        theme.selected = true
-        
+
        this.form.template.addEvent('change', function(e) {
            if (this.form.template.value != 'ajax') {
                this.form.theme.disabled = true;
@ -154,7 +168,7 @@ Deluge.Widgets.WebUIPreferences = new Class({
            }
        }.bindWithEvent(this));
    },
-    
+
    apply: function() {
        Deluge.UI.setTheme(this.form.theme.value);
        Deluge.Client.set_webui_config(this.changed, {
@ -173,7 +187,7 @@ Deluge.Widgets.PreferencesWindow = new Class({
        title: 'Preferences',
        url: '/template/render/html/window_preferences.html'
    },
-    
+
    initialize: function() {
        this.parent();
        this.categories = [];
@ -181,18 +195,18 @@ Deluge.Widgets.PreferencesWindow = new Class({
        this.addEvent('loaded', this.loaded.bindWithEvent(this));
        this.addEvent('beforeShow', this.beforeShown.bindWithEvent(this));
    },
-    
+
    loaded: function(event) {
        this.catlist = this.content.getElement('.categories ul');
        this.pages = this.content.getElement('.pref_pages');
        this.title = this.pages.getElement('h3');
-        
+
        this.reset = this.content.getElement('.buttons .reset');
        this.apply = this.content.getElement('.buttons .apply');
        this.apply.addEvent('click', this.applied.bindWithEvent(this));
-        
+
        this.webui = new Deluge.Widgets.WebUIPreferences();
-        
+
        this.download = new Deluge.Widgets.GenericPreferences('Download', {
            url: '/template/render/html/preferences_download.html'
        });
@ -208,7 +222,7 @@ Deluge.Widgets.PreferencesWindow = new Class({
        this.queue = new Deluge.Widgets.GenericPreferences('Queue', {
            url: '/template/render/html/preferences_queue.html'
        });
-        
+
        this.addCategory(this.webui);
        this.addCategory(this.download);
        this.addCategory(this.network);
@ -216,11 +230,11 @@ Deluge.Widgets.PreferencesWindow = new Class({
        this.addCategory(this.daemon);
        this.addCategory(this.queue);
    },
-    
+
    addCategory: function(category) {
        this.categories.include(category);
        var categoryIndex = this.categories.indexOf(category);
-        
+
        var tab = new Element('li');
        tab.set('text', category.name);
        tab.addEvent('click', function(e) {
@ -230,14 +244,14 @@ Deluge.Widgets.PreferencesWindow = new Class({

        this.catlist.grab(tab);
        this.pages.grab(category.addClass('deluge-prefs-page'));
-        
-        
+
+
        if (this.currentPage < 0) {
            this.currentPage = categoryIndex;
            this.select(categoryIndex);
        };
    },
-    
+
    select: function(id) {
        this.categories[this.currentPage].removeClass('deluge-prefs-page-active');
        this.categories[this.currentPage].tab.removeClass('deluge-prefs-active');
@ -247,13 +261,13 @@ Deluge.Widgets.PreferencesWindow = new Class({
        this.currentPage = id;
        this.fireEvent('pageChanged');
    },
-    
+
    applied: function(event) {
        var config = {};
        this.categories.each(function(category) {
            config = $merge(config, category.getConfig());
        });
-        
+
        if ($defined(config['end_listen_port']) || $defined(config['start_listen_port'])) {
            var startport = $pick(config['start_listen_port'], this.config['listen_ports'][0]);
            var endport = $pick(config['end_listen_port'], this.config['listen_ports'][1]);
@ -261,7 +275,7 @@ Deluge.Widgets.PreferencesWindow = new Class({
            delete config['start_listen_port'];
            config['listen_ports'] = [startport, endport];
        }
-        
+
        if ($defined(config['end_outgoing_port']) || $defined(config['start_outgoing_port'])) {
            var startport = $pick(config['start_outgoing_port'], this.config['outgoing_ports'][0]);
            var endport = $pick(config['end_outgoing_port'], this.config['outgoing_ports'][1]);
@ -269,7 +283,7 @@ Deluge.Widgets.PreferencesWindow = new Class({
            delete config['start_outgoing_port'];
            config['outgoing_ports'] = [startport, endport];
        }
-        
+
        Deluge.Client.set_config(config, {
            onSuccess: function(e) {
                this.hide();
@ -286,7 +300,7 @@ Deluge.Widgets.PreferencesWindow = new Class({
        // in order to not have to modify the generic preferences class.
        this.config['start_listen_port'] = this.config['listen_ports'][0];
        this.config['end_listen_port'] = this.config['listen_ports'][1];
-        
+
        this.config['start_outgoing_port'] = this.config['outgoing_ports'][0];
        this.config['end_outgoing_port'] = this.config['outgoing_ports'][1];

@ -294,7 +308,7 @@ Deluge.Widgets.PreferencesWindow = new Class({
        this.categories.each(function(category) {
            if (category.update && category.core) category.update(this.config);
        }, this);
-        
+
        // Update the config for the webui pages.
        var webconfig = Deluge.Client.get_webui_config({async: false});
        this.webui.update(webconfig);
--- a/deluge/ui/webui/templates/ajax/static/js/deluge-torrent-grid.js
+++ b/deluge/ui/webui/templates/ajax/static/js/deluge-torrent-grid.js
@ -2,11 +2,25 @@
 Script: deluge-torrent-grid.js
    Contains the Deluge torrent grid.

-License:
-    General Public License v3
-
-Copyright:
-    Damien Churchill (c) 2008 <damoxc@gmail.com>
+ *
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *


    Class: Deluge.Widgets.TorrentGrid
@ -21,7 +35,7 @@ Copyright:
 */
 Deluge.Widgets.TorrentGrid = new Class({
    Extends: Widgets.DataGrid,
-    
+
    options: {
        columns: [
            {name: 'number',text: '#',type:'number',width: 20},
@ -37,7 +51,7 @@ Deluge.Widgets.TorrentGrid = new Class({
            {name: 'avail',text: 'Avail.',type:'number',width: 60}
        ]
    },
-    
+
    icons: {
        'Downloading': '/pixmaps/downloading16.png',
        'Seeding': '/pixmaps/seeding16.png',
@ -46,19 +60,19 @@ Deluge.Widgets.TorrentGrid = new Class({
        'Error': '/pixmaps/alert16.png',
        'Checking': '/pixmaps/checking16.png'
    },
-    
+
    /*
        Property: getSelectedTorrentIds
            Helper function to quickly return the torrent ids of the currently
            selected torrents in the grid.
-        
+
        Example:
            var ids = '';
            grid.getSelectedTorrentIds.each(function(id) {
                ids += id + '\n';
            });
            alert(ids);
-        
+
        Returns:
            A list containing the currently selected torrent ids.
    */
@ -69,14 +83,14 @@ Deluge.Widgets.TorrentGrid = new Class({
        });
        return torrentIds;
    },
-    
+
    /*
        Property: updateTorrents
            Event handler for when a list item is clicked
-        
+
        Arguments:
            e - The event args
-        
+
        Example:
            listItem.addEvent('click', this.clicked.bindWithEvent(this));
    */
@ -107,7 +121,7 @@ Deluge.Widgets.TorrentGrid = new Class({
                this.addRow(row, true);
            };
        }, this);
-        
+
        // remove any torrents no longer in the grid.
        this.rows.each(function(row) {
            if (!torrents.has(row.id)) {
--- a/deluge/ui/webui/templates/ajax/static/js/deluge-ui.js
+++ b/deluge/ui/webui/templates/ajax/static/js/deluge-ui.js
@ -2,11 +2,25 @@
 Script: deluge-ui.js
    Ties all the other scripts together to build up the Deluge AJAX UI.

-License:
-    General Public License v3
-
-Copyright:
-    Damien Churchill (c) 2008 <damoxc@gmail.com>
+ *
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *


    Object: Deluge.UI
--- a/deluge/ui/webui/templates/ajax/static/js/deluge.js
+++ b/deluge/ui/webui/templates/ajax/static/js/deluge.js
@ -2,8 +2,24 @@
 * Script: deluge.js
 *  The core script for the deluge ajax ui
 *
- * Copyright:
- *   Damien Churchill (c) 2008 <damoxc@gmail.com>
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *
 */

 var Deluge = $empty;
@ -14,13 +30,13 @@ Deluge.Keys = {
        'total_seeds', 'num_peers', 'total_peers', 'download_payload_rate',
        'upload_payload_rate', 'eta', 'ratio', 'distributed_copies',
        'is_auto_managed'
-    ],    
+    ],
    Statistics: [
        'total_done', 'total_payload_download', 'total_uploaded',
        'total_payload_upload', 'next_announce', 'tracker_status', 'num_pieces',
        'piece_length', 'is_auto_managed', 'active_time', 'seeding_time',
        'seed_rank'
-    ],    
+    ],
    Files: [
        'files', 'file_progress', 'file_priorities'
    ],
--- a/deluge/ui/webui/templates/classic/gettext.js
+++ b/deluge/ui/webui/templates/classic/gettext.js
@ -3,8 +3,25 @@
 *  A script file that is run through the template renderer in order for
 *  translated strings to be retrieved.
 *
- * Copyright:
- *   Damien Churchill (c) 2008
+ *
+ * Copyright (C) Damien Churchill 2008 <damoxc@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 3, 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.
+ *
 */

 GetText = {
--- a/libtorrent/include/libtorrent/GeoIP.h
+++ b/libtorrent/include/libtorrent/GeoIP.h
@ -69,7 +69,7 @@ typedef enum {
 	GEOIP_MEMORY_CACHE = 1,
 	GEOIP_CHECK_CACHE = 2,
 	GEOIP_INDEX_CACHE = 4,
-	GEOIP_MMAP_CACHE = 8,
+	GEOIP_MMAP_CACHE = 8
 } GeoIPOptions;

 typedef enum {
@ -89,14 +89,14 @@ typedef enum {
 typedef enum {
 	GEOIP_ANON_PROXY = 1,
 	GEOIP_HTTP_X_FORWARDED_FOR_PROXY = 2,
-	GEOIP_HTTP_CLIENT_IP_PROXY = 3,
+	GEOIP_HTTP_CLIENT_IP_PROXY = 3
 } GeoIPProxyTypes;

 typedef enum {
 	GEOIP_UNKNOWN_SPEED = 0,
 	GEOIP_DIALUP_SPEED = 1,
 	GEOIP_CABLEDSL_SPEED = 2,
-	GEOIP_CORPORATE_SPEED = 3,
+	GEOIP_CORPORATE_SPEED = 3
 } GeoIPNetspeedValues;

 extern char **GeoIPDBFileName;
--- a/libtorrent/include/libtorrent/alert_types.hpp
+++ b/libtorrent/include/libtorrent/alert_types.hpp
@ -223,9 +223,9 @@ namespace libtorrent
 		tracker_error_alert(torrent_handle const& h
 			, int times
 			, int status
-			, std::string const& url
+			, std::string const& url_
 			, std::string const& msg_)
-			: tracker_alert(h, url)
+			: tracker_alert(h, url_)
 			, times_in_row(times)
 			, status_code(status)
 			, msg(msg_)
@ -252,9 +252,9 @@ namespace libtorrent
 	struct TORRENT_EXPORT tracker_warning_alert: tracker_alert
 	{
 		tracker_warning_alert(torrent_handle const& h
-			, std::string const& url
+			, std::string const& url_
 			, std::string const& msg_)
-			: tracker_alert(h, url)
+			: tracker_alert(h, url_)
 			, msg(msg_)
 		{ TORRENT_ASSERT(!url.empty()); }

@ -276,8 +276,8 @@ namespace libtorrent
 		scrape_reply_alert(torrent_handle const& h
 			, int incomplete_
 			, int complete_
-			, std::string const& url)
-			: tracker_alert(h, url)
+			, std::string const& url_)
+			: tracker_alert(h, url_)
 			, incomplete(incomplete_)
 			, complete(complete_)
 		{ TORRENT_ASSERT(!url.empty()); }
@ -300,9 +300,9 @@ namespace libtorrent
 	struct TORRENT_EXPORT scrape_failed_alert: tracker_alert
 	{
 		scrape_failed_alert(torrent_handle const& h
-			, std::string const& url
+			, std::string const& url_
 			, std::string const& msg_)
-			: tracker_alert(h, url)
+			: tracker_alert(h, url_)
 			, msg(msg_)
 		{ TORRENT_ASSERT(!url.empty()); }

@ -323,8 +323,8 @@ namespace libtorrent
 	{
 		tracker_reply_alert(torrent_handle const& h
 			, int np
-			, std::string const& url)
-			: tracker_alert(h, url)
+			, std::string const& url_)
+			: tracker_alert(h, url_)
 			, num_peers(np)
 		{ TORRENT_ASSERT(!url.empty()); }

@ -367,8 +367,8 @@ namespace libtorrent
 	struct TORRENT_EXPORT tracker_announce_alert: tracker_alert
 	{
 		tracker_announce_alert(torrent_handle const& h
-			, std::string const& url, int event_)
-			: tracker_alert(h, url)
+			, std::string const& url_, int event_)
+			: tracker_alert(h, url_)
 			, event(event_)
 		{ TORRENT_ASSERT(!url.empty()); }

--- a/libtorrent/include/libtorrent/aux_/session_impl.hpp
+++ b/libtorrent/include/libtorrent/aux_/session_impl.hpp
@ -61,17 +61,11 @@ POSSIBILITY OF SUCH DAMAGE.

 #include "libtorrent/torrent_handle.hpp"
 #include "libtorrent/entry.hpp"
-#include "libtorrent/torrent_info.hpp"
 #include "libtorrent/socket.hpp"
-#include "libtorrent/peer_connection.hpp"
 #include "libtorrent/peer_id.hpp"
-#include "libtorrent/policy.hpp"
 #include "libtorrent/tracker_manager.hpp"
-#include "libtorrent/peer_info.hpp"
 #include "libtorrent/alert.hpp"
-#include "libtorrent/fingerprint.hpp"
 #include "libtorrent/debug.hpp"
-#include "libtorrent/peer_request.hpp"
 #include "libtorrent/piece_block_progress.hpp"
 #include "libtorrent/ip_filter.hpp"
 #include "libtorrent/config.hpp"
@ -82,9 +76,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/stat.hpp"
 #include "libtorrent/file_pool.hpp"
 #include "libtorrent/bandwidth_manager.hpp"
-#include "libtorrent/natpmp.hpp"
-#include "libtorrent/upnp.hpp"
-#include "libtorrent/lsd.hpp"
 #include "libtorrent/socket_type.hpp"
 #include "libtorrent/connection_queue.hpp"
 #include "libtorrent/disk_io_thread.hpp"
@ -94,6 +85,16 @@ namespace libtorrent
 {

 	namespace fs = boost::filesystem;
+	class peer_connection;
+	class upnp;
+	class natpmp;
+	class lsd;
+	class fingerprint;
+
+	namespace dht
+	{
+		class dht_tracker;
+	};

 	namespace aux
 	{
@ -236,13 +237,7 @@ namespace libtorrent
 			int num_connections() const
 			{ return m_connections.size(); }

-			void unchoke_peer(peer_connection& c)
-			{
-				torrent* t = c.associated_torrent().lock().get();
-				TORRENT_ASSERT(t);
-				if (t->unchoke_peer(c))
-					++m_num_unchoked;
-			}
+			void unchoke_peer(peer_connection& c);

 			session_status status() const;
 			void set_peer_id(peer_id const& id);
@ -294,24 +289,6 @@ namespace libtorrent
 			void load_state(entry const& ses_state);
 			entry state() const;

-#ifdef TORRENT_STATS
-			void log_buffer_usage()
-			{
-				int send_buffer_capacity = 0;
-				int used_send_buffer = 0;
-				for (connection_map::const_iterator i = m_connections.begin()
-					, end(m_connections.end()); i != end; ++i)
-				{
-					send_buffer_capacity += (*i)->send_buffer_capacity();
-					used_send_buffer += (*i)->send_buffer_size();
-				}
-				TORRENT_ASSERT(send_buffer_capacity >= used_send_buffer);
-				m_buffer_usage_logger << log_time() << " send_buffer_size: " << send_buffer_capacity << std::endl;
-				m_buffer_usage_logger << log_time() << " used_send_buffer: " << used_send_buffer << std::endl;
-				m_buffer_usage_logger << log_time() << " send_buffer_utilization: "
-					<< (used_send_buffer * 100.f / send_buffer_capacity) << std::endl;
-			}
-#endif
 			void start_lsd();
 			natpmp* start_natpmp();
 			upnp* start_upnp();
@ -586,6 +563,8 @@ namespace libtorrent
 #endif

 #ifdef TORRENT_STATS
+			void log_buffer_usage();
+
 			// logger used to write bandwidth usage statistics
 			std::ofstream m_stats_logger;
 			int m_second_counter;
--- a/libtorrent/include/libtorrent/bandwidth_manager.hpp
+++ b/libtorrent/include/libtorrent/bandwidth_manager.hpp
@ -269,7 +269,7 @@ private:
 		if (m_abort) return;

 		error_code ec;
-		TORRENT_ASSERT(e.expires_at > time_now());
+//		TORRENT_ASSERT(e.expires_at > time_now());
 		m_history_timer.expires_at(e.expires_at, ec);
 		m_history_timer.async_wait(bind(&bandwidth_manager::on_history_expire, this, _1));
 	}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew Resch	c413032c96	Tag 1.1.2 release	2009-01-31 22:18:11 +00:00
Marcos Pinto	0cc4efc455	version bump	2009-01-31 21:27:50 +00:00
Marcos Pinto	c5e5a3d4e7	lang sync for release	2009-01-31 21:14:26 +00:00
Marcos Pinto	8a5aa3a150	release prep	2009-01-31 20:58:29 +00:00
Andrew Resch	b0f9117a3d	lt sync 3225	2009-01-28 16:19:36 +00:00
Andrew Resch	040b4938e1	Fix license headers Remove ui/webui/ssl from package_data since it doesn't exist	2009-01-28 00:36:33 +00:00
Andrew Resch	bc34d864ff	Remove pythonize module since it's no longer used	2009-01-27 23:44:26 +00:00
Andrew Resch	4a07a33503	Update copyright years in aboutdialog	2009-01-27 23:34:03 +00:00
Andrew Resch	933228a82a	Fix saving files/peers tab state when no column is sorted	2009-01-27 21:45:44 +00:00
Andrew Resch	a777233a7a	Fix typo	2009-01-27 21:41:48 +00:00
Andrew Resch	79fb4b260d	Fix #761 use proper theme colours in sidebar	2009-01-27 21:21:15 +00:00
Andrew Resch	3f414f4bdf	lt sync 3219	2009-01-27 19:24:07 +00:00
Andrew Resch	04bebad82f	lt sync 3218	2009-01-27 17:27:23 +00:00
Andrew Resch	0808bdaa0f	Fix up some copyright headers	2009-01-27 00:21:53 +00:00
Andrew Resch	fc5d436021	Remove 'state_upgrade.py' script since this functionality is included in Deluge now.	2009-01-27 00:17:43 +00:00