From 028d7873d7c0efbae1d23eddfeb57c95e74c900a Mon Sep 17 00:00:00 2001 From: Kai Huuhko Date: Mon, 8 May 2017 04:10:47 +0300 Subject: [PATCH] Release 0.7.0 --- TODO | 37 ++- bin/epour | 2 +- debian/changelog | 6 + debian/control | 10 +- debian/rules | 7 +- epour/Epour.py | 4 +- epour/__init__.py | 2 +- epour/gui/Preferences.py | 2 +- epour/gui/TorrentProps.py | 2 +- epour/gui/TorrentSelector.py | 2 +- epour/gui/Widgets.py | 2 +- epour/gui/__init__.py | 2 +- epour/session.py | 2 +- po/epour.pot | 533 +++++++++++++++++++++++------------ setup.py | 2 +- 15 files changed, 388 insertions(+), 227 deletions(-) diff --git a/TODO b/TODO index 15f87f1..e003229 100644 --- a/TODO +++ b/TODO @@ -15,8 +15,7 @@ Torrent-handle controls/options: Torrent status info: http://libtorrent.org/reference-Core.html#torrent_status Add Torrent-dialog: - ☐ Dialog window - ☐ Add preferences for initial/automatic values for options + ☐ Add preferences for initial/automatic values for options Preferences: ☐ max uploads ? @@ -35,23 +34,9 @@ Misc: Remake this feature ☐ Moving finished torrents to a different folder ☐ Individual torrents - ✔ Session @done (16-08-11 01:15) - ✔ Save torrent & resume data periodically @done (16-07-30 08:05) - Will this accomplish anything? - http://libtorrent.org/reference-Core.html#save_resume_data() - http://libtorrent.org/reference-Core.html#need_save_resume_data() - ✔ Pause gui updates when iconized/withdrawn @done (13:58 20.07.2014) ☐ Total count of torrents in session status ☐ Local search function for torrents, files? ☐ Web search - ✘ Handle switching between py2 <--> py3, messes up with pickled list of torrents @cancelled (16-07-30 08:15) - File "/usr/bin/epour", line 7, in - app = Epour() - File "/usr/lib/python2.7/dist-packages/epour/Epour.py", line 89, in __init__ - self.session.load_torrents() - File "/usr/lib/python2.7/dist-packages/epour/session.py", line 182, in load_torrents - torrents = cPickle.load(pkl_file) - AttributeError: 'module' object has no attribute 'OrderedDict' Error handling: ☐ Torrent errors http://libtorrent.org/reference-Alerts.html#torrent_error_alert @@ -67,9 +52,6 @@ Error handling: http://libtorrent.org/reference-Alerts.html#listen_succeeded_alert I18N: This should wait until most of the features are in and the strings are stable. - ☐ Make strings localizable - ☐ Create pot file - ☐ Generate po files ＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿ Archive: @@ -81,6 +63,22 @@ Archive: ./epour/gui/__init__.py>ItemMenu ✔ Force reannounce @done (18:43 06.07.2014) @project(Torrent-handle controls/options) ✔ Force DHT reannounce @done (18:43 06.07.2014) @project(Torrent-handle controls/options) + ✔ Make strings localizable @done (17-05-08 01:40) @project(I18N) + ✔ Generate pot file @done (17-05-08 01:40) @project(I18N) + ✔ Dialog window @done (17-05-08 01:38) @project(Add Torrent-dialog) + ✔ Session @done (16-08-11 01:15) @project(Misc) + ✘ Handle switching between py2 <--> py3, messes up with pickled list of torrents @cancelled (16-07-30 08:15) @project(Misc) + File "/usr/bin/epour", line 7, in + app = Epour() + File "/usr/lib/python2.7/dist-packages/epour/Epour.py", line 89, in __init__ + self.session.load_torrents() + File "/usr/lib/python2.7/dist-packages/epour/session.py", line 182, in load_torrents + torrents = cPickle.load(pkl_file) + AttributeError: 'module' object has no attribute 'OrderedDict' + ✔ Save torrent & resume data periodically @done (16-07-30 08:05) @project(Misc) + Will this accomplish anything? + http://libtorrent.org/reference-Core.html#save_resume_data() + http://libtorrent.org/reference-Core.html#need_save_resume_data() ✔ Use dicts to hold torrent info between sessions. @done (15:57 30.06.2014) @project(Add Torrent-dialog) ✔ Storage path @done (15:57 30.06.2014) @project(Add Torrent-dialog) ✔ Options @done (15:57 30.06.2014) @project(Add Torrent-dialog) @@ -93,6 +91,7 @@ Archive: http://libtorrent.org/reference-Core.html#move_storage() ✔ set_upload_limit() set_download_limit() upload_limit() download_limit() @done (14:50 09.07.2014) @project(Torrent-handle controls/options) ✔ save_path() move_storage() @done (14:18 09.07.2014) @project(Torrent-handle controls/options) + ✔ Pause gui updates when iconized/withdrawn @done (13:58 20.07.2014) @project(Misc) ✔ Move proxy settings to its own naviframe page and don't autocollapse the frames @done (13-08-18 18:02) @project(Misc) ✔ set_max_uploads() max_uploads() @done (12:47 08.07.2014) @project(Torrent-handle controls/options) ✔ set_max_connections() max_connections() @done (12:47 08.07.2014) @project(Torrent-handle controls/options) diff --git a/bin/epour b/bin/epour index 1890371..9caf906 100755 --- a/bin/epour +++ b/bin/epour @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import logging diff --git a/debian/changelog b/debian/changelog index dea6703..9d38b10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +epour (0.7.0-1) xenial; urgency=low + + * Release 0.7.0 + + -- Kai Huuhko Mon, 08 May 2017 03:41:19 +0300 + epour (0.5.2.0) precise; urgency=low * Handle file:// URI's diff --git a/debian/control b/debian/control index 8081823..986ab32 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: epour Maintainer: Kai Huuhko Section: python Priority: optional -Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 7.4.3), python-distutils-extra -Standards-Version: 3.9.1 +Build-Depends: python3 (>= 3.2), debhelper (>= 7.4.3), python3-distutils-extra +Standards-Version: 3.9.7 Package: epour Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-libtorrent, python-efl -Description: Simple torrent client - Epour is a simple torrent client using EFL and libtorrent. +Depends: ${misc:Depends}, ${python:Depends}, python3-libtorrent, python3-efl, python3-xdg +Description: Enlightened torrent client + Epour is a torrent client, using EFL and libtorrent. diff --git a/debian/rules b/debian/rules index cc5acda..2a72859 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,4 @@ #!/usr/bin/make -f -# This file was automatically generated by stdeb 0.6.0+git at -# Tue, 22 Jan 2013 19:57:42 +0200 - %: - dh $@ --with python2 --buildsystem=python_distutils - - + dh $@ --with python3 --buildsystem=python_distutils diff --git a/epour/Epour.py b/epour/Epour.py index 9d28418..6de9bb5 100644 --- a/epour/Epour.py +++ b/epour/Epour.py @@ -1,8 +1,8 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Epour - A bittorrent client using EFL and libtorrent # -# Copyright 2012-2016 Kai Huuhko +# Copyright 2012-2017 Kai Huuhko # # 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 diff --git a/epour/__init__.py b/epour/__init__.py index 5c2c6c5..49e0fc1 100644 --- a/epour/__init__.py +++ b/epour/__init__.py @@ -1 +1 @@ -__version__ = "0.6.9" +__version__ = "0.7.0" diff --git a/epour/gui/Preferences.py b/epour/gui/Preferences.py index 1590212..801837d 100644 --- a/epour/gui/Preferences.py +++ b/epour/gui/Preferences.py @@ -1,7 +1,7 @@ # # Epour - A bittorrent client using EFL and libtorrent # -# Copyright 2012-2016 Kai Huuhko +# Copyright 2012-2017 Kai Huuhko # # 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 diff --git a/epour/gui/TorrentProps.py b/epour/gui/TorrentProps.py index f62cd6e..ac19cd6 100644 --- a/epour/gui/TorrentProps.py +++ b/epour/gui/TorrentProps.py @@ -1,7 +1,7 @@ # # Epour - A bittorrent client using EFL and libtorrent # -# Copyright 2012-2016 Kai Huuhko +# Copyright 2012-2017 Kai Huuhko # # 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 diff --git a/epour/gui/TorrentSelector.py b/epour/gui/TorrentSelector.py index ca30941..c6c8993 100644 --- a/epour/gui/TorrentSelector.py +++ b/epour/gui/TorrentSelector.py @@ -1,7 +1,7 @@ # # Epour - A bittorrent client using EFL and libtorrent # -# Copyright 2012-2016 Kai Huuhko +# Copyright 2012-2017 Kai Huuhko # # 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 diff --git a/epour/gui/Widgets.py b/epour/gui/Widgets.py index 5c96ebe..9823d1d 100644 --- a/epour/gui/Widgets.py +++ b/epour/gui/Widgets.py @@ -1,7 +1,7 @@ # # Epour - A bittorrent client using EFL and libtorrent # -# Copyright 2012-2016 Kai Huuhko +# Copyright 2012-2017 Kai Huuhko # # 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 diff --git a/epour/gui/__init__.py b/epour/gui/__init__.py index bc4b87a..0eb3aec 100644 --- a/epour/gui/__init__.py +++ b/epour/gui/__init__.py @@ -1,7 +1,7 @@ # # Epour - A bittorrent client using EFL and libtorrent # -# Copyright 2012-2016 Kai Huuhko +# Copyright 2012-2017 Kai Huuhko # # 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 diff --git a/epour/session.py b/epour/session.py index 29fee9e..fb82d74 100644 --- a/epour/session.py +++ b/epour/session.py @@ -1,7 +1,7 @@ # # Epour - A bittorrent client using EFL and libtorrent # -# Copyright 2012-2016 Kai Huuhko +# Copyright 2012-2017 Kai Huuhko # # 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 diff --git a/po/epour.pot b/po/epour.pot index a152d84..18fca0b 100644 --- a/po/epour.pot +++ b/po/epour.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-16 12:38+0300\n" +"POT-Creation-Date: 2017-05-08 04:04+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,427 +17,499 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../epour/gui/Preferences.py:97 +#: ../epour/gui/Preferences.py:98 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:98 msgid "Epour General Preferences" msgstr "" -#: ../epour/gui/Preferences.py:111 +#: ../epour/gui/Preferences.py:112 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:112 msgid "Move completed torrents" msgstr "" -#: ../epour/gui/Preferences.py:119 +#: ../epour/gui/Preferences.py:120 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:120 msgid "Completed torrents" msgstr "" -#: ../epour/gui/Preferences.py:148 +#: ../epour/gui/Preferences.py:149 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:149 msgid "Delete original .torrent file when added" msgstr "" -#: ../epour/gui/Preferences.py:156 +#: ../epour/gui/Preferences.py:157 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:157 msgid "Ask for confirmation on exit" msgstr "" -#: ../epour/gui/Preferences.py:165 +#: ../epour/gui/Preferences.py:166 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:166 msgid "Torrents to be added from dbus or command line open a dialog" msgstr "" -#: ../epour/gui/Preferences.py:200 +#: ../epour/gui/Preferences.py:201 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:201 msgid "Change path" msgstr "" -#: ../epour/gui/Preferences.py:237 +#: ../epour/gui/Preferences.py:238 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:238 msgid "Listen port (range)" msgstr "" -#: ../epour/gui/Preferences.py:276 +#: ../epour/gui/Preferences.py:277 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:277 msgid "Epour Proxy Preferences" msgstr "" -#: ../epour/gui/Preferences.py:279 +#: ../epour/gui/Preferences.py:280 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:280 msgid "Proxy for torrent peer connections" msgstr "" -#: ../epour/gui/Preferences.py:281 +#: ../epour/gui/Preferences.py:282 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:282 msgid "Proxy for torrent web seed connections" msgstr "" -#: ../epour/gui/Preferences.py:283 +#: ../epour/gui/Preferences.py:284 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:284 msgid "Proxy for tracker connections" msgstr "" -#: ../epour/gui/Preferences.py:285 +#: ../epour/gui/Preferences.py:286 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:286 msgid "Proxy for DHT connections" msgstr "" -#: ../epour/gui/Preferences.py:320 +#: ../epour/gui/Preferences.py:322 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:322 msgid "Proxy type" msgstr "" -#: ../epour/gui/Preferences.py:330 +#: ../epour/gui/Preferences.py:332 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:332 msgid "Hostname" msgstr "" -#: ../epour/gui/Preferences.py:341 +#: ../epour/gui/Preferences.py:343 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:343 msgid "Port" msgstr "" -#: ../epour/gui/Preferences.py:349 +#: ../epour/gui/Preferences.py:351 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:351 msgid "Username" msgstr "" -#: ../epour/gui/Preferences.py:360 +#: ../epour/gui/Preferences.py:362 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:362 msgid "Password" msgstr "" -#: ../epour/gui/Preferences.py:372 +#: ../epour/gui/Preferences.py:374 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:374 msgid "Proxy hostname lookups" msgstr "" -#: ../epour/gui/Preferences.py:381 +#: ../epour/gui/Preferences.py:383 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:383 msgid "Proxy peer connections" msgstr "" -#: ../epour/gui/Preferences.py:391 ../epour/gui/Preferences.py:459 +#: ../epour/gui/Preferences.py:393 ../epour/gui/Preferences.py:461 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:393 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:461 msgid "Apply" msgstr "" -#: ../epour/gui/Preferences.py:410 +#: ../epour/gui/Preferences.py:412 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:412 #, python-format msgid "%s settings saved" msgstr "" -#: ../epour/gui/Preferences.py:422 +#: ../epour/gui/Preferences.py:424 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:424 msgid "Encryption settings" msgstr "" -#: ../epour/gui/Preferences.py:434 +#: ../epour/gui/Preferences.py:436 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:436 msgid "Incoming encryption" msgstr "" -#: ../epour/gui/Preferences.py:440 +#: ../epour/gui/Preferences.py:442 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:442 msgid "Outgoing encryption" msgstr "" -#: ../epour/gui/Preferences.py:446 +#: ../epour/gui/Preferences.py:448 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:448 msgid "Allowed encryption level" msgstr "" -#: ../epour/gui/Preferences.py:453 +#: ../epour/gui/Preferences.py:455 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:455 msgid "Prefer RC4 ecryption" msgstr "" -#: ../epour/gui/Preferences.py:483 +#: ../epour/gui/Preferences.py:485 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Preferences.py:485 msgid "Epour Session Preferences" msgstr "" -#: ../epour/gui/TorrentProps.py:90 -msgid "Enable/disable file download" -msgstr "" - -#: ../epour/gui/TorrentProps.py:124 -msgid "Invalid torrent handle." -msgstr "" - -#: ../epour/gui/TorrentProps.py:149 -msgid "Torrent info" -msgstr "" - -#: ../epour/gui/TorrentProps.py:157 -msgid "Torrent settings" -msgstr "" - -#: ../epour/gui/TorrentProps.py:165 -msgid "Torrent status" -msgstr "" - -#: ../epour/gui/TorrentProps.py:174 -msgid "Magnet URI" -msgstr "" - -#: ../epour/gui/TorrentProps.py:182 -msgid "Copy" -msgstr "" - -#: ../epour/gui/TorrentProps.py:209 -#, python-format -msgid "Epour - Files for torrent: %s" -msgstr "" - -#: ../epour/gui/TorrentProps.py:251 -msgid "Select all" -msgstr "" - -#: ../epour/gui/TorrentProps.py:255 -msgid "Select none" -msgstr "" - -#: ../epour/gui/TorrentProps.py:394 -msgid "Private" -msgstr "" - -#: ../epour/gui/TorrentProps.py:445 -msgid "Storage path" -msgstr "" - -#: ../epour/gui/TorrentProps.py:451 -msgid "Select" -msgstr "" - -#: ../epour/gui/TorrentProps.py:503 -msgid "disabled" -msgstr "" - -#: ../epour/gui/TorrentProps.py:539 ../epour/gui/__init__.py:440 -msgid "Queued" -msgstr "" - -#: ../epour/gui/TorrentProps.py:539 ../epour/gui/__init__.py:440 -msgid "Checking" -msgstr "" - -#: ../epour/gui/TorrentProps.py:539 ../epour/gui/__init__.py:440 -msgid "Downloading metadata" -msgstr "" - -#: ../epour/gui/TorrentProps.py:539 ../epour/gui/__init__.py:441 -msgid "Downloading" -msgstr "" - -#: ../epour/gui/TorrentProps.py:540 ../epour/gui/__init__.py:441 -msgid "Finished" -msgstr "" - -#: ../epour/gui/TorrentProps.py:540 ../epour/gui/__init__.py:441 -msgid "Seeding" -msgstr "" - -#: ../epour/gui/TorrentProps.py:540 ../epour/gui/__init__.py:441 -msgid "Allocating" -msgstr "" - -#: ../epour/gui/TorrentProps.py:540 ../epour/gui/__init__.py:442 -msgid "Checking resume data" -msgstr "" - #: ../epour/gui/Widgets.py:130 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Widgets.py:130 msgid "Close" msgstr "" #: ../epour/gui/Widgets.py:143 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Widgets.py:143 msgid "OK" msgstr "" #: ../epour/gui/Widgets.py:152 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Widgets.py:152 msgid "Confirm exit" msgstr "" #: ../epour/gui/Widgets.py:153 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Widgets.py:153 msgid "Are you sure you wish to exit Epour?" msgstr "" #: ../epour/gui/Widgets.py:155 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Widgets.py:155 msgid "Yes" msgstr "" #: ../epour/gui/Widgets.py:159 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/Widgets.py:159 msgid "No" msgstr "" -#: ../epour/gui/__init__.py:91 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:122 +#: ../epour/gui/__init__.py:122 msgid "Add torrent" msgstr "" -#: ../epour/gui/__init__.py:103 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:134 +#: ../epour/gui/__init__.py:134 msgid "Pause Session" msgstr "" -#: ../epour/gui/__init__.py:106 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:137 +#: ../epour/gui/__init__.py:137 msgid "Resume Session" msgstr "" -#: ../epour/gui/__init__.py:121 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:152 +#: ../epour/gui/__init__.py:152 msgid "Preferences" msgstr "" -#: ../epour/gui/__init__.py:124 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:155 +#: ../epour/gui/__init__.py:155 msgid "General" msgstr "" -#: ../epour/gui/__init__.py:127 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:158 +#: ../epour/gui/__init__.py:158 msgid "Proxy" msgstr "" -#: ../epour/gui/__init__.py:130 ../epour/gui/__init__.py:348 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:161 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:386 +#: ../epour/gui/__init__.py:161 ../epour/gui/__init__.py:386 msgid "Session" msgstr "" -#: ../epour/gui/__init__.py:133 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:164 +#: ../epour/gui/__init__.py:164 msgid "Exit" msgstr "" -#: ../epour/gui/__init__.py:248 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:287 +#: ../epour/gui/__init__.py:287 msgid "Torrent {} has finished downloading." msgstr "" -#: ../epour/gui/__init__.py:379 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:417 +#: ../epour/gui/__init__.py:417 msgid "Peer connections" msgstr "" -#: ../epour/gui/__init__.py:387 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:425 +#: ../epour/gui/__init__.py:425 msgid "Upload slots" msgstr "" -#: ../epour/gui/__init__.py:396 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:434 +#: ../epour/gui/__init__.py:434 msgid "Listening" msgstr "" -#: ../epour/gui/__init__.py:456 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:478 +#: ../epour/gui/__init__.py:478 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:540 +#: ../epour/gui/TorrentProps.py:540 +msgid "Queued" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:478 +#: ../epour/gui/__init__.py:478 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:540 +#: ../epour/gui/TorrentProps.py:540 +msgid "Checking" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:478 +#: ../epour/gui/__init__.py:478 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:540 +#: ../epour/gui/TorrentProps.py:540 +msgid "Downloading metadata" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:479 +#: ../epour/gui/__init__.py:479 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:540 +#: ../epour/gui/TorrentProps.py:540 +msgid "Downloading" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:479 +#: ../epour/gui/__init__.py:479 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:541 +#: ../epour/gui/TorrentProps.py:541 +msgid "Finished" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:479 +#: ../epour/gui/__init__.py:479 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:541 +#: ../epour/gui/TorrentProps.py:541 +msgid "Seeding" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:479 +#: ../epour/gui/__init__.py:479 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:541 +#: ../epour/gui/TorrentProps.py:541 +msgid "Allocating" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:480 +#: ../epour/gui/__init__.py:480 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:541 +#: ../epour/gui/TorrentProps.py:541 +msgid "Checking resume data" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:500 +#: ../epour/gui/__init__.py:500 msgid "Invalid torrent" msgstr "" -#: ../epour/gui/__init__.py:467 +#. NOTE: Estimated Time of Arrival (time until the process is finished) +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:516 +#: ../epour/gui/__init__.py:516 #, python-brace-format -msgid "{0:.0%} complete, ETA: {1} (Down: {2}/s Up: {3}/s Queue pos: {4})" +msgid "ETA: {0} " msgstr "" -#: ../epour/gui/__init__.py:546 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:519 +#: ../epour/gui/__init__.py:519 +#, python-brace-format +msgid "Download: {0}/s " +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:521 +#: ../epour/gui/__init__.py:521 +#, python-brace-format +msgid "Upload: {0}/s " +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:523 +#: ../epour/gui/__init__.py:523 +#, python-brace-format +msgid "Queue position: {0}" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:611 +#: ../epour/gui/__init__.py:611 msgid "Resume" msgstr "" -#: ../epour/gui/__init__.py:546 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:611 +#: ../epour/gui/__init__.py:611 msgid "Pause" msgstr "" -#: ../epour/gui/__init__.py:551 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:616 +#: ../epour/gui/__init__.py:616 msgid "Queue" msgstr "" -#: ../epour/gui/__init__.py:553 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:618 +#: ../epour/gui/__init__.py:618 msgid "Up" msgstr "" -#: ../epour/gui/__init__.py:555 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:620 +#: ../epour/gui/__init__.py:620 msgid "Down" msgstr "" -#: ../epour/gui/__init__.py:557 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:622 +#: ../epour/gui/__init__.py:622 msgid "Top" msgstr "" -#: ../epour/gui/__init__.py:559 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:624 +#: ../epour/gui/__init__.py:624 msgid "Bottom" msgstr "" -#: ../epour/gui/__init__.py:561 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:626 +#: ../epour/gui/__init__.py:626 msgid "Remove torrent" msgstr "" -#: ../epour/gui/__init__.py:564 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:629 +#: ../epour/gui/__init__.py:629 msgid "and data files" msgstr "" -#: ../epour/gui/__init__.py:568 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:633 +#: ../epour/gui/__init__.py:633 msgid "Force reannounce" msgstr "" -#: ../epour/gui/__init__.py:579 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:644 +#: ../epour/gui/__init__.py:644 msgid "Force DHT reannounce" msgstr "" -#: ../epour/gui/__init__.py:582 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:647 +#: ../epour/gui/__init__.py:647 msgid "Scrape tracker" msgstr "" -#: ../epour/gui/__init__.py:590 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:655 +#: ../epour/gui/__init__.py:655 msgid "Force re-check" msgstr "" -#: ../epour/gui/__init__.py:604 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:669 +#: ../epour/gui/__init__.py:669 msgid "Torrent properties" msgstr "" -#: ../epour/gui/__init__.py:640 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:705 +#: ../epour/gui/__init__.py:705 msgid "Time when added" msgstr "" -#: ../epour/gui/__init__.py:641 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:706 +#: ../epour/gui/__init__.py:706 msgid "Time when completed" msgstr "" -#: ../epour/gui/__init__.py:642 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:707 +#: ../epour/gui/__init__.py:707 msgid "All time downloaded" msgstr "" -#: ../epour/gui/__init__.py:643 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:708 +#: ../epour/gui/__init__.py:708 msgid "All time uploaded" msgstr "" -#: ../epour/gui/__init__.py:644 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:709 +#: ../epour/gui/__init__.py:709 msgid "Total wanted done" msgstr "" -#: ../epour/gui/__init__.py:645 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:710 +#: ../epour/gui/__init__.py:710 msgid "Total wanted" msgstr "" -#: ../epour/gui/__init__.py:646 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:711 +#: ../epour/gui/__init__.py:711 msgid "Total downloaded this session" msgstr "" -#: ../epour/gui/__init__.py:648 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:713 +#: ../epour/gui/__init__.py:713 msgid "Total uploaded this session" msgstr "" -#: ../epour/gui/__init__.py:649 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:714 +#: ../epour/gui/__init__.py:714 msgid "Total failed" msgstr "" -#: ../epour/gui/__init__.py:650 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:715 +#: ../epour/gui/__init__.py:715 msgid "Number of seeds" msgstr "" -#: ../epour/gui/__init__.py:651 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:716 +#: ../epour/gui/__init__.py:716 msgid "Number of peers" msgstr "" -#: ../epour/gui/__init__.py:680 ../epour/gui/__init__.py:723 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:742 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:785 +#: ../epour/gui/__init__.py:742 ../epour/gui/__init__.py:785 msgid "N/A" msgstr "" -#: ../epour/gui/__init__.py:703 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/__init__.py:765 +#: ../epour/gui/__init__.py:765 #, python-format msgid "Pieces (scaled 1:%d)" msgstr "" -#: ../epour/gui/TorrentSelector.py:61 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:60 +#: ../epour/gui/TorrentSelector.py:60 msgid "Seed Mode" msgstr "" -#: ../epour/gui/TorrentSelector.py:62 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:61 +#: ../epour/gui/TorrentSelector.py:61 msgid "Share Mode" msgstr "" -#: ../epour/gui/TorrentSelector.py:63 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:62 +#: ../epour/gui/TorrentSelector.py:62 msgid "Apply IP Filter" msgstr "" -#: ../epour/gui/TorrentSelector.py:64 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:63 +#: ../epour/gui/TorrentSelector.py:63 msgid "Start Paused" msgstr "" -#: ../epour/gui/TorrentSelector.py:65 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:64 +#: ../epour/gui/TorrentSelector.py:64 msgid "Duplicate Is Error" msgstr "" -#: ../epour/gui/TorrentSelector.py:66 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:65 +#: ../epour/gui/TorrentSelector.py:65 msgid "Super Seeding" msgstr "" -#: ../epour/gui/TorrentSelector.py:67 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:66 +#: ../epour/gui/TorrentSelector.py:66 msgid "Sequential Download" msgstr "" -#: ../epour/gui/TorrentSelector.py:74 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:73 +#: ../epour/gui/TorrentSelector.py:73 msgid "" "If Seed Mode is set, Epour will assume that all files are\n" "present for this torrent and that they all match the hashes in the\n" @@ -453,7 +525,8 @@ msgid "" "file) is a no-op and will be ignored." msgstr "" -#: ../epour/gui/TorrentSelector.py:90 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:89 +#: ../epour/gui/TorrentSelector.py:89 #, python-format msgid "" "Determines if the torrent should be added in share mode or not.\n" @@ -475,7 +548,8 @@ msgid "" "The share mode has one setting, the share ratio target." msgstr "" -#: ../epour/gui/TorrentSelector.py:111 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:110 +#: ../epour/gui/TorrentSelector.py:110 msgid "" "Determines if the IP filter should apply to this torrent or not. By\n" "default all torrents are subject to filtering by the IP filter\n" @@ -484,7 +558,8 @@ msgid "" "torrent for instance." msgstr "" -#: ../epour/gui/TorrentSelector.py:120 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:119 +#: ../epour/gui/TorrentSelector.py:119 msgid "" "Specifies whether or not the torrent is to be started in a paused\n" "state. I.e. it won't connect to the tracker or any of the peers\n" @@ -493,65 +568,151 @@ msgid "" "starting them." msgstr "" -#: ../epour/gui/TorrentSelector.py:129 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:128 +#: ../epour/gui/TorrentSelector.py:128 msgid "" "Sets the torrent into super seeding mode. If the torrent is not a\n" "seed, this flag has no effect." msgstr "" -#: ../epour/gui/TorrentSelector.py:135 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:134 +#: ../epour/gui/TorrentSelector.py:134 msgid "Sets the sequential download state for the torrent." msgstr "" -#: ../epour/gui/TorrentSelector.py:142 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:141 +#: ../epour/gui/TorrentSelector.py:141 msgid "Add Torrent" msgstr "" -#: ../epour/gui/TorrentSelector.py:168 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:167 +#: ../epour/gui/TorrentSelector.py:167 msgid "Enter torrent file path / magnet URI / info hash" msgstr "" -#: ../epour/gui/TorrentSelector.py:176 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:175 +#: ../epour/gui/TorrentSelector.py:175 msgid "Select file" msgstr "" -#: ../epour/gui/TorrentSelector.py:183 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:182 +#: ../epour/gui/TorrentSelector.py:182 msgid "Advanced Options" msgstr "" -#: ../epour/gui/TorrentSelector.py:206 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:205 +#: ../epour/gui/TorrentSelector.py:205 msgid "Name" msgstr "" -#: ../epour/gui/TorrentSelector.py:207 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:206 +#: ../epour/gui/TorrentSelector.py:206 msgid "Tracker ID" msgstr "" #. Downloaded data is saved in this path -#: ../epour/gui/TorrentSelector.py:219 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:218 +#: ../epour/gui/TorrentSelector.py:218 msgid "Data Save Path" msgstr "" -#: ../epour/gui/TorrentSelector.py:261 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:263 +#: ../epour/gui/TorrentSelector.py:263 msgid "Max Uploads" msgstr "" -#: ../epour/gui/TorrentSelector.py:262 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:264 +#: ../epour/gui/TorrentSelector.py:264 msgid "Max Connections" msgstr "" -#: ../epour/gui/TorrentSelector.py:273 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:275 +#: ../epour/gui/TorrentSelector.py:275 msgid "Upload Limit" msgstr "" -#: ../epour/gui/TorrentSelector.py:274 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:276 +#: ../epour/gui/TorrentSelector.py:276 msgid "Download Limit" msgstr "" -#: ../epour/gui/TorrentSelector.py:299 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:301 +#: ../epour/gui/TorrentSelector.py:301 msgid "Ok" msgstr "" -#: ../epour/gui/TorrentSelector.py:303 +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentSelector.py:305 +#: ../epour/gui/TorrentSelector.py:305 msgid "Cancel" msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:90 +#: ../epour/gui/TorrentProps.py:90 +msgid "Enable/disable file download" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:124 +#: ../epour/gui/TorrentProps.py:124 +msgid "Invalid torrent handle." +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:149 +#: ../epour/gui/TorrentProps.py:149 +msgid "Torrent info" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:157 +#: ../epour/gui/TorrentProps.py:157 +msgid "Torrent settings" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:165 +#: ../epour/gui/TorrentProps.py:165 +msgid "Torrent status" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:174 +#: ../epour/gui/TorrentProps.py:174 +msgid "Magnet URI" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:182 +#: ../epour/gui/TorrentProps.py:182 +msgid "Copy" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:210 +#: ../epour/gui/TorrentProps.py:210 +#, python-format +msgid "Epour - Files for torrent: %s" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:252 +#: ../epour/gui/TorrentProps.py:252 +msgid "Select all" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:256 +#: ../epour/gui/TorrentProps.py:256 +msgid "Select none" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:395 +#: ../epour/gui/TorrentProps.py:395 +msgid "Private" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:446 +#: ../epour/gui/TorrentProps.py:446 +msgid "Storage path" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:452 +#: ../epour/gui/TorrentProps.py:452 +msgid "Select" +msgstr "" + +#: ../debian/epour/usr/lib/python2.7/dist-packages/epour/gui/TorrentProps.py:504 +#: ../epour/gui/TorrentProps.py:504 +msgid "disabled" +msgstr "" diff --git a/setup.py b/setup.py index eee6b85..06d5ef0 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import os import distutils