diff options
| -rw-r--r-- | locale/cli.pot | 68 | ||||
| -rw-r--r-- | locale/core.pot | 98 | ||||
| -rw-r--r-- | locale/gui.pot | 146 | ||||
| -rw-r--r-- | locale/setup.pot | 156 | ||||
| -rw-r--r-- | module/gui/ConnectionManager.py | 3 | ||||
| -rw-r--r-- | module/gui/Queue.py | 4 | ||||
| -rw-r--r-- | module/gui/connector.py | 7 | ||||
| -rw-r--r-- | module/plugins/hoster/NetloadIn.py | 2 |
8 files changed, 273 insertions, 211 deletions
diff --git a/locale/cli.pot b/locale/cli.pot index e8ad11be8..c1987d0c8 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-08-31 21:21+0200\n" +"POT-Creation-Date: 2010-09-05 11:46+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,139 +17,139 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: pyLoadCli.py:60 +#: pyLoadCli.py:59 msgid "pyLoadCore not running" msgstr "" -#: pyLoadCli.py:65 +#: pyLoadCli.py:64 msgid "Linklist added" msgstr "" -#: pyLoadCli.py:71 pyLoadCli.py:130 +#: pyLoadCli.py:70 pyLoadCli.py:129 msgid " Command Line Interface" msgstr "" -#: pyLoadCli.py:132 +#: pyLoadCli.py:131 #, python-format msgid "%s Downloads:" msgstr "" -#: pyLoadCli.py:142 +#: pyLoadCli.py:141 msgid " Speed: " msgstr "" -#: pyLoadCli.py:142 +#: pyLoadCli.py:141 msgid " Size: " msgstr "" -#: pyLoadCli.py:142 +#: pyLoadCli.py:141 msgid " Finished in: " msgstr "" -#: pyLoadCli.py:142 +#: pyLoadCli.py:141 msgid " ID: " msgstr "" -#: pyLoadCli.py:147 +#: pyLoadCli.py:146 msgid "waiting: " msgstr "" -#: pyLoadCli.py:153 pyLoadCli.py:155 +#: pyLoadCli.py:152 pyLoadCli.py:154 msgid "Status: " msgstr "" -#: pyLoadCli.py:153 pyLoadCli.py:155 +#: pyLoadCli.py:152 pyLoadCli.py:154 msgid " total Speed: " msgstr "" -#: pyLoadCli.py:153 pyLoadCli.py:155 +#: pyLoadCli.py:152 pyLoadCli.py:154 msgid " Files in queue: " msgstr "" -#: pyLoadCli.py:167 +#: pyLoadCli.py:166 msgid "Menu:" msgstr "" -#: pyLoadCli.py:172 +#: pyLoadCli.py:171 msgid " Add Links" msgstr "" -#: pyLoadCli.py:174 +#: pyLoadCli.py:173 msgid " Manage Links" msgstr "" -#: pyLoadCli.py:176 +#: pyLoadCli.py:175 msgid " (Un)Pause Server" msgstr "" -#: pyLoadCli.py:178 +#: pyLoadCli.py:177 msgid " Kill Server" msgstr "" -#: pyLoadCli.py:180 +#: pyLoadCli.py:179 msgid " Quit" msgstr "" -#: pyLoadCli.py:190 +#: pyLoadCli.py:189 msgid "Name your package." msgstr "" -#: pyLoadCli.py:200 pyLoadCli.py:217 pyLoadCli.py:257 +#: pyLoadCli.py:199 pyLoadCli.py:216 pyLoadCli.py:256 msgid " back to main menu" msgstr "" -#: pyLoadCli.py:205 +#: pyLoadCli.py:204 #, python-format msgid "Package: %s" msgstr "" -#: pyLoadCli.py:207 +#: pyLoadCli.py:206 msgid "Parse the links you want to add." msgstr "" -#: pyLoadCli.py:209 +#: pyLoadCli.py:208 #, python-format msgid "Type %s when done." msgstr "" -#: pyLoadCli.py:211 +#: pyLoadCli.py:210 msgid "Links added: " msgstr "" -#: pyLoadCli.py:223 +#: pyLoadCli.py:222 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:239 +#: pyLoadCli.py:238 msgid "Type d(number) of the link you want to delete or r(number) to restart." msgstr "" -#: pyLoadCli.py:255 +#: pyLoadCli.py:254 msgid " - previous" msgstr "" -#: pyLoadCli.py:255 +#: pyLoadCli.py:254 msgid " - next" msgstr "" -#: pyLoadCli.py:531 +#: pyLoadCli.py:530 msgid "Username: " msgstr "" -#: pyLoadCli.py:532 +#: pyLoadCli.py:531 msgid "address: " msgstr "" -#: pyLoadCli.py:534 +#: pyLoadCli.py:533 msgid "Use SSL? ([y]/n): " msgstr "" -#: pyLoadCli.py:539 +#: pyLoadCli.py:538 msgid "Port: " msgstr "" -#: pyLoadCli.py:542 +#: pyLoadCli.py:541 msgid "Password: " msgstr "" diff --git a/locale/core.pot b/locale/core.pot index f3bf7ad80..c0c178fa7 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-08-31 21:21+0200\n" +"POT-Creation-Date: 2010-09-05 11:46+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" @@ -25,112 +25,116 @@ msgstr "" msgid "folder for logs" msgstr "" -#: pyLoadCore.py:198 +#: pyLoadCore.py:199 #, python-format msgid "Using home directory: %s" msgstr "" -#: pyLoadCore.py:202 +#: pyLoadCore.py:203 msgid "pycrypto to decode container files" msgstr "" -#: pyLoadCore.py:203 +#: pyLoadCore.py:204 msgid "Python Image Libary (PIL) for captcha reading" msgstr "" -#: pyLoadCore.py:204 +#: pyLoadCore.py:205 msgid "pycurl to download any files" msgstr "" -#: pyLoadCore.py:205 +#: pyLoadCore.py:206 msgid "Django for webinterface" msgstr "" -#: pyLoadCore.py:206 +#: pyLoadCore.py:207 msgid "folder for temporary files" msgstr "" -#: pyLoadCore.py:209 +#: pyLoadCore.py:212 msgid "folder for downloads" msgstr "" -#: pyLoadCore.py:210 +#: pyLoadCore.py:213 msgid "file for links" msgstr "" -#: pyLoadCore.py:213 +#: pyLoadCore.py:216 msgid "OpenSSL for secure connection" msgstr "" -#: pyLoadCore.py:233 +#: pyLoadCore.py:236 #, python-format msgid "Downloadtime: %s" msgstr "" -#: pyLoadCore.py:242 +#: pyLoadCore.py:245 #, python-format msgid "Free space: %sGB" msgstr "" -#: pyLoadCore.py:244 +#: pyLoadCore.py:247 #, python-format msgid "Free space: %sMB" msgstr "" -#: pyLoadCore.py:280 +#: pyLoadCore.py:268 +msgid "links.txt could not be cleared" +msgstr "" + +#: pyLoadCore.py:283 msgid "restarting pyLoad" msgstr "" -#: pyLoadCore.py:284 +#: pyLoadCore.py:287 msgid "pyLoad quits" msgstr "" -#: pyLoadCore.py:298 +#: pyLoadCore.py:301 msgid "Secure XMLRPC Server Started" msgstr "" -#: pyLoadCore.py:300 +#: pyLoadCore.py:303 msgid "SSL Certificates not found, fallback to auth XMLRPC server" msgstr "" -#: pyLoadCore.py:302 pyLoadCore.py:305 +#: pyLoadCore.py:305 pyLoadCore.py:308 msgid "Auth XMLRPC Server Started" msgstr "" -#: pyLoadCore.py:311 +#: pyLoadCore.py:314 #, python-format msgid "Failed starting XMLRPC server CLI and GUI will not be available: %s" msgstr "" -#: pyLoadCore.py:347 +#: pyLoadCore.py:353 #, python-format msgid "Install %s" msgstr "" -#: pyLoadCore.py:380 +#: pyLoadCore.py:388 #, python-format msgid "could not find %(desc)s: %(name)s" msgstr "" -#: pyLoadCore.py:382 +#: pyLoadCore.py:390 #, python-format msgid "could not create %(desc)s: %(name)s" msgstr "" -#: pyLoadCore.py:407 +#: pyLoadCore.py:415 msgid "shutting down..." msgstr "" -#: pyLoadCore.py:422 +#: pyLoadCore.py:430 msgid "error while shutting down" msgstr "" -#: pyLoadCore.py:548 +#: pyLoadCore.py:560 #, python-format msgid "Added package %(name)s containing %(count)d links" msgstr "" -#: pyLoadCore.py:716 +#: pyLoadCore.py:731 msgid "killed pyLoad from Terminal" msgstr "" @@ -231,13 +235,13 @@ msgstr "" msgid "unknown" msgstr "" -#: module/FileDatabase.py:451 module/plugins/hooks/IRCInterface.py:68 +#: module/FileDatabase.py:453 module/plugins/hooks/IRCInterface.py:68 #: module/plugins/hooks/XMPPInterface.py:75 #, python-format msgid "Package finished: %s" msgstr "" -#: module/FileDatabase.py:549 +#: module/FileDatabase.py:551 msgid "Filedatabase was deleted due to incompatible version." msgstr "" @@ -292,7 +296,7 @@ msgstr "" msgid "Download starts: %s" msgstr "" -#: module/PluginThread.py:142 module/PluginThread.py:275 +#: module/PluginThread.py:142 module/PluginThread.py:276 #, python-format msgid "Plugin %s is missing a function." msgstr "" @@ -307,31 +311,31 @@ msgstr "" msgid "Download restarted: %s" msgstr "" -#: module/PluginThread.py:175 module/PluginThread.py:284 +#: module/PluginThread.py:175 module/PluginThread.py:285 #, python-format msgid "Download is offline: %s" msgstr "" -#: module/PluginThread.py:178 module/PluginThread.py:207 +#: module/PluginThread.py:178 module/PluginThread.py:208 #, python-format msgid "Download failed: %(name)s | %(msg)s" msgstr "" -#: module/PluginThread.py:195 +#: module/PluginThread.py:191 msgid "Couldn't connect to host waiting 1 minute and retry." msgstr "" -#: module/PluginThread.py:224 +#: module/PluginThread.py:225 #, python-format msgid "Download finished: %s" msgstr "" -#: module/PluginThread.py:270 +#: module/PluginThread.py:271 #, python-format msgid "Decrypting starts: %s" msgstr "" -#: module/PluginThread.py:287 module/PluginThread.py:296 +#: module/PluginThread.py:288 module/PluginThread.py:297 #, python-format msgid "Decrypting failed: %(name)s | %(msg)s" msgstr "" @@ -464,6 +468,18 @@ msgstr "" msgid "New version of %(type)s|%(name)s : %(version).2f" msgstr "" +#: module/plugins/hoster/MegauploadCom.py:87 +#, python-format +msgid "" +"%s: Megaupload is currently blocking your IP. Try again later, manually." +msgstr "" + +#: module/plugins/hoster/MegauploadCom.py:123 +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:71 #, python-format @@ -488,22 +504,26 @@ msgstr "" msgid "Rapidshare: No free slots!" msgstr "" -#: module/plugins/hoster/NetloadIn.py:124 +#: module/plugins/hoster/NetloadIn.py:104 +msgid "No API Data was send" +msgstr "" + +#: module/plugins/hoster/NetloadIn.py:130 #, python-format msgid "Netload: final wait %d seconds" msgstr "" -#: module/plugins/hoster/NetloadIn.py:133 +#: module/plugins/hoster/NetloadIn.py:139 #, python-format msgid "Netload: try number %d " msgstr "" -#: module/plugins/hoster/NetloadIn.py:146 +#: module/plugins/hoster/NetloadIn.py:152 #, python-format msgid "Netload: waiting between downloads %d s." msgstr "" -#: module/plugins/hoster/NetloadIn.py:176 +#: module/plugins/hoster/NetloadIn.py:183 #, python-format msgid "Netload: waiting for captcha %d s." msgstr "" diff --git a/locale/gui.pot b/locale/gui.pot index 9821872ae..46154271c 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-08-31 21:21+0200\n" +"POT-Creation-Date: 2010-09-05 11:46+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,48 +17,50 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: pyLoadGui.py:272 -msgid "Paused" +#: pyLoadGui.py:279 +msgid "paused" msgstr "" -#: pyLoadGui.py:274 -msgid "Running" +#: pyLoadGui.py:281 +msgid "running" msgstr "" -#: pyLoadGui.py:276 +#: pyLoadGui.py:283 #, python-format -msgid "Status: %(status)s | Speed: %(speed)s kb/s" +msgid "" +"status: %(status)s | speed: %(speed)s kb/s | free space: %(freespace)s " +"MiB" msgstr "" -#: pyLoadGui.py:315 +#: pyLoadGui.py:322 msgid "Unnamed" msgstr "" -#: pyLoadGui.py:602 +#: pyLoadGui.py:632 #, python-format msgid "Finished downloading of '%s'" msgstr "" -#: pyLoadGui.py:604 +#: pyLoadGui.py:634 #, python-format msgid "Started downloading '%s'" msgstr "" -#: pyLoadGui.py:606 +#: pyLoadGui.py:636 #, python-format msgid "Failed downloading '%s'!" msgstr "" -#: pyLoadGui.py:609 +#: pyLoadGui.py:639 #, python-format msgid "Added '%s' to queue" msgstr "" -#: pyLoadGui.py:645 +#: pyLoadGui.py:690 msgid "Show" msgstr "" -#: pyLoadGui.py:650 module/gui/MainWindow.py:74 +#: pyLoadGui.py:695 module/gui/MainWindow.py:86 msgid "Exit" msgstr "" @@ -107,7 +109,7 @@ msgstr "" msgid "Reload" msgstr "" -#: module/gui/SettingsWidget.py:60 module/gui/ConnectionManager.py:156 +#: module/gui/SettingsWidget.py:60 module/gui/ConnectionManager.py:196 msgid "Save" msgstr "" @@ -120,56 +122,68 @@ msgid "No" msgstr "" #: module/gui/ConnectionManager.py:33 +msgid "pyLoad ConnectionManager" +msgstr "" + +#: module/gui/ConnectionManager.py:38 msgid "New" msgstr "" -#: module/gui/ConnectionManager.py:34 +#: module/gui/ConnectionManager.py:39 msgid "Edit" msgstr "" -#: module/gui/ConnectionManager.py:35 module/gui/MainWindow.py:199 -#: module/gui/MainWindow.py:238 +#: module/gui/ConnectionManager.py:40 module/gui/MainWindow.py:211 +#: module/gui/MainWindow.py:250 msgid "Remove" msgstr "" -#: module/gui/ConnectionManager.py:36 +#: module/gui/ConnectionManager.py:41 msgid "Connect" msgstr "" -#: module/gui/ConnectionManager.py:76 +#: module/gui/ConnectionManager.py:47 +msgid "Connect:" +msgstr "" + +#: module/gui/ConnectionManager.py:64 +msgid "Use internal Core:" +msgstr "" + +#: module/gui/ConnectionManager.py:108 #, python-format msgid "%s (Default)" msgstr "" -#: module/gui/ConnectionManager.py:138 +#: module/gui/ConnectionManager.py:178 msgid "Name:" msgstr "" -#: module/gui/ConnectionManager.py:139 +#: module/gui/ConnectionManager.py:179 msgid "Host:" msgstr "" -#: module/gui/ConnectionManager.py:140 +#: module/gui/ConnectionManager.py:180 msgid "SSL:" msgstr "" -#: module/gui/ConnectionManager.py:141 +#: module/gui/ConnectionManager.py:181 msgid "Local:" msgstr "" -#: module/gui/ConnectionManager.py:142 +#: module/gui/ConnectionManager.py:182 msgid "User:" msgstr "" -#: module/gui/ConnectionManager.py:143 +#: module/gui/ConnectionManager.py:183 msgid "Password:" msgstr "" -#: module/gui/ConnectionManager.py:144 +#: module/gui/ConnectionManager.py:184 msgid "Port:" msgstr "" -#: module/gui/ConnectionManager.py:157 module/gui/CaptchaDock.py:57 +#: module/gui/ConnectionManager.py:197 module/gui/CaptchaDock.py:57 msgid "Cancel" msgstr "" @@ -177,144 +191,148 @@ msgstr "" msgid "pyLoad Client" msgstr "" -#: module/gui/MainWindow.py:64 +#: module/gui/MainWindow.py:76 msgid "Status: Not Connected" msgstr "" -#: module/gui/MainWindow.py:69 +#: module/gui/MainWindow.py:81 msgid "File" msgstr "" -#: module/gui/MainWindow.py:70 +#: module/gui/MainWindow.py:82 msgid "Connections" msgstr "" -#: module/gui/MainWindow.py:75 +#: module/gui/MainWindow.py:87 msgid "Connection manager" msgstr "" -#: module/gui/MainWindow.py:97 +#: module/gui/MainWindow.py:109 msgid "Queue" msgstr "" -#: module/gui/MainWindow.py:98 +#: module/gui/MainWindow.py:110 msgid "Collector" msgstr "" -#: module/gui/MainWindow.py:99 +#: module/gui/MainWindow.py:111 msgid "Accounts" msgstr "" -#: module/gui/MainWindow.py:100 +#: module/gui/MainWindow.py:112 msgid "Settings" msgstr "" -#: module/gui/MainWindow.py:101 +#: module/gui/MainWindow.py:113 msgid "Log" msgstr "" -#: module/gui/MainWindow.py:129 +#: module/gui/MainWindow.py:141 msgid "Main Toolbar" msgstr "" -#: module/gui/MainWindow.py:132 +#: module/gui/MainWindow.py:144 msgid "Toggle Pause/Resume" msgstr "" -#: module/gui/MainWindow.py:138 +#: module/gui/MainWindow.py:150 msgid "Stop" msgstr "" -#: module/gui/MainWindow.py:140 +#: module/gui/MainWindow.py:152 msgid "Add" msgstr "" -#: module/gui/MainWindow.py:142 +#: module/gui/MainWindow.py:154 msgid "Check Clipboard" msgstr "" -#: module/gui/MainWindow.py:149 +#: module/gui/MainWindow.py:161 msgid "Package" msgstr "" -#: module/gui/MainWindow.py:150 +#: module/gui/MainWindow.py:162 msgid "Container" msgstr "" -#: module/gui/MainWindow.py:166 +#: module/gui/MainWindow.py:178 msgid "Push selected packages to queue" msgstr "" -#: module/gui/MainWindow.py:200 +#: module/gui/MainWindow.py:212 msgid "Restart" msgstr "" -#: module/gui/MainWindow.py:201 +#: module/gui/MainWindow.py:213 msgid "Pull out" msgstr "" -#: module/gui/MainWindow.py:202 +#: module/gui/MainWindow.py:214 msgid "Abort" msgstr "" -#: module/gui/MainWindow.py:203 module/gui/MainWindow.py:240 +#: module/gui/MainWindow.py:215 module/gui/MainWindow.py:252 msgid "Edit Name" msgstr "" -#: module/gui/MainWindow.py:204 module/gui/Queue.py:85 +#: module/gui/MainWindow.py:216 module/gui/Queue.py:85 msgid "Priority" msgstr "" -#: module/gui/MainWindow.py:206 +#: module/gui/MainWindow.py:218 msgid "very high" msgstr "" -#: module/gui/MainWindow.py:208 +#: module/gui/MainWindow.py:220 msgid "high" msgstr "" -#: module/gui/MainWindow.py:210 +#: module/gui/MainWindow.py:222 msgid "normal" msgstr "" -#: module/gui/MainWindow.py:212 +#: module/gui/MainWindow.py:224 msgid "low" msgstr "" -#: module/gui/MainWindow.py:214 +#: module/gui/MainWindow.py:226 msgid "very low" msgstr "" -#: module/gui/MainWindow.py:239 +#: module/gui/MainWindow.py:251 msgid "Push to queue" msgstr "" -#: module/gui/MainWindow.py:303 +#: module/gui/MainWindow.py:253 +msgid "Refresh Status" +msgstr "" + +#: module/gui/MainWindow.py:318 #, python-format msgid "All Container Types (%s)" msgstr "" -#: module/gui/MainWindow.py:304 +#: module/gui/MainWindow.py:319 #, python-format msgid "DLC (%s)" msgstr "" -#: module/gui/MainWindow.py:305 +#: module/gui/MainWindow.py:320 #, python-format msgid "CCF (%s)" msgstr "" -#: module/gui/MainWindow.py:306 +#: module/gui/MainWindow.py:321 #, python-format msgid "RSDF (%s)" msgstr "" -#: module/gui/MainWindow.py:307 +#: module/gui/MainWindow.py:322 #, python-format msgid "Text Files (%s)" msgstr "" -#: module/gui/MainWindow.py:309 +#: module/gui/MainWindow.py:324 msgid "Open container" msgstr "" @@ -339,5 +357,9 @@ msgid "OK" msgstr "" #: module/gui/Queue.py:87 +msgid "ETA" +msgstr "" + +#: module/gui/Queue.py:89 msgid "Progress" msgstr "" diff --git a/locale/setup.pot b/locale/setup.pot index 5e99b41c3..19ea6de37 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-08-31 21:21+0200\n" +"POT-Creation-Date: 2010-09-05 11:46+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" @@ -94,288 +94,306 @@ msgstr "" msgid "Webinterface" msgstr "" -#: module/setup.py:94 +#: module/setup.py:88 +msgid "extended Click'N'Load" +msgstr "" + +#: module/setup.py:95 msgid "Features available:" msgstr "" -#: module/setup.py:98 +#: module/setup.py:99 msgid "Featues missing: " msgstr "" -#: module/setup.py:102 +#: module/setup.py:103 msgid "no py-crypto available" msgstr "" -#: module/setup.py:103 +#: module/setup.py:104 msgid "You need this if you want to decrypt container files." msgstr "" -#: module/setup.py:107 +#: module/setup.py:108 msgid "no SSL available" msgstr "" -#: module/setup.py:108 +#: module/setup.py:109 msgid "" "This is needed if you want to establish a secure connection to core or " "webinterface." msgstr "" -#: module/setup.py:109 +#: module/setup.py:110 msgid "If you only want to access locally to pyLoad ssl is not usefull." msgstr "" -#: module/setup.py:113 +#: module/setup.py:114 msgid "no Captcha Recognition available" msgstr "" -#: module/setup.py:114 +#: module/setup.py:115 msgid "Only needed for some hosters and as freeuser." msgstr "" -#: module/setup.py:118 +#: module/setup.py:119 msgid "Gui not available" msgstr "" -#: module/setup.py:119 +#: module/setup.py:120 msgid "The Graphical User Interface." msgstr "" -#: module/setup.py:123 +#: module/setup.py:124 msgid "no Webinterface available" msgstr "" -#: module/setup.py:124 +#: module/setup.py:125 msgid "Gives abillity to control pyLoad with your webbrowser." msgstr "" -#: module/setup.py:127 +#: module/setup.py:129 +msgid "no JavaScript engine found" +msgstr "" + +#: module/setup.py:130 +msgid "" +"You will need this for some Click'N'Load links. Install Spidermonkey or ossp-" +"js" +msgstr "" + +#: module/setup.py:132 msgid "You can abort the setup now and fix some dependicies if you want." msgstr "" -#: module/setup.py:129 +#: module/setup.py:134 msgid "Continue with setup?" msgstr "" -#: module/setup.py:135 +#: module/setup.py:140 #, python-format msgid "Do you want to change the config path? Current is %s" msgstr "" -#: module/setup.py:136 +#: module/setup.py:141 msgid "" "If you use pyLoad on a server or the home partition lives on an iternal " "flash it may be a good idea to change it." msgstr "" -#: module/setup.py:137 +#: module/setup.py:142 msgid "Change config path?" msgstr "" -#: module/setup.py:144 +#: module/setup.py:149 msgid "Do you want to configure basic settings?" msgstr "" -#: module/setup.py:145 +#: module/setup.py:150 msgid "This is recommend for first run." msgstr "" -#: module/setup.py:146 +#: module/setup.py:151 msgid "Make basic setup?" msgstr "" -#: module/setup.py:153 +#: module/setup.py:158 msgid "Do you want to configure ssl?" msgstr "" -#: module/setup.py:154 +#: module/setup.py:159 msgid "Configure ssl?" msgstr "" -#: module/setup.py:160 +#: module/setup.py:165 msgid "Do you want to configure webinterface?" msgstr "" -#: module/setup.py:161 +#: module/setup.py:166 msgid "Configure webinterface?" msgstr "" -#: module/setup.py:166 +#: module/setup.py:171 msgid "Setup finished successfully." msgstr "" -#: module/setup.py:167 +#: module/setup.py:172 msgid "Hit enter to exit and restart pyLoad" msgstr "" -#: module/setup.py:173 +#: module/setup.py:178 msgid "## System Check ##" msgstr "" -#: module/setup.py:178 +#: module/setup.py:183 msgid "Your python version is to new, Please use Python 2.6/2.7" msgstr "" -#: module/setup.py:181 +#: module/setup.py:186 msgid "Your python version is to old, Please use at least Python 2.5" msgstr "" -#: module/setup.py:184 +#: module/setup.py:189 msgid "Python Version: OK" msgstr "" -#: module/setup.py:232 +#: module/setup.py:236 msgid "Your django version is to old, please upgrade to django 1.1" msgstr "" -#: module/setup.py:235 +#: module/setup.py:239 msgid "Your django version is to new, please use django 1.2" msgstr "" -#: module/setup.py:247 +#: module/setup.py:248 +msgid "JS engine" +msgstr "" + +#: module/setup.py:254 msgid "## Basic Setup ##" msgstr "" -#: module/setup.py:250 +#: module/setup.py:257 msgid "" "The following logindata are only valid for CLI and GUI, but NOT for " "webinterface." msgstr "" -#: module/setup.py:251 module/setup.py:295 module/setup.py:338 +#: module/setup.py:258 module/setup.py:302 module/setup.py:345 msgid "Username" msgstr "" -#: module/setup.py:255 +#: module/setup.py:262 msgid "Language" msgstr "" -#: module/setup.py:256 +#: module/setup.py:263 msgid "Downloadfolder" msgstr "" -#: module/setup.py:257 +#: module/setup.py:264 msgid "Max parallel downloads" msgstr "" -#: module/setup.py:258 +#: module/setup.py:265 msgid "" "You should disable checksum proofing, if you have low hardware requirements." msgstr "" -#: module/setup.py:259 +#: module/setup.py:266 msgid "Proof checksum?" msgstr "" -#: module/setup.py:261 +#: module/setup.py:268 msgid "Use Reconnect?" msgstr "" -#: module/setup.py:264 +#: module/setup.py:271 msgid "Reconnect script location" msgstr "" -#: module/setup.py:269 +#: module/setup.py:276 msgid "## Webinterface Setup ##" msgstr "" -#: module/setup.py:276 +#: module/setup.py:283 msgid "You already have a database for the webinterface." msgstr "" -#: module/setup.py:277 +#: module/setup.py:284 msgid "Do you want to delete it and make a new one?" msgstr "" -#: module/setup.py:294 +#: module/setup.py:301 msgid "" "If you see no errors, your db should be fine and we're adding an user now." msgstr "" -#: module/setup.py:311 +#: module/setup.py:318 msgid "Activate webinterface?" msgstr "" -#: module/setup.py:313 +#: module/setup.py:320 msgid "" "Listen address, if you use 127.0.0.1 or localhost, the webinterface will " "only accessible locally." msgstr "" -#: module/setup.py:314 +#: module/setup.py:321 msgid "Address" msgstr "" -#: module/setup.py:315 +#: module/setup.py:322 msgid "Port" msgstr "" -#: module/setup.py:320 +#: module/setup.py:327 msgid "## SSL Setup ##" msgstr "" -#: module/setup.py:322 +#: module/setup.py:329 msgid "Execute these commands from pyLoad folder to make ssl certificates:" msgstr "" -#: module/setup.py:328 +#: module/setup.py:335 msgid "If you're done and everything went fine, you can activate ssl now." msgstr "" -#: module/setup.py:330 +#: module/setup.py:337 msgid "Activate SSL?" msgstr "" -#: module/setup.py:336 +#: module/setup.py:343 msgid "Setting new username and password" msgstr "" -#: module/setup.py:347 +#: module/setup.py:354 msgid "Setting new configpath, current configuration will not be transfered!" msgstr "" -#: module/setup.py:348 +#: module/setup.py:355 msgid "Configpath" msgstr "" -#: module/setup.py:356 +#: module/setup.py:363 msgid "Configpath changed, setup will now close, please restart to go on." msgstr "" -#: module/setup.py:357 +#: module/setup.py:364 msgid "Press Enter to exit." msgstr "" -#: module/setup.py:361 +#: module/setup.py:368 #, python-format msgid "Setting config path failed: %s" msgstr "" -#: module/setup.py:366 +#: module/setup.py:373 #, python-format msgid "%s: OK" msgstr "" -#: module/setup.py:368 +#: module/setup.py:375 #, python-format msgid "%s: missing" msgstr "" -#: module/setup.py:407 +#: module/setup.py:414 msgid "Password: " msgstr "" -#: module/setup.py:410 +#: module/setup.py:417 msgid "Password to short. Use at least 4 symbols." msgstr "" -#: module/setup.py:413 +#: module/setup.py:420 msgid "Password (again): " msgstr "" -#: module/setup.py:418 +#: module/setup.py:425 msgid "Passwords did not match." msgstr "" -#: module/setup.py:432 module/setup.py:443 +#: module/setup.py:439 module/setup.py:450 msgid "Invalid Input" msgstr "" diff --git a/module/gui/ConnectionManager.py b/module/gui/ConnectionManager.py index 2a63698a0..021bd6bdd 100644 --- a/module/gui/ConnectionManager.py +++ b/module/gui/ConnectionManager.py @@ -51,6 +51,7 @@ class ConnectionManager(QWidget): #line.setFixedWidth(100) line.setFrameShape(line.HLine) line.setFrameShadow(line.Sunken) + line.setFixedHeight(10) boxLayout.addWidget(line) @@ -60,7 +61,7 @@ class ConnectionManager(QWidget): form.setAlignment(Qt.AlignRight) checkbox = QCheckBox() - form.addRow(_("Use internal Core"), checkbox) + form.addRow(_("Use internal Core:"), checkbox) boxLayout.addLayout(form) diff --git a/module/gui/Queue.py b/module/gui/Queue.py index 42e92c61a..ca527bb2c 100644 --- a/module/gui/Queue.py +++ b/module/gui/Queue.py @@ -216,8 +216,8 @@ class QueueView(CollectorView): self.setColumnWidth(1, 100) self.setColumnWidth(2, 150) self.setColumnWidth(3, 50) - self.setColumnWidth(4, 50) - self.setColumnWidth(5, 100) + self.setColumnWidth(4, 70) + self.setColumnWidth(5, 80) self.setEditTriggers(QAbstractItemView.NoEditTriggers) diff --git a/module/gui/connector.py b/module/gui/connector.py index 28bfaacc4..2554f4ced 100644 --- a/module/gui/connector.py +++ b/module/gui/connector.py @@ -50,12 +50,13 @@ class Connector(QThread): while not hasattr(self.addr[1], "server_methods"): sleep(1) - self.proxy = DispatchRPC(self.mutex, self.addr[1].server_methods) + self.proxy = self.addr[1].server_methods else: self.proxy = DispatchRPC(self.mutex, ServerProxy(self.addr, allow_none=True, verbose=False)) - self.connect(self.proxy, SIGNAL("proxy_error"), self._proxyError) - self.connect(self.proxy, SIGNAL("connectionLost"), self, SIGNAL("connectionLost")) + self.connect(self.proxy, SIGNAL("proxy_error"), self._proxyError) + self.connect(self.proxy, SIGNAL("connectionLost"), self, SIGNAL("connectionLost")) + try: server_version = self.proxy.get_server_version() self.connectionID = uuid().hex diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index 0a8bbd9af..a8f96aaa3 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -179,7 +179,7 @@ class NetloadIn(Hoster): file_id = re.search('<input name="file_id" type="hidden" value="(.*)" />', page).group(1) if not captchawaited: wait = self.get_wait_time(page) - if i == 1: wait = 1 + if i == 0: wait = 1 # wait only 1 sec contrary to time on website self.log.info(_("Netload: waiting for captcha %d s." % wait)) self.setWait(wait) self.wait() |