Updates Chinese translations

- Updates Chinese translation.
- Adds missing label in the settings window.
- Updates README.md to reflect the projects current status.

README.md

@@ -13,9 +13,9 @@ _Read this in other languages: [简体中文](https://github.com/Emphasia/TumblT
 * A download queue.
 * Autosave of the queuelist.
 * Save, clear and restore the queuelist.
-* A clipboard monitor that detects *http(s):// .tumblr.com* urls in the clipboard (copy and paste) and automatically adds the blog to the bloglist.
+* A clipboard monitor that detects *blogname.tumblr.com* urls in the clipboard (copy and paste) and automatically adds the blog to the bloglist.
 * A settings panel (change download location, turn preview off/on, define number of concurrent downloads, set the imagesize of downloaded pictures, set download defaults, enable portable mode, etc.).
-* Allows to set a http proxy.
+* Uses Windows proxy settings.
 * A bandwidth throttler.
 * An option to download an url list instead of the actual files.
 * Set a start time for a automatic download (e.g. during nights).
@@ -30,7 +30,7 @@ _Read this in other languages: [简体中文](https://github.com/Emphasia/TumblT
 * Download meta information for photo, video and audio posts.
 * Downloads inlined photos and videos (e.g. photos embedded in question&answer posts).
 * Download of \_raw image files (original/higher resolution pictures).
-* Support for downloading Imgur.com, Gfycat.com and Webmshare.com linked files in tumblr posts.
+* Support for downloading Imgur, Gfycat, Webmshare, Mixtape, Lolisafe, Uguu, Catbox and SafeMoe linked files in tumblr posts.
 * Download of safe mode/NSFW blogs.
 * Allows to download only original content of the blog and skip reblogged posts.
 * Can download only tagged posts.
@@ -49,6 +49,7 @@ _Read this in other languages: [简体中文](https://github.com/Emphasia/TumblT
 
 * A downloader for downloading photos and videos from the tumblr search (e.g. http://www.tumblr.com/search/my+keywords).
 * Download of \_raw image files (original/higher resolution pictures). 
+* Can download only specific blog pages instead of the whole blog.
 
 ### Tumblr tag search backup/download:
 
@@ -67,11 +68,11 @@ Latest releases can be found [here](https://github.com/johanneszab/TumblThree/re
 
 * extract the .zip file and run the application by double clicking TumblThree.exe.
 * Copy the url of any tumblr.com blog you want to backup from into the textbox at the bottom left. Afterwards, click on 'Add Blog' on the right side of it.
-* Alternatively, if you copy (ctrl-c) a whole _tumblr.com_ blog url from the address bar/a text file, the clipboard monitor from TumblThree will detect it and automatically add the blog.
+* Alternatively, if you copy (ctrl-c) a _tumblr.com_ blog url from the address bar/a text file, the clipboard monitor from TumblThree will detect it and automatically add the blog.
 * To start the download process, click on 'Crawl'. The application will regularly check for (new) blogs in the queue and start processing them, until you stop the application by pressing 'Stop'. So, you can either add blogs to the queue via 'Add to Queue' or double click first and then click 'Crawl', or you start the download process first and add blogs to the queue afterwards.
 * A light blue bar left to the blog in the queue indicates a actively downloading blog.
 * The blog manager on the left side also indicates the state of each blog. A red background shows an offline blog, a green background an actively crawling blog and a purple background an enqueued blog.
-* You change the download location, the number of parallel connections, the default backup settings for each newly added blog and various other settings in the 'Settings'. 
+* You change the download location, the number of concurrent connections, the default backup settings for each newly added blog and various other settings in the 'Settings'. 
 * In the Details window you can view statistics of your blog and set blog specific options. You can here what kind of post type (photo, video, audio, text, conversation, quote, link) to download.
 * For downloading only tagged posts, you'll have to do some steps:
   1. Add the blog url.
@@ -80,18 +81,18 @@ Latest releases can be found [here](https://github.com/johanneszab/TumblThree/re
   1. Add the blog url.
   2. Open the blog in the details tab, enter the password in the Password textbox.
 * For downloading hidden blogs (login required blogs), you have to do some steps:
-  1. Go to Settings, click the Authenticate button. Logon to tumblr using an account. The window/browser should automatically close after the login indicating a successful authentication. TumblThree will use the Internet Explorer cookies for authentication. Alternatively, you can also use the Internet Explorer directly for logging in to the Tumblr.com network.
+  1. Go to Settings, click the Authenticate button. Login to tumblr using an account. The window/browser should automatically close after the login indicating a successful authentication. TumblThree will use the Internet Explorer cookies for authentication. Alternatively, you can also use the Internet Explorer directly for logging in to the Tumblr.com network.
   2. Add the blog url.
 * For downloading liked photos and videos, you'll have to do some steps:
-  1. Go to Settings, click the Authenticate button. Logon to tumblr using an account. The window/browser should automatically close after the login indicating a successful authentication. TumblThree will use the Internet Explorer cookies for authentication. Alternatively, you can also use the Internet Explorer directly for logging in to the Tumblr.com network.
+  1. Go to Settings, click the Authenticate button. Login to tumblr using an account. The window/browser should automatically close after the login indicating a successful authentication. TumblThree will use the Internet Explorer cookies for authentication. Alternatively, you can also use the Internet Explorer directly for logging in to the Tumblr.com network.
   2. Add the blog url including the liked/by string in the url (e.g. https://www.tumblr.com/liked/by/wallpaperfx/).
   3. For downloading your own likes, make sure you've (temporarily) enabled the following options in your blogs settings (i.e. https://www.tumblr.com/settings/blog/yourblogname):
       * Likes -> Share posts you like (to enable the publicly visible liked/by page)
       * Visibility -> _blog_ is explicit (to see/download NSFW likes)
 * For downloading photos and videos from the tumblr search, you'll have to do some steps:
   1. Add the search url including your key words separated by plus signs (+) in the url (e.g. https://www.tumblr.com/search/my+special+tags).
 * For downloading photos and videos from the tumblr tag search, you'll have to do some steps:
-  1. Go to Settings, click the Authenticate button. Logon to tumblr using an account. The window/browser should automatically close after the login indicating a successful authentication. TumblThree will use the Internet Explorer cookies for authentication. Alternatively, you can also use the Internet Explorer directly for logging in to the Tumblr.com network.
+  1. Go to Settings, click the Authenticate button. Login to tumblr using an account. The window/browser should automatically close after the login indicating a successful authentication. TumblThree will use the Internet Explorer cookies for authentication. Alternatively, you can also use the Internet Explorer directly for logging in to the Tumblr.com network.
   2. Add the search url including your tags separated by plus signs (+) in the url (e.g. https://www.tumblr.com/tagged/my+special+tags).
 * Key Mappings:
   * double click on a blog adds it to the queue
@@ -111,7 +112,6 @@ The default settings should cover most users. You should only have to change the
   * Here you can set what posts newly added blogs will download per default. To change what each blog downloads, click on a blog in the main interface, select the Details Tab on the right and change the settings. This separation allows to download different kind of post for different blogs. You can change the download settings for multiple existing blogs by selecting them with shift+left click for a range or ctrl-a for all of them.
   * Note: You might want to always select:
     *  _Download Reblogged posts_: Downloads reblogs, not just original content of the blog author.
-    *  _Force Rescan_: Force Rescan always crawls the whole blog and not just new posts which were added after the last successful crawl. The statistics of a blog (total posts, number of post, number of duplicates) currently can only be updated if the whole blog is crawled. Thus, disabling this might result in downloading "more" posts than displayed in TumblThree. If you don't care about the displayed blog statistics, turning Force Rescan off will decrease the scanning time since already downloaded posts are skipped in the scanning.
 
 Settings you might want to change if the download speed is not satisfactory:
 * Connection -> Concurrent connections: Specifies the number of connections used for downloading posts. The number is shared between all actively downloading blogs.

README.zh-cn.md

@@ -6,7 +6,10 @@ This is Emphasia's Simplified Chinese translation for [johanneszab's TumblThree]
 
 - 作者页面：https://www.jzab.de/content/tumblthree
 - 未来的新功能与改进：https://github.com/johanneszab/TumblThree/wiki/New-Feature-Requests-and-Possible-Enhancements
-- 程序BUG或建议：https://github.com/johanneszab/TumblThree/issues
+- 程序BUG或建议：
+  - 向作者提*（建议英语）*：https://github.com/johanneszab/TumblThree/issues
+  - 向我提*（中英皆可）*：https://github.com/Emphasia/TumblThree-zh/issues
+  - 注意：在国内的网络环境下，**设定用于下载的代理**可能是必须的，这并不是TumblThree的BUG。
 
 ## 下载 Download
 
@@ -18,7 +21,7 @@ This is Emphasia's Simplified Chinese translation for [johanneszab's TumblThree]
 >
 > 同步的版本因新功能的增加可能会有未翻译和错误的情况，而完全翻译的版本一般会晚一个版本。
 
-TumblThree作者的最新版本、别的版本及更新历史： https://github.com/johanneszab/TumblThree/releases
+TumblThree作者的最新版本、别的版本及更新历史：https://github.com/johanneszab/TumblThree/releases
 
 ## 新手入门 Getting Started
 
@@ -35,17 +38,18 @@ TumblThree作者的最新版本、别的版本及更新历史： https://github.
 当你感觉**下载速度不理想时**可能想更改的设置：
 
 - `下载` -> HTTP代理：设定用于下载的代理。**注意：在国内的网络环境下，这可能是必须的。**（也可以考虑修改hosts😏）
-- `全局` -> 并行连接数：设定用于下载帖子的连接的数目。该数目将被所有当前正在下载的博客共用。注意：如果你只下载视频帖子，你也许想要减少并行连接数至8或更低，具体取决于你的网络状况。否则你可能会因为tumblr服务器频繁的关闭连接（同时打开了太多连接）而得到不完整的文件。对小文件（如图片）这没啥影响。
-- `全局` -> 并行博客数：同时处理的博客数量。
+- `下载` -> 并发连接数：设定用于下载帖子的连接的数目。该数目将被所有当前正在下载的博客共用。注意：如果你只下载视频帖子，你也许想要减少并行连接数至8或更低，具体取决于你的网络状况。否则你可能会因为tumblr服务器频繁的关闭连接（同时打开了太多连接）而得到不完整的文件。对小文件（如图片）这没啥影响。
+- `下载` -> 并发视频数：设定用于下载视频的连接的数目。该数目将被所有当前正在下载的博客共用。注意：当同时打开太多连接时，tumblr视频服务器(vt.tumblr.com)会频繁的关闭连接，从而导致得到不完整的文件。因此，设置此选项以供单独设定与其最大连接数。
+- `下载` -> 并发博客数：同时处理的博客数量。
 
 一般情况下你不需要改变其他的连接设置。特别的，除非你明确知道其作用否则不要去更改的：
 
-- `全局` -> 限制Tumblr-Api连接数：保持选中启用且不要改变对应的值（默认*90连接数每60秒*）。如果你执意更改，你可能会得到*博客离线*或*下载不全*等问题。
+- `下载` -> 限制Tumblr-API连接数：保持选中启用且不要改变对应的值（默认*90连接数每60秒*）。如果你执意更改，你可能会得到*博客离线*或*下载不全*等问题。
 
 ## 使用指南 Usage
 
 - 下载并解压 `.zip` 文件，运行 `TumblThree.exe`。
-- 复制想要备份或下载的tumblr博客`URL` (http(s)://\*.tumblr.com\*)到底部的文本框（或使用剪贴板监视功能自动添加）后，点击右边的 `添加博客`。
+- 复制想要备份或下载的tumblr博客`URL`(http(s)://\*.tumblr.com\*)到底部的文本框（或使用剪贴板监视功能自动添加）后，点击右边的 `添加博客`。
 - 先将要处理的博客`添加到队列`，然后单击`开始`来开始下载（爬取），程序将自动检查队列中的博客并处理，直到你按下`停止` 。当然，你可以也可以先开始再向队列中添加博客。
 - 队列中博客左边的蓝条表明这个博客正在下载，左边的博客管理器也表明了各个博客的状态（红色为离线，绿色为下载中，紫色为等待）。
 - 你可在`设置`中设置并行的博客数目，下载目录和指定图片分辨率，或自动下载的时间。
@@ -66,6 +70,14 @@ TumblThree作者的最新版本、别的版本及更新历史： https://github.
     1. 到`设置`，单击`授权`，`登录`tumblr，登陆成功后弹出窗口会自动关闭
     2. 添加该博客（包括liked/by字符串 e.g. https://www.tumblr.com/liked/by/wallpaperfx/）
     3. 将该博客添加到队列并下载
+
+    下载您 **自己的“喜欢”** 时，请确认您已经在您的博客设置 (https://www.tumblr.com/settings/blog/ *你的博客名*) 中（临时地）启用以下选项：
+    + `Likes` -> Share posts you like (使 “喜欢”页 公开)
+    + `Visibility` -> _blog_ is explicit (使 NSFW “喜欢” 可见/可下载)
+  - 下载tumblr搜索结果中的图片和视频：
+    1. 到`设置`，单击`授权`，`登录`tumblr，登陆成功后弹出窗口会自动关闭
+    2. 添加该博客（包括以‘+’分隔的关键词 e.g.  https://www.tumblr.com/search/my+keyword）
+    3. 将该博客添加到队列并下载
   - 下载tumblr标签搜索结果中的图片和视频：
     1. 到`设置`，单击`授权`，`登录`tumblr，登陆成功后弹出窗口会自动关闭
     2. 添加该博客（包括以‘+’分隔的标签 e.g.  https://www.tumblr.com/tagged/my+special+tags）
@@ -86,11 +98,11 @@ TumblThree作者的最新版本、别的版本及更新历史： https://github.
 
 - 保存的文件
   - 注意：以下文件都以json格式保存
-  - 设置文件(Settings.json) 保存在 C:\\Users\\*用户名*\\AppData\\Local\\TumblThree\\
+  - 设置文件Settings.json保存在 C:\\Users\\*用户名*\\AppData\\Local\\TumblThree\\
   - 你可以使用 *便携模式* (设置->全局) 将设置文件保存在程序根目录
-  - 对每个博客，在下载目录（默认在程序根目录下的 _.\\Blogs\\_）下有一个以博客名命名的 索引(*Index*) 文件夹 中有 数据库(序列化类) 文件。其中储存了博客URL、何时添加、哪些文件已被下载等信息。这使你能够移动已下载的文件到别的目录而不影响下载过程。
+  - 对每个博客，在下载目录（默认在程序根目录下的 _.\\Blogs\\_）下有一个以博客名命名的 索引(*Index*)文件夹 中有 数据库(序列化类) 文件。其中储存了博客URL、何时添加、哪些文件已被下载等信息。这使你能够移动已下载的文件到别的目录而不影响下载过程。
 
-- 另有一些设置未在UI中显示，要查看或修改全部的设置可打开设置文件(Settings.json)。
+- 另有一些设置未在UI中显示，要查看或修改全部的设置可打开设置文件Settings.json。
 
   其中一些值得注意的可以进一步优化应用程序的设置：
 
@@ -107,20 +119,22 @@ TumblThree作者的最新版本、别的版本及更新历史： https://github.
 * 可导出下载地址而不实际下载
 * 下载队列可自动保存
 * 下载队列可导出、清空和恢复
-* 可设置指定分辨率
+* 可设置指定（下载）分辨率
+* 可跳过下载已在别的博客（当前已加载的）下载过的文件
 * 可用便携模式
-* 可用代理
+* 可用HTTP代理
 * 可限制带宽和线程
 * 可设置自动下载
-* 使用SSL而不是不安全的http连接
+* 使用SSL而不是不安全的HTTP连接
 * 任务栏图标和快捷键绑定
 
 ### 博客备份或下载 Blog backup/download
 
 * 可下载图片、视频、文本、音频、引用、对话、链接和回复贴
 * 可下载图片、视频、音频的元数据
 * 可下载内嵌的图片和视频
-* 可下载safe-mode、密码保护或隐藏的博客
+* 可下载safe-mode、密码保护或隐藏以及NSFW的博客
+* 可下载外链 Imgur.com, Gfycat.com 和 Webmshare.com 的帖子
 * 可仅下载原创帖而跳过转发帖
 * 可仅下载带标签（或指定标签）的帖子
 * 可下载特定页数或时间段内的帖子而不是整个博客

src/TumblThree/TumblThree.Applications/Controllers/ModuleController.cs

@@ -117,11 +117,11 @@ public void Initialize()
 
         public async void Run()
         {
-            ManagerController.RestoreColumn();
             ShellViewModel.IsQueueViewVisible = true;
             ShellViewModel.Show();
 
             // Let the UI to initialize first before loading the queuelist.
+            await Dispatcher.CurrentDispatcher.InvokeAsync(ManagerController.RestoreColumn, DispatcherPriority.ApplicationIdle);
             await Dispatcher.CurrentDispatcher.InvokeAsync(QueueController.Run, DispatcherPriority.ApplicationIdle);
         }
 

src/TumblThree/TumblThree.Applications/Properties/Resources.zh.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -142,7 +142,7 @@
     <value>无</value>
   </data>
   <data name="BlogTypesOnceFinished" xml:space="preserve">
-    <value>一旦完成</value>
+    <value>有完成过</value>
   </data>
   <data name="Body" xml:space="preserve">
     <value>Body: {0]</value>
@@ -183,9 +183,26 @@
   <data name="CrawlerError" xml:space="preserve">
     <value>抓取工具线程遇到错误。</value>
   </data>
+  <data name="Crawling" xml:space="preserve">
+    <value>爬取中</value>
+  </data>
+  <data name="Downloading" xml:space="preserve">
+    <value>下载中</value>
+  </data>
+  <data name="TimeoutReached" xml:space="preserve">
+    <value>{0} 的 {1} 出现连接超时。</value>
+  </data>
   <data name="Date" xml:space="preserve">
     <value>Date: {0}</value>
   </data>
+  <data name="DeleteBlogsDialog" xml:space="preserve">
+    <value>你确定要删除以下序号博客？
+{0}</value>
+  </data>
+  <data name="DeleteBlogsAndFilesDialog" xml:space="preserve">
+    <value>你确定要删除以下序号博客及其所有已下载文件？
+{0}</value>
+  </data>
   <data name="DiskFull" xml:space="preserve">
     <value>磁盘空间不足。</value>
   </data>
@@ -282,6 +299,9 @@
   <data name="ProgressGetUrlShort" xml:space="preserve">
     <value>已评估 {0} 个博客。</value>
   </data>
+  <data name="ProgressSkipFile" xml:space="preserve">
+    <value>{0} 个已下载，正在跳过...</value>
+  </data>
   <data name="ProgressUniqueDownloads" xml:space="preserve">
     <value>统计唯一的下载，删除重复文件...</value>
   </data>
@@ -306,13 +326,22 @@
   <data name="Tags" xml:space="preserve">
     <value>Tags: {0}</value>
   </data>
+  <data name="Textfile" xml:space="preserve">
+    <value>Text file</value>
+  </data>
   <data name="Title" xml:space="preserve">
     <value>Title: {0}</value>
   </data>
   <data name="UrlWithSlug" xml:space="preserve">
     <value>Url with slug: {0}</value>
   </data>
+  <data name="VideoCaption" xml:space="preserve">
+    <value>Video Caption: {0}</value>
+  </data>
   <data name="VideoPlayer" xml:space="preserve">
     <value>Video Player: {0}</value>
   </data>
+  <data name="VideoSource" xml:space="preserve">
+    <value>Video Source: {0}</value>
+  </data>
 </root>