diff options
| author | 2010-10-07 22:50:26 +0200 | |
|---|---|---|
| committer | 2010-10-07 22:50:26 +0200 | |
| commit | c2029bf97a5b9c2e06473ad352b7dd174a06a648 (patch) | |
| tree | f44c54e79bb648845209e8bb75b34fe33efeb9cf | |
| parent | closed #149 (diff) | |
| download | pyload-c2029bf97a5b9c2e06473ad352b7dd174a06a648.tar.xz | |
new locale
| -rw-r--r-- | locale/cli.pot | 2 | ||||
| -rw-r--r-- | locale/core.pot | 246 | ||||
| -rw-r--r-- | locale/django.pot | 50 | ||||
| -rw-r--r-- | locale/gui.pot | 38 | ||||
| -rw-r--r-- | locale/setup.pot | 74 | ||||
| -rw-r--r-- | module/PluginThread.py | 4 | ||||
| -rwxr-xr-x | module/network/Request.py | 4 | ||||
| -rw-r--r-- | module/plugins/Account.py | 4 | ||||
| -rw-r--r-- | module/web/settings.py | 3 | ||||
| -rwxr-xr-x | pyLoadCore.py | 6 | 
10 files changed, 257 insertions, 174 deletions
| diff --git a/locale/cli.pot b/locale/cli.pot index d2ff8f745..e51cba280 100644 --- a/locale/cli.pot +++ b/locale/cli.pot @@ -8,7 +8,7 @@ msgid ""  msgstr ""  "Project-Id-Version: pyLoad 0.4\n"  "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n" -"POT-Creation-Date: 2010-09-23 18:11+0200\n" +"POT-Creation-Date: 2010-10-07 22:49+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" diff --git a/locale/core.pot b/locale/core.pot index 7b75cbbb8..fd14329df 100644 --- a/locale/core.pot +++ b/locale/core.pot @@ -8,7 +8,7 @@ msgid ""  msgstr ""  "Project-Id-Version: pyLoad 0.4\n"  "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n" -"POT-Creation-Date: 2010-09-23 18:11+0200\n" +"POT-Creation-Date: 2010-10-07 22:49+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,160 +17,160 @@ msgstr ""  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -#: pyLoadCore.py:162 +#: pyLoadCore.py:163  msgid "Received Quit signal"  msgstr "" -#: pyLoadCore.py:204 +#: pyLoadCore.py:205  #, python-format  msgid "Failed changing group: %s"  msgstr "" -#: pyLoadCore.py:213 +#: pyLoadCore.py:214  #, python-format  msgid "Failed changing user: %s"  msgstr "" -#: pyLoadCore.py:215 +#: pyLoadCore.py:216  msgid "folder for logs"  msgstr "" -#: pyLoadCore.py:226 +#: pyLoadCore.py:227  #, python-format  msgid "Using home directory: %s"  msgstr "" -#: pyLoadCore.py:230 -msgid "pycrypto to decode container files" -msgstr "" -  #: pyLoadCore.py:231 -msgid "Python Image Libary (PIL) for captcha reading" +msgid "pycrypto to decode container files"  msgstr ""  #: pyLoadCore.py:232 -msgid "pycurl to download any files" +msgid "Python Image Libary (PIL) for captcha reading"  msgstr "" -#: pyLoadCore.py:233 +#: pyLoadCore.py:234  msgid "Django for webinterface"  msgstr "" -#: pyLoadCore.py:234 +#: pyLoadCore.py:235  msgid "folder for temporary files"  msgstr "" -#: pyLoadCore.py:239 -msgid "folder for downloads" +#: pyLoadCore.py:236 +msgid "tesseract for captcha reading"  msgstr ""  #: pyLoadCore.py:240 +msgid "folder for downloads" +msgstr "" + +#: pyLoadCore.py:241  msgid "file for links"  msgstr "" -#: pyLoadCore.py:243 +#: pyLoadCore.py:244  msgid "OpenSSL for secure connection"  msgstr "" -#: pyLoadCore.py:265 +#: pyLoadCore.py:268  #, python-format  msgid "Downloadtime: %s"  msgstr "" -#: pyLoadCore.py:276 +#: pyLoadCore.py:279  #, python-format  msgid "Free space: %sGB"  msgstr "" -#: pyLoadCore.py:278 +#: pyLoadCore.py:281  #, python-format  msgid "Free space: %sMB"  msgstr "" -#: pyLoadCore.py:299 +#: pyLoadCore.py:302  msgid "links.txt could not be cleared"  msgstr "" -#: pyLoadCore.py:317 +#: pyLoadCore.py:319  msgid "restarting pyLoad"  msgstr "" -#: pyLoadCore.py:321 +#: pyLoadCore.py:323  msgid "pyLoad quits"  msgstr "" -#: pyLoadCore.py:342 +#: pyLoadCore.py:344  msgid "Secure XMLRPC Server Started"  msgstr "" -#: pyLoadCore.py:344 +#: pyLoadCore.py:346  msgid "SSL Certificates not found, fallback to auth XMLRPC server"  msgstr "" -#: pyLoadCore.py:346 pyLoadCore.py:349 +#: pyLoadCore.py:348 pyLoadCore.py:351  msgid "Auth XMLRPC Server Started"  msgstr "" -#: pyLoadCore.py:355 +#: pyLoadCore.py:357  #, python-format  msgid "Failed starting XMLRPC server CLI and GUI will not be available: %s"  msgstr "" -#: pyLoadCore.py:399 +#: pyLoadCore.py:401  #, python-format  msgid "Install %s"  msgstr "" -#: pyLoadCore.py:434 +#: pyLoadCore.py:436  #, python-format  msgid "could not find %(desc)s: %(name)s"  msgstr "" -#: pyLoadCore.py:436 +#: pyLoadCore.py:438  #, python-format  msgid "could not create %(desc)s: %(name)s"  msgstr "" -#: pyLoadCore.py:461 +#: pyLoadCore.py:463  msgid "shutting down..."  msgstr "" -#: pyLoadCore.py:476 +#: pyLoadCore.py:478  msgid "error while shutting down"  msgstr "" -#: pyLoadCore.py:609 +#: pyLoadCore.py:611  #, python-format  msgid "Added package %(name)s containing %(count)d links"  msgstr "" -#: pyLoadCore.py:807 +#: pyLoadCore.py:809  msgid "killed pyLoad from Terminal"  msgstr "" -#: module/ThreadManager.py:93 +#: module/ThreadManager.py:94  #, python-format  msgid "Reconnect Failed: %s"  msgstr "" -#: module/ThreadManager.py:114 +#: module/ThreadManager.py:115  msgid "Reconnect script not found!"  msgstr "" -#: module/ThreadManager.py:120 +#: module/ThreadManager.py:121  msgid "Starting reconnect"  msgstr "" -#: module/ThreadManager.py:129 +#: module/ThreadManager.py:130  #, python-format  msgid "Old IP: %s"  msgstr "" -#: module/ThreadManager.py:134 +#: module/ThreadManager.py:135  msgid "Failed executing reconnect script!"  msgstr "" -#: module/ThreadManager.py:150 +#: module/ThreadManager.py:151  #, python-format  msgid "Reconnected, new IP: %s"  msgstr "" @@ -190,73 +190,73 @@ msgstr ""  msgid "Failed activating %(name)s"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "finished"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "offline"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "online"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "queued"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "checking"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "waiting"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "reconnected"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "starting"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "failed"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "aborted"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "decrypting"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "custom"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "downloading"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "processing"  msgstr "" -#: module/FileDatabase.py:82 +#: module/FileDatabase.py:84  msgid "unknown"  msgstr "" -#: module/FileDatabase.py:492 module/plugins/hooks/IRCInterface.py:68 +#: module/FileDatabase.py:499 module/plugins/hooks/IRCInterface.py:68  #: module/plugins/hooks/XMPPInterface.py:75  #, python-format  msgid "Package finished: %s"  msgstr "" -#: module/FileDatabase.py:590 +#: module/FileDatabase.py:610  msgid "Filedatabase was deleted due to incompatible version."  msgstr "" @@ -302,7 +302,7 @@ msgstr ""  msgid "You should fix dependicies or deactivate load on startup."  msgstr "" -#: module/AccountManager.py:87 +#: module/AccountManager.py:85  msgid "Account settings deleted, due to new config format."  msgstr "" @@ -320,7 +320,7 @@ msgstr ""  msgid "Download starts: %s"  msgstr "" -#: module/PluginThread.py:164 module/PluginThread.py:318 +#: module/PluginThread.py:164 module/PluginThread.py:319  #, python-format  msgid "Plugin %s is missing a function."  msgstr "" @@ -335,35 +335,41 @@ msgstr ""  msgid "Download restarted: %s"  msgstr "" -#: module/PluginThread.py:202 module/PluginThread.py:327 +#: module/PluginThread.py:202 module/PluginThread.py:328  #, python-format  msgid "Download is offline: %s"  msgstr "" -#: module/PluginThread.py:205 module/PluginThread.py:250 +#: module/PluginThread.py:205 module/PluginThread.py:251  #, python-format  msgid "Download failed: %(name)s | %(msg)s"  msgstr ""  #: module/PluginThread.py:218 -msgid "Couldn't connect to host waiting 1 minute and retry." +msgid "" +"Couldn't connect to host or connection resetted waiting 1 minute and retry."  msgstr "" -#: module/PluginThread.py:267 +#: module/PluginThread.py:268  #, python-format  msgid "Download finished: %s"  msgstr "" -#: module/PluginThread.py:313 +#: module/PluginThread.py:314  #, python-format  msgid "Decrypting starts: %s"  msgstr "" -#: module/PluginThread.py:330 module/PluginThread.py:339 +#: module/PluginThread.py:331 module/PluginThread.py:344  #, python-format  msgid "Decrypting failed: %(name)s | %(msg)s"  msgstr "" +#: module/PluginThread.py:338 +#, python-format +msgid "Retrying %s" +msgstr "" +  #: module/web/ServerThread.py:45  msgid "Database for Webinterface does not exitst, it will not be available."  msgstr "" @@ -407,13 +413,17 @@ msgstr ""  msgid "Parsed package %(name)s with %(len)d links"  msgstr "" -#: module/plugins/Plugin.py:237 +#: module/plugins/Plugin.py:252  msgid "" -"No Client connected for captcha decrypting, or pil and tesseract not " -"installed" +"Pil and tesseract not installed and no Client connected for captcha " +"decrypting"  msgstr "" -#: module/plugins/Plugin.py:289 +#: module/plugins/Plugin.py:254 +msgid "No Client connected for captcha decrypting" +msgstr "" + +#: module/plugins/Plugin.py:296 module/plugins/Plugin.py:319  #, python-format  msgid "Setting User and Group failed: %s"  msgstr "" @@ -422,6 +432,30 @@ msgstr ""  msgid "File not exists."  msgstr "" +#: module/plugins/Account.py:50 module/plugins/Account.py:54 +#, python-format +msgid "Could not login with %(plugin)s account %(user)s | %(msg)s" +msgstr "" + +#: module/plugins/Account.py:50 +msgid "Wrong Password" +msgstr "" + +#: module/plugins/Account.py:148 +#, python-format +msgid "Your Time %s has wrong format, use: 1:22-3:44" +msgstr "" + +#: module/plugins/Account.py:185 +#, python-format +msgid "%(plugin)s Account %(user)s has not enough traffic" +msgstr "" + +#: module/plugins/Account.py:190 +#, python-format +msgid "%(plugin)s Account %(user)s is expired" +msgstr "" +  #: module/plugins/crypter/SerienjunkiesOrg.py:103  msgid "Downloadlimit reached"  msgstr "" @@ -434,31 +468,38 @@ msgstr ""  msgid "Click'N'Load: Port 9666 already in use"  msgstr "" -#: module/plugins/hooks/UnRar.py:103 +#: module/plugins/hooks/UnRar.py:118  #, python-format  msgid "starting Unrar of %s"  msgstr "" -#: module/plugins/hooks/UnRar.py:119 module/plugins/hooks/UnRar.py:146 +#: module/plugins/hooks/UnRar.py:134 module/plugins/hooks/UnRar.py:164  #, python-format  msgid "Unrar of %s failed (wrong password)"  msgstr "" -#: module/plugins/hooks/UnRar.py:125 +#: module/plugins/hooks/UnRar.py:140  #, python-format  msgid "Unrar of %s failed (missing volume)"  msgstr "" -#: module/plugins/hooks/UnRar.py:129 module/plugins/hooks/UnRar.py:143 +#: module/plugins/hooks/UnRar.py:144 module/plugins/hooks/UnRar.py:161  #, python-format  msgid "Unrar of %s ok"  msgstr "" -#: module/plugins/hooks/UnRar.py:134 module/plugins/hooks/UnRar.py:139 +#: module/plugins/hooks/UnRar.py:149 module/plugins/hooks/UnRar.py:157  #, python-format  msgid "Unrar of %s failed"  msgstr "" +#: module/plugins/hooks/UnRar.py:152 +#, python-format +msgid "" +"Your ram amount of %s MB seems not sufficient to unrar this file. You can " +"deactivate this warning and risk instability" +msgstr "" +  #: module/plugins/hooks/IRCInterface.py:75  #, python-format  msgid "Download finished: %(name)s @ %(plugin)s " @@ -516,11 +557,8 @@ msgid "***  Get it here: http://pyload.org/download  ***"  msgstr ""  #: module/plugins/hooks/UpdateManager.py:60 -msgid "Not able to connect server" -msgstr "" -  #: module/plugins/hooks/UpdateManager.py:70 -msgid "Plugins could not be updated" +msgid "Not able to connect server for updates"  msgstr ""  #: module/plugins/hooks/UpdateManager.py:95 @@ -528,62 +566,66 @@ msgstr ""  msgid "New version of %(type)s|%(name)s : %(version).2f"  msgstr "" -#: module/plugins/hoster/MegauploadCom.py:96 +#: module/plugins/hoster/MegauploadCom.py:83 +#, python-format +msgid "Megaupload: waiting %d minues" +msgstr "" + +#: module/plugins/hoster/MegauploadCom.py:108  #, python-format  msgid ""  "%s: Megaupload is currently blocking your IP. Try again later, manually."  msgstr "" -#: module/plugins/hoster/MegauploadCom.py:166 +#: module/plugins/hoster/MegauploadCom.py:175  msgid ""  "Looks like the file is still not available. Retry downloading later, "  "manually."  msgstr "" -#: module/plugins/hoster/UploadedTo.py:68 -#: module/plugins/hoster/RapidshareCom.py:72 +#: module/plugins/hoster/UploadedTo.py:56 +#: module/plugins/hoster/RapidshareCom.py:153  #, python-format  msgid "%(name)s: Use Premium Account (%(left)sGB left)"  msgstr "" -#: module/plugins/hoster/UploadedTo.py:70 -#: module/plugins/hoster/RapidshareCom.py:74 +#: module/plugins/hoster/UploadedTo.py:58 +#: module/plugins/hoster/RapidshareCom.py:155  #, python-format  msgid "%s: Not enough traffic left"  msgstr "" -#: module/plugins/hoster/RapidshareCom.py:92 -msgid "Rapidshare: Traffic Share (direct download)" +#: module/plugins/hoster/UploadedTo.py:61 +msgid "Traffic exceeded"  msgstr "" -#: module/plugins/hoster/RapidshareCom.py:148 -msgid "Rapidshare: Already downloading, wait 30 minutes" -msgstr "" - -#: module/plugins/hoster/RapidshareCom.py:158 -msgid "Rapidshare: No free slots!" +#: module/plugins/hoster/RapidshareCom.py:98 +msgid "Rapidshare: Traffic Share (direct download)"  msgstr "" -#: module/plugins/hoster/NetloadIn.py:104 -msgid "No API Data was send" +#: module/plugins/hoster/RapidshareCom.py:139 +#: module/plugins/hoster/RapidshareCom.py:213 +msgid "Already downloading from this ip address, waiting 60 seconds"  msgstr "" -#: module/plugins/hoster/NetloadIn.py:130 -#, python-format -msgid "Netload: final wait %d seconds" +#: module/plugins/hoster/RapidshareCom.py:144 +msgid "Invalid Auth Code, download will be restarted"  msgstr "" -#: module/plugins/hoster/NetloadIn.py:139 -#, python-format -msgid "Netload: try number %d " +#: module/plugins/hoster/RapidshareCom.py:217 +msgid "RapidShareCom: No free slots"  msgstr "" -#: module/plugins/hoster/NetloadIn.py:152 +#: module/plugins/hoster/NetloadIn.py:166  #, python-format  msgid "Netload: waiting between downloads %d s."  msgstr "" -#: module/plugins/hoster/NetloadIn.py:183 +#: module/plugins/hoster/NetloadIn.py:191  #, python-format  msgid "Netload: waiting for captcha %d s."  msgstr "" + +#: module/plugins/hoster/NetloadIn.py:230 +msgid "Downloaded File was empty" +msgstr "" diff --git a/locale/django.pot b/locale/django.pot index c5b76476c..67e0ec214 100644 --- a/locale/django.pot +++ b/locale/django.pot @@ -8,7 +8,7 @@ msgid ""  msgstr ""  "Project-Id-Version: PACKAGE VERSION\n"  "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-23 18:05+0200\n" +"POT-Creation-Date: 2010-10-07 22:49+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" @@ -60,28 +60,36 @@ msgstr ""  msgid "waiting %s"  msgstr "" -#: pyload/views.py:32 +#: pyload/views.py:45  msgid ""  "Can't connect to pyLoad. Please check your configuration and make sure "  "pyLoad is running."  msgstr "" -#: pyload/views.py:53 +#: pyload/views.py:66  msgid "You don't have permission to view this page."  msgstr "" -#: pyload/views.py:105 +#: pyload/views.py:118  msgid "Download directory not found."  msgstr "" -#: pyload/views.py:323 +#: pyload/views.py:338  msgid "Error occured when setting the following options:"  msgstr "" -#: pyload/views.py:327 +#: pyload/views.py:342  msgid "All options were set correctly."  msgstr "" +#: pyload/views.py:348 pyload/views.py:355 +msgid "unlimited" +msgstr "" + +#: pyload/views.py:350 pyload/views.py:357 +msgid "not available" +msgstr "" +  #: templates/default/base.html:17 templates/default/base.html.py:282  msgid "Webinterface"  msgstr "" @@ -234,7 +242,7 @@ msgid "Input the text on the captcha."  msgstr ""  #: templates/default/captcha.html:28 templates/default/edit_package.html:35 -#: templates/default/settings.html:170 +#: templates/default/settings.html:196  msgid "Submit"  msgstr "" @@ -415,14 +423,38 @@ msgid "Move Package to Collector"  msgstr ""  #: templates/default/settings.html:139 +msgid "Status:" +msgstr "" + +#: templates/default/settings.html:142 +msgid "valid" +msgstr "" + +#: templates/default/settings.html:145 +msgid "not valid" +msgstr "" + +#: templates/default/settings.html:150 +msgid "Valid until:" +msgstr "" + +#: templates/default/settings.html:156 +msgid "Traffic left:" +msgstr "" + +#: templates/default/settings.html:162 +msgid "Time:" +msgstr "" + +#: templates/default/settings.html:166  msgid "Delete? "  msgstr "" -#: templates/default/settings.html:149 +#: templates/default/settings.html:175  msgid "New account:"  msgstr "" -#: templates/default/settings.html:156 +#: templates/default/settings.html:182  msgid "New password:"  msgstr "" diff --git a/locale/gui.pot b/locale/gui.pot index 26e81ef78..68edecea6 100644 --- a/locale/gui.pot +++ b/locale/gui.pot @@ -8,7 +8,7 @@ msgid ""  msgstr ""  "Project-Id-Version: pyLoad 0.4\n"  "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n" -"POT-Creation-Date: 2010-09-23 18:11+0200\n" +"POT-Creation-Date: 2010-10-07 22:49+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,50 +17,50 @@ msgstr ""  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -#: pyLoadGui.py:279 +#: pyLoadGui.py:280  msgid "paused"  msgstr "" -#: pyLoadGui.py:281 +#: pyLoadGui.py:282  msgid "running"  msgstr "" -#: pyLoadGui.py:283 +#: pyLoadGui.py:284  #, python-format  msgid ""  "status: %(status)s  |  speed: %(speed)s kb/s  |  free space: %(freespace)s "  "MiB"  msgstr "" -#: pyLoadGui.py:322 +#: pyLoadGui.py:323  msgid "Unnamed"  msgstr "" -#: pyLoadGui.py:638 +#: pyLoadGui.py:650  #, python-format  msgid "Finished downloading of '%s'"  msgstr "" -#: pyLoadGui.py:640 +#: pyLoadGui.py:652  #, python-format  msgid "Started downloading '%s'"  msgstr "" -#: pyLoadGui.py:642 +#: pyLoadGui.py:654  #, python-format  msgid "Failed downloading '%s'!"  msgstr "" -#: pyLoadGui.py:645 +#: pyLoadGui.py:657  #, python-format  msgid "Added '%s' to queue"  msgstr "" -#: pyLoadGui.py:697 +#: pyLoadGui.py:709  msgid "Show"  msgstr "" -#: pyLoadGui.py:702 module/gui/MainWindow.py:86 +#: pyLoadGui.py:714 module/gui/MainWindow.py:86  msgid "Exit"  msgstr "" @@ -161,19 +161,27 @@ msgstr ""  msgid "Traffic left"  msgstr "" -#: module/gui/SettingsWidget.py:58 +#: module/gui/SettingsWidget.py:73 +msgid "General" +msgstr "" + +#: module/gui/SettingsWidget.py:74 +msgid "Plugins" +msgstr "" + +#: module/gui/SettingsWidget.py:88  msgid "Reload"  msgstr "" -#: module/gui/SettingsWidget.py:60 module/gui/ConnectionManager.py:196 +#: module/gui/SettingsWidget.py:89 module/gui/ConnectionManager.py:196  msgid "Save"  msgstr "" -#: module/gui/SettingsWidget.py:96 +#: module/gui/SettingsWidget.py:195  msgid "Yes"  msgstr "" -#: module/gui/SettingsWidget.py:97 +#: module/gui/SettingsWidget.py:196  msgid "No"  msgstr "" diff --git a/locale/setup.pot b/locale/setup.pot index 506d902f2..575ce6c16 100644 --- a/locale/setup.pot +++ b/locale/setup.pot @@ -8,7 +8,7 @@ msgid ""  msgstr ""  "Project-Id-Version: pyLoad 0.4\n"  "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n" -"POT-Creation-Date: 2010-09-23 18:11+0200\n" +"POT-Creation-Date: 2010-10-07 22:49+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" @@ -245,155 +245,155 @@ msgstr ""  msgid "Your django version is to new, please use django 1.2"  msgstr "" -#: module/setup.py:248 +#: module/setup.py:250  msgid "JS engine"  msgstr "" -#: module/setup.py:254 +#: module/setup.py:256  msgid "## Basic Setup ##"  msgstr "" -#: module/setup.py:257 +#: module/setup.py:259  msgid ""  "The following logindata are only valid for CLI and GUI, but NOT for "  "webinterface."  msgstr "" -#: module/setup.py:258 module/setup.py:303 module/setup.py:346 +#: module/setup.py:260 module/setup.py:305 module/setup.py:348  msgid "Username"  msgstr "" -#: module/setup.py:262 +#: module/setup.py:264  msgid "Language"  msgstr "" -#: module/setup.py:264 +#: module/setup.py:266  msgid "Downloadfolder"  msgstr "" -#: module/setup.py:265 +#: module/setup.py:267  msgid "Max parallel downloads"  msgstr "" -#: module/setup.py:266 +#: module/setup.py:268  msgid ""  "You should disable checksum proofing, if you have low hardware requirements."  msgstr "" -#: module/setup.py:267 +#: module/setup.py:269  msgid "Proof checksum?"  msgstr "" -#: module/setup.py:269 +#: module/setup.py:271  msgid "Use Reconnect?"  msgstr "" -#: module/setup.py:272 +#: module/setup.py:274  msgid "Reconnect script location"  msgstr "" -#: module/setup.py:277 +#: module/setup.py:279  msgid "## Webinterface Setup ##"  msgstr "" -#: module/setup.py:284 +#: module/setup.py:286  msgid "You already have a database for the webinterface."  msgstr "" -#: module/setup.py:285 +#: module/setup.py:287  msgid "Do you want to delete it and make a new one?"  msgstr "" -#: module/setup.py:302 +#: module/setup.py:304  msgid ""  "If you see no errors, your db should be fine and we're adding an user now."  msgstr "" -#: module/setup.py:319 +#: module/setup.py:321  msgid "Activate webinterface?"  msgstr "" -#: module/setup.py:321 +#: module/setup.py:323  msgid ""  "Listen address, if you use 127.0.0.1 or localhost, the webinterface will "  "only accessible locally."  msgstr "" -#: module/setup.py:322 +#: module/setup.py:324  msgid "Address"  msgstr "" -#: module/setup.py:323 +#: module/setup.py:325  msgid "Port"  msgstr "" -#: module/setup.py:328 +#: module/setup.py:330  msgid "## SSL Setup ##"  msgstr "" -#: module/setup.py:330 +#: module/setup.py:332  msgid "Execute these commands from pyLoad folder to make ssl certificates:"  msgstr "" -#: module/setup.py:336 +#: module/setup.py:338  msgid "If you're done and everything went fine, you can activate ssl now."  msgstr "" -#: module/setup.py:338 +#: module/setup.py:340  msgid "Activate SSL?"  msgstr "" -#: module/setup.py:344 +#: module/setup.py:346  msgid "Setting new username and password"  msgstr "" -#: module/setup.py:355 +#: module/setup.py:357  msgid "Setting new configpath, current configuration will not be transfered!"  msgstr "" -#: module/setup.py:356 +#: module/setup.py:358  msgid "Configpath"  msgstr "" -#: module/setup.py:364 +#: module/setup.py:366  msgid "Configpath changed, setup will now close, please restart to go on."  msgstr "" -#: module/setup.py:365 +#: module/setup.py:367  msgid "Press Enter to exit."  msgstr "" -#: module/setup.py:369 +#: module/setup.py:371  #, python-format  msgid "Setting config path failed: %s"  msgstr "" -#: module/setup.py:374 +#: module/setup.py:376  #, python-format  msgid "%s: OK"  msgstr "" -#: module/setup.py:376 +#: module/setup.py:378  #, python-format  msgid "%s: missing"  msgstr "" -#: module/setup.py:419 +#: module/setup.py:421  msgid "Password: "  msgstr "" -#: module/setup.py:424 +#: module/setup.py:426  msgid "Password to short. Use at least 4 symbols."  msgstr "" -#: module/setup.py:430 +#: module/setup.py:432  msgid "Password (again): "  msgstr "" -#: module/setup.py:437 +#: module/setup.py:439  msgid "Passwords did not match."  msgstr "" -#: module/setup.py:451 module/setup.py:462 +#: module/setup.py:453 module/setup.py:464  msgid "Invalid Input"  msgstr "" diff --git a/module/PluginThread.py b/module/PluginThread.py index 296b51bb3..3ee299f72 100644 --- a/module/PluginThread.py +++ b/module/PluginThread.py @@ -214,8 +214,8 @@ class DownloadThread(PluginThread):                  code, msg = e -                if code in (7,52,56,28): -                    self.m.log.warning(_("Couldn't connect to host waiting 1 minute and retry.")) +                if code in (7, 18, 28, 52, 56): +                    self.m.log.warning(_("Couldn't connect to host or connection resetted waiting 1 minute and retry."))                      wait = time() + 60                      while time() < wait:                          sleep(1) diff --git a/module/network/Request.py b/module/network/Request.py index 03b69f528..f9941d74c 100755 --- a/module/network/Request.py +++ b/module/network/Request.py @@ -89,8 +89,8 @@ class Request:          self.pycurl.setopt(pycurl.HEADERFUNCTION, self.write_header)          #self.pycurl.setopt(pycurl.BUFFERSIZE, self.bufferSize)          self.pycurl.setopt(pycurl.SSL_VERIFYPEER, 0) -        self.pycurl.setopt(pycurl.LOW_SPEED_TIME, 20) -        self.pycurl.setopt(pycurl.LOW_SPEED_LIMIT, 100) +        self.pycurl.setopt(pycurl.LOW_SPEED_TIME, 30) +        self.pycurl.setopt(pycurl.LOW_SPEED_LIMIT, 20)          if self.debug:              self.pycurl.setopt(pycurl.VERBOSE, 1) diff --git a/module/plugins/Account.py b/module/plugins/Account.py index d0beaa8dc..19ab8f4ba 100644 --- a/module/plugins/Account.py +++ b/module/plugins/Account.py @@ -47,11 +47,11 @@ class Account():          try:              self.login(user, data)          except WrongPassword: -            self.core.log.warning(_("Could not login with %s account %s | %s") % (self.__name__, user, _("Wrong Password"))) +            self.core.log.warning(_("Could not login with %(plugin)s account %(user)s | %(msg)s") % {"plugin": self.__name__, "user": user, "msg": _("Wrong Password")})              data["valid"] = False          except Exception, e: -            self.core.log.warning(_("Could not login with %s account %s | %s") % (self.__name__, user, e)) +            self.core.log.warning(_("Could not login with %(plugin)s account %(user)s | %(msg)s") % {"plugin" :self.__name__, "user": user, "msg": e})              data["valid"] = False              if self.core.debug:                  print_exc() diff --git a/module/web/settings.py b/module/web/settings.py index 4dfe50fdc..c087cc6bf 100644 --- a/module/web/settings.py +++ b/module/web/settings.py @@ -27,7 +27,6 @@ sys.path.append(pypath)  config = None
  #os.chdir(PROJECT_DIR) # UNCOMMENT FOR LOCALE GENERATION
 -#DEBUG = config.get("general","debug")
  try:
      import module.web.ServerThread
 @@ -55,6 +54,8 @@ except:      PYLOAD = xmlrpclib.ServerProxy(server_url, allow_none=True)
 +DEBUG = config.get("general","debug_mode")
 +
  from module.JsEngine import JsEngine
  JS = JsEngine()
 diff --git a/pyLoadCore.py b/pyLoadCore.py index bb518755b..46ca289a1 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -230,12 +230,12 @@ class Core(object):          self.check_install("Crypto", _("pycrypto to decode container files"))          img = self.check_install("Image", _("Python Image Libary (PIL) for captcha reading")) -        self.check_install("pycurl", _("pycurl to download any files"), True, True) +        #self.check_install("pycurl", _("pycurl to download any files"), True, True)          self.check_install("django", _("Django for webinterface"))          self.check_file("tmp", _("folder for temporary files"), True) -        #tesser = self.check_install("tesseract", _("tesseract for captcha reading"), False) +        tesser = self.check_install("tesseract", _("tesseract for captcha reading"), False) if os.name != "nt" else True -        self.captcha = img +        self.captcha = img and tesser          self.check_file(self.config['general']['download_folder'], _("folder for downloads"), True)          self.check_file("links.txt", _("file for links")) | 
