diff --git a/po/ar.po b/po/ar.po index d280a2983..b9e6c60f0 100644 --- a/po/ar.po +++ b/po/ar.po @@ -571,10 +571,6 @@ msgstr "معدل الرفع" msgid "Filename" msgstr "اسم‌الملف" -#: src/interface.py:486 -msgid "Offset" -msgstr "إزاحة" - #: src/interface.py:487 msgid "Progress" msgstr "المنجز" diff --git a/po/ast.po b/po/ast.po index 0369e0ada..5bf883a4c 100644 --- a/po/ast.po +++ b/po/ast.po @@ -562,10 +562,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/bg.po b/po/bg.po index 10952c426..0907b4733 100644 --- a/po/bg.po +++ b/po/bg.po @@ -561,10 +561,6 @@ msgstr "качено съотношение" msgid "Filename" msgstr "файл име" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/ca.po b/po/ca.po index 00fecec42..063788b80 100644 --- a/po/ca.po +++ b/po/ca.po @@ -584,10 +584,6 @@ msgstr "Velocitat de pujada" msgid "Filename" msgstr "Nom del fitxer" -#: src/interface.py:486 -msgid "Offset" -msgstr "Desplaçament" - #: src/interface.py:487 msgid "Progress" msgstr "Progrés" @@ -775,9 +771,6 @@ msgstr "Seleccioneu un directori per a les baixades" #~ msgid "size" #~ msgstr "mida" -#~ msgid "offset" -#~ msgstr "desplaçament" - #~ msgid "download?" #~ msgstr "baixa?" diff --git a/po/cs.po b/po/cs.po index fe0d7034f..498823530 100644 --- a/po/cs.po +++ b/po/cs.po @@ -561,10 +561,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/da.po b/po/da.po index 3bc022d2f..b5e8530c9 100644 --- a/po/da.po +++ b/po/da.po @@ -570,10 +570,6 @@ msgstr "Sendehastighed" msgid "Filename" msgstr "Filnavn" -#: src/interface.py:486 -msgid "Offset" -msgstr "Justering" - #: src/interface.py:487 msgid "Progress" msgstr "Fremskridt" diff --git a/po/de.po b/po/de.po index c72951618..44f3f26de 100644 --- a/po/de.po +++ b/po/de.po @@ -570,10 +570,6 @@ msgstr "Upload-Rate" msgid "Filename" msgstr "Dateiname" -#: src/interface.py:486 -msgid "Offset" -msgstr "Absatz" - #: src/interface.py:487 msgid "Progress" msgstr "Fortschritt" diff --git a/po/deluge.pot b/po/deluge.pot index a0998b2cc..0b7a8d107 100644 --- a/po/deluge.pot +++ b/po/deluge.pot @@ -725,10 +725,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:635 -msgid "Offset" -msgstr "" - #: src/interface.py:636 msgid "Progress" msgstr "" diff --git a/po/el.po b/po/el.po index ba331a345..b20859d8d 100644 --- a/po/el.po +++ b/po/el.po @@ -569,10 +569,6 @@ msgstr "Ρυθμός ανεβάσματος" msgid "Filename" msgstr "'Ονομα αρχείου" -#: src/interface.py:486 -msgid "Offset" -msgstr "Μετατόπιση" - #: src/interface.py:487 msgid "Progress" msgstr "Πρόοδος" diff --git a/po/en_AU.po b/po/en_AU.po index c184086bc..b7447882b 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -562,10 +562,6 @@ msgstr "Up Speed" msgid "Filename" msgstr "Filename" -#: src/interface.py:486 -msgid "Offset" -msgstr "Offset" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/en_CA.po b/po/en_CA.po index ffe31ff18..0f060627f 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -562,10 +562,6 @@ msgstr "Up Speed" msgid "Filename" msgstr "Filename" -#: src/interface.py:486 -msgid "Offset" -msgstr "Offset" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index 31a9622a0..a074aeeb9 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -575,10 +575,6 @@ msgstr "Up Speed" msgid "Filename" msgstr "Filename" -#: src/interface.py:486 -msgid "Offset" -msgstr "Offset" - #: src/interface.py:487 msgid "Progress" msgstr "Progress" diff --git a/po/es.po b/po/es.po index 7b04fad80..34b6f4162 100644 --- a/po/es.po +++ b/po/es.po @@ -590,10 +590,6 @@ msgstr "Velocidad de Subida" msgid "Filename" msgstr "Nombre del archivo" -#: src/interface.py:486 -msgid "Offset" -msgstr "Compensar" - #: src/interface.py:487 msgid "Progress" msgstr "En proceso" diff --git a/po/et.po b/po/et.po index a7cefc794..911dd2ceb 100644 --- a/po/et.po +++ b/po/et.po @@ -561,10 +561,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/eu.po b/po/eu.po index d8107470c..aedd19cc0 100644 --- a/po/eu.po +++ b/po/eu.po @@ -563,10 +563,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/fi.po b/po/fi.po index 7bd71d77f..e3464e2ff 100644 --- a/po/fi.po +++ b/po/fi.po @@ -561,10 +561,6 @@ msgstr "Lähetysnopeus" msgid "Filename" msgstr "Tiedostonimi" -#: src/interface.py:486 -msgid "Offset" -msgstr "Siirtymä" - #: src/interface.py:487 msgid "Progress" msgstr "Eteneminen" diff --git a/po/fr.po b/po/fr.po index 78e678721..911c5181f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -760,10 +760,6 @@ msgstr "Vitesse d'envoi" msgid "Filename" msgstr "Nom de Fichier" -#: src/interface.py:630 -msgid "Offset" -msgstr "Décalage" - #: src/interface.py:631 msgid "Progress" msgstr "Avancement" diff --git a/po/gl.po b/po/gl.po index fa1270f9a..ed6ccc1e7 100644 --- a/po/gl.po +++ b/po/gl.po @@ -561,10 +561,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/he.po b/po/he.po index c8eddb265..2d78c0881 100644 --- a/po/he.po +++ b/po/he.po @@ -562,10 +562,6 @@ msgstr "קצב העלאה" msgid "Filename" msgstr "שם קובץ" -#: src/interface.py:486 -msgid "Offset" -msgstr "היסט" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/hr.po b/po/hr.po index f69722ca5..6d543b933 100644 --- a/po/hr.po +++ b/po/hr.po @@ -561,10 +561,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/hu.po b/po/hu.po index 7303a178d..6f3aad51a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -561,10 +561,6 @@ msgstr "Feltöltési korlát" msgid "Filename" msgstr "Fájlnév" -#: src/interface.py:486 -msgid "Offset" -msgstr "Fájlpozíció" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/id.po b/po/id.po index 7abf072be..8ec3d4c76 100644 --- a/po/id.po +++ b/po/id.po @@ -562,10 +562,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/it.po b/po/it.po index 18c9995d3..073633088 100644 --- a/po/it.po +++ b/po/it.po @@ -586,11 +586,6 @@ msgstr "Velocità di invio" msgid "Filename" msgstr "Nome file" -#: src/interface.py:486 -#, fuzzy -msgid "Offset" -msgstr "Scostamento" - #: src/interface.py:487 msgid "Progress" msgstr "Avanzamento" diff --git a/po/ja.po b/po/ja.po index 5aff82df0..b96152738 100644 --- a/po/ja.po +++ b/po/ja.po @@ -561,10 +561,6 @@ msgstr "アップロードの率" msgid "Filename" msgstr "ファイル名" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/ko.po b/po/ko.po index 83f2492ec..7897c592f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -561,10 +561,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/la.po b/po/la.po index c944b403b..21c827f73 100644 --- a/po/la.po +++ b/po/la.po @@ -561,10 +561,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/lt.po b/po/lt.po index 6b3ce75a8..66caa9fa0 100644 --- a/po/lt.po +++ b/po/lt.po @@ -562,10 +562,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/lv.po b/po/lv.po index b83a6c2ee..beebed4a8 100644 --- a/po/lv.po +++ b/po/lv.po @@ -563,10 +563,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/nb.po b/po/nb.po index bf2cff24b..e0e5e9d15 100644 --- a/po/nb.po +++ b/po/nb.po @@ -564,10 +564,6 @@ msgstr "Opplastingsrate" msgid "Filename" msgstr "Filnavn" -#: src/interface.py:486 -msgid "Offset" -msgstr "Forskyvning:" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/nl.po b/po/nl.po index a80de9d94..b56808127 100644 --- a/po/nl.po +++ b/po/nl.po @@ -563,10 +563,6 @@ msgstr "Upload ratio" msgid "Filename" msgstr "Bestandsnaam" -#: src/interface.py:486 -msgid "Offset" -msgstr "Verschuiving" - #: src/interface.py:487 msgid "Progress" msgstr "Voortgang" diff --git a/po/pl.po b/po/pl.po index a08979579..29326e50a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -562,10 +562,6 @@ msgstr "Wysyłanie" msgid "Filename" msgstr "Nazwa pliku" -#: src/interface.py:486 -msgid "Offset" -msgstr "Offset" - #: src/interface.py:487 msgid "Progress" msgstr "Status" diff --git a/po/pt.po b/po/pt.po index 8ca08368c..9eb560041 100644 --- a/po/pt.po +++ b/po/pt.po @@ -563,10 +563,6 @@ msgstr "Velocidade de upload" msgid "Filename" msgstr "Nome do ficheiro" -#: src/interface.py:486 -msgid "Offset" -msgstr "Deslocamento" - #: src/interface.py:487 msgid "Progress" msgstr "Evolução" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8f725443b..4b7bc4d60 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -569,10 +569,6 @@ msgstr "Taxa de envio" msgid "Filename" msgstr "Nome do arquivo" -#: src/interface.py:486 -msgid "Offset" -msgstr "Sem configuração" - #: src/interface.py:487 msgid "Progress" msgstr "Progresso" diff --git a/po/ro.po b/po/ro.po index 2272d704e..1d19f047a 100644 --- a/po/ro.po +++ b/po/ro.po @@ -567,10 +567,6 @@ msgstr "Viteza Donare" msgid "Filename" msgstr "Nume fişier" -#: src/interface.py:486 -msgid "Offset" -msgstr "Decalaj" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/ru.po b/po/ru.po index 1a4bb6963..e52064639 100644 --- a/po/ru.po +++ b/po/ru.po @@ -574,10 +574,6 @@ msgstr "Скорость раздачи" msgid "Filename" msgstr "Файл" -#: src/interface.py:486 -msgid "Offset" -msgstr "Смещение" - #: src/interface.py:487 msgid "Progress" msgstr "Состояние" diff --git a/po/sk.po b/po/sk.po index 5efa36593..7552660ef 100644 --- a/po/sk.po +++ b/po/sk.po @@ -560,10 +560,6 @@ msgstr "Rýchlosť odosielania" msgid "Filename" msgstr "Názov súboru" -#: src/interface.py:486 -msgid "Offset" -msgstr "Odstup" - #: src/interface.py:487 msgid "Progress" msgstr "Priebeh" diff --git a/po/sl.po b/po/sl.po index 7b2d6d39c..dc9887fef 100644 --- a/po/sl.po +++ b/po/sl.po @@ -561,10 +561,6 @@ msgstr "Hitrost Oddajanja" msgid "Filename" msgstr "Ime datoteke" -#: src/interface.py:486 -msgid "Offset" -msgstr "Odmik" - #: src/interface.py:487 msgid "Progress" msgstr "Opravljeno" diff --git a/po/sr.po b/po/sr.po index 1f9d9652b..3eb85f32c 100644 --- a/po/sr.po +++ b/po/sr.po @@ -562,10 +562,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/sv.po b/po/sv.po index 2779ef420..ff404d5f0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -584,10 +584,6 @@ msgstr "Sändningshastighet" msgid "Filename" msgstr "Filnamn" -#: src/interface.py:486 -msgid "Offset" -msgstr "Position" - #: src/interface.py:487 msgid "Progress" msgstr "Förlopp" diff --git a/po/ta.po b/po/ta.po index 0a6ddfde1..fea7b7d2c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -561,10 +561,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "முன்னேற்றம்" diff --git a/po/tlh.po b/po/tlh.po index fb4b8643e..6b29f1307 100644 --- a/po/tlh.po +++ b/po/tlh.po @@ -561,10 +561,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/tr.po b/po/tr.po index 2ed0b6afe..a1cf01e35 100644 --- a/po/tr.po +++ b/po/tr.po @@ -563,10 +563,6 @@ msgstr "Gönderme Hızı" msgid "Filename" msgstr "Dosya adı" -#: src/interface.py:486 -msgid "Offset" -msgstr "Konum" - #: src/interface.py:487 msgid "Progress" msgstr "İlerleme" diff --git a/po/uk.po b/po/uk.po index 9fc8c65bb..bd0a67fdc 100644 --- a/po/uk.po +++ b/po/uk.po @@ -561,10 +561,6 @@ msgstr "" msgid "Filename" msgstr "" -#: src/interface.py:486 -msgid "Offset" -msgstr "" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0c9798e83..e7ef308cc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -565,10 +565,6 @@ msgstr "上传速度" msgid "Filename" msgstr "文件名" -#: src/interface.py:486 -msgid "Offset" -msgstr "偏移量" - #: src/interface.py:487 msgid "Progress" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 44901aee6..3d8cb9e13 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -564,10 +564,6 @@ msgstr "上傳頻寬" msgid "Filename" msgstr "檔案名稱" -#: src/interface.py:486 -msgid "Offset" -msgstr "偏移量" - #: src/interface.py:487 msgid "Progress" msgstr "進度" @@ -663,9 +659,6 @@ msgstr "請選取一個下載目錄" #~ msgid "size" #~ msgstr "大小" -#~ msgid "offset" -#~ msgstr "前置量" - #~ msgid "download?" #~ msgstr "確定要下載?" diff --git a/src/deluge_core.cpp b/src/deluge_core.cpp index fcee72e07..15100fd6f 100644 --- a/src/deluge_core.cpp +++ b/src/deluge_core.cpp @@ -959,7 +959,6 @@ static PyObject *torrent_get_file_info(PyObject *self, PyObject *args) file_info = Py_BuildValue( "{s:s,s:d,s:d,s:f}", "path", currFile.path.string().c_str(), - "offset", double(currFile.offset), "size", double(currFile.size), "progress", progresses[i - start]*100.0 ); diff --git a/src/interface.py b/src/interface.py index fc51f2d4e..253b5873f 100644 --- a/src/interface.py +++ b/src/interface.py @@ -519,7 +519,7 @@ class DelugeGTK: i=0 for f in all_files: self.file_store.append([not file_filter[i], f['path'], common.fsize(f['size']), - f['offset'], round(f['progress'],2)]) + round(f['progress'],2)]) i=i+1 return True @@ -642,7 +642,7 @@ class DelugeGTK: "check_selected": self.file_check_selected, "uncheck_selected": self.file_uncheck_selected, }) - self.file_store = gtk.ListStore(bool, str, str, str, float) + self.file_store = gtk.ListStore(bool, str, str, float) self.file_view.set_model(self.file_store) self.file_view.get_selection().set_mode(gtk.SELECTION_MULTIPLE) self.file_view.get_selection().set_select_function(self.file_clicked) @@ -652,8 +652,7 @@ class DelugeGTK: dgtk.add_toggle_column(self.file_view, _("Download"), 0, toggled_signal=self.file_toggled) dgtk.add_text_column(self.file_view, _("Filename"), 1).set_expand(True) dgtk.add_text_column(self.file_view, _("Size"), 2) - dgtk.add_text_column(self.file_view, _("Offset"), 3) - dgtk.add_func_column(self.file_view, _("Progress"), percent, 4) + dgtk.add_func_column(self.file_view, _("Progress"), percent, 3) def file_select_all(self, widget): self.file_view.get_selection().select_all() @@ -1091,8 +1090,9 @@ class DelugeGTK: new_file_info = self.manager.get_torrent_file_info(unique_id) for file in new_file_info: iter = self.file_get_iter_from_name(file['path']) - if (iter != None) and (round(self.file_store.get_value(iter, 4),2) != round(file['progress'],2)): - self.file_store.set_value(iter, 4, round(file['progress'],2)) + if iter != None and \ + round(self.file_store.get_value(iter, 3), 2) != round(file['progress'], 2): + self.file_store.set_value(iter, 3, round(file['progress'], 2)) return True else: