diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-05-28 17:06:55 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-05-28 17:06:55 +0200 |
| commit | 3fe887026d035422a01a8bf5c76686370ed58dd5 (patch) | |
| tree | 6db7e571acfc2241d128b4aa81dd5f5081cb38b6 | |
| parent | change password in webif (diff) | |
| download | pyload-3fe887026d035422a01a8bf5c76686370ed58dd5.tar.xz | |
fix dlc, new cli functions, new locale
| -rw-r--r-- | locale/cli.pot | 226 | ||||
| -rw-r--r-- | locale/core.pot | 310 | ||||
| -rw-r--r-- | locale/django.pot | 441 | ||||
| -rw-r--r-- | locale/generate_locale.py | 2 | ||||
| -rw-r--r-- | locale/gui.pot | 128 | ||||
| -rw-r--r-- | locale/setup.pot | 6 | ||||
| -rw-r--r-- | module/PluginThread.py | 1 | ||||
| -rw-r--r-- | module/plugins/PluginManager.py | 2 | ||||
| -rw-r--r-- | module/plugins/accounts/FilesonicCom.py | 10 | ||||
| -rw-r--r-- | module/remote/thriftbackend/thriftgen/pyload/Pyload.py | 242 | ||||
| -rw-r--r-- | module/remote/thriftbackend/thriftgen/pyload/ttypes.py | 34 | ||||
| -rw-r--r-- | pyLoadCli.py | 12 |
12 files changed, 814 insertions, 600 deletions
diff --git a/locale/cli.pot b/locale/cli.pot index 3a68e464b..56b6fa2a8 100644 --- a/locale/cli.pot +++ b/locale/cli.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pyLoad 0.4.5\n" "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n" -"POT-Creation-Date: 2011-03-14 16:47+0100\n" +"POT-Creation-Date: 2011-05-28 17:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,204 +17,254 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: pyLoadCli.py:59 pyLoadCli.py:117 +#: pyLoadCli.py:66 pyLoadCli.py:124 msgid " Command Line Interface" msgstr "" -#: pyLoadCli.py:119 +#: pyLoadCli.py:156 #, python-format msgid "%s Downloads:" msgstr "" -#: pyLoadCli.py:131 +#: pyLoadCli.py:168 msgid " Speed: " msgstr "" -#: pyLoadCli.py:131 +#: pyLoadCli.py:168 msgid " Size: " msgstr "" -#: pyLoadCli.py:132 +#: pyLoadCli.py:169 msgid " Finished in: " msgstr "" -#: pyLoadCli.py:133 +#: pyLoadCli.py:170 msgid " ID: " msgstr "" -#: pyLoadCli.py:138 +#: pyLoadCli.py:175 msgid "waiting: " msgstr "" -#: pyLoadCli.py:145 pyLoadCli.py:149 +#: pyLoadCli.py:183 pyLoadCli.py:187 msgid "Status: " msgstr "" -#: pyLoadCli.py:145 pyLoadCli.py:149 +#: pyLoadCli.py:183 pyLoadCli.py:187 msgid " total Speed: " msgstr "" -#: pyLoadCli.py:146 pyLoadCli.py:150 +#: pyLoadCli.py:184 pyLoadCli.py:188 msgid " Files in queue: " msgstr "" -#: pyLoadCli.py:162 +#: pyLoadCli.py:194 msgid "Menu:" msgstr "" -#: pyLoadCli.py:167 +#: pyLoadCli.py:196 msgid " Add Links" msgstr "" -#: pyLoadCli.py:169 -msgid " Manage Links" -msgstr "" - -#: pyLoadCli.py:171 -msgid " (Un)Pause Server" -msgstr "" - -#: pyLoadCli.py:173 -msgid " Kill Server" -msgstr "" - -#: pyLoadCli.py:175 -msgid " Quit" +#: pyLoadCli.py:197 +msgid " Manage Queue" msgstr "" -#: pyLoadCli.py:185 -msgid "Name your package." +#: pyLoadCli.py:198 +msgid " Manage Collector" msgstr "" -#: pyLoadCli.py:195 pyLoadCli.py:212 pyLoadCli.py:259 -msgid " back to main menu" +#: pyLoadCli.py:199 +msgid " (Un)Pause Server" msgstr "" #: pyLoadCli.py:200 -#, python-format -msgid "Package: %s" -msgstr "" - -#: pyLoadCli.py:202 -msgid "Parse the links you want to add." -msgstr "" - -#: pyLoadCli.py:204 -#, python-format -msgid "Type %s when done." -msgstr "" - -#: pyLoadCli.py:206 -msgid "Links added: " -msgstr "" - -#: pyLoadCli.py:219 -msgid "" -"Type d(number of package) to delete a package, r to restart, or w/o d,r to " -"look into it." -msgstr "" - -#: pyLoadCli.py:241 -msgid "Type d(number) of the link you want to delete or r(number) to restart." -msgstr "" - -#: pyLoadCli.py:257 -msgid " - previous" +msgid " Kill Server" msgstr "" -#: pyLoadCli.py:257 -msgid " - next" +#: pyLoadCli.py:201 +msgid " Quit" msgstr "" -#: pyLoadCli.py:356 +#: pyLoadCli.py:277 pyLoadCli.py:284 msgid "Please use this syntax: add <Package name> <link> <link2> ..." msgstr "" -#: pyLoadCli.py:397 +#: pyLoadCli.py:340 msgid "pyLoad was terminated" msgstr "" -#: pyLoadCli.py:550 +#: pyLoadCli.py:398 msgid "Prints server status" msgstr "" -#: pyLoadCli.py:551 +#: pyLoadCli.py:399 msgid "Prints downloads in queue" msgstr "" -#: pyLoadCli.py:552 +#: pyLoadCli.py:400 msgid "Prints downloads in collector" msgstr "" -#: pyLoadCli.py:553 +#: pyLoadCli.py:401 msgid "Adds package to queue" msgstr "" -#: pyLoadCli.py:554 +#: pyLoadCli.py:402 +msgid "Adds package to collector" +msgstr "" + +#: pyLoadCli.py:403 msgid "Delete Files from Queue/Collector" msgstr "" -#: pyLoadCli.py:555 +#: pyLoadCli.py:404 msgid "Delete Packages from Queue/Collector" msgstr "" -#: pyLoadCli.py:556 +#: pyLoadCli.py:405 +msgid "Move Packages from Queue to Collector or vice versa" +msgstr "" + +#: pyLoadCli.py:406 +msgid "Restart files" +msgstr "" + +#: pyLoadCli.py:407 +msgid "Restart packages" +msgstr "" + +#: pyLoadCli.py:408 msgid "Pause the server" msgstr "" -#: pyLoadCli.py:557 +#: pyLoadCli.py:409 msgid "continue downloads" msgstr "" -#: pyLoadCli.py:558 +#: pyLoadCli.py:410 msgid "Toggle pause/unpause" msgstr "" -#: pyLoadCli.py:559 +#: pyLoadCli.py:411 msgid "kill server" msgstr "" -#: pyLoadCli.py:561 +#: pyLoadCli.py:413 msgid "List of commands:" msgstr "" -#: pyLoadCli.py:621 +#: pyLoadCli.py:426 +msgid "Couldn't write user config file" +msgstr "" + +#: pyLoadCli.py:498 msgid "You need py-openssl to connect to this pyLoad Core." msgstr "" -#: pyLoadCli.py:628 +#: pyLoadCli.py:505 msgid "Address: " msgstr "" -#: pyLoadCli.py:629 +#: pyLoadCli.py:506 msgid "Port: " msgstr "" -#: pyLoadCli.py:630 +#: pyLoadCli.py:507 msgid "Username: " msgstr "" -#: pyLoadCli.py:634 +#: pyLoadCli.py:511 msgid "Password: " msgstr "" -#: pyLoadCli.py:639 +#: pyLoadCli.py:516 pyLoadCli.py:525 msgid "Login data is wrong." msgstr "" -#: pyLoadCli.py:641 pyLoadCli.py:649 +#: pyLoadCli.py:518 pyLoadCli.py:527 #, python-format msgid "Could not establish connection to %(addr)s:%(port)s." msgstr "" -#: pyLoadCli.py:647 -msgid "Login data is required." +#: pyLoadCli.py:530 +msgid "You need py-openssl to connect to this pyLoad core." msgstr "" -#: pyLoadCli.py:651 -msgid "You need py-openssl to connect to this pyLoad." +#: pyLoadCli.py:532 +msgid "Interactive mode ignored since you passed some commands." msgstr "" -#: pyLoadCli.py:654 -msgid "Interactive mode ignored since you passed some commands." +#: module/cli/ManageFiles.py:97 +msgid "Manage Packages:" +msgstr "" + +#: module/cli/ManageFiles.py:99 +msgid "Manage Links:" +msgstr "" + +#: module/cli/ManageFiles.py:104 +msgid "What do you want to move?" +msgstr "" + +#: module/cli/ManageFiles.py:106 +msgid "What do you want to delete?" +msgstr "" + +#: module/cli/ManageFiles.py:108 +msgid "What do you want to restart?" +msgstr "" + +#: module/cli/ManageFiles.py:113 +msgid "Choose what yout want to do or enter package number." +msgstr "" + +#: module/cli/ManageFiles.py:115 +msgid "delete" +msgstr "" + +#: module/cli/ManageFiles.py:115 +msgid "move" +msgstr "" + +#: module/cli/ManageFiles.py:115 +msgid "restart" +msgstr "" + +#: module/cli/ManageFiles.py:148 +msgid " - previous" +msgstr "" + +#: module/cli/ManageFiles.py:148 +msgid " - next" +msgstr "" + +#: module/cli/ManageFiles.py:149 module/cli/AddPackage.py:64 +msgid " back to main menu" +msgstr "" + +#: module/cli/AddPackage.py:48 +msgid "Add Package:" +msgstr "" + +#: module/cli/AddPackage.py:53 +msgid "Enter a name for the new package" +msgstr "" + +#: module/cli/AddPackage.py:57 +#, python-format +msgid "Package: %s" +msgstr "" + +#: module/cli/AddPackage.py:58 +msgid "Parse the links you want to add." +msgstr "" + +#: module/cli/AddPackage.py:59 +#, python-format +msgid "Type %s when done." +msgstr "" + +#: module/cli/AddPackage.py:60 +msgid "Links added: " msgstr "" diff --git a/locale/core.pot b/locale/core.pot index 97ee5f18d..b10e6ace8 100644 --- a/locale/core.pot +++ b/locale/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pyLoad 0.4.5\n" "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n" -"POT-Creation-Date: 2011-03-14 16:47+0100\n" +"POT-Creation-Date: 2011-05-28 17:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,116 +21,133 @@ msgstr "" msgid "Received Quit signal" msgstr "" -#: pyLoadCore.py:251 +#: pyLoadCore.py:264 #, python-format msgid "pyLoad already running with pid %s" msgstr "" -#: pyLoadCore.py:265 +#: pyLoadCore.py:278 #, python-format msgid "Failed changing group: %s" msgstr "" -#: pyLoadCore.py:274 +#: pyLoadCore.py:287 #, python-format msgid "Failed changing user: %s" msgstr "" -#: pyLoadCore.py:276 +#: pyLoadCore.py:289 msgid "folder for logs" msgstr "" -#: pyLoadCore.py:287 +#: pyLoadCore.py:300 +msgid "Starting" +msgstr "" + +#: pyLoadCore.py:301 #, python-format msgid "Using home directory: %s" msgstr "" -#: pyLoadCore.py:293 +#: pyLoadCore.py:307 msgid "pycrypto to decode container files" msgstr "" -#: pyLoadCore.py:296 +#: pyLoadCore.py:310 msgid "folder for temporary files" msgstr "" -#: pyLoadCore.py:301 +#: pyLoadCore.py:315 msgid "folder for downloads" msgstr "" -#: pyLoadCore.py:302 +#: pyLoadCore.py:316 msgid "file for links" msgstr "" -#: pyLoadCore.py:305 +#: pyLoadCore.py:319 msgid "OpenSSL for secure connection" msgstr "" -#: pyLoadCore.py:309 +#: pyLoadCore.py:323 msgid "Moving old user config to DB" msgstr "" -#: pyLoadCore.py:312 +#: pyLoadCore.py:326 msgid "Please check your logindata with ./pyLoadCore.py -u" msgstr "" -#: pyLoadCore.py:334 +#: pyLoadCore.py:348 #, python-format msgid "Downloadtime: %s" msgstr "" -#: pyLoadCore.py:346 +#: pyLoadCore.py:360 #, python-format msgid "Free space: %s" msgstr "" -#: pyLoadCore.py:376 +#: pyLoadCore.py:380 +msgid "Activating Accounts..." +msgstr "" + +#: pyLoadCore.py:387 +msgid "Activating Plugins..." +msgstr "" + +#: pyLoadCore.py:390 +msgid "pyLoad is up and running" +msgstr "" + +#: pyLoadCore.py:395 msgid "restarting pyLoad" msgstr "" -#: pyLoadCore.py:380 +#: pyLoadCore.py:399 msgid "pyLoad quits" msgstr "" -#: pyLoadCore.py:434 +#: pyLoadCore.py:453 #, python-format msgid "Install %s" msgstr "" -#: pyLoadCore.py:469 +#: pyLoadCore.py:488 #, python-format msgid "could not find %(desc)s: %(name)s" msgstr "" -#: pyLoadCore.py:471 +#: pyLoadCore.py:490 #, python-format msgid "could not create %(desc)s: %(name)s" msgstr "" -#: pyLoadCore.py:483 +#: pyLoadCore.py:502 msgid "shutting down..." msgstr "" -#: pyLoadCore.py:498 +#: pyLoadCore.py:517 msgid "error while shutting down" msgstr "" -#: pyLoadCore.py:632 +#: pyLoadCore.py:649 #, python-format msgid "Added package %(name)s containing %(count)d links" msgstr "" -#: pyLoadCore.py:684 +#: pyLoadCore.py:701 #, python-format msgid "Added %(count)d links to package #%(package)d " msgstr "" -#: pyLoadCore.py:900 +#: pyLoadCore.py:919 msgid "killed pyLoad from Terminal" msgstr "" -#: module/JsEngine.py:89 +#: module/JsEngine.py:133 msgid "" -"No js engine detected, please install either Spidermonkey, ossp-js or pyv8" +"No js engine detected, please install either Spidermonkey, ossp-js, pyv8 or " +"rhino" msgstr "" #: module/ThreadManager.py:94 @@ -155,68 +172,74 @@ msgstr "" msgid "Reconnected, new IP: %s" msgstr "" -#: module/HookManager.py:50 module/HookManager.py:80 +#: module/HookManager.py:57 module/HookManager.py:125 #, python-format msgid "Error executing hooks: %s" msgstr "" -#: module/HookManager.py:65 -#, python-format -msgid "%(name)s loaded, activated %(value)s" -msgstr "" - -#: module/HookManager.py:67 +#: module/HookManager.py:108 #, python-format msgid "Failed activating %(name)s" msgstr "" -#: module/CaptchaManager.py:78 -msgid "No Client connected for captcha decrypting" +#: module/HookManager.py:112 +#, python-format +msgid "Activated plugins: %s" msgstr "" -#: module/PluginThread.py:163 +#: module/HookManager.py:113 #, python-format -msgid "Download skipped: %(name)s @ %(plugin)s" +msgid "Deactivate plugins: %s" msgstr "" -#: module/PluginThread.py:166 -msgid "File already exists." +#: module/CaptchaManager.py:78 +msgid "No Client connected for captcha decrypting" msgstr "" -#: module/PluginThread.py:169 +#: module/PluginThread.py:147 #, python-format msgid "Download starts: %s" msgstr "" -#: module/PluginThread.py:177 module/PluginThread.py:330 +#: module/PluginThread.py:155 module/PluginThread.py:329 #, python-format msgid "Plugin %s is missing a function." msgstr "" -#: module/PluginThread.py:184 module/PluginThread.py:241 -#: module/PluginThread.py:349 +#: module/PluginThread.py:163 module/PluginThread.py:226 +#: module/PluginThread.py:348 #, python-format msgid "Download aborted: %s" msgstr "" -#: module/PluginThread.py:201 +#: module/PluginThread.py:183 #, python-format msgid "Download restarted: %s" msgstr "" -#: module/PluginThread.py:211 module/PluginThread.py:339 +#: module/PluginThread.py:193 module/PluginThread.py:338 #, python-format msgid "Download is offline: %s" msgstr "" -#: module/PluginThread.py:214 module/PluginThread.py:262 +#: module/PluginThread.py:196 +#, python-format +msgid "Download is temporary offline: %s" +msgstr "" + +#: module/PluginThread.py:199 module/PluginThread.py:263 #, python-format msgid "Download failed: %(name)s | %(msg)s" msgstr "" -#: module/PluginThread.py:230 +#: module/PluginThread.py:215 msgid "" -"Couldn't connect to host or connection resetted waiting 1 minute and retry." +"Couldn't connect to host or connection reset, waiting 1 minute and retry." +msgstr "" + +#: module/PluginThread.py:249 +#, python-format +msgid "Download skipped: %(name)s due to %(plugin)s" msgstr "" #: module/PluginThread.py:278 @@ -224,22 +247,22 @@ msgstr "" msgid "Download finished: %s" msgstr "" -#: module/PluginThread.py:325 +#: module/PluginThread.py:324 #, python-format msgid "Decrypting starts: %s" msgstr "" -#: module/PluginThread.py:342 module/PluginThread.py:363 +#: module/PluginThread.py:341 module/PluginThread.py:362 #, python-format msgid "Decrypting failed: %(name)s | %(msg)s" msgstr "" -#: module/PluginThread.py:356 +#: module/PluginThread.py:355 #, python-format msgid "Retrying %s" msgstr "" -#: module/PluginThread.py:456 +#: module/PluginThread.py:454 #, python-format msgid "Info Fetching for %(name)s failed | %(err)s" msgstr "" @@ -325,43 +348,43 @@ msgstr "" msgid "Starting fastcgi server: %(host)s:%(port)d" msgstr "" -#: module/web/pyload_app.py:101 +#: module/web/pyload_app.py:102 msgid "You dont have permission to access this page." msgstr "" -#: module/web/pyload_app.py:175 +#: module/web/pyload_app.py:180 module/web/pyload_app.py:230 msgid "Download directory not found." msgstr "" -#: module/web/pyload_app.py:237 module/web/pyload_app.py:244 +#: module/web/pyload_app.py:299 module/web/pyload_app.py:306 msgid "unlimited" msgstr "" -#: module/web/pyload_app.py:239 module/web/pyload_app.py:246 +#: module/web/pyload_app.py:301 module/web/pyload_app.py:308 msgid "not available" msgstr "" -#: module/web/pyload_app.py:510 +#: module/web/pyload_app.py:588 msgid "Run pyLoadCore.py -s to access the setup." msgstr "" -#: module/web/json_app.py:56 +#: module/web/json_app.py:61 #, python-format msgid "waiting %s" msgstr "" -#: module/plugins/Plugin.py:273 +#: module/plugins/Plugin.py:283 msgid "" "Pil and tesseract not installed and no Client connected for captcha " "decrypting" msgstr "" -#: module/plugins/Plugin.py:277 +#: module/plugins/Plugin.py:287 msgid "No captcha result obtained in appropiate time by any of the plugins." msgstr "" -#: module/plugins/Plugin.py:344 module/plugins/Plugin.py:368 -#: module/plugins/hoster/Xdcc.py:236 +#: module/plugins/Plugin.py:374 module/plugins/Plugin.py:406 +#: module/plugins/hoster/Xdcc.py:237 #, python-format msgid "Setting User and Group failed: %s" msgstr "" @@ -370,41 +393,41 @@ msgstr "" msgid "File not exists." msgstr "" -#: module/plugins/PluginManager.py:70 +#: module/plugins/PluginManager.py:77 msgid "Crypter" msgstr "" -#: module/plugins/PluginManager.py:71 +#: module/plugins/PluginManager.py:78 msgid "Container" msgstr "" -#: module/plugins/PluginManager.py:72 +#: module/plugins/PluginManager.py:79 msgid "Hoster" msgstr "" -#: module/plugins/PluginManager.py:74 +#: module/plugins/PluginManager.py:81 msgid "Captcha" msgstr "" -#: module/plugins/PluginManager.py:75 +#: module/plugins/PluginManager.py:82 msgid "Account" msgstr "" -#: module/plugins/PluginManager.py:76 +#: module/plugins/PluginManager.py:83 msgid "Hook" msgstr "" -#: module/plugins/PluginManager.py:160 +#: module/plugins/PluginManager.py:164 #, python-format msgid "%s has a invalid pattern." msgstr "" -#: module/plugins/PluginManager.py:292 +#: module/plugins/PluginManager.py:317 #, python-format msgid "Error importing %(name)s: %(msg)s" msgstr "" -#: module/plugins/PluginManager.py:293 +#: module/plugins/PluginManager.py:318 msgid "You should fix dependicies or deactivate load on startup." msgstr "" @@ -412,27 +435,27 @@ msgstr "" msgid "Account settings deleted, due to new config format." msgstr "" -#: module/plugins/Account.py:53 module/plugins/Account.py:57 +#: module/plugins/Account.py:66 module/plugins/Account.py:72 #, python-format msgid "Could not login with %(plugin)s account %(user)s | %(msg)s" msgstr "" -#: module/plugins/Account.py:53 +#: module/plugins/Account.py:67 msgid "Wrong Password" msgstr "" -#: module/plugins/Account.py:172 +#: module/plugins/Account.py:205 #, python-format msgid "Your Time %s has wrong format, use: 1:22-3:44" msgstr "" -#: module/plugins/Account.py:209 +#: module/plugins/Account.py:231 #, python-format msgid "" "%(plugin)s Account %(user)s has not enough traffic, checking again in 30min" msgstr "" -#: module/plugins/Account.py:215 +#: module/plugins/Account.py:240 #, python-format msgid "%(plugin)s Account %(user)s is expired, checking again in 1h" msgstr "" @@ -441,10 +464,15 @@ msgstr "" msgid "Downloadlimit reached" msgstr "" -#: module/plugins/hooks/ClickAndLoad.py:73 +#: module/plugins/hooks/ClickAndLoad.py:74 msgid "Click'N'Load: Port 9666 already in use" msgstr "" +#: module/plugins/hooks/ExtractArchive.py:56 +#, python-format +msgid "Failed activating %s extracting plugin" +msgstr "" + #: module/plugins/hooks/UnRar.py:120 #, python-format msgid "starting Unrar of %s" @@ -483,7 +511,7 @@ msgstr "" #: module/plugins/hooks/IRCInterface.py:72 #: module/plugins/hooks/XMPPInterface.py:76 -#: module/database/FileDatabase.py:486 +#: module/database/FileDatabase.py:480 #, python-format msgid "Package finished: %s" msgstr "" @@ -508,6 +536,10 @@ msgstr "" msgid "Download finished: %(name)s @ %(plugin)s" msgstr "" +#: module/plugins/hooks/RehostTo.py:46 +msgid "Please add your rehost.to account first and restart pyLoad" +msgstr "" + #: module/plugins/hooks/HotFolder.py:82 #, python-format msgid "Added %s from HotFolder" @@ -518,100 +550,103 @@ msgstr "" msgid "folders for scripts" msgstr "" -#: module/plugins/hooks/UpdateManager.py:44 +#: module/plugins/hooks/UpdateManager.py:45 msgid "*** Plugins have been updated, please restart pyLoad ***" msgstr "" -#: module/plugins/hooks/UpdateManager.py:46 +#: module/plugins/hooks/UpdateManager.py:47 +msgid "Plugins updated and reloaded" +msgstr "" + +#: module/plugins/hooks/UpdateManager.py:49 msgid "No plugin updates available" msgstr "" -#: module/plugins/hooks/UpdateManager.py:54 +#: module/plugins/hooks/UpdateManager.py:62 msgid "No Updates for pyLoad" msgstr "" -#: module/plugins/hooks/UpdateManager.py:57 +#: module/plugins/hooks/UpdateManager.py:65 #, python-format msgid "*** New pyLoad Version %s available ***" msgstr "" -#: module/plugins/hooks/UpdateManager.py:58 +#: module/plugins/hooks/UpdateManager.py:66 msgid "*** Get it here: http://pyload.org/download ***" msgstr "" -#: module/plugins/hooks/UpdateManager.py:61 -#: module/plugins/hooks/UpdateManager.py:71 +#: module/plugins/hooks/UpdateManager.py:69 +#: module/plugins/hooks/UpdateManager.py:79 msgid "Not able to connect server for updates" msgstr "" -#: module/plugins/hooks/UpdateManager.py:96 +#: module/plugins/hooks/UpdateManager.py:104 #, python-format msgid "New version of %(type)s|%(name)s : %(version).2f" msgstr "" -#: module/plugins/hoster/MegauploadCom.py:97 +#: module/plugins/hoster/MegauploadCom.py:108 #, python-format msgid "Megaupload: waiting %d minutes" msgstr "" -#: module/plugins/hoster/MegauploadCom.py:120 +#: module/plugins/hoster/MegauploadCom.py:131 msgid "You should enable direct Download in your Megaupload Account settings" msgstr "" -#: module/plugins/hoster/MegauploadCom.py:131 +#: module/plugins/hoster/MegauploadCom.py:142 msgid "You need premium to download files larger than 1 GB" msgstr "" -#: module/plugins/hoster/MegauploadCom.py:136 +#: module/plugins/hoster/MegauploadCom.py:147 msgid "The file is password protected, enter a password and restart." msgstr "" -#: module/plugins/hoster/MegauploadCom.py:153 +#: module/plugins/hoster/MegauploadCom.py:164 msgid "Megaupload is currently blocking your IP. Try again later, manually." msgstr "" -#: module/plugins/hoster/MegauploadCom.py:225 +#: module/plugins/hoster/MegauploadCom.py:237 msgid "" "Looks like the file is still not available. Retry downloading later, " "manually." msgstr "" -#: module/plugins/hoster/MegauploadCom.py:228 +#: module/plugins/hoster/MegauploadCom.py:240 msgid "Wrong password for download link." msgstr "" -#: module/plugins/hoster/UploadedTo.py:76 -#: module/plugins/hoster/RapidshareCom.py:141 +#: module/plugins/hoster/UploadedTo.py:116 #, python-format msgid "%s: Not enough traffic left" msgstr "" -#: module/plugins/hoster/UploadedTo.py:79 +#: module/plugins/hoster/UploadedTo.py:119 msgid "Traffic exceeded" msgstr "" -#: module/plugins/hoster/UploadedTo.py:85 -msgid "Deactivate direct downloads in your Uploaded.to Account settings." +#: module/plugins/hoster/RehostTo.py:27 +msgid "Please enter your rehost.to account or deactivate this plugin" msgstr "" #: module/plugins/hoster/RapidshareCom.py:99 msgid "Rapidshare: Traffic Share (direct download)" msgstr "" -#: module/plugins/hoster/RapidshareCom.py:129 -#: module/plugins/hoster/RapidshareCom.py:199 +#: module/plugins/hoster/RapidshareCom.py:128 +#: module/plugins/hoster/RapidshareCom.py:198 msgid "Already downloading from this ip address, waiting 60 seconds" msgstr "" -#: module/plugins/hoster/RapidshareCom.py:133 +#: module/plugins/hoster/RapidshareCom.py:132 msgid "Invalid Auth Code, download will be restarted" msgstr "" -#: module/plugins/hoster/RapidshareCom.py:203 +#: module/plugins/hoster/RapidshareCom.py:202 msgid "RapidShareCom: No free slots" msgstr "" -#: module/plugins/hoster/RapidshareCom.py:206 +#: module/plugins/hoster/RapidshareCom.py:205 msgid "You need a premium account for this file" msgstr "" @@ -629,103 +664,112 @@ msgstr "" msgid "Netload: waiting between downloads %d s." msgstr "" -#: module/plugins/hoster/NetloadIn.py:207 +#: module/plugins/hoster/NetloadIn.py:206 #, python-format msgid "Netload: waiting for captcha %d s." msgstr "" -#: module/plugins/hoster/NetloadIn.py:246 +#: module/plugins/hoster/NetloadIn.py:245 msgid "Downloaded File was empty" msgstr "" +#: module/plugins/hoster/RealdebridCom.py:35 +msgid "Please enter your Real-debrid account or deactivate this plugin" +msgstr "" + #: module/plugins/container/LinkList.py:54 msgid "LinkList could not be cleared." msgstr "" -#: module/plugins/accounts/MegauploadCom.py:43 +#: module/plugins/accounts/MegauploadCom.py:41 msgid "Activate direct Download in your MegaUpload Account" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/plugins/accounts/FilesonicCom.py:51 +#, python-format +msgid "%s: Invalid login retrieving user details" +msgstr "" + +#: module/plugins/accounts/BitshareCom.py:36 +msgid "Activate direct Download in your Bitshare Account" +msgstr "" + +#: module/database/FileDatabase.py:47 msgid "finished" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "offline" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "online" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "queued" msgstr "" -#: module/database/FileDatabase.py:53 -msgid "checking" +#: module/database/FileDatabase.py:47 +msgid "skipped" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "waiting" msgstr "" -#: module/database/FileDatabase.py:53 -msgid "reconnected" +#: module/database/FileDatabase.py:47 +msgid "temp. offline" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "starting" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "failed" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "aborted" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "decrypting" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "custom" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "downloading" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "processing" msgstr "" -#: module/database/FileDatabase.py:53 +#: module/database/FileDatabase.py:47 msgid "unknown" msgstr "" -#: module/database/DatabaseBackend.py:174 +#: module/database/DatabaseBackend.py:172 msgid "Filedatabase was deleted due to incompatible version." msgstr "" -#: module/database/DatabaseBackend.py:189 +#: module/database/DatabaseBackend.py:187 msgid "Filedatabase could NOT be converted." msgstr "" -#: module/database/DatabaseBackend.py:198 +#: module/database/DatabaseBackend.py:196 msgid "Database was converted from v2 to v3." msgstr "" -#: module/database/DatabaseBackend.py:206 +#: module/database/DatabaseBackend.py:204 msgid "Database was converted from v3 to v4." msgstr "" -#: module/database/DatabaseBackend.py:223 +#: module/database/DatabaseBackend.py:221 msgid "Converting old Django DB" msgstr "" - -#: module/database/DatabaseBackend.py:240 -msgid "Moving users" -msgstr "" diff --git a/locale/django.pot b/locale/django.pot index 62219b090..eef1c38e9 100644 --- a/locale/django.pot +++ b/locale/django.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pyLoad 0.4.5\n" "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n" -"POT-Creation-Date: 2011-03-14 16:47+0100\n" +"POT-Creation-Date: 2011-05-28 17:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,265 +17,357 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: module/web/pyload_app.py:101 +#: module/web/pyload_app.py:102 msgid "You dont have permission to access this page." msgstr "" -#: module/web/pyload_app.py:175 +#: module/web/pyload_app.py:180 module/web/pyload_app.py:230 msgid "Download directory not found." msgstr "" -#: module/web/pyload_app.py:237 module/web/pyload_app.py:244 +#: module/web/pyload_app.py:299 module/web/pyload_app.py:306 msgid "unlimited" msgstr "" -#: module/web/pyload_app.py:239 module/web/pyload_app.py:246 +#: module/web/pyload_app.py:301 module/web/pyload_app.py:308 msgid "not available" msgstr "" -#: module/web/pyload_app.py:510 +#: module/web/pyload_app.py:588 msgid "Run pyLoadCore.py -s to access the setup." msgstr "" -#: module/web/json_app.py:56 +#: module/web/json_app.py:61 #, python-format msgid "waiting %s" msgstr "" -#: module/web/templates/default/downloads.html:7 -#: module/web/templates/default/settings.html:46 -#: module/web/templates/default/base.html:250 -#: module/web/templates/default/logs.html:10 -#: module/web/templates/default/queue.html:19 -#: module/web/templates/default/collector.html:19 -msgid "Home" +#: module/web/templates/default/info.html:14 +#: module/web/templates/default/info.html:15 +#: module/web/templates/default/home.html:238 +msgid "Information" msgstr "" -#: module/web/templates/default/downloads.html:10 -#: module/web/templates/default/settings.html:49 -#: module/web/templates/default/base.html:253 -#: module/web/templates/default/logs.html:13 -#: module/web/templates/default/queue.html:14 -#: module/web/templates/default/queue.html:15 -#: module/web/templates/default/queue.html:22 -#: module/web/templates/default/collector.html:22 -#: module/web/templates/default/window.html:37 -msgid "Queue" +#: module/web/templates/default/info.html:18 +msgid "News" msgstr "" -#: module/web/templates/default/downloads.html:13 -#: module/web/templates/default/settings.html:53 -#: module/web/templates/default/base.html:256 -#: module/web/templates/default/logs.html:16 -#: module/web/templates/default/queue.html:25 -#: module/web/templates/default/collector.html:14 -#: module/web/templates/default/collector.html:15 -#: module/web/templates/default/collector.html:25 -#: module/web/templates/default/window.html:39 -msgid "Collector" +#: module/web/templates/default/info.html:21 +msgid "Support" +msgstr "" + +#: module/web/templates/default/info.html:28 +msgid "System" +msgstr "" + +#: module/web/templates/default/info.html:31 +msgid "Python:" +msgstr "" + +#: module/web/templates/default/info.html:35 +msgid "OS:" +msgstr "" + +#: module/web/templates/default/info.html:39 +msgid "pyLoad version:" +msgstr "" + +#: module/web/templates/default/info.html:43 +msgid "Installation Folder:" +msgstr "" + +#: module/web/templates/default/info.html:47 +msgid "Config Folder:" +msgstr "" + +#: module/web/templates/default/info.html:51 +msgid "Download Folder:" +msgstr "" + +#: module/web/templates/default/info.html:55 +msgid "Language:" +msgstr "" + +#: module/web/templates/default/info.html:59 +msgid "Webinterface Port:" +msgstr "" + +#: module/web/templates/default/info.html:63 +msgid "Remote Interface Port:" msgstr "" -#: module/web/templates/default/downloads.html:16 -#: module/web/templates/default/downloads.html:27 -#: module/web/templates/default/settings.html:57 -#: module/web/templates/default/base.html:259 -#: module/web/templates/default/logs.html:19 -#: module/web/templates/default/queue.html:28 -#: module/web/templates/default/collector.html:28 +#: module/web/templates/default/downloads.html:6 +#: module/web/templates/default/base.html:266 +#: module/web/templates/default/home.html:219 msgid "Downloads" msgstr "" -#: module/web/templates/default/downloads.html:19 -#: module/web/templates/default/settings.html:61 -#: module/web/templates/default/base.html:262 -#: module/web/templates/default/logs.html:3 -#: module/web/templates/default/logs.html:4 -#: module/web/templates/default/logs.html:22 -#: module/web/templates/default/queue.html:31 -#: module/web/templates/default/collector.html:31 -msgid "Logs" +#: module/web/templates/default/filemanager.html:19 +#: module/web/templates/default/base.html:269 +#: module/web/templates/default/home.html:222 +msgid "FileManager" msgstr "" -#: module/web/templates/default/downloads.html:22 -#: module/web/templates/default/settings.html:3 -#: module/web/templates/default/settings.html:4 -#: module/web/templates/default/settings.html:65 -#: module/web/templates/default/base.html:265 -#: module/web/templates/default/logs.html:25 -#: module/web/templates/default/queue.html:34 -#: module/web/templates/default/collector.html:34 -msgid "Config" +#: module/web/templates/default/filemanager.html:65 +#: module/web/templates/default/folder.html:14 +msgid "Folder is empty" +msgstr "" + +#: module/web/templates/default/rename_directory.html:3 +msgid "Rename directory" +msgstr "" + +#: module/web/templates/default/rename_directory.html:7 +msgid "New Name" +msgstr "" + +#: module/web/templates/default/rename_directory.html:8 +msgid "Name the selected item must be renamed to." +msgstr "" + +#: module/web/templates/default/rename_directory.html:12 +#: module/web/templates/default/admin.html:140 +#: module/web/templates/default/admin.html:170 +#: module/web/templates/default/settings.html:201 +#: module/web/templates/default/edit_package.html:34 +#: module/web/templates/default/captcha.html:27 +msgid "Submit" +msgstr "" + +#: module/web/templates/default/rename_directory.html:13 +#: module/web/templates/default/admin.html:171 +#: module/web/templates/default/settings.html:233 +#: module/web/templates/default/window.html:44 +#: module/web/templates/default/edit_package.html:35 +msgid "Reset" +msgstr "" + +#: module/web/templates/default/rename_directory.html:20 +msgid "Delete directory" +msgstr "" + +#: module/web/templates/default/rename_directory.html:24 +msgid "Yes" +msgstr "" + +#: module/web/templates/default/rename_directory.html:25 +msgid "No" msgstr "" -#: module/web/templates/default/admin.html:3 -#: module/web/templates/default/admin.html:4 +#: module/web/templates/default/admin.html:70 +#: module/web/templates/default/admin.html:71 msgid "Administrate User" msgstr "" -#: module/web/templates/default/admin.html:8 +#: module/web/templates/default/admin.html:75 msgid "Note: You can only change permissions for webinterface." msgstr "" -#: module/web/templates/default/admin.html:9 +#: module/web/templates/default/admin.html:76 msgid "To add user or change passwords use:" msgstr "" -#: module/web/templates/default/admin.html:10 +#: module/web/templates/default/admin.html:77 msgid "" "Important: Admin user have always all permissions! Only Admin user can use " "other clients like CLI and GUI." msgstr "" -#: module/web/templates/default/admin.html:16 -#: module/web/templates/default/settings.html:147 +#: module/web/templates/default/admin.html:83 +#: module/web/templates/default/settings.html:122 #: module/web/templates/default/window.html:10 -#: module/web/templates/default/home.html:212 +#: module/web/templates/default/home.html:236 #: module/web/templates/default/edit_package.html:6 msgid "Name" msgstr "" -#: module/web/templates/default/admin.html:19 +#: module/web/templates/default/admin.html:86 +#: module/web/templates/default/admin.html:146 +msgid "Change Password" +msgstr "" + +#: module/web/templates/default/admin.html:89 msgid "Admin" msgstr "" -#: module/web/templates/default/admin.html:22 +#: module/web/templates/default/admin.html:92 msgid "Add downloads" msgstr "" -#: module/web/templates/default/admin.html:25 +#: module/web/templates/default/admin.html:95 msgid "Delete downloads" msgstr "" -#: module/web/templates/default/admin.html:28 +#: module/web/templates/default/admin.html:98 msgid "Change server status" msgstr "" -#: module/web/templates/default/admin.html:31 +#: module/web/templates/default/admin.html:101 msgid "See queue/collector" msgstr "" -#: module/web/templates/default/admin.html:34 +#: module/web/templates/default/admin.html:104 msgid "Download from webinterface" msgstr "" -#: module/web/templates/default/admin.html:37 +#: module/web/templates/default/admin.html:107 msgid "Change settings" msgstr "" -#: module/web/templates/default/admin.html:57 -#: module/web/templates/default/settings.html:220 -#: module/web/templates/default/edit_package.html:34 -#: module/web/templates/default/captcha.html:27 -msgid "Submit" +#: module/web/templates/default/admin.html:110 +msgid "Filemanager" +msgstr "" + +#: module/web/templates/default/admin.html:117 +msgid "change" +msgstr "" + +#: module/web/templates/default/admin.html:148 +msgid "Enter your current and desired Password." +msgstr "" + +#: module/web/templates/default/admin.html:149 +msgid "User" +msgstr "" + +#: module/web/templates/default/admin.html:150 +#: module/web/templates/default/settings.html:213 +msgid "Your username." +msgstr "" + +#: module/web/templates/default/admin.html:154 +msgid "Current password" +msgstr "" + +#: module/web/templates/default/admin.html:155 +#: module/web/templates/default/settings.html:218 +msgid "The password for this account." +msgstr "" + +#: module/web/templates/default/admin.html:159 +msgid "New password" +msgstr "" + +#: module/web/templates/default/admin.html:160 +msgid "The new password." +msgstr "" + +#: module/web/templates/default/admin.html:164 +msgid "New password (repeat)" +msgstr "" + +#: module/web/templates/default/admin.html:165 +msgid "Please repeat the new password." +msgstr "" + +#: module/web/templates/default/settings.html:3 +#: module/web/templates/default/settings.html:4 +#: module/web/templates/default/base.html:275 +#: module/web/templates/default/home.html:228 +msgid "Config" msgstr "" -#: module/web/templates/default/settings.html:72 +#: module/web/templates/default/settings.html:47 msgid "General" msgstr "" -#: module/web/templates/default/settings.html:73 +#: module/web/templates/default/settings.html:48 msgid "Plugins" msgstr "" -#: module/web/templates/default/settings.html:74 +#: module/web/templates/default/settings.html:49 msgid "Accounts" msgstr "" -#: module/web/templates/default/settings.html:101 -#: module/web/templates/default/settings.html:130 +#: module/web/templates/default/settings.html:76 +#: module/web/templates/default/settings.html:105 msgid "Choose a section from the menu" msgstr "" -#: module/web/templates/default/settings.html:146 +#: module/web/templates/default/settings.html:121 msgid "Plugin" msgstr "" -#: module/web/templates/default/settings.html:148 -#: module/web/templates/default/settings.html:236 +#: module/web/templates/default/settings.html:123 +#: module/web/templates/default/settings.html:217 #: module/web/templates/default/login.html:19 #: module/web/templates/default/window.html:24 #: module/web/templates/default/edit_package.html:29 msgid "Password" msgstr "" -#: module/web/templates/default/settings.html:149 -#: module/web/templates/default/home.html:213 +#: module/web/templates/default/settings.html:124 +#: module/web/templates/default/home.html:237 msgid "Status" msgstr "" -#: module/web/templates/default/settings.html:150 +#: module/web/templates/default/settings.html:125 msgid "Premium" msgstr "" -#: module/web/templates/default/settings.html:151 +#: module/web/templates/default/settings.html:126 msgid "Valid until" msgstr "" -#: module/web/templates/default/settings.html:152 +#: module/web/templates/default/settings.html:127 msgid "Traffic left" msgstr "" -#: module/web/templates/default/settings.html:153 +#: module/web/templates/default/settings.html:128 msgid "Time" msgstr "" -#: module/web/templates/default/settings.html:154 +#: module/web/templates/default/settings.html:129 +msgid "Max Parallel" +msgstr "" + +#: module/web/templates/default/settings.html:130 msgid "Delete?" msgstr "" -#: module/web/templates/default/settings.html:177 +#: module/web/templates/default/settings.html:153 msgid "valid" msgstr "" -#: module/web/templates/default/settings.html:180 +#: module/web/templates/default/settings.html:156 msgid "not valid" msgstr "" -#: module/web/templates/default/settings.html:187 +#: module/web/templates/default/settings.html:163 msgid "yes" msgstr "" -#: module/web/templates/default/settings.html:190 +#: module/web/templates/default/settings.html:166 msgid "no" msgstr "" -#: module/web/templates/default/settings.html:221 -#: module/web/templates/default/settings.html:251 -#: module/web/templates/default/base.html:280 +#: module/web/templates/default/settings.html:202 +#: module/web/templates/default/settings.html:232 +#: module/web/templates/default/base.html:290 msgid "Add" msgstr "" -#: module/web/templates/default/settings.html:229 +#: module/web/templates/default/settings.html:210 msgid "Add Account" msgstr "" -#: module/web/templates/default/settings.html:230 +#: module/web/templates/default/settings.html:211 msgid "Enter your account data to use premium features." msgstr "" -#: module/web/templates/default/settings.html:231 +#: module/web/templates/default/settings.html:212 #: module/web/templates/default/login.html:3 msgid "Login" msgstr "" -#: module/web/templates/default/settings.html:232 -msgid "Your username." -msgstr "" - -#: module/web/templates/default/settings.html:241 +#: module/web/templates/default/settings.html:222 msgid "Type" msgstr "" -#: module/web/templates/default/settings.html:242 +#: module/web/templates/default/settings.html:223 msgid "Choose the hoster for your account." msgstr "" -#: module/web/templates/default/settings.html:252 -#: module/web/templates/default/window.html:44 -#: module/web/templates/default/edit_package.html:35 -msgid "Reset" -msgstr "" - #: module/web/templates/default/pathchooser.html:39 #: module/web/templates/default/pathchooser.html:41 msgid "Path" @@ -333,7 +425,7 @@ msgid "To reset your login data or add an user run:" msgstr "" #: module/web/templates/default/base.html:18 -#: module/web/templates/default/base.html:302 +#: module/web/templates/default/base.html:312 msgid "Webinterface" msgstr "" @@ -349,68 +441,104 @@ msgstr "" msgid "Administrate" msgstr "" -#: module/web/templates/default/base.html:237 +#: module/web/templates/default/base.html:234 +msgid "Info" +msgstr "" + +#: module/web/templates/default/base.html:238 msgid "Please Login!" msgstr "" -#: module/web/templates/default/base.html:277 -#: module/web/templates/default/logs.html:32 +#: module/web/templates/default/base.html:257 +#: module/web/templates/default/home.html:210 +msgid "Home" +msgstr "" + +#: module/web/templates/default/base.html:260 +#: module/web/templates/default/queue.html:14 +#: module/web/templates/default/queue.html:15 +#: module/web/templates/default/window.html:37 +#: module/web/templates/default/home.html:213 +msgid "Queue" +msgstr "" + +#: module/web/templates/default/base.html:263 +#: module/web/templates/default/collector.html:14 +#: module/web/templates/default/collector.html:15 +#: module/web/templates/default/window.html:39 +#: module/web/templates/default/home.html:216 +msgid "Collector" +msgstr "" + +#: module/web/templates/default/base.html:272 +#: module/web/templates/default/logs.html:3 +#: module/web/templates/default/logs.html:4 +#: module/web/templates/default/home.html:225 +msgid "Logs" +msgstr "" + +#: module/web/templates/default/base.html:287 +#: module/web/templates/default/logs.html:12 msgid "Start" msgstr "" -#: module/web/templates/default/base.html:278 +#: module/web/templates/default/base.html:288 msgid "Stop" msgstr "" -#: module/web/templates/default/base.html:279 +#: module/web/templates/default/base.html:289 msgid "Cancel" msgstr "" -#: module/web/templates/default/base.html:286 +#: module/web/templates/default/base.html:296 msgid "Download:" msgstr "" -#: module/web/templates/default/base.html:286 -#: module/web/templates/default/base.html:287 +#: module/web/templates/default/base.html:296 +#: module/web/templates/default/base.html:297 #: module/web/templates/default/settings_item.html:11 msgid "on" msgstr "" -#: module/web/templates/default/base.html:286 -#: module/web/templates/default/base.html:287 +#: module/web/templates/default/base.html:296 +#: module/web/templates/default/base.html:297 #: module/web/templates/default/settings_item.html:13 msgid "off" msgstr "" -#: module/web/templates/default/base.html:287 +#: module/web/templates/default/base.html:297 msgid "Reconnect:" msgstr "" -#: module/web/templates/default/base.html:288 +#: module/web/templates/default/base.html:298 msgid "Speed:" msgstr "" -#: module/web/templates/default/base.html:289 +#: module/web/templates/default/base.html:299 msgid "Active:" msgstr "" -#: module/web/templates/default/base.html:290 +#: module/web/templates/default/base.html:300 msgid "Reload page" msgstr "" -#: module/web/templates/default/base.html:324 +#: module/web/templates/default/base.html:330 +msgid "loading" +msgstr "" + +#: module/web/templates/default/base.html:339 msgid "Back to top" msgstr "" -#: module/web/templates/default/logs.html:32 +#: module/web/templates/default/logs.html:12 msgid "prev" msgstr "" -#: module/web/templates/default/logs.html:32 +#: module/web/templates/default/logs.html:12 msgid "next" msgstr "" -#: module/web/templates/default/logs.html:32 +#: module/web/templates/default/logs.html:12 msgid "End" msgstr "" @@ -418,43 +546,28 @@ msgstr "" msgid "You were successfully logged out." msgstr "" -#: module/web/templates/default/queue.html:40 -#: module/web/templates/default/collector.html:39 +#: module/web/templates/default/queue.html:19 +#: module/web/templates/default/collector.html:19 msgid "Delete Finished" msgstr "" -#: module/web/templates/default/queue.html:41 -#: module/web/templates/default/collector.html:40 +#: module/web/templates/default/queue.html:20 +#: module/web/templates/default/collector.html:20 msgid "Restart Failed" msgstr "" -#: module/web/templates/default/queue.html:46 -#: module/web/templates/default/collector.html:45 -msgid "success" -msgstr "" - -#: module/web/templates/default/queue.html:47 -#: module/web/templates/default/collector.html:46 -msgid "failure" -msgstr "" - -#: module/web/templates/default/queue.html:50 -#: module/web/templates/default/collector.html:49 -msgid "loading" -msgstr "" - -#: module/web/templates/default/queue.html:74 -#: module/web/templates/default/collector.html:73 +#: module/web/templates/default/queue.html:48 +#: module/web/templates/default/collector.html:47 msgid "Folder:" msgstr "" -#: module/web/templates/default/queue.html:74 -#: module/web/templates/default/collector.html:73 +#: module/web/templates/default/queue.html:48 +#: module/web/templates/default/collector.html:47 msgid "Password:" msgstr "" -#: module/web/templates/default/queue.html:74 -#: module/web/templates/default/collector.html:73 +#: module/web/templates/default/queue.html:48 +#: module/web/templates/default/collector.html:47 msgid "Priority:" msgstr "" @@ -503,15 +616,11 @@ msgstr "" msgid "Active Downloads" msgstr "" -#: module/web/templates/default/home.html:214 -msgid "Information" -msgstr "" - -#: module/web/templates/default/home.html:215 +#: module/web/templates/default/home.html:239 msgid "Size" msgstr "" -#: module/web/templates/default/home.html:216 +#: module/web/templates/default/home.html:240 msgid "Progress" msgstr "" diff --git a/locale/generate_locale.py b/locale/generate_locale.py index cc2a064a6..d519ca35f 100644 --- a/locale/generate_locale.py +++ b/locale/generate_locale.py @@ -73,7 +73,6 @@ print "Generate cli.pot" f = open("includes.txt", "wb") f.write("./pyLoadCli.py\n") -f.close() for path, dir, filenames in walk("./module/cli"): if [True for x in EXCLUDE if x in path]: continue @@ -81,6 +80,7 @@ for path, dir, filenames in walk("./module/cli"): if file.endswith(".py") and file not in EXCLUDE: f.write(join(path, file) + "\n") +f.close() call(["xgettext", "--files-from=includes.txt", "--default-domain=cli"] + options) diff --git a/locale/gui.pot b/locale/gui.pot index bfb37dbde..14e780448 100644 --- a/locale/gui.pot +++ b/locale/gui.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pyLoad 0.4.5\n" "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n" -"POT-Creation-Date: 2011-03-14 16:47+0100\n" +"POT-Creation-Date: 2011-05-28 17:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -56,7 +56,7 @@ msgstr "" msgid "Show" msgstr "" -#: pyLoadGui.py:744 module/gui/MainWindow.py:135 +#: pyLoadGui.py:744 module/gui/MainWindow.py:133 msgid "Exit" msgstr "" @@ -77,76 +77,76 @@ msgstr "" msgid "server is version %(new)s client accepts version %(current)s" msgstr "" -#: module/gui/Collector.py:72 +#: module/gui/Collector.py:57 msgid "finished" msgstr "" -#: module/gui/Collector.py:73 +#: module/gui/Collector.py:58 msgid "offline" msgstr "" -#: module/gui/Collector.py:74 +#: module/gui/Collector.py:59 msgid "online" msgstr "" -#: module/gui/Collector.py:75 +#: module/gui/Collector.py:60 msgid "queued" msgstr "" -#: module/gui/Collector.py:76 -msgid "checking" +#: module/gui/Collector.py:61 +msgid "skipped" msgstr "" -#: module/gui/Collector.py:77 +#: module/gui/Collector.py:62 msgid "waiting" msgstr "" -#: module/gui/Collector.py:78 -msgid "reconnected" +#: module/gui/Collector.py:63 +msgid "temp. offline" msgstr "" -#: module/gui/Collector.py:79 +#: module/gui/Collector.py:64 msgid "starting" msgstr "" -#: module/gui/Collector.py:80 +#: module/gui/Collector.py:65 msgid "failed" msgstr "" -#: module/gui/Collector.py:81 +#: module/gui/Collector.py:66 msgid "aborted" msgstr "" -#: module/gui/Collector.py:82 +#: module/gui/Collector.py:67 msgid "decrypting" msgstr "" -#: module/gui/Collector.py:83 +#: module/gui/Collector.py:68 msgid "custom" msgstr "" -#: module/gui/Collector.py:84 +#: module/gui/Collector.py:69 msgid "downloading" msgstr "" -#: module/gui/Collector.py:85 +#: module/gui/Collector.py:70 msgid "processing" msgstr "" -#: module/gui/Collector.py:309 module/gui/PackageDock.py:66 +#: module/gui/Collector.py:294 module/gui/PackageDock.py:66 #: module/gui/Queue.py:161 msgid "Name" msgstr "" -#: module/gui/Collector.py:311 module/gui/Queue.py:165 +#: module/gui/Collector.py:296 module/gui/Queue.py:165 msgid "Plugin" msgstr "" -#: module/gui/Collector.py:313 module/gui/Queue.py:163 +#: module/gui/Collector.py:298 module/gui/Queue.py:163 msgid "Status" msgstr "" -#: module/gui/Collector.py:315 module/gui/Queue.py:169 +#: module/gui/Collector.py:300 module/gui/Queue.py:169 msgid "Size" msgstr "" @@ -215,12 +215,12 @@ msgstr "" msgid "New" msgstr "" -#: module/gui/ConnectionManager.py:39 module/gui/MainWindow.py:347 +#: module/gui/ConnectionManager.py:39 module/gui/MainWindow.py:344 msgid "Edit" msgstr "" -#: module/gui/ConnectionManager.py:40 module/gui/MainWindow.py:279 -#: module/gui/MainWindow.py:318 module/gui/MainWindow.py:346 +#: module/gui/ConnectionManager.py:40 module/gui/MainWindow.py:276 +#: module/gui/MainWindow.py:315 module/gui/MainWindow.py:343 msgid "Remove" msgstr "" @@ -293,162 +293,162 @@ msgstr "" msgid "Speed:" msgstr "" -#: module/gui/MainWindow.py:130 +#: module/gui/MainWindow.py:129 msgid "File" msgstr "" -#: module/gui/MainWindow.py:131 +#: module/gui/MainWindow.py:130 msgid "Connections" msgstr "" -#: module/gui/MainWindow.py:136 +#: module/gui/MainWindow.py:134 msgid "Connection manager" msgstr "" -#: module/gui/MainWindow.py:159 +#: module/gui/MainWindow.py:156 msgid "Overview" msgstr "" -#: module/gui/MainWindow.py:160 +#: module/gui/MainWindow.py:157 msgid "Queue" msgstr "" -#: module/gui/MainWindow.py:161 +#: module/gui/MainWindow.py:158 msgid "Collector" msgstr "" -#: module/gui/MainWindow.py:162 +#: module/gui/MainWindow.py:159 msgid "Accounts" msgstr "" -#: module/gui/MainWindow.py:163 +#: module/gui/MainWindow.py:160 msgid "Settings" msgstr "" -#: module/gui/MainWindow.py:164 +#: module/gui/MainWindow.py:161 msgid "Log" msgstr "" -#: module/gui/MainWindow.py:195 +#: module/gui/MainWindow.py:192 msgid "Main Toolbar" msgstr "" -#: module/gui/MainWindow.py:198 +#: module/gui/MainWindow.py:195 msgid "Toggle Pause/Resume" msgstr "" -#: module/gui/MainWindow.py:204 +#: module/gui/MainWindow.py:201 msgid "Stop" msgstr "" -#: module/gui/MainWindow.py:206 module/gui/MainWindow.py:325 -#: module/gui/MainWindow.py:345 +#: module/gui/MainWindow.py:203 module/gui/MainWindow.py:322 +#: module/gui/MainWindow.py:342 msgid "Add" msgstr "" -#: module/gui/MainWindow.py:208 +#: module/gui/MainWindow.py:205 msgid "Check Clipboard" msgstr "" -#: module/gui/MainWindow.py:215 module/gui/MainWindow.py:331 +#: module/gui/MainWindow.py:212 module/gui/MainWindow.py:328 #: module/gui/Overview.py:110 msgid "Package" msgstr "" -#: module/gui/MainWindow.py:216 module/gui/MainWindow.py:332 +#: module/gui/MainWindow.py:213 module/gui/MainWindow.py:329 msgid "Container" msgstr "" -#: module/gui/MainWindow.py:217 +#: module/gui/MainWindow.py:214 msgid "Account" msgstr "" -#: module/gui/MainWindow.py:218 module/gui/MainWindow.py:333 +#: module/gui/MainWindow.py:215 module/gui/MainWindow.py:330 msgid "Links" msgstr "" -#: module/gui/MainWindow.py:242 +#: module/gui/MainWindow.py:239 msgid "Push selected packages to queue" msgstr "" -#: module/gui/MainWindow.py:265 +#: module/gui/MainWindow.py:262 msgid "New Account" msgstr "" -#: module/gui/MainWindow.py:280 module/gui/MainWindow.py:321 +#: module/gui/MainWindow.py:277 module/gui/MainWindow.py:318 msgid "Restart" msgstr "" -#: module/gui/MainWindow.py:281 +#: module/gui/MainWindow.py:278 msgid "Pull out" msgstr "" -#: module/gui/MainWindow.py:282 +#: module/gui/MainWindow.py:279 msgid "Abort" msgstr "" -#: module/gui/MainWindow.py:283 module/gui/MainWindow.py:320 +#: module/gui/MainWindow.py:280 module/gui/MainWindow.py:317 msgid "Edit Name" msgstr "" -#: module/gui/MainWindow.py:284 module/gui/Queue.py:167 +#: module/gui/MainWindow.py:281 module/gui/Queue.py:167 msgid "Priority" msgstr "" -#: module/gui/MainWindow.py:286 +#: module/gui/MainWindow.py:283 msgid "very high" msgstr "" -#: module/gui/MainWindow.py:288 +#: module/gui/MainWindow.py:285 msgid "high" msgstr "" -#: module/gui/MainWindow.py:290 +#: module/gui/MainWindow.py:287 msgid "normal" msgstr "" -#: module/gui/MainWindow.py:292 +#: module/gui/MainWindow.py:289 msgid "low" msgstr "" -#: module/gui/MainWindow.py:294 +#: module/gui/MainWindow.py:291 msgid "very low" msgstr "" -#: module/gui/MainWindow.py:319 +#: module/gui/MainWindow.py:316 msgid "Push to queue" msgstr "" -#: module/gui/MainWindow.py:322 +#: module/gui/MainWindow.py:319 msgid "Refresh Status" msgstr "" -#: module/gui/MainWindow.py:425 +#: module/gui/MainWindow.py:422 #, python-format msgid "All Container Types (%s)" msgstr "" -#: module/gui/MainWindow.py:426 +#: module/gui/MainWindow.py:423 #, python-format msgid "DLC (%s)" msgstr "" -#: module/gui/MainWindow.py:427 +#: module/gui/MainWindow.py:424 #, python-format msgid "CCF (%s)" msgstr "" -#: module/gui/MainWindow.py:428 +#: module/gui/MainWindow.py:425 #, python-format msgid "RSDF (%s)" msgstr "" -#: module/gui/MainWindow.py:429 +#: module/gui/MainWindow.py:426 #, python-format msgid "Text Files (%s)" msgstr "" -#: module/gui/MainWindow.py:431 +#: module/gui/MainWindow.py:428 msgid "Open container" msgstr "" diff --git a/locale/setup.pot b/locale/setup.pot index 1b14e0a55..8defb0a8d 100644 --- a/locale/setup.pot +++ b/locale/setup.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pyLoad 0.4.5\n" "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n" -"POT-Creation-Date: 2011-03-14 16:47+0100\n" +"POT-Creation-Date: 2011-05-28 17:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -150,8 +150,8 @@ msgstr "" #: module/setup.py:138 msgid "" -"You will need this for some Click'N'Load links. Install Spidermonkey or ossp-" -"js" +"You will need this for some Click'N'Load links. Install Spidermonkey, ossp-" +"js, pyv8 or rhino" msgstr "" #: module/setup.py:140 diff --git a/module/PluginThread.py b/module/PluginThread.py index 33701ee69..6a8b98e6d 100644 --- a/module/PluginThread.py +++ b/module/PluginThread.py @@ -253,7 +253,6 @@ class DownloadThread(PluginThread): self.m.core.files.checkPackageFinished(pyfile) self.active = False - pyfile.finishIfDone() self.m.core.files.save() continue diff --git a/module/plugins/PluginManager.py b/module/plugins/PluginManager.py index 9f59cb1de..f583f91de 100644 --- a/module/plugins/PluginManager.py +++ b/module/plugins/PluginManager.py @@ -247,7 +247,7 @@ class PluginManager(): if plugin.has_key("new_name"): return plugin["new_name"] - return plugin["name"] + return name diff --git a/module/plugins/accounts/FilesonicCom.py b/module/plugins/accounts/FilesonicCom.py index 7ea7ea7cb..9f57809ad 100644 --- a/module/plugins/accounts/FilesonicCom.py +++ b/module/plugins/accounts/FilesonicCom.py @@ -22,10 +22,10 @@ from time import mktime, strptime from module.plugins.Account import Account -try:
- from json import loads as json_loads
-except ImportError: # pragma: no cover
- from module.lib.simplejson import loads as json_loads
+try: + from json import loads as json_loads +except ImportError: # pragma: no cover + from module.lib.simplejson import loads as json_loads class FilesonicCom(Account): @@ -45,7 +45,7 @@ class FilesonicCom(Account): post = {"u": user, "p" : self.accounts[user]["password"]} ).decode("utf8") - self.core.log.debug(_("%s: account status retrieved from api %s" % (self.__name__,xml))) + self.core.log.debug("%s: account status retrieved from api %s" % (self.__name__,xml)) json = json_loads(xml) if json["FSApi_User"]["getInfo"]["status"] != "success": self.core.log.error(_("%s: Invalid login retrieving user details" % self.__name__)) diff --git a/module/remote/thriftbackend/thriftgen/pyload/Pyload.py b/module/remote/thriftbackend/thriftgen/pyload/Pyload.py index 049523659..ba9d6a7a2 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/Pyload.py +++ b/module/remote/thriftbackend/thriftgen/pyload/Pyload.py @@ -15,7 +15,7 @@ except: fastbinary = None -class Iface(object): +class Iface: def getConfigValue(self, category, option, section): """ Parameters: @@ -2785,7 +2785,7 @@ class Processor(Iface, TProcessor): # HELPER FUNCTIONS AND STRUCTURES -class getConfigValue_args(object): +class getConfigValue_args: """ Attributes: - category @@ -2868,7 +2868,7 @@ class getConfigValue_args(object): def __ne__(self, other): return not (self == other) -class getConfigValue_result(object): +class getConfigValue_result: """ Attributes: - success @@ -2926,7 +2926,7 @@ class getConfigValue_result(object): def __ne__(self, other): return not (self == other) -class setConfigValue_args(object): +class setConfigValue_args: """ Attributes: - category @@ -3021,7 +3021,7 @@ class setConfigValue_args(object): def __ne__(self, other): return not (self == other) -class setConfigValue_result(object): +class setConfigValue_result: thrift_spec = ( ) @@ -3062,7 +3062,7 @@ class setConfigValue_result(object): def __ne__(self, other): return not (self == other) -class getConfig_args(object): +class getConfig_args: thrift_spec = ( ) @@ -3103,7 +3103,7 @@ class getConfig_args(object): def __ne__(self, other): return not (self == other) -class getConfig_result(object): +class getConfig_result: """ Attributes: - success @@ -3170,7 +3170,7 @@ class getConfig_result(object): def __ne__(self, other): return not (self == other) -class getPluginConfig_args(object): +class getPluginConfig_args: thrift_spec = ( ) @@ -3211,7 +3211,7 @@ class getPluginConfig_args(object): def __ne__(self, other): return not (self == other) -class getPluginConfig_result(object): +class getPluginConfig_result: """ Attributes: - success @@ -3278,7 +3278,7 @@ class getPluginConfig_result(object): def __ne__(self, other): return not (self == other) -class pauseServer_args(object): +class pauseServer_args: thrift_spec = ( ) @@ -3319,7 +3319,7 @@ class pauseServer_args(object): def __ne__(self, other): return not (self == other) -class pauseServer_result(object): +class pauseServer_result: thrift_spec = ( ) @@ -3360,7 +3360,7 @@ class pauseServer_result(object): def __ne__(self, other): return not (self == other) -class unpauseServer_args(object): +class unpauseServer_args: thrift_spec = ( ) @@ -3401,7 +3401,7 @@ class unpauseServer_args(object): def __ne__(self, other): return not (self == other) -class unpauseServer_result(object): +class unpauseServer_result: thrift_spec = ( ) @@ -3442,7 +3442,7 @@ class unpauseServer_result(object): def __ne__(self, other): return not (self == other) -class togglePause_args(object): +class togglePause_args: thrift_spec = ( ) @@ -3483,7 +3483,7 @@ class togglePause_args(object): def __ne__(self, other): return not (self == other) -class togglePause_result(object): +class togglePause_result: """ Attributes: - success @@ -3541,7 +3541,7 @@ class togglePause_result(object): def __ne__(self, other): return not (self == other) -class statusServer_args(object): +class statusServer_args: thrift_spec = ( ) @@ -3582,7 +3582,7 @@ class statusServer_args(object): def __ne__(self, other): return not (self == other) -class statusServer_result(object): +class statusServer_result: """ Attributes: - success @@ -3641,7 +3641,7 @@ class statusServer_result(object): def __ne__(self, other): return not (self == other) -class freeSpace_args(object): +class freeSpace_args: thrift_spec = ( ) @@ -3682,7 +3682,7 @@ class freeSpace_args(object): def __ne__(self, other): return not (self == other) -class freeSpace_result(object): +class freeSpace_result: """ Attributes: - success @@ -3740,7 +3740,7 @@ class freeSpace_result(object): def __ne__(self, other): return not (self == other) -class getServerVersion_args(object): +class getServerVersion_args: thrift_spec = ( ) @@ -3781,7 +3781,7 @@ class getServerVersion_args(object): def __ne__(self, other): return not (self == other) -class getServerVersion_result(object): +class getServerVersion_result: """ Attributes: - success @@ -3839,7 +3839,7 @@ class getServerVersion_result(object): def __ne__(self, other): return not (self == other) -class kill_args(object): +class kill_args: thrift_spec = ( ) @@ -3880,7 +3880,7 @@ class kill_args(object): def __ne__(self, other): return not (self == other) -class kill_result(object): +class kill_result: thrift_spec = ( ) @@ -3921,7 +3921,7 @@ class kill_result(object): def __ne__(self, other): return not (self == other) -class restart_args(object): +class restart_args: thrift_spec = ( ) @@ -3962,7 +3962,7 @@ class restart_args(object): def __ne__(self, other): return not (self == other) -class restart_result(object): +class restart_result: thrift_spec = ( ) @@ -4003,7 +4003,7 @@ class restart_result(object): def __ne__(self, other): return not (self == other) -class getLog_args(object): +class getLog_args: """ Attributes: - offset @@ -4062,7 +4062,7 @@ class getLog_args(object): def __ne__(self, other): return not (self == other) -class getLog_result(object): +class getLog_result: """ Attributes: - success @@ -4128,7 +4128,7 @@ class getLog_result(object): def __ne__(self, other): return not (self == other) -class checkURL_args(object): +class checkURL_args: """ Attributes: - urls @@ -4195,7 +4195,7 @@ class checkURL_args(object): def __ne__(self, other): return not (self == other) -class checkURL_result(object): +class checkURL_result: """ Attributes: - success @@ -4263,7 +4263,7 @@ class checkURL_result(object): def __ne__(self, other): return not (self == other) -class isTimeDownload_args(object): +class isTimeDownload_args: thrift_spec = ( ) @@ -4304,7 +4304,7 @@ class isTimeDownload_args(object): def __ne__(self, other): return not (self == other) -class isTimeDownload_result(object): +class isTimeDownload_result: """ Attributes: - success @@ -4362,7 +4362,7 @@ class isTimeDownload_result(object): def __ne__(self, other): return not (self == other) -class isTimeReconnect_args(object): +class isTimeReconnect_args: thrift_spec = ( ) @@ -4403,7 +4403,7 @@ class isTimeReconnect_args(object): def __ne__(self, other): return not (self == other) -class isTimeReconnect_result(object): +class isTimeReconnect_result: """ Attributes: - success @@ -4461,7 +4461,7 @@ class isTimeReconnect_result(object): def __ne__(self, other): return not (self == other) -class toggleReconnect_args(object): +class toggleReconnect_args: thrift_spec = ( ) @@ -4502,7 +4502,7 @@ class toggleReconnect_args(object): def __ne__(self, other): return not (self == other) -class toggleReconnect_result(object): +class toggleReconnect_result: """ Attributes: - success @@ -4560,7 +4560,7 @@ class toggleReconnect_result(object): def __ne__(self, other): return not (self == other) -class statusDownloads_args(object): +class statusDownloads_args: thrift_spec = ( ) @@ -4601,7 +4601,7 @@ class statusDownloads_args(object): def __ne__(self, other): return not (self == other) -class statusDownloads_result(object): +class statusDownloads_result: """ Attributes: - success @@ -4668,7 +4668,7 @@ class statusDownloads_result(object): def __ne__(self, other): return not (self == other) -class addPackage_args(object): +class addPackage_args: """ Attributes: - name @@ -4759,7 +4759,7 @@ class addPackage_args(object): def __ne__(self, other): return not (self == other) -class addPackage_result(object): +class addPackage_result: """ Attributes: - success @@ -4817,7 +4817,7 @@ class addPackage_result(object): def __ne__(self, other): return not (self == other) -class getPackageData_args(object): +class getPackageData_args: """ Attributes: - pid @@ -4876,7 +4876,7 @@ class getPackageData_args(object): def __ne__(self, other): return not (self == other) -class getPackageData_result(object): +class getPackageData_result: """ Attributes: - success @@ -4948,7 +4948,7 @@ class getPackageData_result(object): def __ne__(self, other): return not (self == other) -class getFileData_args(object): +class getFileData_args: """ Attributes: - fid @@ -5007,7 +5007,7 @@ class getFileData_args(object): def __ne__(self, other): return not (self == other) -class getFileData_result(object): +class getFileData_result: """ Attributes: - success @@ -5079,7 +5079,7 @@ class getFileData_result(object): def __ne__(self, other): return not (self == other) -class deleteFiles_args(object): +class deleteFiles_args: """ Attributes: - fids @@ -5146,7 +5146,7 @@ class deleteFiles_args(object): def __ne__(self, other): return not (self == other) -class deleteFiles_result(object): +class deleteFiles_result: thrift_spec = ( ) @@ -5187,7 +5187,7 @@ class deleteFiles_result(object): def __ne__(self, other): return not (self == other) -class deletePackages_args(object): +class deletePackages_args: """ Attributes: - pids @@ -5254,7 +5254,7 @@ class deletePackages_args(object): def __ne__(self, other): return not (self == other) -class deletePackages_result(object): +class deletePackages_result: thrift_spec = ( ) @@ -5295,7 +5295,7 @@ class deletePackages_result(object): def __ne__(self, other): return not (self == other) -class getQueue_args(object): +class getQueue_args: thrift_spec = ( ) @@ -5336,7 +5336,7 @@ class getQueue_args(object): def __ne__(self, other): return not (self == other) -class getQueue_result(object): +class getQueue_result: """ Attributes: - success @@ -5403,7 +5403,7 @@ class getQueue_result(object): def __ne__(self, other): return not (self == other) -class getCollector_args(object): +class getCollector_args: thrift_spec = ( ) @@ -5444,7 +5444,7 @@ class getCollector_args(object): def __ne__(self, other): return not (self == other) -class getCollector_result(object): +class getCollector_result: """ Attributes: - success @@ -5511,7 +5511,7 @@ class getCollector_result(object): def __ne__(self, other): return not (self == other) -class getQueueData_args(object): +class getQueueData_args: thrift_spec = ( ) @@ -5552,7 +5552,7 @@ class getQueueData_args(object): def __ne__(self, other): return not (self == other) -class getQueueData_result(object): +class getQueueData_result: """ Attributes: - success @@ -5619,7 +5619,7 @@ class getQueueData_result(object): def __ne__(self, other): return not (self == other) -class getCollectorData_args(object): +class getCollectorData_args: thrift_spec = ( ) @@ -5660,7 +5660,7 @@ class getCollectorData_args(object): def __ne__(self, other): return not (self == other) -class getCollectorData_result(object): +class getCollectorData_result: """ Attributes: - success @@ -5727,7 +5727,7 @@ class getCollectorData_result(object): def __ne__(self, other): return not (self == other) -class addFiles_args(object): +class addFiles_args: """ Attributes: - pid @@ -5806,7 +5806,7 @@ class addFiles_args(object): def __ne__(self, other): return not (self == other) -class addFiles_result(object): +class addFiles_result: thrift_spec = ( ) @@ -5847,7 +5847,7 @@ class addFiles_result(object): def __ne__(self, other): return not (self == other) -class pushToQueue_args(object): +class pushToQueue_args: """ Attributes: - pid @@ -5906,7 +5906,7 @@ class pushToQueue_args(object): def __ne__(self, other): return not (self == other) -class pushToQueue_result(object): +class pushToQueue_result: thrift_spec = ( ) @@ -5947,7 +5947,7 @@ class pushToQueue_result(object): def __ne__(self, other): return not (self == other) -class pullFromQueue_args(object): +class pullFromQueue_args: """ Attributes: - pid @@ -6006,7 +6006,7 @@ class pullFromQueue_args(object): def __ne__(self, other): return not (self == other) -class pullFromQueue_result(object): +class pullFromQueue_result: thrift_spec = ( ) @@ -6047,7 +6047,7 @@ class pullFromQueue_result(object): def __ne__(self, other): return not (self == other) -class restartPackage_args(object): +class restartPackage_args: """ Attributes: - pid @@ -6106,7 +6106,7 @@ class restartPackage_args(object): def __ne__(self, other): return not (self == other) -class restartPackage_result(object): +class restartPackage_result: thrift_spec = ( ) @@ -6147,7 +6147,7 @@ class restartPackage_result(object): def __ne__(self, other): return not (self == other) -class restartFile_args(object): +class restartFile_args: """ Attributes: - fid @@ -6206,7 +6206,7 @@ class restartFile_args(object): def __ne__(self, other): return not (self == other) -class restartFile_result(object): +class restartFile_result: thrift_spec = ( ) @@ -6247,7 +6247,7 @@ class restartFile_result(object): def __ne__(self, other): return not (self == other) -class recheckPackage_args(object): +class recheckPackage_args: """ Attributes: - pid @@ -6306,7 +6306,7 @@ class recheckPackage_args(object): def __ne__(self, other): return not (self == other) -class recheckPackage_result(object): +class recheckPackage_result: thrift_spec = ( ) @@ -6347,7 +6347,7 @@ class recheckPackage_result(object): def __ne__(self, other): return not (self == other) -class stopAllDownloads_args(object): +class stopAllDownloads_args: thrift_spec = ( ) @@ -6388,7 +6388,7 @@ class stopAllDownloads_args(object): def __ne__(self, other): return not (self == other) -class stopAllDownloads_result(object): +class stopAllDownloads_result: thrift_spec = ( ) @@ -6429,7 +6429,7 @@ class stopAllDownloads_result(object): def __ne__(self, other): return not (self == other) -class stopDownloads_args(object): +class stopDownloads_args: """ Attributes: - fids @@ -6496,7 +6496,7 @@ class stopDownloads_args(object): def __ne__(self, other): return not (self == other) -class stopDownloads_result(object): +class stopDownloads_result: thrift_spec = ( ) @@ -6537,7 +6537,7 @@ class stopDownloads_result(object): def __ne__(self, other): return not (self == other) -class setPackageName_args(object): +class setPackageName_args: """ Attributes: - pid @@ -6608,7 +6608,7 @@ class setPackageName_args(object): def __ne__(self, other): return not (self == other) -class setPackageName_result(object): +class setPackageName_result: thrift_spec = ( ) @@ -6649,7 +6649,7 @@ class setPackageName_result(object): def __ne__(self, other): return not (self == other) -class movePackage_args(object): +class movePackage_args: """ Attributes: - destination @@ -6720,7 +6720,7 @@ class movePackage_args(object): def __ne__(self, other): return not (self == other) -class movePackage_result(object): +class movePackage_result: thrift_spec = ( ) @@ -6761,7 +6761,7 @@ class movePackage_result(object): def __ne__(self, other): return not (self == other) -class uploadContainer_args(object): +class uploadContainer_args: """ Attributes: - filename @@ -6832,7 +6832,7 @@ class uploadContainer_args(object): def __ne__(self, other): return not (self == other) -class uploadContainer_result(object): +class uploadContainer_result: thrift_spec = ( ) @@ -6873,7 +6873,7 @@ class uploadContainer_result(object): def __ne__(self, other): return not (self == other) -class setPriority_args(object): +class setPriority_args: """ Attributes: - pid @@ -6944,7 +6944,7 @@ class setPriority_args(object): def __ne__(self, other): return not (self == other) -class setPriority_result(object): +class setPriority_result: thrift_spec = ( ) @@ -6985,7 +6985,7 @@ class setPriority_result(object): def __ne__(self, other): return not (self == other) -class orderPackage_args(object): +class orderPackage_args: """ Attributes: - pid @@ -7056,7 +7056,7 @@ class orderPackage_args(object): def __ne__(self, other): return not (self == other) -class orderPackage_result(object): +class orderPackage_result: thrift_spec = ( ) @@ -7097,7 +7097,7 @@ class orderPackage_result(object): def __ne__(self, other): return not (self == other) -class orderFile_args(object): +class orderFile_args: """ Attributes: - fid @@ -7168,7 +7168,7 @@ class orderFile_args(object): def __ne__(self, other): return not (self == other) -class orderFile_result(object): +class orderFile_result: thrift_spec = ( ) @@ -7209,7 +7209,7 @@ class orderFile_result(object): def __ne__(self, other): return not (self == other) -class setPackageData_args(object): +class setPackageData_args: """ Attributes: - pid @@ -7290,7 +7290,7 @@ class setPackageData_args(object): def __ne__(self, other): return not (self == other) -class setPackageData_result(object): +class setPackageData_result: thrift_spec = ( ) @@ -7331,7 +7331,7 @@ class setPackageData_result(object): def __ne__(self, other): return not (self == other) -class deleteFinished_args(object): +class deleteFinished_args: thrift_spec = ( ) @@ -7372,7 +7372,7 @@ class deleteFinished_args(object): def __ne__(self, other): return not (self == other) -class deleteFinished_result(object): +class deleteFinished_result: thrift_spec = ( ) @@ -7413,7 +7413,7 @@ class deleteFinished_result(object): def __ne__(self, other): return not (self == other) -class restartFailed_args(object): +class restartFailed_args: thrift_spec = ( ) @@ -7454,7 +7454,7 @@ class restartFailed_args(object): def __ne__(self, other): return not (self == other) -class restartFailed_result(object): +class restartFailed_result: thrift_spec = ( ) @@ -7495,7 +7495,7 @@ class restartFailed_result(object): def __ne__(self, other): return not (self == other) -class getPackageOrder_args(object): +class getPackageOrder_args: """ Attributes: - destination @@ -7554,7 +7554,7 @@ class getPackageOrder_args(object): def __ne__(self, other): return not (self == other) -class getPackageOrder_result(object): +class getPackageOrder_result: """ Attributes: - success @@ -7622,7 +7622,7 @@ class getPackageOrder_result(object): def __ne__(self, other): return not (self == other) -class getFileOrder_args(object): +class getFileOrder_args: """ Attributes: - pid @@ -7681,7 +7681,7 @@ class getFileOrder_args(object): def __ne__(self, other): return not (self == other) -class getFileOrder_result(object): +class getFileOrder_result: """ Attributes: - success @@ -7749,7 +7749,7 @@ class getFileOrder_result(object): def __ne__(self, other): return not (self == other) -class isCaptchaWaiting_args(object): +class isCaptchaWaiting_args: thrift_spec = ( ) @@ -7790,7 +7790,7 @@ class isCaptchaWaiting_args(object): def __ne__(self, other): return not (self == other) -class isCaptchaWaiting_result(object): +class isCaptchaWaiting_result: """ Attributes: - success @@ -7848,7 +7848,7 @@ class isCaptchaWaiting_result(object): def __ne__(self, other): return not (self == other) -class getCaptchaTask_args(object): +class getCaptchaTask_args: """ Attributes: - exclusive @@ -7907,7 +7907,7 @@ class getCaptchaTask_args(object): def __ne__(self, other): return not (self == other) -class getCaptchaTask_result(object): +class getCaptchaTask_result: """ Attributes: - success @@ -7966,7 +7966,7 @@ class getCaptchaTask_result(object): def __ne__(self, other): return not (self == other) -class getCaptchaTaskStatus_args(object): +class getCaptchaTaskStatus_args: """ Attributes: - tid @@ -8025,7 +8025,7 @@ class getCaptchaTaskStatus_args(object): def __ne__(self, other): return not (self == other) -class getCaptchaTaskStatus_result(object): +class getCaptchaTaskStatus_result: """ Attributes: - success @@ -8083,7 +8083,7 @@ class getCaptchaTaskStatus_result(object): def __ne__(self, other): return not (self == other) -class setCaptchaResult_args(object): +class setCaptchaResult_args: """ Attributes: - tid @@ -8154,7 +8154,7 @@ class setCaptchaResult_args(object): def __ne__(self, other): return not (self == other) -class setCaptchaResult_result(object): +class setCaptchaResult_result: thrift_spec = ( ) @@ -8195,7 +8195,7 @@ class setCaptchaResult_result(object): def __ne__(self, other): return not (self == other) -class getEvents_args(object): +class getEvents_args: """ Attributes: - uuid @@ -8254,7 +8254,7 @@ class getEvents_args(object): def __ne__(self, other): return not (self == other) -class getEvents_result(object): +class getEvents_result: """ Attributes: - success @@ -8321,7 +8321,7 @@ class getEvents_result(object): def __ne__(self, other): return not (self == other) -class getAccounts_args(object): +class getAccounts_args: """ Attributes: - refresh @@ -8380,7 +8380,7 @@ class getAccounts_args(object): def __ne__(self, other): return not (self == other) -class getAccounts_result(object): +class getAccounts_result: """ Attributes: - success @@ -8447,7 +8447,7 @@ class getAccounts_result(object): def __ne__(self, other): return not (self == other) -class getAccountTypes_args(object): +class getAccountTypes_args: thrift_spec = ( ) @@ -8488,7 +8488,7 @@ class getAccountTypes_args(object): def __ne__(self, other): return not (self == other) -class getAccountTypes_result(object): +class getAccountTypes_result: """ Attributes: - success @@ -8554,7 +8554,7 @@ class getAccountTypes_result(object): def __ne__(self, other): return not (self == other) -class updateAccounts_args(object): +class updateAccounts_args: """ Attributes: - data @@ -8614,7 +8614,7 @@ class updateAccounts_args(object): def __ne__(self, other): return not (self == other) -class updateAccounts_result(object): +class updateAccounts_result: thrift_spec = ( ) @@ -8655,7 +8655,7 @@ class updateAccounts_result(object): def __ne__(self, other): return not (self == other) -class removeAccount_args(object): +class removeAccount_args: """ Attributes: - plugin @@ -8726,7 +8726,7 @@ class removeAccount_args(object): def __ne__(self, other): return not (self == other) -class removeAccount_result(object): +class removeAccount_result: thrift_spec = ( ) @@ -8767,7 +8767,7 @@ class removeAccount_result(object): def __ne__(self, other): return not (self == other) -class login_args(object): +class login_args: """ Attributes: - username @@ -8838,7 +8838,7 @@ class login_args(object): def __ne__(self, other): return not (self == other) -class login_result(object): +class login_result: """ Attributes: - success @@ -8896,7 +8896,7 @@ class login_result(object): def __ne__(self, other): return not (self == other) -class getUserData_args(object): +class getUserData_args: thrift_spec = ( ) @@ -8937,7 +8937,7 @@ class getUserData_args(object): def __ne__(self, other): return not (self == other) -class getUserData_result(object): +class getUserData_result: """ Attributes: - success @@ -8996,7 +8996,7 @@ class getUserData_result(object): def __ne__(self, other): return not (self == other) -class getServices_args(object): +class getServices_args: thrift_spec = ( ) @@ -9037,7 +9037,7 @@ class getServices_args(object): def __ne__(self, other): return not (self == other) -class getServices_result(object): +class getServices_result: """ Attributes: - success @@ -9106,7 +9106,7 @@ class getServices_result(object): def __ne__(self, other): return not (self == other) -class hasService_args(object): +class hasService_args: """ Attributes: - plugin @@ -9177,7 +9177,7 @@ class hasService_args(object): def __ne__(self, other): return not (self == other) -class hasService_result(object): +class hasService_result: """ Attributes: - success @@ -9235,7 +9235,7 @@ class hasService_result(object): def __ne__(self, other): return not (self == other) -class call_args(object): +class call_args: """ Attributes: - info @@ -9295,7 +9295,7 @@ class call_args(object): def __ne__(self, other): return not (self == other) -class call_result(object): +class call_result: """ Attributes: - success diff --git a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py index 6174506cd..b3ef98de3 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py +++ b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py @@ -14,7 +14,7 @@ except: fastbinary = None -class DownloadStatus(object): +class DownloadStatus: Finished = 0 Offline = 1 Online = 2 @@ -67,7 +67,7 @@ class DownloadStatus(object): "Unknown": 14, } -class Destination(object): +class Destination: Queue = 0 Collector = 1 @@ -81,7 +81,7 @@ class Destination(object): "Collector": 1, } -class ElementType(object): +class ElementType: Package = 0 File = 1 @@ -96,7 +96,7 @@ class ElementType(object): } -class DownloadInfo(object): +class DownloadInfo: """ Attributes: - fid @@ -311,7 +311,7 @@ class DownloadInfo(object): def __ne__(self, other): return not (self == other) -class ServerStatus(object): +class ServerStatus: """ Attributes: - pause @@ -442,7 +442,7 @@ class ServerStatus(object): def __ne__(self, other): return not (self == other) -class ConfigItem(object): +class ConfigItem: """ Attributes: - name @@ -537,7 +537,7 @@ class ConfigItem(object): def __ne__(self, other): return not (self == other) -class ConfigSection(object): +class ConfigSection: """ Attributes: - name @@ -629,7 +629,7 @@ class ConfigSection(object): def __ne__(self, other): return not (self == other) -class FileData(object): +class FileData: """ Attributes: - fid @@ -820,7 +820,7 @@ class FileData(object): def __ne__(self, other): return not (self == other) -class PackageData(object): +class PackageData: """ Attributes: - pid @@ -984,7 +984,7 @@ class PackageData(object): def __ne__(self, other): return not (self == other) -class PackageInfo(object): +class PackageInfo: """ Attributes: - pid @@ -1147,7 +1147,7 @@ class PackageInfo(object): def __ne__(self, other): return not (self == other) -class CaptchaTask(object): +class CaptchaTask: """ Attributes: - tid @@ -1230,7 +1230,7 @@ class CaptchaTask(object): def __ne__(self, other): return not (self == other) -class Event(object): +class Event: """ Attributes: - event @@ -1325,7 +1325,7 @@ class Event(object): def __ne__(self, other): return not (self == other) -class UserData(object): +class UserData: """ Attributes: - name @@ -1432,7 +1432,7 @@ class UserData(object): def __ne__(self, other): return not (self == other) -class AccountInfo(object): +class AccountInfo: """ Attributes: - validuntil @@ -1585,7 +1585,7 @@ class AccountInfo(object): def __ne__(self, other): return not (self == other) -class AccountData(object): +class AccountData: """ Attributes: - type @@ -1690,7 +1690,7 @@ class AccountData(object): def __ne__(self, other): return not (self == other) -class ServiceInfo(object): +class ServiceInfo: """ Attributes: - funcs @@ -1759,7 +1759,7 @@ class ServiceInfo(object): def __ne__(self, other): return not (self == other) -class ServiceCall(object): +class ServiceCall: """ Attributes: - plugin diff --git a/pyLoadCli.py b/pyLoadCli.py index bf96f3cca..cc2598600 100644 --- a/pyLoadCli.py +++ b/pyLoadCli.py @@ -310,6 +310,16 @@ class Cli: elif command == "kill": self.client.kill() + elif command == "restart_file": + for x in args: + self.client.restartFile(int(x)) + print "Files restarted." + elif command == "restart_package": + for pid in args: + pack = self.client.getPackageData(int(pid)) + self.client.restartPackage(pack.pid) + print "Packages restarted." + else: print_commands() @@ -393,6 +403,8 @@ def print_commands(): ("del_file <fid> <fid2>...", _("Delete Files from Queue/Collector")), ("del_package <pid> <pid2>...", _("Delete Packages from Queue/Collector")), ("move <pid> <pid2>...", _("Move Packages from Queue to Collector or vice versa")), + ("restart_file <fid> <fid2>...", _("Restart files")), + ("restart_package <pid> <pid2>...", _("Restart packages")), ("pause", _("Pause the server")), ("unpause", _("continue downloads")), ("toggle", _("Toggle pause/unpause")), |