Updated locale templates

5 files changed, 659 insertions, 573 deletions

diff --git a/locale/cli.pot b/locale/cli.pot
index 1332687b9..c39b9f0d8 100644
--- a/locale/cli.pot
+++ b/locale/cli.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pyload 0.4.9.9-dev\n"
 "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
-"POT-Creation-Date: 2013-08-10 11:58+0200\n"
+"POT-Creation-Date: 2013-10-13 18:16+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"
@@ -47,6 +47,50 @@ msgstr ""
 msgid " back to main menu"
 msgstr ""
 
+#: pyload/cli/ManageFiles.py:97
+msgid "Manage Packages:"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:99
+msgid "Manage Links:"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:104
+msgid "What do you want to move?"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:106
+msgid "What do you want to delete?"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:108
+msgid "What do you want to restart?"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:113
+msgid "Choose what you want to do, or enter package number."
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:115
+msgid "delete"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:115
+msgid "move"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:115
+msgid "restart"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:148
+msgid " - previous"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:148
+msgid " - next"
+msgstr ""
+
 #: pyload/cli/Cli.py:75 pyload/cli/Cli.py:133
 msgid " Command Line Interface"
 msgstr ""
@@ -249,47 +293,3 @@ msgstr ""
 #: pyload/cli/Cli.py:582
 msgid "Interactive mode ignored since you passed some commands."
 msgstr ""
-
-#: pyload/cli/ManageFiles.py:97
-msgid "Manage Packages:"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:99
-msgid "Manage Links:"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:104
-msgid "What do you want to move?"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:106
-msgid "What do you want to delete?"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:108
-msgid "What do you want to restart?"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:113
-msgid "Choose what you want to do, or enter package number."
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:115
-msgid "delete"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:115
-msgid "move"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:115
-msgid "restart"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:148
-msgid " - previous"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:148
-msgid " - next"
-msgstr ""
diff --git a/locale/core.pot b/locale/core.pot
index a6e5b978f..0fc068d26 100644
--- a/locale/core.pot
+++ b/locale/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pyload 0.4.9.9-dev\n"
 "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
-"POT-Creation-Date: 2013-08-10 11:58+0200\n"
+"POT-Creation-Date: 2013-10-13 18:16+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,16 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pyload/AccountManager.py:49
-#, python-format
-msgid "Unknown account plugin %s"
-msgstr ""
-
-#: pyload/AccountManager.py:71
-#, python-format
-msgid "Could not load account %s"
-msgstr ""
-
 #: pyload/AddonManager.py:62
 #, python-format
 msgid "Error when executing %s"
@@ -55,19 +45,33 @@ msgstr ""
 msgid "Deactivating Plugins..."
 msgstr ""
 
-#: pyload/api/DownloadApi.py:44
-#, python-format
-msgid "Added package %(name)s as folder %(folder)s"
+#: pyload/web/ServerThread.py:49
+msgid "SSL certificates not found."
 msgstr ""
 
-#: pyload/api/DownloadApi.py:95
-#, python-format
-msgid "Added %d links to package"
+#: pyload/web/ServerThread.py:53
+msgid "WebUI built is not available"
+msgstr ""
+
+#: pyload/web/ServerThread.py:55
+msgid "Running webUI in development mode"
+msgstr ""
+
+#: pyload/web/ServerThread.py:73
+msgid "Failed starting webserver: "
 msgstr ""
 
-#: pyload/Api.py:152
+#: pyload/web/ServerThread.py:107
+msgid "Failed importing webserver: "
+msgstr ""
+
+#: pyload/web/ServerThread.py:125
+msgid "This server offers no SSL, please consider using threaded instead"
+msgstr ""
+
+#: pyload/web/ServerThread.py:139
 #, python-format
-msgid "User '%s' tries to log in"
+msgid "Starting %(name)s webserver: %(host)s:%(port)d"
 msgstr ""
 
 #: pyload/config/default.py:14
@@ -316,82 +320,56 @@ msgstr ""
 msgid "Download Time"
 msgstr ""
 
-#: pyload/Core.py:195
-msgid "Received Quit signal"
-msgstr ""
-
-#: pyload/Core.py:323
-#, python-format
-msgid "pyLoad already running with pid %s"
-msgstr ""
-
-#: pyload/Core.py:337
+#: pyload/network/HTTPDownload.py:249
 #, python-format
-msgid "Failed changing group: %s"
+msgid "Download chunks failed, fallback to single connection | %s"
 msgstr ""
 
-#: pyload/Core.py:347
+#: pyload/api/DownloadApi.py:33
 #, python-format
-msgid "Failed changing user: %s"
-msgstr ""
-
-#: pyload/Core.py:358
-msgid "Starting"
+msgid "Added package %(name)s as folder %(folder)s"
 msgstr ""
 
-#: pyload/Core.py:359
+#: pyload/api/DownloadApi.py:84
 #, python-format
-msgid "Using home directory: %s"
-msgstr ""
-
-#: pyload/Core.py:373
-msgid "All links removed"
+msgid "Added %d links to package"
 msgstr ""
 
-#: pyload/Core.py:403
+#: pyload/AccountManager.py:49
 #, python-format
-msgid "Download time: %s"
+msgid "Account plugin %s not available"
 msgstr ""
 
-#: pyload/Core.py:418
+#: pyload/AccountManager.py:70
 #, python-format
-msgid "Free space: %s"
-msgstr ""
-
-#: pyload/Core.py:438
-msgid "Activating Accounts..."
-msgstr ""
-
-#: pyload/Core.py:443
-msgid "Restarting failed downloads..."
-msgstr ""
-
-#: pyload/Core.py:451
-msgid "pyLoad is up and running"
+msgid "Could not load account %s"
 msgstr ""
 
-#: pyload/Core.py:474
-msgid "restarting pyLoad"
+#: pyload/interaction/InteractionManager.py:88
+msgid "Query"
 msgstr ""
 
-#: pyload/Core.py:478
-msgid "pyLoad quits"
+#: pyload/interaction/InteractionManager.py:111
+msgid "Captcha request"
 msgstr ""
 
-#: pyload/Core.py:564
-msgid "shutting down..."
+#: pyload/interaction/InteractionManager.py:111
+msgid "Please solve the captcha."
 msgstr ""
 
-#: pyload/Core.py:579
-msgid "error while shutting down"
+#: pyload/remote/RemoteManager.py:35
+#, python-format
+msgid "Remote backend error: %s"
 msgstr ""
 
-#: pyload/Core.py:661
-msgid "killed pyLoad from terminal"
+#: pyload/remote/RemoteManager.py:80
+#, python-format
+msgid "Starting %(name)s: %(addr)s:%(port)s"
 msgstr ""
 
-#: pyload/database/DatabaseBackend.py:167
-msgid "Database was deleted due to incompatible version."
+#: pyload/remote/RemoteManager.py:82
+#, python-format
+msgid "Failed loading backend %(name)s | %(error)s"
 msgstr ""
 
 #: pyload/FileManager.py:53
@@ -467,58 +445,131 @@ msgstr ""
 msgid "Package finished: %s"
 msgstr ""
 
-#: pyload/interaction/InteractionManager.py:88
-msgid "Query"
+#: pyload/Api.py:150
+#, python-format
+msgid "User '%s' tries to log in"
 msgstr ""
 
-#: pyload/interaction/InteractionManager.py:111
-msgid "Captcha request"
+#: pyload/Core.py:195
+msgid "Received Quit signal"
 msgstr ""
 
-#: pyload/interaction/InteractionManager.py:111
-msgid "Please solve the captcha."
+#: pyload/Core.py:321
+#, python-format
+msgid "pyLoad already running with pid %s"
 msgstr ""
 
-#: pyload/network/HTTPDownload.py:249
+#: pyload/Core.py:335
 #, python-format
-msgid "Download chunks failed, fallback to single connection | %s"
+msgid "Failed changing group: %s"
 msgstr ""
 
-#: pyload/PluginManager.py:316
+#: pyload/Core.py:345
 #, python-format
-msgid "Error importing %(name)s: %(msg)s"
+msgid "Failed changing user: %s"
 msgstr ""
 
-#: pyload/remote/RemoteManager.py:35
+#: pyload/Core.py:356
+msgid "Starting"
+msgstr ""
+
+#: pyload/Core.py:357
 #, python-format
-msgid "Remote backend error: %s"
+msgid "Using home directory: %s"
 msgstr ""
 
-#: pyload/remote/RemoteManager.py:80
+#: pyload/Core.py:371
+msgid "All links removed"
+msgstr ""
+
+#: pyload/Core.py:401
 #, python-format
-msgid "Starting %(name)s: %(addr)s:%(port)s"
+msgid "Download time: %s"
 msgstr ""
 
-#: pyload/remote/RemoteManager.py:82
+#: pyload/Core.py:416
 #, python-format
-msgid "Failed loading backend %(name)s | %(error)s"
+msgid "Free space: %s"
 msgstr ""
 
-#: pyload/threads/AddonThread.py:55
-msgid "An Error occurred"
+#: pyload/Core.py:436
+msgid "Activating Accounts..."
 msgstr ""
 
-#: pyload/threads/DecrypterThread.py:50
-msgid "Decrypting failed"
+#: pyload/Core.py:441
+msgid "Restarting failed downloads..."
 msgstr ""
 
-#: pyload/threads/DecrypterThread.py:73
+#: pyload/Core.py:449
+msgid "pyLoad is up and running"
+msgstr ""
+
+#: pyload/Core.py:472
+msgid "restarting pyLoad"
+msgstr ""
+
+#: pyload/Core.py:476
+msgid "pyLoad quits"
+msgstr ""
+
+#: pyload/Core.py:562
+msgid "shutting down..."
+msgstr ""
+
+#: pyload/Core.py:577
+msgid "error while shutting down"
+msgstr ""
+
+#: pyload/Core.py:659
+msgid "killed pyLoad from terminal"
+msgstr ""
+
+#: pyload/database/DatabaseBackend.py:167
+msgid "Database was deleted due to incompatible version."
+msgstr ""
+
+#: pyload/threads/DecrypterThread.py:30
 #, python-format
 msgid "Decrypted %(count)d links into package %(name)s"
 msgstr ""
 
-#: pyload/threads/DecrypterThread.py:80
-msgid "No links decrypted"
+#: pyload/threads/DecrypterThread.py:55
+msgid "Decrypting aborted"
+msgstr ""
+
+#: pyload/threads/DecrypterThread.py:57
+msgid "Decrypting failed"
+msgstr ""
+
+#: pyload/threads/InfoThread.py:143
+#, python-format
+msgid "Info Fetching for %(name)s failed | %(err)s"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:148
+#, python-format
+msgid "Reconnect Failed: %s"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:188
+msgid "Reconnect script not found!"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:194
+msgid "Starting reconnect"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:208
+msgid "Failed executing reconnect script!"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:219
+#, python-format
+msgid "Reconnected, new IP: %s"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:297
+msgid "Not enough space left on device"
 msgstr ""
 
 #: pyload/threads/DownloadThread.py:64
@@ -575,35 +626,13 @@ msgstr ""
 msgid "Internal Server Error"
 msgstr ""
 
-#: pyload/threads/InfoThread.py:147
-#, python-format
-msgid "Info Fetching for %(name)s failed | %(err)s"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:155
-#, python-format
-msgid "Reconnect Failed: %s"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:192
-msgid "Reconnect script not found!"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:198
-msgid "Starting reconnect"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:212
-msgid "Failed executing reconnect script!"
+#: pyload/threads/AddonThread.py:55
+msgid "An Error occurred"
 msgstr ""
 
-#: pyload/threads/ThreadManager.py:224
+#: pyload/PluginManager.py:316
 #, python-format
-msgid "Reconnected, new IP: %s"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:298
-msgid "Not enough space left on device"
+msgid "Error importing %(name)s: %(msg)s"
 msgstr ""
 
 #: pyload/utils/JsEngine.py:188
@@ -612,31 +641,6 @@ msgid ""
 "nodejs or rhino"
 msgstr ""
 
-#: pyload/web/ServerThread.py:49
-msgid "SSL certificates not found."
-msgstr ""
-
-#: pyload/web/ServerThread.py:53
-msgid "WebUI built is not available"
-msgstr ""
-
-#: pyload/web/ServerThread.py:55
-msgid "Running webUI in development mode"
-msgstr ""
-
-#: pyload/web/ServerThread.py:73
-msgid "Failed starting webserver: "
-msgstr ""
-
-#: pyload/web/ServerThread.py:107
-msgid "Failed importing webserver: "
-msgstr ""
-
-#: pyload/web/ServerThread.py:125
-msgid "This server offers no SSL, please consider using threaded instead"
-msgstr ""
-
-#: pyload/web/ServerThread.py:139
-#, python-format
-msgid "Starting %(name)s webserver: %(host)s:%(port)d"
+#: pyload/utils/packagetools.py:130
+msgid "Unnamed package"
 msgstr ""
diff --git a/locale/plugins.pot b/locale/plugins.pot
index fa9d6d25a..8ef8c07d9 100644
--- a/locale/plugins.pot
+++ b/locale/plugins.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pyload 0.4.9.9-dev\n"
 "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
-"POT-Creation-Date: 2013-08-10 11:58+0200\n"
+"POT-Creation-Date: 2013-10-13 18:16+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,225 +17,261 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pyload/plugins/Account.py:140 pyload/plugins/Account.py:146
+#: pyload/plugins/network/CurlDownload.py:245
 #, python-format
-msgid "Could not login with account %(user)s | %(msg)s"
+msgid "Download chunks failed, fallback to single connection | %s"
 msgstr ""
 
-#: pyload/plugins/Account.py:141
-msgid "Wrong Password"
+#: pyload/plugins/Base.py:327
+msgid ""
+"Pil and tesseract not installed and no Client connected for captcha "
+"decrypting"
 msgstr ""
 
-#: pyload/plugins/Account.py:202
-#, python-format
-msgid "Get Account Info for %s"
+#: pyload/plugins/Base.py:331
+msgid "No captcha result obtained in appropriate time."
 msgstr ""
 
-#: pyload/plugins/Account.py:211
+#: pyload/plugins/Hoster.py:260 pyload/plugins/Hoster.py:297
+#: pyload/plugins/hoster/ARD.py:79
 #, python-format
-msgid "Error: %s"
+msgid "Setting User and Group failed: %s"
 msgstr ""
 
-#: pyload/plugins/Account.py:262
-#, python-format
-msgid "Your Time %s has a wrong format, use: 1:22-3:44"
+#: pyload/plugins/Crypter.py:170
+msgid "Not existing file or unsupported protocol"
 msgstr ""
 
-#: pyload/plugins/Account.py:285
+#: pyload/plugins/Crypter.py:228
 #, python-format
-msgid "Account %s has not enough traffic, checking again in 30min"
+msgid "Could not remove file '%s'"
 msgstr ""
 
-#: pyload/plugins/Account.py:293
-#, python-format
-msgid "Account %s is expired, checking again in 1h"
+#: pyload/plugins/hoster/RapidshareCom.py:102
+msgid "Rapidshare: Traffic Share (direct download)"
 msgstr ""
 
-#: pyload/plugins/Account.py:310
-#, python-format
-msgid "Login with %s"
+#: pyload/plugins/hoster/RapidshareCom.py:129
+#: pyload/plugins/hoster/RapidshareCom.py:197
+msgid "Already downloading from this ip address, waiting 60 seconds"
 msgstr ""
 
-#: pyload/plugins/accounts/BitshareCom.py:37
-msgid "Activate direct Download in your Bitshare Account"
+#: pyload/plugins/hoster/RapidshareCom.py:133
+msgid "Invalid Auth Code, download will be restarted"
 msgstr ""
 
-#: pyload/plugins/Addon.py:118
-#, python-format
-msgid "Error executing addons: %s"
+#: pyload/plugins/hoster/RapidshareCom.py:202
+msgid "RapidShareCom: No free slots"
 msgstr ""
 
-#: pyload/plugins/addons/Captcha9kw.py:58
-#: pyload/plugins/addons/CaptchaTrader.py:69
-#: pyload/plugins/addons/ExpertDecoders.py:50
-#, python-format
-msgid "%s credits left"
+#: pyload/plugins/hoster/RapidshareCom.py:205
+msgid "You need a premium account for this file"
 msgstr ""
 
-#: pyload/plugins/addons/Captcha9kw.py:91
+#: pyload/plugins/hoster/RapidshareCom.py:207
+msgid "Filename reported invalid"
+msgstr ""
+
+#: pyload/plugins/hoster/RealdebridCom.py:45
+#: pyload/plugins/hoster/Premium4Me.py:29
+#: pyload/plugins/hoster/MultiDebridCom.py:44
+#: pyload/plugins/hoster/FastixRu.py:38 pyload/plugins/hoster/ZeveraCom.py:25
+#: pyload/plugins/hoster/UnrestrictLi.py:57
+#: pyload/plugins/hoster/SimplydebridCom.py:28
+#: pyload/plugins/hoster/AlldebridCom.py:41
+#: pyload/plugins/hoster/RehostTo.py:26 pyload/plugins/hoster/ReloadCc.py:24
+#: pyload/plugins/hoster/DebridItaliaCom.py:43
+#: pyload/plugins/hoster/PremiumizeMe.py:26
 #, python-format
-msgid "New CaptchaID from upload: %s : %s"
+msgid "Please enter your %s account or deactivate this plugin"
 msgstr ""
 
-#: pyload/plugins/addons/Captcha9kw.py:127
-msgid "Your Captcha 9kw.eu Account has not enough credits"
+#: pyload/plugins/hoster/MegaNz.py:56
+msgid "Decryption failed"
 msgstr ""
 
-#: pyload/plugins/addons/CaptchaBrotherhood.py:69
-#, python-format
-msgid "%d credits left"
+#: pyload/plugins/hoster/MegaNz.py:106
+msgid "No file key provided in the URL"
 msgstr ""
 
-#: pyload/plugins/addons/CaptchaTrader.py:117
-msgid "Could not send response."
+#: pyload/plugins/hoster/MegaNz.py:118
+msgid "Error code:"
 msgstr ""
 
-#: pyload/plugins/addons/CaptchaTrader.py:135
-msgid "Your CaptchaTrader Account has not enough credits"
+#: pyload/plugins/hoster/FileserveCom.py:99
+msgid "Parallel download error, now waiting 60s."
 msgstr ""
 
-#: pyload/plugins/addons/ClickAndLoad.py:75
-msgid "Click'N'Load: Port 9666 already in use"
+#: pyload/plugins/hoster/FileserveCom.py:215
+msgid "Not logged in."
 msgstr ""
 
-#: pyload/plugins/addons/ExpertDecoders.py:95
-msgid "Your ExpertDecoders Account has not enough credits"
+#: pyload/plugins/hoster/UploadedTo.py:135
+msgid "API key invalid"
 msgstr ""
 
-#: pyload/plugins/addons/ExternalScripts.py:53
+#: pyload/plugins/hoster/UploadedTo.py:159
 #, python-format
-msgid "Installed scripts for %s: "
+msgid "%s: Not enough traffic left"
 msgstr ""
 
-#: pyload/plugins/addons/ExternalScripts.py:68
-msgid "Script not executable:"
+#: pyload/plugins/hoster/UploadedTo.py:162
+msgid "Traffic exceeded"
 msgstr ""
 
-#: pyload/plugins/addons/ExternalScripts.py:78
-#, python-format
-msgid "Error in %(script)s: %(error)s"
+#: pyload/plugins/hoster/BasePlugin.py:64
+msgid "Authorization required (username:password)"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:93
-#, python-format
-msgid "No %s installed"
+#: pyload/plugins/hoster/NetloadIn.py:145
+#: pyload/plugins/hoster/NetloadIn.py:169
+msgid "File temporarily not available"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:95
-#: pyload/plugins/addons/ExtractArchive.py:100
+#: pyload/plugins/hoster/NetloadIn.py:182
 #, python-format
-msgid "Could not activate %s"
+msgid "Netload: waiting between downloads %d s."
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:105
-msgid "Activated"
+#: pyload/plugins/hoster/NetloadIn.py:213
+#, python-format
+msgid "Netload: waiting for captcha %d s."
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:107
-msgid "No Extract plugins activated"
+#: pyload/plugins/hoster/NetloadIn.py:251
+msgid "Downloaded File was empty"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:119
+#: pyload/plugins/hoster/FilesMailRu.py:99
 #, python-format
-msgid "Package %s queued for later extracting"
+msgid ""
+"There was HTML Code in the Downloaded File (%s)...redirect error? The "
+"Download will be restarted."
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:142
+#: pyload/plugins/hoster/XHamsterCom.py:77
+#: pyload/plugins/hoster/XHamsterCom.py:86
+#: pyload/plugins/hoster/XHamsterCom.py:89
 #, python-format
-msgid "Check package %s"
+msgid "long_url: %s"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:183
+#: pyload/plugins/Account.py:140 pyload/plugins/Account.py:146
 #, python-format
-msgid "Extract to %s"
+msgid "Could not login with account %(user)s | %(msg)s"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:198
-msgid "No files found to extract"
+#: pyload/plugins/Account.py:141
+msgid "Wrong Password"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:205
-msgid "extracting"
+#: pyload/plugins/Account.py:202
+#, python-format
+msgid "Get Account Info for %s"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:216
-msgid "Password protected"
+#: pyload/plugins/Account.py:211
+#, python-format
+msgid "Error: %s"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:237
-msgid "Wrong password"
+#: pyload/plugins/Account.py:263
+#, python-format
+msgid "Your Time %s has a wrong format, use: 1:22-3:44"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:245
+#: pyload/plugins/Account.py:286
 #, python-format
-msgid "Deleting %s files"
+msgid "Account %s has not enough traffic, checking again in 30min"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:252
-msgid "Extracting finished"
+#: pyload/plugins/Account.py:294
+#, python-format
+msgid "Account %s is expired, checking again in 1h"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:258
-msgid "Archive Error"
+#: pyload/plugins/Account.py:311
+#, python-format
+msgid "Login with %s"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:260
-msgid "CRC Mismatch"
+#: pyload/plugins/Addon.py:118
+#, python-format
+msgid "Error executing addons: %s"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:264
-msgid "Unknown Error"
+#: pyload/plugins/accounts/BitshareCom.py:37
+msgid "Activate direct Download in your Bitshare Account"
 msgstr ""
 
-#: pyload/plugins/addons/ExtractArchive.py:316
-msgid "Setting User and Group failed"
+#: pyload/plugins/crypter/SerienjunkiesOrg.py:130
+msgid "Downloadlimit reached"
 msgstr ""
 
-#: pyload/plugins/addons/HotFolder.py:82
+#: pyload/plugins/addons/ExternalScripts.py:53
 #, python-format
-msgid "Added %s from HotFolder"
+msgid "Installed scripts for %s: "
 msgstr ""
 
-#: pyload/plugins/addons/IRCInterface.py:74
-#: pyload/plugins/addons/XMPPInterface.py:83
-#, python-format
-msgid "Package finished: %s"
+#: pyload/plugins/addons/ExternalScripts.py:68
+msgid "Script not executable:"
 msgstr ""
 
-#: pyload/plugins/addons/IRCInterface.py:82
+#: pyload/plugins/addons/ExternalScripts.py:78
 #, python-format
-msgid "Download finished: %(name)s @ %(plugin)s "
+msgid "Error in %(script)s: %(error)s"
 msgstr ""
 
-#: pyload/plugins/addons/IRCInterface.py:95
+#: pyload/plugins/addons/CaptchaTrader.py:69
+#: pyload/plugins/addons/Captcha9kw.py:58
+#: pyload/plugins/addons/ExpertDecoders.py:50
 #, python-format
-msgid "New Captcha Request: %s"
+msgid "%s credits left"
 msgstr ""
 
-#: pyload/plugins/addons/IRCInterface.py:96
+#: pyload/plugins/addons/CaptchaTrader.py:117
+msgid "Could not send response."
+msgstr ""
+
+#: pyload/plugins/addons/CaptchaTrader.py:135
+msgid "Your CaptchaTrader Account has not enough credits"
+msgstr ""
+
+#: pyload/plugins/addons/Captcha9kw.py:92
 #, python-format
-msgid "Answer with 'c %s text on the captcha'"
+msgid "New CaptchaID from upload: %s : %s"
 msgstr ""
 
-#: pyload/plugins/addons/LinkdecrypterCom.py:37
-msgid "Crypter list not found"
+#: pyload/plugins/addons/Captcha9kw.py:128
+msgid "Your Captcha 9kw.eu Account has not enough credits"
 msgstr ""
 
-#: pyload/plugins/addons/LinkdecrypterCom.py:51
-msgid "Crypter list is empty"
+#: pyload/plugins/addons/RehostTo.py:32
+msgid "Please add your rehost.to account first and restart pyLoad"
 msgstr ""
 
-#: pyload/plugins/addons/MultiHoster.py:29
+#: pyload/plugins/addons/HotFolder.py:82
 #, python-format
-msgid "Activated %s"
+msgid "Added %s from HotFolder"
 msgstr ""
 
-#: pyload/plugins/addons/MultiHoster.py:47
-msgid "No Hoster loaded"
+#: pyload/plugins/addons/ClickAndLoad.py:75
+msgid "Click'N'Load: Port 9666 already in use"
 msgstr ""
 
-#: pyload/plugins/addons/RehostTo.py:32
-msgid "Please add your rehost.to account first and restart pyLoad"
+#: pyload/plugins/addons/XMPPInterface.py:83
+#: pyload/plugins/addons/IRCInterface.py:74
+#, python-format
+msgid "Package finished: %s"
+msgstr ""
+
+#: pyload/plugins/addons/XMPPInterface.py:91
+#, python-format
+msgid "Download finished: %(name)s @ %(plugin)s"
+msgstr ""
+
+#: pyload/plugins/addons/ExpertDecoders.py:95
+msgid "Your ExpertDecoders Account has not enough credits"
 msgstr ""
 
 #: pyload/plugins/addons/UpdateManager.py:74
@@ -282,145 +318,114 @@ msgstr ""
 msgid "Version mismatch"
 msgstr ""
 
-#: pyload/plugins/addons/XMPPInterface.py:91
+#: pyload/plugins/addons/ExtractArchive.py:93
 #, python-format
-msgid "Download finished: %(name)s @ %(plugin)s"
-msgstr ""
-
-#: pyload/plugins/Base.py:329
-msgid ""
-"Pil and tesseract not installed and no Client connected for captcha "
-"decrypting"
+msgid "No %s installed"
 msgstr ""
 
-#: pyload/plugins/Base.py:333
-msgid "No captcha result obtained in appropriate time."
+#: pyload/plugins/addons/ExtractArchive.py:95
+#: pyload/plugins/addons/ExtractArchive.py:100
+#, python-format
+msgid "Could not activate %s"
 msgstr ""
 
-#: pyload/plugins/crypter/SerienjunkiesOrg.py:130
-msgid "Downloadlimit reached"
+#: pyload/plugins/addons/ExtractArchive.py:105
+msgid "Activated"
 msgstr ""
 
-#: pyload/plugins/Crypter.py:136
-msgid "Not existing file or unsupported protocol"
+#: pyload/plugins/addons/ExtractArchive.py:107
+msgid "No Extract plugins activated"
 msgstr ""
 
-#: pyload/plugins/hoster/AlldebridCom.py:36
-#: pyload/plugins/hoster/DebridItaliaCom.py:38
-#: pyload/plugins/hoster/FastixRu.py:34
-#: pyload/plugins/hoster/MultiDebridCom.py:39
-#: pyload/plugins/hoster/Premium4Me.py:27
-#: pyload/plugins/hoster/PremiumizeMe.py:21
-#: pyload/plugins/hoster/RealdebridCom.py:40
-#: pyload/plugins/hoster/RehostTo.py:26 pyload/plugins/hoster/ReloadCc.py:24
-#: pyload/plugins/hoster/UnrestrictLi.py:51
-#: pyload/plugins/hoster/ZeveraCom.py:22
+#: pyload/plugins/addons/ExtractArchive.py:119
 #, python-format
-msgid "Please enter your %s account or deactivate this plugin"
+msgid "Package %s queued for later extracting"
 msgstr ""
 
-#: pyload/plugins/hoster/ARD.py:79 pyload/plugins/Hoster.py:278
-#: pyload/plugins/Hoster.py:315
+#: pyload/plugins/addons/ExtractArchive.py:142
 #, python-format
-msgid "Setting User and Group failed: %s"
-msgstr ""
-
-#: pyload/plugins/hoster/BasePlugin.py:64
-msgid "Authorization required (username:password)"
-msgstr ""
-
-#: pyload/plugins/hoster/FileserveCom.py:99
-msgid "Parallel download error, now waiting 60s."
-msgstr ""
-
-#: pyload/plugins/hoster/FileserveCom.py:215
-msgid "Not logged in."
+msgid "Check package %s"
 msgstr ""
 
-#: pyload/plugins/hoster/FilesMailRu.py:99
+#: pyload/plugins/addons/ExtractArchive.py:183
 #, python-format
-msgid ""
-"There was HTML Code in the Downloaded File (%s)...redirect error? The "
-"Download will be restarted."
+msgid "Extract to %s"
 msgstr ""
 
-#: pyload/plugins/hoster/MegaNz.py:56
-msgid "Decryption failed"
+#: pyload/plugins/addons/ExtractArchive.py:198
+msgid "No files found to extract"
 msgstr ""
 
-#: pyload/plugins/hoster/MegaNz.py:101
-msgid "No file key provided in the URL"
+#: pyload/plugins/addons/ExtractArchive.py:205
+msgid "extracting"
 msgstr ""
 
-#: pyload/plugins/hoster/MegaNz.py:113
-msgid "Error code:"
+#: pyload/plugins/addons/ExtractArchive.py:216
+msgid "Password protected"
 msgstr ""
 
-#: pyload/plugins/hoster/NetloadIn.py:146
-#: pyload/plugins/hoster/NetloadIn.py:170
-msgid "File temporarily not available"
+#: pyload/plugins/addons/ExtractArchive.py:237
+msgid "Wrong password"
 msgstr ""
 
-#: pyload/plugins/hoster/NetloadIn.py:183
+#: pyload/plugins/addons/ExtractArchive.py:245
 #, python-format
-msgid "Netload: waiting between downloads %d s."
+msgid "Deleting %s files"
 msgstr ""
 
-#: pyload/plugins/hoster/NetloadIn.py:214
-#, python-format
-msgid "Netload: waiting for captcha %d s."
+#: pyload/plugins/addons/ExtractArchive.py:252
+msgid "Extracting finished"
 msgstr ""
 
-#: pyload/plugins/hoster/NetloadIn.py:252
-msgid "Downloaded File was empty"
+#: pyload/plugins/addons/ExtractArchive.py:258
+msgid "Archive Error"
 msgstr ""
 
-#: pyload/plugins/hoster/RapidshareCom.py:102
-msgid "Rapidshare: Traffic Share (direct download)"
+#: pyload/plugins/addons/ExtractArchive.py:260
+msgid "CRC Mismatch"
 msgstr ""
 
-#: pyload/plugins/hoster/RapidshareCom.py:129
-#: pyload/plugins/hoster/RapidshareCom.py:197
-msgid "Already downloading from this ip address, waiting 60 seconds"
+#: pyload/plugins/addons/ExtractArchive.py:264
+msgid "Unknown Error"
 msgstr ""
 
-#: pyload/plugins/hoster/RapidshareCom.py:133
-msgid "Invalid Auth Code, download will be restarted"
+#: pyload/plugins/addons/ExtractArchive.py:316
+msgid "Setting User and Group failed"
 msgstr ""
 
-#: pyload/plugins/hoster/RapidshareCom.py:202
-msgid "RapidShareCom: No free slots"
+#: pyload/plugins/addons/LinkdecrypterCom.py:37
+msgid "Crypter list not found"
 msgstr ""
 
-#: pyload/plugins/hoster/RapidshareCom.py:205
-msgid "You need a premium account for this file"
+#: pyload/plugins/addons/LinkdecrypterCom.py:51
+msgid "Crypter list is empty"
 msgstr ""
 
-#: pyload/plugins/hoster/RapidshareCom.py:207
-msgid "Filename reported invalid"
+#: pyload/plugins/addons/IRCInterface.py:82
+#, python-format
+msgid "Download finished: %(name)s @ %(plugin)s "
 msgstr ""
 
-#: pyload/plugins/hoster/UploadedTo.py:137
-msgid "API key invalid"
+#: pyload/plugins/addons/IRCInterface.py:95
+#, python-format
+msgid "New Captcha Request: %s"
 msgstr ""
 
-#: pyload/plugins/hoster/UploadedTo.py:161
+#: pyload/plugins/addons/IRCInterface.py:96
 #, python-format
-msgid "%s: Not enough traffic left"
+msgid "Answer with 'c %s text on the captcha'"
 msgstr ""
 
-#: pyload/plugins/hoster/UploadedTo.py:164
-msgid "Traffic exceeded"
+#: pyload/plugins/addons/CaptchaBrotherhood.py:69
+#, python-format
+msgid "%d credits left"
 msgstr ""
 
-#: pyload/plugins/hoster/XHamsterCom.py:77
-#: pyload/plugins/hoster/XHamsterCom.py:86
-#: pyload/plugins/hoster/XHamsterCom.py:89
+#: pyload/plugins/addons/MultiHoster.py:29
 #, python-format
-msgid "long_url: %s"
+msgid "Activated %s"
 msgstr ""
 
-#: pyload/plugins/network/CurlDownload.py:245
-#, python-format
-msgid "Download chunks failed, fallback to single connection | %s"
+#: pyload/plugins/addons/MultiHoster.py:47
+msgid "No Hoster loaded"
 msgstr ""
diff --git a/locale/setup.pot b/locale/setup.pot
index d0a724b32..c9ace7bd5 100644
--- a/locale/setup.pot
+++ b/locale/setup.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pyload 0.4.9.9-dev\n"
 "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
-"POT-Creation-Date: 2013-08-10 11:58+0200\n"
+"POT-Creation-Date: 2013-10-13 18:16+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,388 +17,305 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pyload/Setup.py:72
-msgid "Would you like to configure pyLoad via Webinterface?"
-msgstr ""
-
-#: pyload/Setup.py:73
-msgid "You need a Browser and a connection to this PC for it."
-msgstr ""
-
-#: pyload/Setup.py:74
-msgid "Url would be: http://hostname:8000/"
-msgstr ""
-
-#: pyload/Setup.py:75
-msgid "Start initial webinterface for configuration?"
-msgstr ""
-
-#: pyload/Setup.py:86
+#: pyload/setup/Setup.py:118
 msgid "Welcome to the pyLoad Configuration Assistent."
 msgstr ""
 
-#: pyload/Setup.py:87
+#: pyload/setup/Setup.py:119
 msgid ""
 "It will check your system and make a basic setup in order to run pyLoad."
 msgstr ""
 
-#: pyload/Setup.py:89
+#: pyload/setup/Setup.py:121
 msgid "The value in brackets [] always is the default value,"
 msgstr ""
 
-#: pyload/Setup.py:90
+#: pyload/setup/Setup.py:122
 msgid ""
 "in case you don't want to change it or you are unsure what to choose, just "
 "hit enter."
 msgstr ""
 
-#: pyload/Setup.py:92
+#: pyload/setup/Setup.py:124
 msgid ""
 "Don't forget: You can always rerun this assistent with --setup or -s "
 "parameter, when you start pyLoadCore."
 msgstr ""
 
-#: pyload/Setup.py:93
+#: pyload/setup/Setup.py:125
 msgid "If you have any problems with this assistent hit CTRL+C,"
 msgstr ""
 
-#: pyload/Setup.py:94
+#: pyload/setup/Setup.py:126
 msgid "to abort and don't let him start with pyLoadCore automatically anymore."
 msgstr ""
 
-#: pyload/Setup.py:96
+#: pyload/setup/Setup.py:128
 msgid "When you are ready for system check, hit enter."
 msgstr ""
 
-#: pyload/Setup.py:103
-msgid "Features missing: "
-msgstr ""
-
-#: pyload/Setup.py:107
-msgid "no py-crypto available"
-msgstr ""
-
-#: pyload/Setup.py:108
-msgid "You need this if you want to decrypt container files."
-msgstr ""
-
-#: pyload/Setup.py:112
-msgid "no SSL available"
-msgstr ""
-
-#: pyload/Setup.py:113
-msgid ""
-"This is needed if you want to establish a secure connection to core or "
-"webinterface."
-msgstr ""
-
-#: pyload/Setup.py:114
-msgid "If you only want to access locally to pyLoad ssl is not useful."
-msgstr ""
-
-#: pyload/Setup.py:118
-msgid "no Captcha Recognition available"
-msgstr ""
-
-#: pyload/Setup.py:119
-msgid "Only needed for some hosters and as freeuser."
-msgstr ""
-
-#: pyload/Setup.py:123
-msgid "no JavaScript engine found"
-msgstr ""
-
-#: pyload/Setup.py:124
-msgid ""
-"You will need this for some Click'N'Load links. Install Spidermonkey, ossp-"
-"js, pyv8 or rhino"
-msgstr ""
-
-#: pyload/Setup.py:126
-msgid "You can abort the setup now and fix some dependencies if you want."
-msgstr ""
-
-#: pyload/Setup.py:128
+#: pyload/setup/Setup.py:134
 msgid "Continue with setup?"
 msgstr ""
 
-#: pyload/Setup.py:134
+#: pyload/setup/Setup.py:140
 #, python-format
 msgid "Do you want to change the config path? Current is %s"
 msgstr ""
 
-#: pyload/Setup.py:136
+#: pyload/setup/Setup.py:142
 msgid ""
 "If you use pyLoad on a server or the home partition lives on an internal "
 "flash it may be a good idea to change it."
 msgstr ""
 
-#: pyload/Setup.py:137
+#: pyload/setup/Setup.py:143
 msgid "Change config path?"
 msgstr ""
 
-#: pyload/Setup.py:143
+#: pyload/setup/Setup.py:149
 msgid "Do you want to configure login data and basic settings?"
 msgstr ""
 
-#: pyload/Setup.py:144
+#: pyload/setup/Setup.py:150
 msgid "This is recommend for first run."
 msgstr ""
 
-#: pyload/Setup.py:145
+#: pyload/setup/Setup.py:151
 msgid "Make basic setup?"
 msgstr ""
 
-#: pyload/Setup.py:152
+#: pyload/setup/Setup.py:158
 msgid "Do you want to configure ssl?"
 msgstr ""
 
-#: pyload/Setup.py:153
+#: pyload/setup/Setup.py:159
 msgid "Configure ssl?"
 msgstr ""
 
-#: pyload/Setup.py:159
+#: pyload/setup/Setup.py:164
 msgid "Do you want to configure webinterface?"
 msgstr ""
 
-#: pyload/Setup.py:160
+#: pyload/setup/Setup.py:165
 msgid "Configure webinterface?"
 msgstr ""
 
-#: pyload/Setup.py:165
+#: pyload/setup/Setup.py:170
 msgid "Setup finished successfully."
 msgstr ""
 
-#: pyload/Setup.py:166
+#: pyload/setup/Setup.py:171
 msgid "Hit enter to exit and restart pyLoad"
 msgstr ""
 
-#: pyload/Setup.py:173
-msgid "Webinterface running for setup."
-msgstr ""
-
-#: pyload/Setup.py:190
+#: pyload/setup/Setup.py:178
 msgid "## Basic Setup ##"
 msgstr ""
 
-#: pyload/Setup.py:193
+#: pyload/setup/Setup.py:181
 msgid "The following logindata is valid for CLI, GUI and webinterface."
 msgstr ""
 
-#: pyload/Setup.py:199 pyload/Setup.py:288 pyload/Setup.py:304
+#: pyload/setup/Setup.py:187 pyload/setup/Setup.py:265
+#: pyload/setup/Setup.py:279
 msgid "Username"
 msgstr ""
 
-#: pyload/Setup.py:205
-msgid ""
-"External clients (GUI, CLI or other) need remote access to work over the "
-"network."
-msgstr ""
-
-#: pyload/Setup.py:206
-msgid ""
-"However, if you only want to use the webinterface you may disable it to save "
-"ram."
-msgstr ""
-
-#: pyload/Setup.py:207
-msgid "Enable remote access"
-msgstr ""
-
-#: pyload/Setup.py:211
+#: pyload/setup/Setup.py:194
 msgid "Language"
 msgstr ""
 
-#: pyload/Setup.py:213
+#: pyload/setup/Setup.py:196
 msgid "Download folder"
 msgstr ""
 
-#: pyload/Setup.py:214
+#: pyload/setup/Setup.py:197
 msgid "Max parallel downloads"
 msgstr ""
 
-#: pyload/Setup.py:218
+#: pyload/setup/Setup.py:199
 msgid "Use Reconnect?"
 msgstr ""
 
-#: pyload/Setup.py:221
+#: pyload/setup/Setup.py:202
 msgid "Reconnect script location"
 msgstr ""
 
-#: pyload/Setup.py:226
+#: pyload/setup/Setup.py:207
 msgid "## Webinterface Setup ##"
 msgstr ""
 
-#: pyload/Setup.py:229
+#: pyload/setup/Setup.py:210
 msgid "Activate webinterface?"
 msgstr ""
 
-#: pyload/Setup.py:231
+#: pyload/setup/Setup.py:212
 msgid ""
 "Listen address, if you use 127.0.0.1 or localhost, the webinterface will "
 "only accessible locally."
 msgstr ""
 
-#: pyload/Setup.py:232
+#: pyload/setup/Setup.py:213
 msgid "Address"
 msgstr ""
 
-#: pyload/Setup.py:233
+#: pyload/setup/Setup.py:214
 msgid "Port"
 msgstr ""
 
-#: pyload/Setup.py:235
+#: pyload/setup/Setup.py:216
 msgid ""
 "pyLoad offers several server backends, now following a short explanation."
 msgstr ""
 
-#: pyload/Setup.py:236
+#: pyload/setup/Setup.py:217
 msgid ""
 "Default server, this server offers SSL and is a good alternative to builtin."
 msgstr ""
 
-#: pyload/Setup.py:238
+#: pyload/setup/Setup.py:219
 msgid ""
 "Can be used by apache, lighttpd, requires you to configure them, which is "
 "not too easy job."
 msgstr ""
 
-#: pyload/Setup.py:239
+#: pyload/setup/Setup.py:220
 msgid "Very fast alternative written in C, requires libev and linux knowledge."
 msgstr ""
 
-#: pyload/Setup.py:240
+#: pyload/setup/Setup.py:221
 msgid "Get it from here: https://github.com/jonashaag/bjoern, compile it"
 msgstr ""
 
-#: pyload/Setup.py:241
+#: pyload/setup/Setup.py:222
 msgid "and copy bjoern.so to pyload/lib"
 msgstr ""
 
-#: pyload/Setup.py:245
+#: pyload/setup/Setup.py:226
 msgid ""
 "Attention: In some rare cases the builtin server is not working, if you "
 "notice problems with the webinterface"
 msgstr ""
 
-#: pyload/Setup.py:246
+#: pyload/setup/Setup.py:227
 msgid "come back here and change the builtin server to the threaded one here."
 msgstr ""
 
-#: pyload/Setup.py:248
+#: pyload/setup/Setup.py:229
 msgid "Server"
 msgstr ""
 
-#: pyload/Setup.py:253
+#: pyload/setup/Setup.py:234
 msgid "## SSL Setup ##"
 msgstr ""
 
-#: pyload/Setup.py:255
+#: pyload/setup/Setup.py:236
 msgid ""
 "Execute these commands from pyLoad config folder to make ssl certificates:"
 msgstr ""
 
-#: pyload/Setup.py:261
+#: pyload/setup/Setup.py:242
 msgid "If you're done and everything went fine, you can activate ssl now."
 msgstr ""
 
-#: pyload/Setup.py:262
+#: pyload/setup/Setup.py:243
 msgid "Activate SSL?"
 msgstr ""
 
-#: pyload/Setup.py:278
+#: pyload/setup/Setup.py:255
 msgid "Select action"
 msgstr ""
 
-#: pyload/Setup.py:279
+#: pyload/setup/Setup.py:256
 msgid "1 - Create/Edit user"
 msgstr ""
 
-#: pyload/Setup.py:280
+#: pyload/setup/Setup.py:257
 msgid "2 - List users"
 msgstr ""
 
-#: pyload/Setup.py:281
+#: pyload/setup/Setup.py:258
 msgid "3 - Remove user"
 msgstr ""
 
-#: pyload/Setup.py:282
+#: pyload/setup/Setup.py:259
 msgid "4 - Quit"
 msgstr ""
 
-#: pyload/Setup.py:294
+#: pyload/setup/Setup.py:270
 msgid "Users"
 msgstr ""
 
-#: pyload/Setup.py:322
+#: pyload/setup/Setup.py:318
 msgid "Setting new configpath, current configuration will not be transferred!"
 msgstr ""
 
-#: pyload/Setup.py:323
+#: pyload/setup/Setup.py:319
 msgid "Config path"
 msgstr ""
 
-#: pyload/Setup.py:331
+#: pyload/setup/Setup.py:327
 msgid "Config path changed, setup will now close, please restart to go on."
 msgstr ""
 
-#: pyload/Setup.py:332
+#: pyload/setup/Setup.py:328
 msgid "Press Enter to exit."
 msgstr ""
 
-#: pyload/Setup.py:336
+#: pyload/setup/Setup.py:332
 #, python-format
 msgid "Setting config path failed: %s"
 msgstr ""
 
-#: pyload/Setup.py:347
+#: pyload/setup/Setup.py:343
 msgid "y"
 msgstr ""
 
-#: pyload/Setup.py:349
+#: pyload/setup/Setup.py:345
 msgid "n"
 msgstr ""
 
-#: pyload/Setup.py:373
+#: pyload/setup/Setup.py:369
 msgid "Password: "
 msgstr ""
 
-#: pyload/Setup.py:377
+#: pyload/setup/Setup.py:373
 msgid "Password too short. Use at least 4 symbols."
 msgstr ""
 
-#: pyload/Setup.py:380
+#: pyload/setup/Setup.py:376
 msgid "Password (again): "
 msgstr ""
 
-#: pyload/Setup.py:386
+#: pyload/setup/Setup.py:382
 msgid "Passwords did not match."
 msgstr ""
 
-#: pyload/Setup.py:397
+#: pyload/setup/Setup.py:393
 msgid "yes"
 msgstr ""
 
-#: pyload/Setup.py:397
+#: pyload/setup/Setup.py:393
 msgid "true"
 msgstr ""
 
-#: pyload/Setup.py:397
+#: pyload/setup/Setup.py:393
 msgid "t"
 msgstr ""
 
-#: pyload/Setup.py:400
+#: pyload/setup/Setup.py:396
 msgid "no"
 msgstr ""
 
-#: pyload/Setup.py:400
+#: pyload/setup/Setup.py:396
 msgid "false"
 msgstr ""
 
-#: pyload/Setup.py:400
+#: pyload/setup/Setup.py:396
 msgid "f"
 msgstr ""
 
-#: pyload/Setup.py:403 pyload/Setup.py:413
+#: pyload/setup/Setup.py:399 pyload/setup/Setup.py:409
 msgid "Invalid Input"
 msgstr ""
diff --git a/locale/webUI.pot b/locale/webUI.pot
index cf9fe1015..1bfa8bf4b 100644
--- a/locale/webUI.pot
+++ b/locale/webUI.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pyload 0.4.9.9-dev\n"
 "Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
-"POT-Creation-Date: 2013-08-10 11:58+0200\n"
+"POT-Creation-Date: 2013-10-13 18:16+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,30 +17,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: pyload/web/app/templates/default/admin.html:3
+#: pyload/web/app/templates/default/admin.html:4
+msgid "Admin"
+msgstr ""
+
 #: pyload/web/app/scripts/helpers/formatSize.js:9
+#: pyload/web/app/templates/default/setup/system.html:45
 msgid "not available"
 msgstr ""
 
 #: pyload/web/app/scripts/helpers/formatSize.js:11
+#: pyload/web/app/scripts/helpers/formatTime.js:10
 msgid "unlimited"
 msgstr ""
 
-#: pyload/web/app/templates/default/admin.html:3
-#: pyload/web/app/templates/default/admin.html:4
-msgid "Admin"
+#: pyload/web/app/templates/default/linkgrabber/package.html:25
+#: pyload/web/app/scripts/helpers/linkStatus.js:7
+msgid "online"
 msgstr ""
+#: pyload/web/app/templates/default/linkgrabber/package.html:30
 
-#: pyload/web/app/templates/default/setup.html:3
-msgid "Setup"
+#: pyload/web/app/scripts/helpers/linkStatus.js:9
+msgid "offline"
 msgstr ""
+#: pyload/web/app/templates/default/linkgrabber/package.html:35
 
-#: pyload/web/app/templates/default/accounts/actionbar.html:2
-msgid "Add Account"
+#: pyload/web/app/scripts/helpers/linkStatus.js:11
+#: pyload/web/app/scripts/helpers/formatTime.js:8
+msgid "unknown"
 msgstr ""
 
-#: pyload/web/app/templates/default/accounts/layout.html:2
-msgid "Accounts"
-msgstr ""
+#: pyload/web/app/templates/default/dashboard/select.html:1
+msgid "1 package"
+msgid_plural "%d packages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pyload/web/app/templates/default/dashboard/select.html:4
+msgid "1 file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pyload/web/app/templates/default/dashboard/actionbar.html:9
 msgid "Local"
@@ -71,24 +89,88 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#: pyload/web/app/templates/default/dashboard/select.html:1
-msgid "1 package"
-msgid_plural "%d packages"
-msgstr[0] ""
-msgstr[1] ""
+#: pyload/web/app/templates/default/setup/finished.html:3
+msgid "Nearly Done"
+msgstr ""
 
-#: pyload/web/app/templates/default/dashboard/select.html:4
-msgid "1 file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
+#: pyload/web/app/templates/default/setup/finished.html:7
+msgid "Please check your settings."
+msgstr ""
 
-#: pyload/web/app/templates/default/dialogs/addAccount.html:2
-msgid "Add an account"
+#: pyload/web/app/templates/default/setup/finished.html:15
+msgid "Confirm"
 msgstr ""
 
-#: pyload/web/app/templates/default/dialogs/addAccount.html:7
-msgid "Please enter your account data"
+#: pyload/web/app/templates/default/setup/finished.html:20
+msgid "Pleae add a user first."
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/welcome.html:0
+msgid "Welcome!"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/welcome.html:2
+msgid "pyLoad is running and ready for configuration."
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/welcome.html:5
+msgid "Select your language:"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/welcome.html:12
+msgid "Start configuration"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/layout.html:2
+msgid "Setup"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/system.html:0
+msgid "System"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/system.html:9
+msgid "Dependencies"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/system.html:31
+msgid "Optional"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/system.html:38
+msgid "available"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/system.html:54
+msgid "Next"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/error.html:1
+msgid "Setup timed out"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/error.html:2
+msgid "Setup was closed due to inactivity. Please restart it to continue configuration."
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/error.html:5
+msgid "Setup finished"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/error.html:6
+msgid "Setup was successful. You can restart pyLoad now."
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/error.html:9
+msgid "Setup failed"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup/error.html:11
+msgid "Try to restart it or open a bug report."
+msgstr ""
+
+#: pyload/web/app/templates/default/header/layout.html:12
+msgid "Running..."
 msgstr ""
 
 #: pyload/web/app/templates/default/dialogs/addPluginConfig.html:3
@@ -100,16 +182,24 @@ msgid "Please choose a plugin, which you want to configure"
 msgstr ""
 
 #: pyload/web/app/templates/default/dialogs/addPluginConfig.html:23
-#: pyload/web/app/templates/default/dialogs/linkgrabber.html:46
+#: pyload/web/app/templates/default/linkgrabber/modal.html:39
 msgid "Add"
 msgstr ""
 
 #: pyload/web/app/templates/default/dialogs/addPluginConfig.html:24
-#: pyload/web/app/templates/default/dialogs/linkgrabber.html:47
+#: pyload/web/app/templates/default/linkgrabber/modal.html:40
 #: pyload/web/app/templates/default/dialogs/interactionTask.html:35
 msgid "Close"
 msgstr ""
 
+#: pyload/web/app/templates/default/dialogs/addAccount.html:2
+msgid "Add an account"
+msgstr ""
+
+#: pyload/web/app/templates/default/dialogs/addAccount.html:7
+msgid "Please enter your account data"
+msgstr ""
+
 #: pyload/web/app/templates/default/dialogs/confirmDelete.html:2
 msgid "Please confirm"
 msgstr ""
@@ -130,6 +220,76 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: pyload/web/app/templates/default/header/layout.html:12
-msgid "Running..."
+#: pyload/web/app/templates/default/accounts/account.html:5
+msgid "premium"
+msgstr ""
+
+#: pyload/web/app/templates/default/accounts/account.html:7
+msgid "valid"
+msgstr ""
+
+#: pyload/web/app/templates/default/accounts/account.html:12
+msgid "invalid"
+msgstr ""
+
+#: pyload/web/app/templates/default/accounts/account.html:23
+msgid "Traffic left:"
+msgstr ""
+
+#: pyload/web/app/templates/default/accounts/account.html:27
+msgid "Valid until:"
 msgstr ""
+
+#: pyload/web/app/templates/default/accounts/editAccount.html:2
+msgid "Edit account"
+msgstr ""
+
+#: pyload/web/app/templates/default/accounts/editAccount.html:27
+msgid "Configuration"
+msgstr ""
+
+#: pyload/web/app/templates/default/accounts/layout.html:2
+msgid "Accounts"
+msgstr ""
+
+#: pyload/web/app/templates/default/accounts/actionbar.html:2
+msgid "Add Account"
+msgstr ""
+
+#: pyload/web/app/templates/default/linkgrabber/modal.html:3
+msgid "Add links"
+msgstr ""
+
+#: pyload/web/app/templates/default/linkgrabber/modal.html:4
+msgid "paste & add links to pyLoad"
+msgstr ""
+
+#: pyload/web/app/templates/default/linkgrabber/modal.html:13
+msgid " Paste your links here..."
+msgstr ""
+
+#: pyload/web/app/templates/default/linkgrabber/modal.html:17
+msgid "Container"
+msgstr ""
+
+#: pyload/web/app/templates/default/linkgrabber/modal.html:18
+msgid "Upload"
+msgstr ""
+
+#: pyload/web/app/templates/default/linkgrabber/modal.html:24
+msgid "URL"
+msgstr ""
+
+#: pyload/web/app/templates/default/linkgrabber/modal.html:25
+msgid "Link to Website"
+msgstr ""
+
+#: pyload/web/app/templates/default/linkgrabber/modal.html:31
+msgid "Packages"
+msgstr ""
+
+#: pyload/web/app/templates/default/linkgrabber/package.html:19
+msgid "%d link"
+msgid_plural "%d links"
+msgstr[0] ""
+msgstr[1] ""