Fix Locales

2 files changed, 276 insertions, 276 deletions

diff --git a/locale/zh/LC_MESSAGES/django.po b/locale/zh/LC_MESSAGES/django.po
index bfc2f642e..d34a347af 100644
--- a/locale/zh/LC_MESSAGES/django.po
+++ b/locale/zh/LC_MESSAGES/django.po
@@ -12,673 +12,673 @@ msgstr "Project-Id-Version: pyload\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: crowdin.net\n"
 
-#: module/web/translations.js:1
+#: module/webui/translations.js:1
 msgid "New Captcha Request"
 msgstr "新验证请求"
 
-#: module/web/translations.js:2 module/web/templates/default/captcha.html:7
+#: module/webui/translations.js:2 module/webui/themes/default/tml/captcha.html:7
 msgid "Please read the text on the captcha."
 msgstr "请读取验证码上的文本."
 
-#: module/web/translations.js:3
+#: module/webui/translations.js:3
 msgid "pyLoad restarted"
 msgstr "pyLoad已经重启"
 
-#: module/web/translations.js:4
-#: module/web/templates/default/settings_item.html:16
-#: module/web/templates/default/base.html:123
-#: module/web/templates/default/base.html:124
+#: module/webui/translations.js:4
+#: module/webui/themes/default/tml/settings_item.html:16
+#: module/webui/themes/default/tml/base.html:123
+#: module/webui/themes/default/tml/base.html:124
 msgid "off"
 msgstr "關"
 
-#: module/web/translations.js:5
+#: module/webui/translations.js:5
 msgid "Success"
 msgstr "成功"
 
-#: module/web/translations.js:6
-#: module/web/templates/default/settings_item.html:14
-#: module/web/templates/default/base.html:123
-#: module/web/templates/default/base.html:124
+#: module/webui/translations.js:6
+#: module/webui/themes/default/tml/settings_item.html:14
+#: module/webui/themes/default/tml/base.html:123
+#: module/webui/themes/default/tml/base.html:124
 msgid "on"
 msgstr "開"
 
-#: module/web/translations.js:7
+#: module/webui/translations.js:7
 msgid "You are really sure you want to quit pyLoad?"
 msgstr "确认要退出pyLoad吗？"
 
-#: module/web/translations.js:8
+#: module/webui/translations.js:8
 msgid "Restart Link"
 msgstr "链接重新开始"
 
-#: module/web/translations.js:9
+#: module/webui/translations.js:9
 msgid "Delete Link"
 msgstr "删除链接"
 
-#: module/web/translations.js:10
+#: module/webui/translations.js:10
 msgid "Please Enter a packagename."
 msgstr "请输入下载包名字"
 
-#: module/web/translations.js:11
+#: module/webui/translations.js:11
 msgid "Please click on the right captcha position."
 msgstr "请点击正确的验证码位置"
 
-#: module/web/translations.js:12
+#: module/webui/translations.js:12
 msgid "Error occured."
 msgstr "错误发生了"
 
-#: module/web/translations.js:13
-#: module/web/templates/default/filemanager.html:65
-#: module/web/templates/default/folder.html:14
+#: module/webui/translations.js:13
+#: module/webui/themes/default/tml/filemanager.html:65
+#: module/webui/themes/default/tml/folder.html:14
 msgid "Folder is empty"
 msgstr "文件夹为空"
 
-#: module/web/translations.js:14
+#: module/webui/translations.js:14
 msgid "Failed"
 msgstr "失敗"
 
-#: module/web/translations.js:15
+#: module/webui/translations.js:15
 msgid "No Captchas to read."
 msgstr "没有获取验证码"
 
-#: module/web/translations.js:16
+#: module/webui/translations.js:16
 msgid "Passwords did not match."
 msgstr "密码不符"
 
-#: module/web/translations.js:17
+#: module/webui/translations.js:17
 msgid "Settings saved."
 msgstr "设置已保存"
 
-#: module/web/translations.js:18
+#: module/webui/translations.js:18
 msgid "New folder"
 msgstr "新文件夹"
 
-#: module/web/translations.js:19
+#: module/webui/translations.js:19
 msgid "Are you sure you want to restart pyLoad?"
 msgstr "确定重启pyLoad吗？"
 
-#: module/web/json_app.py:57
+#: module/webui/app/json.py:57
 #, python-format
 msgid "waiting %s"
 msgstr ""
 
-#: module/web/templates/default/home.html:206
+#: module/webui/themes/default/tml/home.html:206
 msgid "Active Downloads"
 msgstr "活动下载"
 
-#: module/web/templates/default/home.html:211
-#: module/web/templates/default/base.html:84
+#: module/webui/themes/default/tml/home.html:211
+#: module/webui/themes/default/tml/base.html:84
 msgid "Home"
 msgstr "首页"
 
-#: module/web/templates/default/home.html:214
-#: module/web/templates/default/queue.html:15
-#: module/web/templates/default/window.html:34
-#: module/web/templates/default/base.html:87
+#: module/webui/themes/default/tml/home.html:214
+#: module/webui/themes/default/tml/queue.html:15
+#: module/webui/themes/default/tml/window.html:34
+#: module/webui/themes/default/tml/base.html:87
 msgid "Queue"
 msgstr ""
 
-#: module/web/templates/default/home.html:217
-#: module/web/templates/default/queue.html:17
-#: module/web/templates/default/window.html:36
-#: module/web/templates/default/base.html:90
+#: module/webui/themes/default/tml/home.html:217
+#: module/webui/themes/default/tml/queue.html:17
+#: module/webui/themes/default/tml/window.html:36
+#: module/webui/themes/default/tml/base.html:90
 msgid "Collector"
 msgstr ""
 
-#: module/web/templates/default/home.html:220
-#: module/web/templates/default/downloads.html:6
-#: module/web/templates/default/base.html:93
+#: module/webui/themes/default/tml/home.html:220
+#: module/webui/themes/default/tml/downloads.html:6
+#: module/webui/themes/default/tml/base.html:93
 msgid "Downloads"
 msgstr "已下载"
 
-#: module/web/templates/default/home.html:226
-#: module/web/templates/default/logs.html:3
-#: module/web/templates/default/logs.html:4
-#: module/web/templates/default/base.html:99
+#: module/webui/themes/default/tml/home.html:226
+#: module/webui/themes/default/tml/logs.html:3
+#: module/webui/themes/default/tml/logs.html:4
+#: module/webui/themes/default/tml/base.html:99
 msgid "Logs"
 msgstr "日志"
 
-#: module/web/templates/default/home.html:229
-#: module/web/templates/default/settings.html:3
-#: module/web/templates/default/settings.html:4
-#: module/web/templates/default/base.html:102
+#: module/webui/themes/default/tml/home.html:229
+#: module/webui/themes/default/tml/settings.html:3
+#: module/webui/themes/default/tml/settings.html:4
+#: module/webui/themes/default/tml/base.html:102
 msgid "Config"
 msgstr "配置"
 
-#: module/web/templates/default/home.html:237
-#: module/web/templates/default/queue.html:82
-#: module/web/templates/default/settings.html:91
-#: module/web/templates/default/window.html:7
-#: module/web/templates/default/admin.html:25
+#: module/webui/themes/default/tml/home.html:237
+#: module/webui/themes/default/tml/queue.html:82
+#: module/webui/themes/default/tml/settings.html:91
+#: module/webui/themes/default/tml/window.html:7
+#: module/webui/themes/default/tml/admin.html:25
 msgid "Name"
 msgstr "名稱"
 
-#: module/web/templates/default/home.html:238
-#: module/web/templates/default/settings.html:93
+#: module/webui/themes/default/tml/home.html:238
+#: module/webui/themes/default/tml/settings.html:93
 msgid "Status"
 msgstr "狀態"
 
-#: module/web/templates/default/home.html:239
-#: module/web/templates/default/info.html:14
-#: module/web/templates/default/info.html:15
+#: module/webui/themes/default/tml/home.html:239
+#: module/webui/themes/default/tml/info.html:14
+#: module/webui/themes/default/tml/info.html:15
 msgid "Information"
 msgstr "信息"
 
-#: module/web/templates/default/home.html:240
+#: module/webui/themes/default/tml/home.html:240
 msgid "Size"
 msgstr "大小"
 
-#: module/web/templates/default/home.html:241
+#: module/webui/themes/default/tml/home.html:241
 msgid "Progress"
 msgstr "进度"
 
-#: module/web/templates/default/login.html:3
-#: module/web/templates/default/settings.html:178
+#: module/webui/themes/default/tml/login.html:3
+#: module/webui/themes/default/tml/settings.html:178
 msgid "Login"
 msgstr "登入"
 
-#: module/web/templates/default/login.html:14
+#: module/webui/themes/default/tml/login.html:14
 msgid "Username"
 msgstr "使用者名稱"
 
-#: module/web/templates/default/login.html:19
-#: module/web/templates/default/queue.html:92
-#: module/web/templates/default/settings.html:92
-#: module/web/templates/default/settings.html:183
-#: module/web/templates/default/window.html:21
+#: module/webui/themes/default/tml/login.html:19
+#: module/webui/themes/default/tml/queue.html:92
+#: module/webui/themes/default/tml/settings.html:92
+#: module/webui/themes/default/tml/settings.html:183
+#: module/webui/themes/default/tml/window.html:21
 msgid "Password"
 msgstr "密碼"
 
-#: module/web/templates/default/login.html:29
+#: module/webui/themes/default/tml/login.html:29
 msgid "Your username and password didn't match. Please try again."
 msgstr "您的用户名和密码不匹配, 请再试一次."
 
-#: module/web/templates/default/login.html:30
+#: module/webui/themes/default/tml/login.html:30
 msgid "To reset your login data or add an user run:"
 msgstr "要重置您的登录数据或添加一个用户, 请运行:"
 
-#: module/web/templates/default/queue.html:25
+#: module/webui/themes/default/tml/queue.html:25
 msgid "Delete Finished"
 msgstr "删除完成"
 
-#: module/web/templates/default/queue.html:26
+#: module/webui/themes/default/tml/queue.html:26
 msgid "Restart Failed"
 msgstr "重启出错"
 
-#: module/web/templates/default/queue.html:65
+#: module/webui/themes/default/tml/queue.html:65
 msgid "Folder:"
 msgstr "文件夹:"
 
-#: module/web/templates/default/queue.html:65
+#: module/webui/themes/default/tml/queue.html:65
 msgid "Password:"
 msgstr "密码:"
 
-#: module/web/templates/default/queue.html:79
+#: module/webui/themes/default/tml/queue.html:79
 msgid "Edit Package"
 msgstr "编辑下载"
 
-#: module/web/templates/default/queue.html:80
+#: module/webui/themes/default/tml/queue.html:80
 msgid "Edit the package detais below."
 msgstr "修改文件包详细注释信息."
 
-#: module/web/templates/default/queue.html:83
+#: module/webui/themes/default/tml/queue.html:83
 msgid "The name of the package."
 msgstr "文件名."
 
-#: module/web/templates/default/queue.html:87
+#: module/webui/themes/default/tml/queue.html:87
 msgid "Folder"
 msgstr "目錄"
 
-#: module/web/templates/default/queue.html:88
+#: module/webui/themes/default/tml/queue.html:88
 msgid "Name of subfolder for these downloads."
 msgstr "此下载的子目录名."
 
-#: module/web/templates/default/queue.html:93
+#: module/webui/themes/default/tml/queue.html:93
 msgid "List of passwords used for unrar."
 msgstr "UNRAR解压缩密码列表."
 
-#: module/web/templates/default/queue.html:97
-#: module/web/templates/default/settings.html:167
-#: module/web/templates/default/captcha.html:33
-#: module/web/templates/default/admin.html:61
-#: module/web/templates/default/admin.html:91
+#: module/webui/themes/default/tml/queue.html:97
+#: module/webui/themes/default/tml/settings.html:167
+#: module/webui/themes/default/tml/captcha.html:33
+#: module/webui/themes/default/tml/admin.html:61
+#: module/webui/themes/default/tml/admin.html:91
 msgid "Submit"
 msgstr "同意"
 
-#: module/web/templates/default/queue.html:98
-#: module/web/templates/default/settings.html:198
-#: module/web/templates/default/window.html:41
-#: module/web/templates/default/admin.html:92
+#: module/webui/themes/default/tml/queue.html:98
+#: module/webui/themes/default/tml/settings.html:198
+#: module/webui/themes/default/tml/window.html:41
+#: module/webui/themes/default/tml/admin.html:92
 msgid "Reset"
 msgstr "重置"
 
-#: module/web/templates/default/logout.html:8
+#: module/webui/themes/default/tml/logout.html:8
 msgid "You were successfully logged out."
 msgstr "您已成功注销."
 
-#: module/web/templates/default/pathchooser.html:39
-#: module/web/templates/default/pathchooser.html:41
+#: module/webui/themes/default/tml/pathchooser.html:39
+#: module/webui/themes/default/tml/pathchooser.html:41
 msgid "Path"
 msgstr "路径"
 
-#: module/web/templates/default/pathchooser.html:39
-#: module/web/templates/default/pathchooser.html:41
+#: module/webui/themes/default/tml/pathchooser.html:39
+#: module/webui/themes/default/tml/pathchooser.html:41
 msgid "absolute"
 msgstr "绝对"
 
-#: module/web/templates/default/pathchooser.html:39
-#: module/web/templates/default/pathchooser.html:41
+#: module/webui/themes/default/tml/pathchooser.html:39
+#: module/webui/themes/default/tml/pathchooser.html:41
 msgid "relative"
 msgstr "相对"
 
-#: module/web/templates/default/pathchooser.html:46
+#: module/webui/themes/default/tml/pathchooser.html:46
 msgid "name"
 msgstr "名称"
 
-#: module/web/templates/default/pathchooser.html:47
+#: module/webui/themes/default/tml/pathchooser.html:47
 msgid "size"
 msgstr "大小"
 
-#: module/web/templates/default/pathchooser.html:48
+#: module/webui/themes/default/tml/pathchooser.html:48
 msgid "type"
 msgstr "类型"
 
-#: module/web/templates/default/pathchooser.html:49
+#: module/webui/themes/default/tml/pathchooser.html:49
 msgid "last modified"
 msgstr "最后修改"
 
-#: module/web/templates/default/pathchooser.html:54
+#: module/webui/themes/default/tml/pathchooser.html:54
 msgid "parent directory"
 msgstr "父目录"
 
-#: module/web/templates/default/pathchooser.html:70
+#: module/webui/themes/default/tml/pathchooser.html:70
 msgid "no content"
 msgstr "没有内容"
 
-#: module/web/templates/default/settings.html:16
+#: module/webui/themes/default/tml/settings.html:16
 msgid "General"
 msgstr "一般設定"
 
-#: module/web/templates/default/settings.html:17
+#: module/webui/themes/default/tml/settings.html:17
 msgid "Plugins"
 msgstr "插件"
 
-#: module/web/templates/default/settings.html:18
+#: module/webui/themes/default/tml/settings.html:18
 msgid "Accounts"
 msgstr "帳戶"
 
-#: module/web/templates/default/settings.html:45
-#: module/web/templates/default/settings.html:74
+#: module/webui/themes/default/tml/settings.html:45
+#: module/webui/themes/default/tml/settings.html:74
 msgid "Choose a section from the menu"
 msgstr "从菜单中选择一项目"
 
-#: module/web/templates/default/settings.html:90
+#: module/webui/themes/default/tml/settings.html:90
 msgid "Plugin"
 msgstr "外掛"
 
-#: module/web/templates/default/settings.html:94
+#: module/webui/themes/default/tml/settings.html:94
 msgid "Premium"
 msgstr "高级帐号"
 
-#: module/web/templates/default/settings.html:95
+#: module/webui/themes/default/tml/settings.html:95
 msgid "Valid until"
 msgstr "有效期至"
 
-#: module/web/templates/default/settings.html:96
+#: module/webui/themes/default/tml/settings.html:96
 msgid "Traffic left"
 msgstr "剩余流量"
 
-#: module/web/templates/default/settings.html:97
+#: module/webui/themes/default/tml/settings.html:97
 msgid "Time"
 msgstr "时间"
 
-#: module/web/templates/default/settings.html:98
+#: module/webui/themes/default/tml/settings.html:98
 msgid "Max Parallel"
 msgstr "最大连接数"
 
-#: module/web/templates/default/settings.html:99
+#: module/webui/themes/default/tml/settings.html:99
 msgid "Delete?"
 msgstr "确认删除?"
 
-#: module/web/templates/default/settings.html:121
+#: module/webui/themes/default/tml/settings.html:121
 msgid "valid"
 msgstr "有效的"
 
-#: module/web/templates/default/settings.html:124
+#: module/webui/themes/default/tml/settings.html:124
 msgid "not valid"
 msgstr "无效"
 
-#: module/web/templates/default/settings.html:131
+#: module/webui/themes/default/tml/settings.html:131
 msgid "yes"
 msgstr "是"
 
-#: module/web/templates/default/settings.html:134
+#: module/webui/themes/default/tml/settings.html:134
 msgid "no"
 msgstr "否"
 
-#: module/web/templates/default/settings.html:168
-#: module/web/templates/default/settings.html:197
-#: module/web/templates/default/base.html:117
+#: module/webui/themes/default/tml/settings.html:168
+#: module/webui/themes/default/tml/settings.html:197
+#: module/webui/themes/default/tml/base.html:117
 msgid "Add"
 msgstr "增加"
 
-#: module/web/templates/default/settings.html:176
+#: module/webui/themes/default/tml/settings.html:176
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: module/web/templates/default/settings.html:177
+#: module/webui/themes/default/tml/settings.html:177
 msgid "Enter your account data to use premium features."
 msgstr "输入您的帐户资料来使用高级功能."
 
-#: module/web/templates/default/settings.html:179
-#: module/web/templates/default/admin.html:71
+#: module/webui/themes/default/tml/settings.html:179
+#: module/webui/themes/default/tml/admin.html:71
 msgid "Your username."
 msgstr "您的用户名."
 
-#: module/web/templates/default/settings.html:184
-#: module/web/templates/default/admin.html:76
+#: module/webui/themes/default/tml/settings.html:184
+#: module/webui/themes/default/tml/admin.html:76
 msgid "The password for this account."
 msgstr "当前密码仅为此帐号所用."
 
-#: module/web/templates/default/settings.html:188
+#: module/webui/themes/default/tml/settings.html:188
 msgid "Type"
 msgstr "種類"
 
-#: module/web/templates/default/settings.html:189
+#: module/webui/themes/default/tml/settings.html:189
 msgid "Choose the hoster for your account."
 msgstr "请选择您帐号对应的网盘类型."
 
-#: module/web/templates/default/logs.html:12
-#: module/web/templates/default/base.html:114
+#: module/webui/themes/default/tml/logs.html:12
+#: module/webui/themes/default/tml/base.html:114
 msgid "Start"
 msgstr "启动"
 
-#: module/web/templates/default/logs.html:12
+#: module/webui/themes/default/tml/logs.html:12
 msgid "prev"
 msgstr "上一页"
 
-#: module/web/templates/default/logs.html:12
+#: module/webui/themes/default/tml/logs.html:12
 msgid "next"
 msgstr "下一页"
 
-#: module/web/templates/default/logs.html:12
+#: module/webui/themes/default/tml/logs.html:12
 msgid "End"
 msgstr "完成"
 
-#: module/web/templates/default/info.html:18
+#: module/webui/themes/default/tml/info.html:18
 msgid "News"
 msgstr "新闻"
 
-#: module/web/templates/default/info.html:21
+#: module/webui/themes/default/tml/info.html:21
 msgid "Support"
 msgstr "技术支持"
 
-#: module/web/templates/default/info.html:37
+#: module/webui/themes/default/tml/info.html:37
 msgid "System"
 msgstr "系統"
 
-#: module/web/templates/default/info.html:40
+#: module/webui/themes/default/tml/info.html:40
 msgid "Python:"
 msgstr ""
 
-#: module/web/templates/default/info.html:44
+#: module/webui/themes/default/tml/info.html:44
 msgid "OS:"
 msgstr "操作系统:"
 
-#: module/web/templates/default/info.html:48
+#: module/webui/themes/default/tml/info.html:48
 msgid "pyLoad version:"
 msgstr "pyLoad 版本:"
 
-#: module/web/templates/default/info.html:52
+#: module/webui/themes/default/tml/info.html:52
 msgid "Installation Folder:"
 msgstr "安装文件夹:"
 
-#: module/web/templates/default/info.html:56
+#: module/webui/themes/default/tml/info.html:56
 msgid "Config Folder:"
 msgstr "配置文件夹:"
 
-#: module/web/templates/default/info.html:60
+#: module/webui/themes/default/tml/info.html:60
 msgid "Download Folder:"
 msgstr "下载文件夹:"
 
-#: module/web/templates/default/info.html:64
+#: module/webui/themes/default/tml/info.html:64
 msgid "Free Space:"
 msgstr "空闲空间:"
 
-#: module/web/templates/default/info.html:68
+#: module/webui/themes/default/tml/info.html:68
 msgid "Language:"
 msgstr "语言:"
 
-#: module/web/templates/default/info.html:72
+#: module/webui/themes/default/tml/info.html:72
 msgid "Webinterface Port:"
 msgstr "Web界面端口:"
 
-#: module/web/templates/default/info.html:76
+#: module/webui/themes/default/tml/info.html:76
 msgid "Remote Interface Port:"
 msgstr "远程接口端口:"
 
-#: module/web/templates/default/setup.html:3
-#: module/web/templates/default/setup.html:4
+#: module/webui/themes/default/tml/setup.html:3
+#: module/webui/themes/default/tml/setup.html:4
 msgid "Setup"
 msgstr "設定"
 
-#: module/web/templates/default/filemanager.html:19
+#: module/webui/themes/default/tml/filemanager.html:19
 msgid "FileManager"
 msgstr "文件管理器"
 
-#: module/web/templates/default/window.html:5
-#: module/web/templates/default/window.html:40
+#: module/webui/themes/default/tml/window.html:5
+#: module/webui/themes/default/tml/window.html:40
 msgid "Add Package"
 msgstr "添加下载"
 
-#: module/web/templates/default/window.html:6
+#: module/webui/themes/default/tml/window.html:6
 msgid "Paste your links or upload a container."
 msgstr "粘贴链接或者上传一容器."
 
-#: module/web/templates/default/window.html:8
+#: module/webui/themes/default/tml/window.html:8
 msgid "The name of the new package."
 msgstr "新建下载的名字."
 
-#: module/web/templates/default/window.html:12
+#: module/webui/themes/default/tml/window.html:12
 msgid "Links"
 msgstr "链接"
 
-#: module/web/templates/default/window.html:13
+#: module/webui/themes/default/tml/window.html:13
 msgid "Paste your links here or any text and press the filter button."
 msgstr "在这里粘贴您的链接或任何文本内容, 然后按\"过滤\"按钮."
 
-#: module/web/templates/default/window.html:14
+#: module/webui/themes/default/tml/window.html:14
 msgid "Filter urls"
 msgstr "过滤"
 
-#: module/web/templates/default/window.html:22
+#: module/webui/themes/default/tml/window.html:22
 msgid "Password for RAR-Archive"
 msgstr "RAR压缩包密码"
 
-#: module/web/templates/default/window.html:26
+#: module/webui/themes/default/tml/window.html:26
 msgid "File"
 msgstr "文件"
 
-#: module/web/templates/default/window.html:27
+#: module/webui/themes/default/tml/window.html:27
 msgid "Upload a container."
 msgstr "上传一容器."
 
-#: module/web/templates/default/window.html:31
+#: module/webui/themes/default/tml/window.html:31
 msgid "Destination"
 msgstr "目的地"
 
-#: module/web/templates/default/captcha.html:6
+#: module/webui/themes/default/tml/captcha.html:6
 msgid "Captcha reading"
 msgstr "验证码读取中..."
 
-#: module/web/templates/default/captcha.html:13
+#: module/webui/themes/default/tml/captcha.html:13
 msgid "Captcha"
 msgstr "验证码"
 
-#: module/web/templates/default/captcha.html:14
+#: module/webui/themes/default/tml/captcha.html:14
 msgid "The captcha."
 msgstr "验证码."
 
-#: module/web/templates/default/captcha.html:20
+#: module/webui/themes/default/tml/captcha.html:20
 msgid "Text"
 msgstr "文本"
 
-#: module/web/templates/default/captcha.html:21
+#: module/webui/themes/default/tml/captcha.html:21
 msgid "Input the text on the captcha."
 msgstr "输入验证码上的文本."
 
-#: module/web/templates/default/captcha.html:34
+#: module/webui/themes/default/tml/captcha.html:34
 msgid "Close"
 msgstr "關閉"
 
-#: module/web/templates/default/base.html:20
-#: module/web/templates/default/base.html:139
+#: module/webui/themes/default/tml/base.html:20
+#: module/webui/themes/default/tml/base.html:139
 msgid "Webinterface"
 msgstr "Web界面"
 
-#: module/web/templates/default/base.html:39
+#: module/webui/themes/default/tml/base.html:39
 msgid "pyLoad Update available!"
 msgstr "pyLoad 更新可用!"
 
-#: module/web/templates/default/base.html:46
+#: module/webui/themes/default/tml/base.html:46
 msgid "Plugins updated, please restart!"
 msgstr "插件已更新, 请重新启动程序!"
 
-#: module/web/templates/default/base.html:52
+#: module/webui/themes/default/tml/base.html:52
 msgid "Captcha waiting"
 msgstr "验证码等待中"
 
-#: module/web/templates/default/base.html:57
+#: module/webui/themes/default/tml/base.html:57
 msgid "Logout"
 msgstr "注销"
 
-#: module/web/templates/default/base.html:59
-#: module/web/templates/default/admin.html:8
-#: module/web/templates/default/admin.html:9
+#: module/webui/themes/default/tml/base.html:59
+#: module/webui/themes/default/tml/admin.html:8
+#: module/webui/themes/default/tml/admin.html:9
 msgid "Administrate"
 msgstr "管理"
 
-#: module/web/templates/default/base.html:61
+#: module/webui/themes/default/tml/base.html:61
 msgid "Info"
 msgstr "信息"
 
-#: module/web/templates/default/base.html:65
+#: module/webui/themes/default/tml/base.html:65
 msgid "Please Login!"
 msgstr "请登录!"
 
-#: module/web/templates/default/base.html:115
+#: module/webui/themes/default/tml/base.html:115
 msgid "Stop"
 msgstr "停止"
 
-#: module/web/templates/default/base.html:116
+#: module/webui/themes/default/tml/base.html:116
 msgid "Cancel"
 msgstr "取消"
 
-#: module/web/templates/default/base.html:123
+#: module/webui/themes/default/tml/base.html:123
 msgid "Download:"
 msgstr "下载:"
 
-#: module/web/templates/default/base.html:124
+#: module/webui/themes/default/tml/base.html:124
 msgid "Reconnect:"
 msgstr "重新连接:"
 
-#: module/web/templates/default/base.html:125
+#: module/webui/themes/default/tml/base.html:125
 msgid "Speed:"
 msgstr "速度:"
 
-#: module/web/templates/default/base.html:126
+#: module/webui/themes/default/tml/base.html:126
 msgid "Active:"
 msgstr "活动:"
 
-#: module/web/templates/default/base.html:127
+#: module/webui/themes/default/tml/base.html:127
 msgid "Reload page"
 msgstr "刷新页面"
 
-#: module/web/templates/default/base.html:157
+#: module/webui/themes/default/tml/base.html:157
 msgid "loading"
 msgstr "加载中"
 
-#: module/web/templates/default/base.html:166
+#: module/webui/themes/default/tml/base.html:166
 msgid "Back to top"
 msgstr "返回顶部"
 
-#: module/web/templates/default/admin.html:13
+#: module/webui/themes/default/tml/admin.html:13
 msgid "Quit pyLoad"
 msgstr "退出pyLoad"
 
-#: module/web/templates/default/admin.html:14
+#: module/webui/themes/default/tml/admin.html:14
 msgid "Restart pyLoad"
 msgstr "重启pyLoad"
 
-#: module/web/templates/default/admin.html:18
+#: module/webui/themes/default/tml/admin.html:18
 msgid "To add user or change passwords use:"
 msgstr "添加用户或更改密码请使用:"
 
-#: module/web/templates/default/admin.html:19
+#: module/webui/themes/default/tml/admin.html:19
 msgid "Important: Admin user have always all permissions!"
 msgstr "重要提示：管理员账户具有所有操作权限！"
 
-#: module/web/templates/default/admin.html:28
-#: module/web/templates/default/admin.html:67
+#: module/webui/themes/default/tml/admin.html:28
+#: module/webui/themes/default/tml/admin.html:67
 msgid "Change Password"
 msgstr "更改密码"
 
-#: module/web/templates/default/admin.html:31
+#: module/webui/themes/default/tml/admin.html:31
 msgid "Admin"
 msgstr ""
 
-#: module/web/templates/default/admin.html:34
+#: module/webui/themes/default/tml/admin.html:34
 msgid "Permissions"
 msgstr "许可"
 
-#: module/web/templates/default/admin.html:41
+#: module/webui/themes/default/tml/admin.html:41
 msgid "change"
 msgstr "更改"
 
-#: module/web/templates/default/admin.html:69
+#: module/webui/themes/default/tml/admin.html:69
 msgid "Enter your current and desired Password."
 msgstr "请输入您当前以及需要修改的密码."
 
-#: module/web/templates/default/admin.html:70
+#: module/webui/themes/default/tml/admin.html:70
 msgid "User"
 msgstr "用户"
 
-#: module/web/templates/default/admin.html:75
+#: module/webui/themes/default/tml/admin.html:75
 msgid "Current password"
 msgstr "当前密码"
 
-#: module/web/templates/default/admin.html:80
+#: module/webui/themes/default/tml/admin.html:80
 msgid "New password"
 msgstr "新密码"
 
-#: module/web/templates/default/admin.html:81
+#: module/webui/themes/default/tml/admin.html:81
 msgid "The new password."
 msgstr "新的密码."
 
-#: module/web/templates/default/admin.html:85
+#: module/webui/themes/default/tml/admin.html:85
 msgid "New password (repeat)"
 msgstr "新密码 (重复)"
 
-#: module/web/templates/default/admin.html:86
+#: module/webui/themes/default/tml/admin.html:86
 msgid "Please repeat the new password."
 msgstr "请确认您的新密码."
 
-#: module/web/pyload_app.py:125
+#: module/webui/app/pyload.py:125
 msgid "You dont have permission to access this page."
 msgstr ""
 
-#: module/web/pyload_app.py:193
+#: module/webui/app/pyload.py:193
 msgid "Download directory not found."
 msgstr ""
 
-#: module/web/pyload_app.py:260 module/web/pyload_app.py:267
+#: module/webui/app/pyload.py:260 module/webui/app/pyload.py:267
 msgid "unlimited"
 msgstr "無限制"
 
-#: module/web/pyload_app.py:262 module/web/pyload_app.py:269
+#: module/webui/app/pyload.py:262 module/webui/app/pyload.py:269
 msgid "not available"
 msgstr ""
 
-#: module/web/pyload_app.py:508
+#: module/webui/app/pyload.py:508
 msgid "Run pyload.py -s to access the setup."
 msgstr ""
 
diff --git a/locale/zh/LC_MESSAGES/pyLoad.po b/locale/zh/LC_MESSAGES/pyLoad.po
index 680ca4f52..19a8a1487 100644
--- a/locale/zh/LC_MESSAGES/pyLoad.po
+++ b/locale/zh/LC_MESSAGES/pyLoad.po
@@ -12,120 +12,120 @@ msgstr "Project-Id-Version: pyload\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: crowdin.net\n"
 
-#: pyload.py:182
+#: module/Core.py:182
 msgid "Received Quit signal"
 msgstr "收到退出訊號"
 
-#: pyload.py:303
+#: module/Core.py:303
 #, python-format
 msgid "pyLoad already running with pid %s"
 msgstr "pyLoad已經在執行，pid %s"
 
-#: pyload.py:317
+#: module/Core.py:317
 #, python-format
 msgid "Failed changing group: %s"
 msgstr "無法改變群組： %s"
 
-#: pyload.py:327
+#: module/Core.py:327
 #, python-format
 msgid "Failed changing user: %s"
 msgstr "無法改變使用者： %s"
 
-#: pyload.py:329
+#: module/Core.py:329
 msgid "folder for logs"
 msgstr "LOG文件夹"
 
-#: pyload.py:340
+#: module/Core.py:340
 msgid "Starting"
 msgstr "開始"
 
-#: pyload.py:341
+#: module/Core.py:341
 #, python-format
 msgid "Using home directory: %s"
 msgstr "使用家目錄： %s"
 
-#: pyload.py:350
+#: module/Core.py:350
 msgid "pycrypto to decode container files"
 msgstr "使用pycrypto解密文件"
 
-#: pyload.py:353
+#: module/Core.py:353
 msgid "folder for temporary files"
 msgstr "临时文件夹"
 
-#: pyload.py:358
+#: module/Core.py:358
 msgid "folder for downloads"
 msgstr "下载文件夹"
 
-#: pyload.py:361
+#: module/Core.py:361
 msgid "OpenSSL for secure connection"
 msgstr "使用OpenSSL安全登陆"
 
-#: pyload.py:365
+#: module/Core.py:365
 msgid "Moving old user config to DB"
 msgstr "将旧用户设定移入数据库"
 
-#: pyload.py:368
+#: module/Core.py:368
 msgid "Please check your logindata with ./pyload.py -u"
 msgstr "请执行./pyload.py -u 来确认你的logindata"
 
-#: pyload.py:371
+#: module/Core.py:371
 msgid "All links removed"
 msgstr "刪除所有連結"
 
-#: pyload.py:402
+#: module/Core.py:402
 #, python-format
 msgid "Downloadtime: %s"
 msgstr "下载时间：%s"
 
-#: pyload.py:412
+#: module/Core.py:412
 #, python-format
 msgid "Free space: %s"
 msgstr "剩餘空間： %s"
 
-#: pyload.py:432
+#: module/Core.py:432
 msgid "Activating Accounts..."
 msgstr "啟動帳戶..."
 
-#: pyload.py:438
+#: module/Core.py:438
 msgid "Activating Plugins..."
 msgstr "激活插件中..."
 
-#: pyload.py:441
+#: module/Core.py:441
 msgid "pyLoad is up and running"
 msgstr "pyLoad已是最新的狀態"
 
-#: pyload.py:460
+#: module/Core.py:460
 msgid "restarting pyLoad"
 msgstr "重新啟動pyLoad"
 
-#: pyload.py:464
+#: module/Core.py:464
 msgid "pyLoad quits"
 msgstr "離開pyLoad"
 
-#: pyload.py:521
+#: module/Core.py:521
 #, python-format
 msgid "Install %s"
 msgstr "安装 %s"
 
-#: pyload.py:557
+#: module/Core.py:557
 #, python-format
 msgid "could not find %(desc)s: %(name)s"
 msgstr "无法找到%(desc)s: %(name)s"
 
-#: pyload.py:559
+#: module/Core.py:559
 #, python-format
 msgid "could not create %(desc)s: %(name)s"
 msgstr "无法创建%(desc)s: %(name)s"
 
-#: pyload.py:580
+#: module/Core.py:580
 msgid "shutting down..."
 msgstr "關閉..."
 
-#: pyload.py:597
+#: module/Core.py:597
 msgid "error while shutting down"
 msgstr "關閉時出現錯誤"
 
-#: pyload.py:661
+#: module/Core.py:661
 msgid "killed pyLoad from Terminal"
 msgstr ""
 
@@ -234,105 +234,105 @@ msgstr "%(name)s ：%(addr)s:%(port)s 啟動中"
 msgid "Failed loading backend %(name)s | %(error)s"
 msgstr "無法載入 %(name)s： %(error)s"
 
-#: module/web/json_app.py:57
+#: module/webui/app/json.py:57
 #, python-format
 msgid "waiting %s"
 msgstr ""
 
-#: module/web/ServerThread.py:35
+#: module/threads/ServerThread.py:35
 msgid "SSL certificates not found."
 msgstr "沒有找到SSL憑證"
 
-#: module/web/ServerThread.py:39
+#: module/threads/ServerThread.py:39
 #, python-format
 msgid "Sorry, we dropped support for starting %s directly within pyLoad"
 msgstr ""
 
-#: module/web/ServerThread.py:40
+#: module/threads/ServerThread.py:40
 msgid "You can use the threaded server which offers good performance and ssl,"
 msgstr ""
 
-#: module/web/ServerThread.py:41
+#: module/threads/ServerThread.py:41
 #, python-format
 msgid "of course you can still use your existing %s with pyLoads fastcgi server"
 msgstr ""
 
-#: module/web/ServerThread.py:42
-msgid "sample configs are located in the module/web/servers directory"
+#: module/threads/ServerThread.py:42
+msgid "sample configs are located in the module/webui/servers directory"
 msgstr ""
 
-#: module/web/ServerThread.py:49
+#: module/threads/ServerThread.py:49
 #, python-format
 msgid "Can't use %(server)s, python-flup is not installed!"
 msgstr ""
 
-#: module/web/ServerThread.py:56
+#: module/threads/ServerThread.py:56
 #, python-format
 msgid "Error importing lightweight server: %s"
 msgstr ""
 
-#: module/web/ServerThread.py:57
+#: module/threads/ServerThread.py:57
 msgid "You need to download and compile bjoern, https://github.com/jonashaag/bjoern"
 msgstr ""
 
-#: module/web/ServerThread.py:58
+#: module/threads/ServerThread.py:58
 msgid "Copy the boern.so to module/lib folder or use setup.py install"
 msgstr ""
 
-#: module/web/ServerThread.py:59
+#: module/threads/ServerThread.py:59
 msgid "Of course you need to be familiar with linux and know how to compile software"
 msgstr ""
 
-#: module/web/ServerThread.py:63
+#: module/threads/ServerThread.py:63
 msgid "Server set to threaded, due to known performance problems on windows."
 msgstr ""
 
-#: module/web/ServerThread.py:80 module/web/ServerThread.py:103
+#: module/threads/ServerThread.py:80 module/threads/ServerThread.py:103
 msgid "This server offers no SSL, please consider using threaded instead"
 msgstr "目前的服務器不支援SSL，請將伺服器模式改為Threaded"
 
-#: module/web/ServerThread.py:82
+#: module/threads/ServerThread.py:82
 #, python-format
 msgid "Starting builtin webserver: %(host)s:%(port)d"
 msgstr ""
 
-#: module/web/ServerThread.py:87
+#: module/threads/ServerThread.py:87
 #, python-format
 msgid "Starting threaded SSL webserver: %(host)s:%(port)d"
 msgstr ""
 
-#: module/web/ServerThread.py:91
+#: module/threads/ServerThread.py:91
 #, python-format
 msgid "Starting threaded webserver: %(host)s:%(port)d"
 msgstr ""
 
-#: module/web/ServerThread.py:97
+#: module/threads/ServerThread.py:97
 #, python-format
 msgid "Starting fastcgi server: %(host)s:%(port)d"
 msgstr ""
 
-#: module/web/ServerThread.py:105
+#: module/threads/ServerThread.py:105
 #, python-format
 msgid "Starting lightweight webserver (bjoern): %(host)s:%(port)d"
 msgstr ""
 
-#: module/web/pyload_app.py:125
+#: module/webui/app/pyload.py:125
 msgid "You dont have permission to access this page."
 msgstr ""
 
-#: module/web/pyload_app.py:193
+#: module/webui/app/pyload.py:193
 msgid "Download directory not found."
 msgstr ""
 
-#: module/web/pyload_app.py:260 module/web/pyload_app.py:267
+#: module/webui/app/pyload.py:260 module/webui/app/pyload.py:267
 msgid "unlimited"
 msgstr "無限制"
 
-#: module/web/pyload_app.py:262 module/web/pyload_app.py:269
+#: module/webui/app/pyload.py:262 module/webui/app/pyload.py:269
 msgid "not available"
 msgstr ""
 
-#: module/web/pyload_app.py:508
+#: module/webui/app/pyload.py:508
 msgid "Run pyload.py -s to access the setup."
 msgstr ""
 
@@ -341,72 +341,72 @@ msgstr ""
 msgid "Download chunks failed, fallback to single connection | %s"
 msgstr "分區下載失敗，採用單一連接下載｜%s"
 
-#: module/PluginThread.py:183
+#: module/threads/PluginThread.py:183
 #, python-format
 msgid "Download starts: %s"
 msgstr "開始下載 %s"
 
-#: module/PluginThread.py:189
+#: module/threads/PluginThread.py:189
 #, python-format
 msgid "Download finished: %s"
 msgstr "%s 下載完成"
 
-#: module/PluginThread.py:194 module/PluginThread.py:365
+#: module/threads/PluginThread.py:194 module/threads/PluginThread.py:365
 #, python-format
 msgid "Plugin %s is missing a function."
 msgstr "%s 模組缺少相關功能"
 
-#: module/PluginThread.py:202 module/PluginThread.py:265
-#: module/PluginThread.py:382
+#: module/threads/PluginThread.py:202 module/threads/PluginThread.py:265
+#: module/threads/PluginThread.py:382
 #, python-format
 msgid "Download aborted: %s"
 msgstr "取消下載 %s"
 
-#: module/PluginThread.py:222
+#: module/threads/PluginThread.py:222
 #, python-format
 msgid "Download restarted: %(name)s | %(msg)s"
 msgstr "重新下載%(name)s ｜%(msg)s"
 
-#: module/PluginThread.py:231 module/PluginThread.py:373
+#: module/threads/PluginThread.py:231 module/threads/PluginThread.py:373
 #, python-format
 msgid "Download is offline: %s"
 msgstr "下載任務斷線：%s"
 
-#: module/PluginThread.py:234
+#: module/threads/PluginThread.py:234
 #, python-format
 msgid "Download is temporary offline: %s"
 msgstr "下載任務暫時斷線：%s"
 
-#: module/PluginThread.py:237 module/PluginThread.py:304
+#: module/threads/PluginThread.py:237 module/threads/PluginThread.py:304
 #, python-format
 msgid "Download failed: %(name)s | %(msg)s"
 msgstr "%(name)s 下載失敗｜%(msg)s"
 
-#: module/PluginThread.py:254
+#: module/threads/PluginThread.py:254
 msgid "Couldn't connect to host or connection reset, waiting 1 minute and retry."
 msgstr "無法連線至host，一分鐘後重試"
 
-#: module/PluginThread.py:290
+#: module/threads/PluginThread.py:290
 #, python-format
 msgid "Download skipped: %(name)s due to %(plugin)s"
 msgstr "%(name)s 取消下載，由於 %(plugin)s"
 
-#: module/PluginThread.py:361
+#: module/threads/PluginThread.py:361
 #, python-format
 msgid "Decrypting starts: %s"
 msgstr ""
 
-#: module/PluginThread.py:376 module/PluginThread.py:394
+#: module/threads/PluginThread.py:376 module/threads/PluginThread.py:394
 #, python-format
 msgid "Decrypting failed: %(name)s | %(msg)s"
 msgstr ""
 
-#: module/PluginThread.py:388
+#: module/threads/PluginThread.py:388
 #, python-format
 msgid "Retrying %s"
 msgstr ""
 
-#: module/PluginThread.py:635
+#: module/threads/PluginThread.py:635
 #, python-format
 msgid "Info Fetching for %(name)s failed | %(err)s"
 msgstr "取得 %(name)s的錯誤資訊|%(err)s"