From 2e210fcf6aebbe05dd2d7ed82f8852755a08fc81 Mon Sep 17 00:00:00 2001
From: Jeffiy <zhangmin6105@qq.com>
Date: Wed, 20 Jan 2016 14:04:17 +0800
Subject: [PATCH] Update chinese translation(part 2)

---
 .../Automate/AutomateForm.zh-CN.resx          |   2 +-
 ShareX.HelpersLib/ShareX.HelpersLib.csproj    |   3 +
 ShareX.HistoryLib/HistoryForm.zh-CN.resx      |  17 +-
 .../HistoryItemInfoForm.zh-CN.resx            |   3 +-
 ShareX.HistoryLib/ImageHistoryForm.zh-CN.resx |   3 +-
 .../Properties/Resources.zh-CN.resx           |  31 ++-
 .../ImageEffectsForm.zh-CN.resx               |  11 +-
 .../Forms/VideoThumbnailerForm.zh-CN.resx     | 126 +++++++++
 .../Properties/Resources.zh-CN.resx           | 123 +++++++++
 ShareX.MediaLib/ShareX.MediaLib.csproj        |   4 +
 .../Forms/ScrollingCaptureForm.zh-CN.resx     | 234 +++++++++++++++++
 .../Properties/Resources.zh-CN.resx           | 167 +++++++++++-
 .../Screencast/FFmpegOptionsForm.zh-CN.resx   |  29 ++-
 .../ShareX.ScreenCaptureLib.csproj            |   3 +
 .../Controls/AccountTypeControl.zh-CN.resx    |   5 +-
 .../Forms/DropboxFilesForm.zh-CN.resx         |   5 +-
 .../Forms/JiraUpload.zh-CN.resx               |   3 +-
 .../Forms/UploadersConfigForm.zh-CN.resx      | 245 +++++++++++++++---
 .../Properties/Resources.zh-CN.resx           |  49 ++--
 ShareX/Forms/MainForm.zh-CN.resx              |   2 +-
 ShareX/Forms/TaskSettingsForm.zh-CN.resx      |   2 +-
 ShareX/ShareX.csproj                          |   9 +
 22 files changed, 987 insertions(+), 89 deletions(-)
 create mode 100644 ShareX.MediaLib/Forms/VideoThumbnailerForm.zh-CN.resx
 create mode 100644 ShareX.MediaLib/Properties/Resources.zh-CN.resx
 create mode 100644 ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.zh-CN.resx

diff --git a/ShareX.HelpersLib/Automate/AutomateForm.zh-CN.resx b/ShareX.HelpersLib/Automate/AutomateForm.zh-CN.resx
index 0b4e1adc5..e0809d123 100644
--- a/ShareX.HelpersLib/Automate/AutomateForm.zh-CN.resx
+++ b/ShareX.HelpersLib/Automate/AutomateForm.zh-CN.resx
@@ -124,7 +124,7 @@
     <value>方法</value>
   </data>
   <data name="btnLoadExample.Text" xml:space="preserve">
-    <value>加载实例</value>
+    <value>加载示例</value>
   </data>
   <data name="btnSaveScript.Text" xml:space="preserve">
     <value>保存</value>
diff --git a/ShareX.HelpersLib/ShareX.HelpersLib.csproj b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
index e1b009f52..a9d959909 100644
--- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
@@ -436,6 +436,9 @@
     <EmbeddedResource Include="Automate\AutomateForm.vi-VN.resx">
       <DependentUpon>AutomateForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Automate\AutomateForm.zh-CN.resx">
+      <DependentUpon>AutomateForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Colors\ColorPickerForm.de.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/ShareX.HistoryLib/HistoryForm.zh-CN.resx b/ShareX.HistoryLib/HistoryForm.zh-CN.resx
index 21652bb5c..b7b2b69bd 100644
--- a/ShareX.HistoryLib/HistoryForm.zh-CN.resx
+++ b/ShareX.HistoryLib/HistoryForm.zh-CN.resx
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="$this.Text" xml:space="preserve">
-    <value>历史</value>
+    <value>历史记录</value>
   </data>
   <data name="btnApplyFilters.Text" xml:space="preserve">
     <value>使用过滤器</value>
@@ -135,19 +136,19 @@
     <value>区分大小写</value>
   </data>
   <data name="cbFilenameFilterCulture.Items" xml:space="preserve">
-    <value>当前区域</value>
+    <value>当前语言</value>
   </data>
   <data name="cbFilenameFilterCulture.Items1" xml:space="preserve">
-    <value>不变的文化（英文）</value>
+    <value>默认语言（英文）</value>
   </data>
   <data name="cbFilenameFilterCulture.Items2" xml:space="preserve">
-    <value>序（英文）</value>
+    <value>顺序（英文）</value>
   </data>
   <data name="cbFilenameFilterMethod.Items" xml:space="preserve">
     <value>包含</value>
   </data>
   <data name="cbFilenameFilterMethod.Items1" xml:space="preserve">
-    <value>与开始</value>
+    <value>开始</value>
   </data>
   <data name="cbFilenameFilterMethod.Items2" xml:space="preserve">
     <value>结尾</value>
@@ -171,7 +172,7 @@
     <value>文本</value>
   </data>
   <data name="chDateTime.Text" xml:space="preserve">
-    <value>日期和时间</value>
+    <value>日期时间</value>
   </data>
   <data name="chFilename.Text" xml:space="preserve">
     <value>文件名</value>
@@ -186,10 +187,10 @@
     <value>过滤器</value>
   </data>
   <data name="lblFilterFrom.Text" xml:space="preserve">
-    <value>来自:</value>
+    <value>从:</value>
   </data>
   <data name="lblFilterTo.Text" xml:space="preserve">
-    <value>要:</value>
+    <value>到:</value>
   </data>
   <data name="tsslStatus.Text" xml:space="preserve">
     <value>状态</value>
diff --git a/ShareX.HistoryLib/HistoryItemInfoForm.zh-CN.resx b/ShareX.HistoryLib/HistoryItemInfoForm.zh-CN.resx
index fa04fc003..b99a15cef 100644
--- a/ShareX.HistoryLib/HistoryItemInfoForm.zh-CN.resx
+++ b/ShareX.HistoryLib/HistoryItemInfoForm.zh-CN.resx
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,6 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="$this.Text" xml:space="preserve">
-    <value>ShareX - 历史的项目信息</value>
+    <value>ShareX - 历史项目信息</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.HistoryLib/ImageHistoryForm.zh-CN.resx b/ShareX.HistoryLib/ImageHistoryForm.zh-CN.resx
index 6f85e2783..74643ab99 100644
--- a/ShareX.HistoryLib/ImageHistoryForm.zh-CN.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.zh-CN.resx
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -120,7 +121,7 @@
     <value>图像历史</value>
   </data>
   <data name="tsbQuickList.Text" xml:space="preserve">
-    <value>只显示最后100张</value>
+    <value>只显示最近100张</value>
   </data>
   <data name="tsddbThumbnailSize.Text" xml:space="preserve">
     <value>缩略图大小</value>
diff --git a/ShareX.HistoryLib/Properties/Resources.zh-CN.resx b/ShareX.HistoryLib/Properties/Resources.zh-CN.resx
index e95b7b48a..bff42f2cf 100644
--- a/ShareX.HistoryLib/Properties/Resources.zh-CN.resx
+++ b/ShareX.HistoryLib/Properties/Resources.zh-CN.resx
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="HistoryForm_HistoryForm_Current_culture___0__" xml:space="preserve">
-    <value>当前区域性（{0}）</value>
+    <value>当前区域（{0}）</value>
   </data>
   <data name="HistoryForm_HistoryForm_History_" xml:space="preserve">
     <value>历史: {0}</value>
@@ -141,22 +142,22 @@
     <value>文件名</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_File_name_with_extension" xml:space="preserve">
-    <value>文件名扩展</value>
+    <value>文件扩展名</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_File_path" xml:space="preserve">
     <value>文件路径</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_Folder" xml:space="preserve">
-    <value>夹</value>
+    <value>文件夹</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_Forum__BBCode__image" xml:space="preserve">
-    <value>论坛（BB代码）的图像</value>
+    <value>论坛（BBCode）的图像</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_Forum__BBCode__link" xml:space="preserve">
-    <value>论坛（BB代码）链接</value>
+    <value>论坛（BBCode）链接</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_Forum__BBCode__linked_image" xml:space="preserve">
-    <value>论坛（BB代码）链接的图像</value>
+    <value>论坛（BBCode）链接的图像</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_HTML_image" xml:space="preserve">
     <value>HTML图像</value>
@@ -177,13 +178,13 @@
     <value>更多信息</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_Open" xml:space="preserve">
-    <value>开放</value>
+    <value>打开</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_Shortened_URL" xml:space="preserve">
-    <value>缩短的URL</value>
+    <value>URL短链</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_Show" xml:space="preserve">
-    <value>演出</value>
+    <value>显示</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_Text" xml:space="preserve">
     <value>文本</value>
@@ -198,18 +199,24 @@
     <value>HTML链接（{0}）</value>
   </data>
   <data name="HistoryItemManager_UpdateTexts_URLs___0__" xml:space="preserve">
-    <value>网址（{0}）</value>
+    <value>URLs（{0}）</value>
   </data>
   <data name="ObjectListView_ObjectListView_Copy_name" xml:space="preserve">
-    <value>副本名称</value>
+    <value>复制名称</value>
   </data>
   <data name="ObjectListView_ObjectListView_Copy_value" xml:space="preserve">
     <value>复制值</value>
   </data>
   <data name="ObjectListView_ObjectListView_Name" xml:space="preserve">
-    <value>名字</value>
+    <value>名称</value>
   </data>
   <data name="ObjectListView_ObjectListView_Value" xml:space="preserve">
     <value>值</value>
   </data>
+  <data name="HistoryManager_GetHistoryItems_Error" xml:space="preserve">
+    <value>错误</value>
+  </data>
+  <data name="HistoryManager_GetHistoryItems_Error_occured_while_reading_XML_file___0_" xml:space="preserve">
+    <value>读取XML文件({0})时发生错误</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.zh-CN.resx b/ShareX.ImageEffectsLib/ImageEffectsForm.zh-CN.resx
index 18d15b661..f3d0d6119 100644
--- a/ShareX.ImageEffectsLib/ImageEffectsForm.zh-CN.resx
+++ b/ShareX.ImageEffectsLib/ImageEffectsForm.zh-CN.resx
@@ -127,7 +127,7 @@
     <value>取消</value>
   </data>
   <data name="btnClear.Text" xml:space="preserve">
-    <value>明确</value>
+    <value>清除</value>
   </data>
   <data name="btnDuplicate.Text" xml:space="preserve">
     <value>复制</value>
@@ -144,4 +144,13 @@
   <data name="btnSaveImage.Text" xml:space="preserve">
     <value>保存图像...</value>
   </data>
+  <data name="mbLoadImage.Text" xml:space="preserve">
+    <value>加载图像...</value>
+  </data>
+  <data name="tsmiLoadImageFromFile.Text" xml:space="preserve">
+    <value>从文件...</value>
+  </data>
+  <data name="tsmiLoadImageFromClipboard.Text" xml:space="preserve">
+    <value>从剪切板...</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.MediaLib/Forms/VideoThumbnailerForm.zh-CN.resx b/ShareX.MediaLib/Forms/VideoThumbnailerForm.zh-CN.resx
new file mode 100644
index 000000000..689969e50
--- /dev/null
+++ b/ShareX.MediaLib/Forms/VideoThumbnailerForm.zh-CN.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnStart.Text" xml:space="preserve">
+    <value>开始截图</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>ShareX - 视频缩略图</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ShareX.MediaLib/Properties/Resources.zh-CN.resx b/ShareX.MediaLib/Properties/Resources.zh-CN.resx
new file mode 100644
index 000000000..63c7f46fc
--- /dev/null
+++ b/ShareX.MediaLib/Properties/Resources.zh-CN.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="VideoThumbnailerForm_btnBrowse_Click_Browse_for_media_file" xml:space="preserve">
+    <value>浏览媒体文件</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ShareX.MediaLib/ShareX.MediaLib.csproj b/ShareX.MediaLib/ShareX.MediaLib.csproj
index 1d6e3d006..77996de1d 100644
--- a/ShareX.MediaLib/ShareX.MediaLib.csproj
+++ b/ShareX.MediaLib/ShareX.MediaLib.csproj
@@ -103,6 +103,9 @@
     <EmbeddedResource Include="Forms\VideoThumbnailerForm.vi-VN.resx">
       <DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\VideoThumbnailerForm.zh-CN.resx">
+      <DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.de.resx" />
     <EmbeddedResource Include="Properties\Resources.fr.resx" />
     <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
@@ -114,6 +117,7 @@
     <EmbeddedResource Include="Properties\Resources.ru.resx" />
     <EmbeddedResource Include="Properties\Resources.tr.resx" />
     <EmbeddedResource Include="Properties\Resources.vi-VN.resx" />
+    <EmbeddedResource Include="Properties\Resources.zh-CN.resx" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.zh-CN.resx b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.zh-CN.resx
new file mode 100644
index 000000000..2850571d2
--- /dev/null
+++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.zh-CN.resx
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnSelectHandle.Text" xml:space="preserve">
+    <value>选择窗口或控件开始滚动捕捉...</value>
+  </data>
+  <data name="btnCapture.Text" xml:space="preserve">
+    <value>开始滚动捕捉</value>
+  </data>
+  <data name="lblScrollDelay.Text" xml:space="preserve">
+    <value>滚动延迟:</value>
+  </data>
+  <data name="lblMaximumScrollCount.Text" xml:space="preserve">
+    <value>最大滚动次数:</value>
+  </data>
+  <data name="tpCapture.Text" xml:space="preserve">
+    <value>捕捉</value>
+  </data>
+  <data name="chkAutoUpload.Text" xml:space="preserve">
+    <value>上传/保存依赖于捕捉后设置</value>
+  </data>
+  <data name="lblNote.Text" xml:space="preserve">
+    <value>请注意，虽然ShareX尽它最大的努力呈现一个准确的滚动捕捉，但它仍然不可能准确捕捉每一个滚动内容。主要的原因是一边捕捉屏幕上一边又有动作，可能会出现问题，比如滚动时在网页上有GIF动画或屏幕上有固定的物体，又比如有网页上有个静态的菜单或者按钮，它不随网页滚动改变位置，但是网页的其他部分又跟着滚动。</value>
+  </data>
+  <data name="cbStartSelectionAutomatically.Text" xml:space="preserve">
+    <value>打开这个窗口之前开始捕捉选中区域</value>
+  </data>
+  <data name="cbAutoCombine.Text" xml:space="preserve">
+    <value>猜测偏移并合并图像</value>
+  </data>
+  <data name="btnSelectRectangle.Text" xml:space="preserve">
+    <value>（可选）选择窗口中自定义区域...</value>
+  </data>
+  <data name="lblStartDelay.Text" xml:space="preserve">
+    <value>开始延迟:</value>
+  </data>
+  <data name="cbStartCaptureAutomatically.Text" xml:space="preserve">
+    <value>捕捉区域选择后立即开始滚动捕捉</value>
+  </data>
+  <data name="cbRemoveDuplicates.Text" xml:space="preserve">
+    <value>删除重复的图像</value>
+  </data>
+  <data name="cbAutoDetectScrollEnd.Text" xml:space="preserve">
+    <value>检测滚动结束</value>
+  </data>
+  <data name="lblScrollMethod.Text" xml:space="preserve">
+    <value>滚动方式:</value>
+  </data>
+  <data name="tpOutput.Text" xml:space="preserve">
+    <value>输出</value>
+  </data>
+  <data name="gbImages.Text" xml:space="preserve">
+    <value>图像</value>
+  </data>
+  <data name="lblImageCount.Text" xml:space="preserve">
+    <value>图像数:</value>
+  </data>
+  <data name="lblIgnoreLast.Text" xml:space="preserve">
+    <value>删除最后:</value>
+  </data>
+  <data name="btnResetCombine.Text" xml:space="preserve">
+    <value>重置输出选项</value>
+  </data>
+  <data name="btnGuessCombineAdjustments.Text" xml:space="preserve">
+    <value>猜测合并调整并合并</value>
+  </data>
+  <data name="btnStartTask.Text" xml:space="preserve">
+    <value>上传/保存依赖于捕捉后设置</value>
+  </data>
+  <data name="btnGuessEdges.Text" xml:space="preserve">
+    <value>猜测边缘值修剪</value>
+  </data>
+  <data name="gbCombineAdjustments.Text" xml:space="preserve">
+    <value>合并调整</value>
+  </data>
+  <data name="lblCombineLastVertical.Text" xml:space="preserve">
+    <value>最后垂直:</value>
+  </data>
+  <data name="lblCombineVertical.Text" xml:space="preserve">
+    <value>垂直:</value>
+  </data>
+  <data name="gbTrimEdges.Text" xml:space="preserve">
+    <value>边缘修剪</value>
+  </data>
+  <data name="lblTrimBottom.Text" xml:space="preserve">
+    <value>底部:</value>
+  </data>
+  <data name="lblTrimRight.Text" xml:space="preserve">
+    <value>右:</value>
+  </data>
+  <data name="lblTrimTop.Text" xml:space="preserve">
+    <value>顶部:</value>
+  </data>
+  <data name="lblTrimLeft.Text" xml:space="preserve">
+    <value>左:</value>
+  </data>
+  <data name="lblProcessing.Text" xml:space="preserve">
+    <value>处理中...</value>
+  </data>
+  <data name="lblScrollTopMethodBeforeCapture.Text" xml:space="preserve">
+    <value>捕捉前滚动到顶部方式:</value>
+  </data>
+  <data name="gbBeforeCapture.Text" xml:space="preserve">
+    <value>捕捉前</value>
+  </data>
+  <data name="gbWhileCapturing.Text" xml:space="preserve">
+    <value>捕捉中</value>
+  </data>
+  <data name="gbAfterCapture.Text" xml:space="preserve">
+    <value>捕捉后</value>
+  </data>
+  <data name="cbAutoClose.Text" xml:space="preserve">
+    <value>处理完成后关闭这个窗口</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>ShareX - 滚动捕捉</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx b/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx
index 30b0742c4..43ccb4fa3 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx
@@ -124,19 +124,19 @@
     <value>浏览ffmpeg.exe</value>
   </data>
   <data name="FFmpegOptionsForm_DownloaderForm_InstallRequested_Download_of_FFmpeg_failed_" xml:space="preserve">
-    <value>下载FFmpeg失败.</value>
+    <value>FFmpeg下载失败。</value>
   </data>
   <data name="FFmpegOptionsForm_DownloaderForm_InstallRequested_Successfully_downloaded_FFmpeg_" xml:space="preserve">
-    <value>下载FFmpeg成功.</value>
+    <value>FFmpeg下载成功。</value>
   </data>
   <data name="FFmpegOptionsForm_UpdateUI_Bitrate___0_k" xml:space="preserve">
-    <value>比特率: {0} K和</value>
+    <value>比特率: {0}K</value>
   </data>
   <data name="FFmpegOptionsForm_UpdateUI_Quality_" xml:space="preserve">
     <value>质量:</value>
   </data>
   <data name="RectangleAnnotate_InitializeComponent_Rectangle_capture_annotate" xml:space="preserve">
-    <value>矩形捕捉注释</value>
+    <value>矩形捕捉标注</value>
   </data>
   <data name="RectangleLight_InitializeComponent_Rectangle_capture_light" xml:space="preserve">
     <value>矩形捕捉光</value>
@@ -152,4 +152,163 @@
   <data name="Surface_InitializeComponent_Region_capture" xml:space="preserve">
     <value>区域捕捉</value>
   </data>
+  <data name="RectangleRegion_WriteTips__Ctrl___C__Copy_position_and_size" xml:space="preserve">
+    <value>[Ctrl + C] 复制位置和大小</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Ctrl___Arrow_keys__Move_cursor_position_faster" xml:space="preserve">
+    <value>[Ctrl + 方向键] 快速移动光标位置</value>
+  </data>
+  <data name="RectangleRegion_WriteTips_Show" xml:space="preserve">
+    <value>显示</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Right_click__Cancel_region_selection" xml:space="preserve">
+    <value>[Right click] [Delete] 取消区域选择</value>
+  </data>
+  <data name="ScrollingCaptureForm_StopCapture_Start_capture" xml:space="preserve">
+    <value>开始捕捉</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Space__Fullscreen_capture" xml:space="preserve">
+    <value>[空格] 全屏捕捉</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Hold_Shift__Move_selected_region_instead_of_resizing" xml:space="preserve">
+    <value>[按住Shift] 移动选中区域而不是改变大小</value>
+  </data>
+  <data name="RectangleRegion_WriteTips_top_left" xml:space="preserve">
+    <value>左上</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Insert__Stop_region_selection" xml:space="preserve">
+    <value>[松开左键] [插入]完成区域选择</value>
+  </data>
+  <data name="RectangleRegion_WriteTips_bottom_right" xml:space="preserve">
+    <value>右下</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Hold_Left_click_on_selection__Move_region" xml:space="preserve">
+    <value>[按住左键单击选择]移动区域</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
+    <value>[小键盘1]矩形形状</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
+    <value>[小键盘4]三角形状</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
+    <value>[右键单击选择区域][Delete]删除区域</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__C___0__screen_wide_crosshair" xml:space="preserve">
+    <value>[C]{0}屏宽十字线</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Arrow_keys__Resize_selected_region_from__0_" xml:space="preserve">
+    <value>[方向键]从{0}调整所选区域</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Q__Activate_multi_region_mode" xml:space="preserve">
+    <value>[Q]启动多区域模式</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Tab__Swap_resize_anchor_to__0_" xml:space="preserve">
+    <value>[Tab]互换调整锚点大小至{0}</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__F1__Hide_tips" xml:space="preserve">
+    <value>[F1]隐藏提示</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
+    <value>[小键盘5]钻石形状</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
+    <value>[数字键盘+或 - ]更改三角形夹角</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__M___0__magnifier" xml:space="preserve">
+    <value>[M]{0}放大镜</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Hold_Left_click__Start_region_selection" xml:space="preserve">
+    <value>[按住左键] [Insert]启动区域选择</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Hold_Ctrl__Resize___Move_faster" xml:space="preserve">
+    <value>[按住Ctrl键]调整大小/快速移动</value>
+  </data>
+  <data name="ScrollingCaptureForm_StartCapture_Stop_capture" xml:space="preserve">
+    <value>停止捕捉</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Hold_Alt__Snap_resizing_to_preset_sizes" xml:space="preserve">
+    <value>[按住Alt键]重置捕捉选择区域至预设大小</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
+    <value>[点击右键] [Esc]取消捕捉</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Q__Activate_quick_capture_mode" xml:space="preserve">
+    <value>[Q]启动快速捕捉模式</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Numpad_2__Rounded_rectangle_shape" xml:space="preserve">
+    <value>[小键盘2]圆角矩形</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Double_Left_click___Enter__Capture_regions" xml:space="preserve">
+    <value>[左键双击] [Enter]捕捉区域</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Numpad_3__Ellipse_shape" xml:space="preserve">
+    <value>[小键盘3]椭圆</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Ctrl___C__Copy_info" xml:space="preserve">
+    <value>[Ctrl + C] 复制信息</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__I___0__position_and_size_info" xml:space="preserve">
+    <value>[I]{0}位置和大小信息</value>
+  </data>
+  <data name="RectangleRegion_WriteTips_Hide" xml:space="preserve">
+    <value>隐藏</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Ctrl___C__Copy_position" xml:space="preserve">
+    <value>[Ctrl + C] 复制位置信息</value>
+  </data>
+  <data name="RectangleTransparent_RectangleTransparent_Rectangle_capture_transparent" xml:space="preserve">
+    <value>透明矩形捕捉</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Numpad___or____Change_rounded_rectangle_corner_radius" xml:space="preserve">
+    <value>[数字键盘+或 - ]更改圆角矩形圆角半径</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Esc__Cancel_capture" xml:space="preserve">
+    <value>[Esc] 取消捕捉</value>
+  </data>
+  <data name="ScreenRegion_Name_Monitor_0___X__1__Y__2__Width__3__Height__4_" xml:space="preserve">
+    <value>显示器 {0} (X:{1} Y:{2} 宽:{3} 高:{4})</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Arrow_keys__Move_cursor_position" xml:space="preserve">
+    <value>[方向键]移动光标的位置</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Mouse_wheel__Change_magnifier_pixel_count" xml:space="preserve">
+    <value>[鼠标滚轮]更改放大镜像素大小</value>
+  </data>
+  <data name="RectangleRegion_WriteTips_____Active_monitor_capture" xml:space="preserve">
+    <value>[〜]捕获活动显示器</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Hold_Shift__Proportional_resizing" xml:space="preserve">
+    <value>[按住Shift]比例调整</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__Ctrl___Mouse_wheel__Change_magnifier_pixel_size" xml:space="preserve">
+    <value>[Ctrl +鼠标滚轮]更改放大镜像素大小</value>
+  </data>
+  <data name="RectangleRegion_WriteTips__1__2__3_____0__Monitor_capture" xml:space="preserve">
+    <value>[1，2，3...0]捕获显示器</value>
+  </data>
+  <data name="RectangleAnnotate_WriteTips__Mouse_wheel__Swap_modes" xml:space="preserve">
+    <value>[鼠标滚轮]互换模式</value>
+  </data>
+  <data name="RectangleAnnotate_WriteTips__1__Select_capture_mode" xml:space="preserve">
+    <value>[1]选择捕捉模式</value>
+  </data>
+  <data name="RectangleAnnotate_WriteTips__2__Select_rectangle_drawing_mode" xml:space="preserve">
+    <value>[2]选择矩形绘图模式</value>
+  </data>
+  <data name="RectangleAnnotate_WriteTips__3__Select_pen_drawing_mode" xml:space="preserve">
+    <value>[3]选择画笔画模式</value>
+  </data>
+  <data name="RectangleAnnotate_WriteTips__Shift__Change_border_color" xml:space="preserve">
+    <value>[Shift]更改边框颜色</value>
+  </data>
+  <data name="RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_border_size" xml:space="preserve">
+    <value>[Ctrl +鼠标滚轮]更改边框尺寸</value>
+  </data>
+  <data name="RectangleAnnotate_WriteTips__Shift__Change_pen_color" xml:space="preserve">
+    <value>[Shift]更改画笔颜色</value>
+  </data>
+  <data name="RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_pen_size" xml:space="preserve">
+    <value>[Ctrl +鼠标滚轮]更改画笔大小</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.zh-CN.resx b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.zh-CN.resx
index bc7eaea98..aa36b1cf1 100644
--- a/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.zh-CN.resx
+++ b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.zh-CN.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="$this.Text" xml:space="preserve">
-    <value>ShareX - FFmpeg的选项</value>
+    <value>ShareX - FFmpeg记录选项</value>
   </data>
   <data name="btnCopyPreview.Text" xml:space="preserve">
     <value>复制</value>
@@ -190,4 +190,31 @@
   <data name="tbVorbis_qscale.ToolTip" xml:space="preserve">
     <value>范围是0-10,其中10为最高质量. 3-6是一个很好的范围内尝试.默认值是3.</value>
   </data>
+  <data name="lblx264Preset.Text" xml:space="preserve">
+    <value>预置:</value>
+  </data>
+  <data name="lblXvidQscale.Text" xml:space="preserve">
+    <value>可变比特率:</value>
+  </data>
+  <data name="gbFFmpegExe.Text" xml:space="preserve">
+    <value>FFmpeg路径</value>
+  </data>
+  <data name="cbOverrideFFmpegPath.Text" xml:space="preserve">
+    <value>使用自定义路径</value>
+  </data>
+  <data name="lblVP8Bitrate.Text" xml:space="preserve">
+    <value>可变比特率:</value>
+  </data>
+  <data name="lblGIFDither.Text" xml:space="preserve">
+    <value>抖动方式:</value>
+  </data>
+  <data name="lblGIFStatsMode.Text" xml:space="preserve">
+    <value>调色板模式:</value>
+  </data>
+  <data name="lblHelperDevices.Text" xml:space="preserve">
+    <value>安装“屏幕捕捉器”和“虚拟音频捕捉器”视频/音频源。</value>
+  </data>
+  <data name="btnInstallHelperDevices.Text" xml:space="preserve">
+    <value>安装捕捉器</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
index f29597252..08e58f6f8 100644
--- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
@@ -164,6 +164,9 @@
     <EmbeddedResource Include="Forms\ScrollingCaptureForm.vi-VN.resx">
       <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\ScrollingCaptureForm.zh-CN.resx">
+      <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.de.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>
diff --git a/ShareX.UploadersLib/Controls/AccountTypeControl.zh-CN.resx b/ShareX.UploadersLib/Controls/AccountTypeControl.zh-CN.resx
index ef85890eb..1886bd9a1 100644
--- a/ShareX.UploadersLib/Controls/AccountTypeControl.zh-CN.resx
+++ b/ShareX.UploadersLib/Controls/AccountTypeControl.zh-CN.resx
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="cbAccountType.Items" xml:space="preserve">
-    <value>Anonymous</value>
+    <value>匿名</value>
   </data>
   <data name="cbAccountType.Items1" xml:space="preserve">
-    <value>User</value>
+    <value>普通用户</value>
   </data>
   <data name="lblAccountType.Text" xml:space="preserve">
     <value>账号类型:</value>
diff --git a/ShareX.UploadersLib/Forms/DropboxFilesForm.zh-CN.resx b/ShareX.UploadersLib/Forms/DropboxFilesForm.zh-CN.resx
index 5e18ee51c..fb8463718 100644
--- a/ShareX.UploadersLib/Forms/DropboxFilesForm.zh-CN.resx
+++ b/ShareX.UploadersLib/Forms/DropboxFilesForm.zh-CN.resx
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -120,7 +121,7 @@
     <value>文件名</value>
   </data>
   <data name="chModified.Text" xml:space="preserve">
-    <value>改性</value>
+    <value>修改</value>
   </data>
   <data name="chSize.Text" xml:space="preserve">
     <value>尺寸</value>
@@ -129,7 +130,7 @@
     <value>选择当前文件夹路径</value>
   </data>
   <data name="tsmiCopyPublicLink.Text" xml:space="preserve">
-    <value>复制链接公</value>
+    <value>复制公共链接</value>
   </data>
   <data name="tsmiCreateDirectory.Text" xml:space="preserve">
     <value>创建目录...</value>
diff --git a/ShareX.UploadersLib/Forms/JiraUpload.zh-CN.resx b/ShareX.UploadersLib/Forms/JiraUpload.zh-CN.resx
index cd3035429..462b8c0d7 100644
--- a/ShareX.UploadersLib/Forms/JiraUpload.zh-CN.resx
+++ b/ShareX.UploadersLib/Forms/JiraUpload.zh-CN.resx
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -126,7 +127,7 @@
     <value>上传</value>
   </data>
   <data name="gpSummary.Text" xml:space="preserve">
-    <value>总结</value>
+    <value>概要</value>
   </data>
   <data name="lblIssueId.Text" xml:space="preserve">
     <value>问题ID:</value>
diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx
index bd96f23d7..72655895b 100644
--- a/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx
+++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx
@@ -130,7 +130,7 @@
     <value>添加</value>
   </data>
   <data name="btnCustomUploaderArgRemove.Text" xml:space="preserve">
-    <value>拆除</value>
+    <value>删除</value>
   </data>
   <data name="btnCustomUploaderClear.Text" xml:space="preserve">
     <value>清除全部 --&gt;</value>
@@ -199,10 +199,10 @@
     <value>打开我的图片网页...</value>
   </data>
   <data name="btnImageShackOpenPublicProfile.Text" xml:space="preserve">
-    <value>开放的公共资料页...</value>
+    <value>打开公共资料页...</value>
   </data>
   <data name="btnImgurRefreshAlbumList.Text" xml:space="preserve">
-    <value>刷新专辑列表</value>
+    <value>刷新相册列表</value>
   </data>
   <data name="btnMegaLogin.Text" xml:space="preserve">
     <value>登录</value>
@@ -250,7 +250,7 @@
     <value>删除相册</value>
   </data>
   <data name="btnPicasaRefreshAlbumList.Text" xml:space="preserve">
-    <value>刷新专辑列表</value>
+    <value>刷新相册列表</value>
   </data>
   <data name="btnPushbulletGetDeviceList.Text" xml:space="preserve">
     <value>获取设备列表</value>
@@ -268,17 +268,15 @@
     <value>使用自定义域:</value>
   </data>
   <data name="cbAmazonS3CustomCNAME.ToolTip" xml:space="preserve">
-    <value>如果你有一桶水设置了一个自定义的域使用此选项.
-如果文本字段为空,那么斗的名字将被用于URL.
-例如,如果你的水桶被称为bucket.example.com那么URL将是http://bucket.example.com/...</value>
+    <value>使用此选项如果你有一个自定义的域的bucket设置。如果文本字段为空，那么bucket的名字将被用于URL。例如，如果你的bucket被称为bucket.example.com那么URL将是http：//bucket.example.com/...</value>
   </data>
   <data name="cbAmazonS3UseRRS.Text" xml:space="preserve">
-    <value>使用减少冗余存储</value>
+    <value>采用精简冗余存储</value>
   </data>
   <data name="cbAmazonS3UseRRS.ToolTip" xml:space="preserve">
-    <value>存储对象使用一个较低的冗余存储类.
-使用此选项,对象是便宜的商店,但有不是99.999999999％99.99％的耐用性.
-这意味着,他们可以从Amazon S3的丢失在某些点.</value>
+    <value>存储对象使用一个较低的冗余存储类。
+使用此选项,对象可以很方便的存储,但只有99.99％的持久性，而不是99.999999999％。
+这意味着,他们可以从Amazon S3某些点丢失。</value>
   </data>
   <data name="cbBoxShare.Text" xml:space="preserve">
     <value>创建共享链接</value>
@@ -290,25 +288,25 @@
     <value>创建共享网址:</value>
   </data>
   <data name="cbEmailRememberLastTo.Text" xml:space="preserve">
-    <value>还记得去年的收件人地址</value>
+    <value>还记得最后一个收件人的地址</value>
   </data>
   <data name="cbGoogleDriveIsPublic.Text" xml:space="preserve">
-    <value>是公众上传?</value>
+    <value>是否公共上传?</value>
   </data>
   <data name="cbGoogleDriveUseFolder.Text" xml:space="preserve">
     <value>上传文件到选定的文件夹</value>
   </data>
   <data name="cbImageShackIsPublic.Text" xml:space="preserve">
-    <value>是公众上传?</value>
+    <value>是否公开上传?</value>
   </data>
   <data name="cbImgurDirectLink.Text" xml:space="preserve">
     <value>使用直接链接</value>
   </data>
   <data name="cbImgurUploadSelectedAlbum.Text" xml:space="preserve">
-    <value>上传图片到相册选择</value>
+    <value>上传图片到选中相册</value>
   </data>
   <data name="cbLocalhostrDirectURL.Text" xml:space="preserve">
-    <value>如果存在直接使用URL</value>
+    <value>如果存在则直接使用URL</value>
   </data>
   <data name="cbMediaFireUseLongLink.Text" xml:space="preserve">
     <value>使用其中包括文件名较长的链接</value>
@@ -326,7 +324,7 @@
     <value>忽略无效的SSL证书</value>
   </data>
   <data name="cbUpasteIsPublic.Text" xml:space="preserve">
-    <value>是公众上传?</value>
+    <value>是否公开上传?</value>
   </data>
   <data name="chBoxFoldersName.Text" xml:space="preserve">
     <value>文件夹名称</value>
@@ -347,7 +345,7 @@
     <value>在发送前确认</value>
   </data>
   <data name="chkGistPublishPublic.Text" xml:space="preserve">
-    <value>创建公共要点</value>
+    <value>创建公共Gist</value>
   </data>
   <data name="chkMinusPublic.Text" xml:space="preserve">
     <value>公开</value>
@@ -371,7 +369,7 @@
     <value>上传图像</value>
   </data>
   <data name="gbPhotobucketAlbums.Text" xml:space="preserve">
-    <value>创建新专辑</value>
+    <value>创建新相册</value>
   </data>
   <data name="gbPhotobucketUserAccount.Text" xml:space="preserve">
     <value>用户帐户</value>
@@ -382,11 +380,8 @@
   <data name="lblAdflyAPIKEY.Text" xml:space="preserve">
     <value>API密钥:</value>
   </data>
-  <data name="lblAmazonS3AccessKey.Text" xml:space="preserve">
-    <value>Access key:</value>
-  </data>
   <data name="lblAmazonS3BucketName.Text" xml:space="preserve">
-    <value>Bucket name:</value>
+    <value>Bucket名称:</value>
   </data>
   <data name="lblAmazonS3Endpoint.Text" xml:space="preserve">
     <value>节点:</value>
@@ -400,9 +395,6 @@
   <data name="lblAmazonS3PathPreviewLabel.Text" xml:space="preserve">
     <value>网址预览:</value>
   </data>
-  <data name="lblAmazonS3SecretKey.Text" xml:space="preserve">
-    <value>密钥:</value>
-  </data>
   <data name="lblBitlyDomain.Text" xml:space="preserve">
     <value>域名:</value>
   </data>
@@ -458,7 +450,7 @@
     <value>缩略图网址:</value>
   </data>
   <data name="lblCustomUploaderURLShortener.Text" xml:space="preserve">
-    <value>URL缩短:</value>
+    <value>URL短链:</value>
   </data>
   <data name="lblDropboxPath.Text" xml:space="preserve">
     <value>上传路径:</value>
@@ -503,7 +495,7 @@
     <value>密码:</value>
   </data>
   <data name="lblGe_ttStatus.Text" xml:space="preserve">
-    <value>需要登录.</value>
+    <value>需要登录。</value>
   </data>
   <data name="lblGoogleDriveFolderID.Text" xml:space="preserve">
     <value>文件夹ID:</value>
@@ -611,22 +603,22 @@
     <value>用户名:</value>
   </data>
   <data name="lblPhotobucketAccountStatus.Text" xml:space="preserve">
-    <value>需要登录.</value>
+    <value>需要登录。</value>
   </data>
   <data name="lblPhotobucketDefaultAlbumName.Text" xml:space="preserve">
     <value>默认相册名称</value>
   </data>
   <data name="lblPhotobucketNewAlbumName.Text" xml:space="preserve">
-    <value>新相册的名称（必须为2至50个字符之间的有效字符为字母,数字,下划线（_）,连字符（ - ）,和空间）</value>
+    <value>新相册的名称（必须在2至50个字符之间，有效字符为字母,数字,下划线（_）,连字符（ - ）,和空间）</value>
   </data>
   <data name="lblPhotobucketParentAlbumPath.Text" xml:space="preserve">
-    <value>根相册路径</value>
+    <value>上级相册路径</value>
   </data>
   <data name="lblPhotobucketVerificationCode.Text" xml:space="preserve">
     <value>验证码（从获得授权页面验证码）:</value>
   </data>
   <data name="lblPicasaAlbumID.Text" xml:space="preserve">
-    <value>相册ID上传（空=无相册上传）:</value>
+    <value>上传相册ID（空=无相册上传）:</value>
   </data>
   <data name="lblPushbulletDevices.Text" xml:space="preserve">
     <value>设备:</value>
@@ -671,7 +663,7 @@
     <value>用户名:</value>
   </data>
   <data name="llAdflyLink.Text" xml:space="preserve">
-    <value>你可以找到你的API密钥和UID在这里</value>
+    <value>在这里你可以找到你的API密钥和UID</value>
   </data>
   <data name="tpCustomUploaders.Text" xml:space="preserve">
     <value>自定义上传者</value>
@@ -700,4 +692,191 @@
   <data name="txtJiraConfigHelp.Text" xml:space="preserve">
     <value>模板</value>
   </data>
+  <data name="btnTwitterNameUpdate.Text" xml:space="preserve">
+    <value>更新</value>
+  </data>
+  <data name="lblTwitterDefaultMessage.Text" xml:space="preserve">
+    <value>默认推特消息:</value>
+  </data>
+  <data name="cbTwitterSkipMessageBox.Text" xml:space="preserve">
+    <value>跳过推特消息框</value>
+  </data>
+  <data name="lblTwitterDescription.Text" xml:space="preserve">
+    <value>名称:</value>
+  </data>
+  <data name="btnTwitterRemove.Text" xml:space="preserve">
+    <value>删除</value>
+  </data>
+  <data name="btnTwitterAdd.Text" xml:space="preserve">
+    <value>添加</value>
+  </data>
+  <data name="btnCustomUploaderRegexAddSyntax.Text" xml:space="preserve">
+    <value>URL字段加入语法</value>
+  </data>
+  <data name="btnCustomUploaderRegexpUpdate.Text" xml:space="preserve">
+    <value>更新</value>
+  </data>
+  <data name="btnCustomUploaderJsonAddSyntax.Text" xml:space="preserve">
+    <value>URL字段加入语法</value>
+  </data>
+  <data name="btnCustomUploaderXmlSyntaxAdd.Text" xml:space="preserve">
+    <value>URL字段加入语法</value>
+  </data>
+  <data name="btnCustomUploaderArgUpdate.Text" xml:space="preserve">
+    <value>更新</value>
+  </data>
+  <data name="tpCustomUploaderArguments.Text" xml:space="preserve">
+    <value>参数</value>
+  </data>
+  <data name="chCustomUploaderArgumentsName.Text" xml:space="preserve">
+    <value>名称</value>
+  </data>
+  <data name="chCustomUploaderArgumentsValue.Text" xml:space="preserve">
+    <value>值</value>
+  </data>
+  <data name="tpCustomUploaderHeaders.Text" xml:space="preserve">
+    <value>头部</value>
+  </data>
+  <data name="btnCustomUploaderHeaderUpdate.Text" xml:space="preserve">
+    <value>更新</value>
+  </data>
+  <data name="btnCustomUploaderHeaderAdd.Text" xml:space="preserve">
+    <value>添加</value>
+  </data>
+  <data name="btnCustomUploaderHeaderRemove.Text" xml:space="preserve">
+    <value>删除</value>
+  </data>
+  <data name="chCustomUploaderHeadersName.Text" xml:space="preserve">
+    <value>名称</value>
+  </data>
+  <data name="chCustomUploaderHeadersValue.Text" xml:space="preserve">
+    <value>值</value>
+  </data>
+  <data name="btnCustomUploadersExportAll.Text" xml:space="preserve">
+    <value>全部...</value>
+  </data>
+  <data name="btnCustomUploaderClearUploaders.Text" xml:space="preserve">
+    <value>清除上传者</value>
+  </data>
+  <data name="lblPolrAPIKey.Text" xml:space="preserve">
+    <value>API密钥:</value>
+  </data>
+  <data name="lblPolrAPIHostname.Text" xml:space="preserve">
+    <value>API主机名:(例如http://example.com/api.php，留空将使用polr.me)</value>
+  </data>
+  <data name="lblLambdaInfo.Text" xml:space="preserve">
+    <value>为了得到一个API密钥，在https://lambda.sx/登录LAMBDA然后点击你的用户名，单击管理帐户。</value>
+  </data>
+  <data name="btnPomfTest.Text" xml:space="preserve">
+    <value>测试全部</value>
+  </data>
+  <data name="lblLambdaUploadURL.Text" xml:space="preserve">
+    <value>链接URL:</value>
+  </data>
+  <data name="lblPomfResultURL.Text" xml:space="preserve">
+    <value>结果URL:</value>
+  </data>
+  <data name="lblPomfUploadURL.Text" xml:space="preserve">
+    <value>上传URL:</value>
+  </data>
+  <data name="lblPomfUploaders.Text" xml:space="preserve">
+    <value>上传者:</value>
+  </data>
+  <data name="lblUp1Host.Text" xml:space="preserve">
+    <value>域名:</value>
+  </data>
+  <data name="grpSeafileShareSettings.Text" xml:space="preserve">
+    <value>Seafile共享设置</value>
+  </data>
+  <data name="lblSeafileSharePassword.Text" xml:space="preserve">
+    <value>共享密码:</value>
+  </data>
+  <data name="lblSeafileDaysToExpire.Text" xml:space="preserve">
+    <value>到期时间:</value>
+  </data>
+  <data name="btnSeafileLibraryPasswordValidate.Text" xml:space="preserve">
+    <value>验证</value>
+  </data>
+  <data name="lblSeafileLibraryPassword.Text" xml:space="preserve">
+    <value>库密码:</value>
+  </data>
+  <data name="colSeafileLibraryName.Text" xml:space="preserve">
+    <value>名称</value>
+  </data>
+  <data name="colSeafileLibrarySize.Text" xml:space="preserve">
+    <value>大小</value>
+  </data>
+  <data name="colSeafileLibraryEncrypted.Text" xml:space="preserve">
+    <value>加密</value>
+  </data>
+  <data name="btnSeafilePathValidate.Text" xml:space="preserve">
+    <value>验证</value>
+  </data>
+  <data name="lblSeafileWritePermNotif.Text" xml:space="preserve">
+    <value>没有写权限的库是隐藏的。
+加密库来禁用共享。</value>
+  </data>
+  <data name="lblSeafilePath.Text" xml:space="preserve">
+    <value>路径:</value>
+  </data>
+  <data name="txtSeafileUploadLocationRefresh.Text" xml:space="preserve">
+    <value>刷新</value>
+  </data>
+  <data name="lblSeafileSelectLibrary.Text" xml:space="preserve">
+    <value>选择库:</value>
+  </data>
+  <data name="grpSeafileAccInfo.Text" xml:space="preserve">
+    <value>账号信息</value>
+  </data>
+  <data name="btnRefreshSeafileAccInfo.Text" xml:space="preserve">
+    <value>刷新</value>
+  </data>
+  <data name="btnSeafileCheckAuthToken.Text" xml:space="preserve">
+    <value>验证</value>
+  </data>
+  <data name="btnSeafileCheckAPIURL.Text" xml:space="preserve">
+    <value>验证</value>
+  </data>
+  <data name="grpSeafileObtainAuthToken.Text" xml:space="preserve">
+    <value>获取身份验证令牌</value>
+  </data>
+  <data name="btnSeafileGetAuthToken.Text" xml:space="preserve">
+    <value>获取</value>
+  </data>
+  <data name="cbSeafileIgnoreInvalidCert.Text" xml:space="preserve">
+    <value>忽略无效的SSL证书</value>
+  </data>
+  <data name="cbSeafileCreateShareableURL.Text" xml:space="preserve">
+    <value>创建共享的URL</value>
+  </data>
+  <data name="lblSeafileAuthToken.Text" xml:space="preserve">
+    <value>身份验证令牌：</value>
+  </data>
+  <data name="lblStreamableUsername.Text" xml:space="preserve">
+    <value>用户名:</value>
+  </data>
+  <data name="lblStreamablePassword.Text" xml:space="preserve">
+    <value>密码:</value>
+  </data>
+  <data name="cbStreamableAnonymous.Text" xml:space="preserve">
+    <value>匿名</value>
+  </data>
+  <data name="lblSulAPIKey.Text" xml:space="preserve">
+    <value>API密钥:</value>
+  </data>
+  <data name="lblOneTimeSecretAPIKey.Text" xml:space="preserve">
+    <value>API密钥:</value>
+  </data>
+  <data name="lblOneTimeSecretEmail.Text" xml:space="preserve">
+    <value>电子邮件:</value>
+  </data>
+  <data name="cbImgurUseGIFV.Text" xml:space="preserve">
+    <value>使用GIF而不是GIFV链接</value>
+  </data>
+  <data name="lblSeafileUsername.Text" xml:space="preserve">
+    <value>电子邮件:</value>
+  </data>
+  <data name="lblSeafilePassword.Text" xml:space="preserve">
+    <value>密码:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.UploadersLib/Properties/Resources.zh-CN.resx b/ShareX.UploadersLib/Properties/Resources.zh-CN.resx
index faec19663..3572cac03 100644
--- a/ShareX.UploadersLib/Properties/Resources.zh-CN.resx
+++ b/ShareX.UploadersLib/Properties/Resources.zh-CN.resx
@@ -124,37 +124,37 @@
     <value>路径不存在:</value>
   </data>
   <data name="DropboxFilesForm_tsmiCreateDirectory_Click_Directory_name_to_create" xml:space="preserve">
-    <value>目录名来创建</value>
+    <value>使用目录名来创建</value>
   </data>
   <data name="DropboxFilesForm_tsmiDelete_Click_Are_you_sure_you_want_to_delete___0___from_your_Dropbox_" xml:space="preserve">
-    <value>你想"{0}"从你的Dropbox中删除吗?</value>
+    <value>你想从你的Dropbox中删除"{0}"吗?</value>
   </data>
   <data name="DropboxFilesForm_tsmiDelete_Click_Delete_file_" xml:space="preserve">
     <value>删除文件?</value>
   </data>
   <data name="FTPClientForm_FTPClientForm_Connecting_to__0_" xml:space="preserve">
-    <value>连接 {0}</value>
+    <value>连接到 {0}</value>
   </data>
   <data name="FTPClientForm_FTPClientForm_ShareX_FTP_client" xml:space="preserve">
     <value>ShareX FTP客户端</value>
   </data>
   <data name="FTPClientForm_FTPCreateDirectory_Directory_name_to_create" xml:space="preserve">
-    <value>目录名来创建</value>
+    <value>使用目录名来创建</value>
   </data>
   <data name="JiraUpload_ValidateIssueId_Issue_not_found" xml:space="preserve">
-    <value>发行未找到</value>
+    <value>未找到问题</value>
   </data>
   <data name="KeyFileNameEditor_EditValue_Browse_for_a_key_file___" xml:space="preserve">
     <value>浏览密钥文件...</value>
   </data>
   <data name="OAuthControl_Status_Status__Logged_in_" xml:space="preserve">
-    <value>状态:登录.</value>
+    <value>状态:已登录。</value>
   </data>
   <data name="OAuthControl_Status_Status__Login_failed_" xml:space="preserve">
-    <value>状态:登录失败.</value>
+    <value>状态:登录失败。</value>
   </data>
   <data name="OAuthControl_Status_Status__Not_logged_in_" xml:space="preserve">
-    <value>状态:不登录.</value>
+    <value>状态:尚未登录。</value>
   </data>
   <data name="OAuthInfo_OAuthInfo_New_account" xml:space="preserve">
     <value>新账户</value>
@@ -163,31 +163,31 @@
     <value>根文件夹</value>
   </data>
   <data name="TwitterTweetForm_SendTweet_Tweet_error" xml:space="preserve">
-    <value>Tweet error</value>
+    <value>Tweet 错误</value>
   </data>
   <data name="UploadersConfigForm_BoxListFolders_Box_refresh_folders_list_failed" xml:space="preserve">
-    <value>箱刷新文件夹列表失败</value>
+    <value>Box刷新文件夹列表失败</value>
   </data>
   <data name="UploadersConfigForm_DropboxAuthComplete_Login_successful_but_getting_account_info_failed_" xml:space="preserve">
-    <value>登录成功,但得到的帐户信息失败.</value>
+    <value>登录成功,但帐户信息获取失败。</value>
   </data>
   <data name="UploadersConfigForm_Error" xml:space="preserve">
     <value>错误</value>
   </data>
   <data name="UploadersConfigForm_ListFolders_Authentication_required_" xml:space="preserve">
-    <value>认证要求.</value>
+    <value>要求认证。</value>
   </data>
   <data name="UploadersConfigForm_LoadSettings_Invalid_device_name" xml:space="preserve">
     <value>无效的设备名称</value>
   </data>
   <data name="UploadersConfigForm_LoadSettings_Parent_album_path_e_g_" xml:space="preserve">
-    <value>家长专辑路径例如</value>
+    <value>上级专辑路径例如</value>
   </data>
   <data name="UploadersConfigForm_LoadSettings_Selected_folder_" xml:space="preserve">
     <value>选定的文件夹:</value>
   </data>
   <data name="UploadersConfigForm_Login_failed" xml:space="preserve">
-    <value>登录失败.</value>
+    <value>登录失败。</value>
   </data>
   <data name="UploadersConfigForm_Login_successful" xml:space="preserve">
     <value>登录成功.</value>
@@ -205,25 +205,25 @@
     <value>未配置</value>
   </data>
   <data name="UploadersConfigForm_MinusUpdateControls_Logged_in_as__0__" xml:space="preserve">
-    <value>登录为 {0}.</value>
+    <value>登录为 {0}。</value>
   </data>
   <data name="UploadersConfigForm_MinusUpdateControls_Not_logged_in_" xml:space="preserve">
     <value>尚未登录.</value>
   </data>
   <data name="UploadersConfigForm_oAuthJira_RefreshButtonClicked_Refresh_authorization_is_not_supported_" xml:space="preserve">
-    <value>不支持刷新授权.</value>
+    <value>不支持刷新授权。</value>
   </data>
   <data name="UploadersConfigForm_OneDriveAddFolder_Querying_folders___" xml:space="preserve">
     <value>查询文件夹...</value>
   </data>
   <data name="UploadersConfigForm_PhotobucketCreateAlbum__0__successfully_created_" xml:space="preserve">
-    <value>{0} 创建成功.</value>
+    <value>{0} 创建成功。</value>
   </data>
   <data name="UploadersConfigForm_SendSpaceRegister_SendSpace_Registration___" xml:space="preserve">
     <value>SendSpace注册</value>
   </data>
   <data name="UploadersConfigForm_TestCustomUploader_Error__Result_is_empty_" xml:space="preserve">
-    <value>错误:结果是空的.</value>
+    <value>错误:结果是空的。</value>
   </data>
   <data name="UploadersConfigForm_TestFTPAccount_Connected_" xml:space="preserve">
     <value>连接成功!</value>
@@ -239,15 +239,24 @@
     <value>电子邮件:</value>
   </data>
   <data name="UploadersConfigForm_UpdateDropboxStatus_Name_" xml:space="preserve">
-    <value>姓名:</value>
+    <value>名称:</value>
   </data>
   <data name="UploadersConfigForm_UpdateDropboxStatus_Upload_path_" xml:space="preserve">
     <value>上传路径:</value>
   </data>
   <data name="UploadersConfigForm_UpdateDropboxStatus_User_ID_" xml:space="preserve">
-    <value>用户身份:</value>
+    <value>用户ID:</value>
   </data>
   <data name="UploadersConfigForm_HubicListFolders_Hubic_refresh_folders_list_failed" xml:space="preserve">
     <value>Hubic刷新文件夹列表失败</value>
   </data>
+  <data name="UploadersConfigForm_FTPOpenClient_FTP_client_only_supports_FTP_or_FTPS_" xml:space="preserve">
+    <value>FTP客户端只支持FTP和FTPS。</value>
+  </data>
+  <data name="UploadersConfigForm_FTPOpenClient_Unable_to_find_valid_FTP_account_" xml:space="preserve">
+    <value>无法找到有效的FTP帐户。</value>
+  </data>
+  <data name="Pomf_Upload_Please_select_one_of_the_Pomf_uploaders_from__Destination_settings_window____Pomf_tab__" xml:space="preserve">
+    <value>请从“目的地设置窗口 -&gt; Pomf上传程序”中选择其中的一个Pomf上传程序。</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX/Forms/MainForm.zh-CN.resx b/ShareX/Forms/MainForm.zh-CN.resx
index eca34ae08..28e3f9faf 100644
--- a/ShareX/Forms/MainForm.zh-CN.resx
+++ b/ShareX/Forms/MainForm.zh-CN.resx
@@ -268,7 +268,7 @@
     <value>文件上传者</value>
   </data>
   <data name="tsmiFreeHand.Text" xml:space="preserve">
-    <value>写意</value>
+    <value>手绘</value>
   </data>
   <data name="tsmiFTPClient.Text" xml:space="preserve">
     <value>FTP客户端...</value>
diff --git a/ShareX/Forms/TaskSettingsForm.zh-CN.resx b/ShareX/Forms/TaskSettingsForm.zh-CN.resx
index 494362348..f5a3f41bc 100644
--- a/ShareX/Forms/TaskSettingsForm.zh-CN.resx
+++ b/ShareX/Forms/TaskSettingsForm.zh-CN.resx
@@ -358,7 +358,7 @@
     <value>截图</value>
   </data>
   <data name="tpEffects.Text" xml:space="preserve">
-    <value>影响</value>
+    <value>效果</value>
   </data>
   <data name="tpGeneral.Text" xml:space="preserve">
     <value>常规</value>
diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj
index 885958a36..b3390b9b7 100644
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -715,6 +715,9 @@
     <EmbeddedResource Include="Forms\FirstTimeConfigForm.vi-VN.resx">
       <DependentUpon>FirstTimeConfigForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\FirstTimeConfigForm.zh-CN.resx">
+      <DependentUpon>FirstTimeConfigForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\HotkeySettingsForm.de.resx">
       <DependentUpon>HotkeySettingsForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -772,6 +775,9 @@
     <EmbeddedResource Include="Forms\ImageCombinerForm.vi-VN.resx">
       <DependentUpon>ImageCombinerForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\ImageCombinerForm.zh-CN.resx">
+      <DependentUpon>ImageCombinerForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\MainForm.de.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -1021,6 +1027,9 @@
     <EmbeddedResource Include="Forms\WebpageCaptureForm.vi-VN.resx">
       <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\WebpageCaptureForm.zh-CN.resx">
+      <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.de.resx" />
     <EmbeddedResource Include="Properties\Resources.es.resx" />
     <EmbeddedResource Include="Properties\Resources.fr.resx" />