• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubybathyscaphegamephpguicwindows翻訳pythonomegattwitterframeworkbtronarduinovb.net計画中(planning stage)directxpreviewertestゲームエンジンdom

Commit MetaInfo

Revisionfaf82de80458868992bc1600ea8e100ac02d03fe (tree)
Zeit2016-03-26 08:16:22
Autornotme <notme@user...>
Commiternotme

Log Message

Japanese translation for ShareX 10.9.1

Ändern Zusammenfassung

Diff

--- a/ShareX.HelpersLib/Forms/DebugForm.ja-JP.resx
+++ b/ShareX.HelpersLib/Forms/DebugForm.ja-JP.resx
@@ -124,7 +124,7 @@
124124 <value>ShareX - デバッグ ログ</value>
125125 </data>
126126 <data name="btnOpenLogFile.Text" xml:space="preserve">
127- <value>ログファイルを開く</value>
127+ <value>ログファイルを開く...</value>
128128 </data>
129129 <data name="lblRunningFrom.Text" xml:space="preserve">
130130 <value>開始パス:</value>
--- a/ShareX.HelpersLib/Forms/ErrorForm.ja-JP.resx
+++ b/ShareX.HelpersLib/Forms/ErrorForm.ja-JP.resx
@@ -118,7 +118,7 @@
118118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119 </resheader>
120120 <data name="btnOpenLogFile.Text" xml:space="preserve">
121- <value>ログファイルを開く</value>
121+ <value>ログファイルを開く...</value>
122122 </data>
123123 <data name="$this.Text" xml:space="preserve">
124124 <value>ShareX - エラー</value>
--- a/ShareX.HelpersLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.HelpersLib/Properties/Resources.ja-JP.resx
@@ -853,4 +853,7 @@
853853 <data name="ReplCodeMenuCategory_Target" xml:space="preserve">
854854 <value>対象</value>
855855 </data>
856+ <data name="Helpers_OpenFile_File_not_exist_" xml:space="preserve">
857+ <value>存在しないファイル:</value>
858+ </data>
856859 </root>
\ No newline at end of file
--- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
@@ -67,7 +67,7 @@
6767 <Private>True</Private>
6868 </Reference>
6969 <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
70- <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
70+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
7171 <Private>True</Private>
7272 </Reference>
7373 <Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL">
@@ -172,7 +172,6 @@
172172 <Compile Include="Forms\MonitorTestForm.Designer.cs">
173173 <DependentUpon>MonitorTestForm.cs</DependentUpon>
174174 </Compile>
175- <Compile Include="Helpers\SSLBypassHelper.cs" />
176175 <Compile Include="Native\NativeConstants.cs" />
177176 <Compile Include="PingHelper.cs" />
178177 <Compile Include="PingResult.cs" />
@@ -353,8 +352,7 @@
353352 </Compile>
354353 <Compile Include="Printer\PrintTextHelper.cs" />
355354 <Compile Include="Helpers\RegistryHelpers.cs" />
356- <Compile Include="SingleInstanceApplication\ApplicationInstanceManager.cs" />
357- <Compile Include="SingleInstanceApplication\InstanceProxy.cs" />
355+ <Compile Include="ApplicationInstanceManager.cs" />
358356 <Compile Include="DebugHelper.cs" />
359357 <Compile Include="UpdateChecker\UpdateCheckerLabel.cs">
360358 <SubType>UserControl</SubType>
--- /dev/null
+++ b/ShareX.IndexerLib/Properties/Resources.ja-JP.resx
@@ -0,0 +1,123 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<root>
3+ <!--
4+ Microsoft ResX Schema
5+
6+ Version 2.0
7+
8+ The primary goals of this format is to allow a simple XML format
9+ that is mostly human readable. The generation and parsing of the
10+ various data types are done through the TypeConverter classes
11+ associated with the data types.
12+
13+ Example:
14+
15+ ... ado.net/XML headers & schema ...
16+ <resheader name="resmimetype">text/microsoft-resx</resheader>
17+ <resheader name="version">2.0</resheader>
18+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+ <value>[base64 mime encoded serialized .NET Framework object]</value>
24+ </data>
25+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+ <comment>This is a comment</comment>
28+ </data>
29+
30+ There are any number of "resheader" rows that contain simple
31+ name/value pairs.
32+
33+ Each data row contains a name, and value. The row also contains a
34+ type or mimetype. Type corresponds to a .NET class that support
35+ text/value conversion through the TypeConverter architecture.
36+ Classes that don't support this are serialized and stored with the
37+ mimetype set.
38+
39+ The mimetype is used for serialized objects, and tells the
40+ ResXResourceReader how to depersist the object. This is currently not
41+ extensible. For a given mimetype the value must be set accordingly:
42+
43+ Note - application/x-microsoft.net.object.binary.base64 is the format
44+ that the ResXResourceWriter will generate, however the reader can
45+ read any of the formats listed below.
46+
47+ mimetype: application/x-microsoft.net.object.binary.base64
48+ value : The object must be serialized with
49+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+ : and then encoded with base64 encoding.
51+
52+ mimetype: application/x-microsoft.net.object.soap.base64
53+ value : The object must be serialized with
54+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+ : and then encoded with base64 encoding.
56+
57+ mimetype: application/x-microsoft.net.object.bytearray.base64
58+ value : The object must be serialized into a byte array
59+ : using a System.ComponentModel.TypeConverter
60+ : and then encoded with base64 encoding.
61+ -->
62+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+ <xsd:element name="root" msdata:IsDataSet="true">
65+ <xsd:complexType>
66+ <xsd:choice maxOccurs="unbounded">
67+ <xsd:element name="metadata">
68+ <xsd:complexType>
69+ <xsd:sequence>
70+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
71+ </xsd:sequence>
72+ <xsd:attribute name="name" use="required" type="xsd:string" />
73+ <xsd:attribute name="type" type="xsd:string" />
74+ <xsd:attribute name="mimetype" type="xsd:string" />
75+ <xsd:attribute ref="xml:space" />
76+ </xsd:complexType>
77+ </xsd:element>
78+ <xsd:element name="assembly">
79+ <xsd:complexType>
80+ <xsd:attribute name="alias" type="xsd:string" />
81+ <xsd:attribute name="name" type="xsd:string" />
82+ </xsd:complexType>
83+ </xsd:element>
84+ <xsd:element name="data">
85+ <xsd:complexType>
86+ <xsd:sequence>
87+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+ </xsd:sequence>
90+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+ <xsd:attribute ref="xml:space" />
94+ </xsd:complexType>
95+ </xsd:element>
96+ <xsd:element name="resheader">
97+ <xsd:complexType>
98+ <xsd:sequence>
99+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+ </xsd:sequence>
101+ <xsd:attribute name="name" type="xsd:string" use="required" />
102+ </xsd:complexType>
103+ </xsd:element>
104+ </xsd:choice>
105+ </xsd:complexType>
106+ </xsd:element>
107+ </xsd:schema>
108+ <resheader name="resmimetype">
109+ <value>text/microsoft-resx</value>
110+ </resheader>
111+ <resheader name="version">
112+ <value>2.0</value>
113+ </resheader>
114+ <resheader name="reader">
115+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+ </resheader>
117+ <resheader name="writer">
118+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+ </resheader>
120+ <data name="DirectoryIndexerForm_BrowseFolder_Choose_folder_path" xml:space="preserve">
121+ <value>フォルダーの選択</value>
122+ </data>
123+</root>
\ No newline at end of file
--- /dev/null
+++ b/ShareX.IndexerLib/ShareX.IndexerLib.csproj
@@ -0,0 +1,113 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+ <PropertyGroup>
5+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+ <ProjectGuid>{750C6F46-2C5A-4488-81D3-3B35CA50F3EE}</ProjectGuid>
8+ <OutputType>Library</OutputType>
9+ <AppDesignerFolder>Properties</AppDesignerFolder>
10+ <RootNamespace>ShareX.IndexerLib</RootNamespace>
11+ <AssemblyName>ShareX.IndexerLib</AssemblyName>
12+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+ <FileAlignment>512</FileAlignment>
14+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15+ <RestorePackages>true</RestorePackages>
16+ <TargetFrameworkProfile />
17+ </PropertyGroup>
18+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19+ <DebugSymbols>true</DebugSymbols>
20+ <DebugType>full</DebugType>
21+ <Optimize>false</Optimize>
22+ <OutputPath>bin\Debug\</OutputPath>
23+ <DefineConstants>DEBUG;TRACE</DefineConstants>
24+ <ErrorReport>prompt</ErrorReport>
25+ <WarningLevel>4</WarningLevel>
26+ </PropertyGroup>
27+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28+ <DebugType>none</DebugType>
29+ <Optimize>true</Optimize>
30+ <OutputPath>bin\Release\</OutputPath>
31+ <DefineConstants>TRACE</DefineConstants>
32+ <ErrorReport>prompt</ErrorReport>
33+ <WarningLevel>4</WarningLevel>
34+ <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
35+ <DebugSymbols>false</DebugSymbols>
36+ </PropertyGroup>
37+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Steam|AnyCPU'">
38+ <OutputPath>bin\Steam\</OutputPath>
39+ <DefineConstants>TRACE</DefineConstants>
40+ <Optimize>true</Optimize>
41+ <PlatformTarget>AnyCPU</PlatformTarget>
42+ <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
43+ <ErrorReport>prompt</ErrorReport>
44+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
45+ </PropertyGroup>
46+ <ItemGroup>
47+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
49+ <Private>True</Private>
50+ </Reference>
51+ <Reference Include="System" />
52+ <Reference Include="System.Core" />
53+ <Reference Include="System.Data" />
54+ <Reference Include="System.Design" />
55+ <Reference Include="System.Drawing" />
56+ <Reference Include="System.Windows.Forms" />
57+ <Reference Include="System.Xml" />
58+ </ItemGroup>
59+ <ItemGroup>
60+ <Compile Include="Forms\DirectoryIndexerForm.cs">
61+ <SubType>Form</SubType>
62+ </Compile>
63+ <Compile Include="Forms\DirectoryIndexerForm.Designer.cs">
64+ <DependentUpon>DirectoryIndexerForm.cs</DependentUpon>
65+ </Compile>
66+ <Compile Include="Enums.cs" />
67+ <Compile Include="HtmlHelper.cs" />
68+ <Compile Include="Indexer.cs" />
69+ <Compile Include="IndexerHtml.cs" />
70+ <Compile Include="IndexerJson.cs" />
71+ <Compile Include="IndexerSettings.cs" />
72+ <Compile Include="IndexerText.cs" />
73+ <Compile Include="FolderInfo.cs" />
74+ <Compile Include="IndexerXml.cs" />
75+ <Compile Include="Properties\AssemblyInfo.cs" />
76+ <Compile Include="Properties\Resources.Designer.cs">
77+ <AutoGen>True</AutoGen>
78+ <DesignTime>True</DesignTime>
79+ <DependentUpon>Resources.resx</DependentUpon>
80+ </Compile>
81+ </ItemGroup>
82+ <ItemGroup>
83+ <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
84+ <Project>{327750e1-9fb7-4cc3-8aea-9bc42180cad3}</Project>
85+ <Name>ShareX.HelpersLib</Name>
86+ </ProjectReference>
87+ </ItemGroup>
88+ <ItemGroup>
89+ <EmbeddedResource Include="Forms\DirectoryIndexerForm.resx">
90+ <DependentUpon>DirectoryIndexerForm.cs</DependentUpon>
91+ </EmbeddedResource>
92+ <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />
93+ <EmbeddedResource Include="Properties\Resources.resx">
94+ <Generator>ResXFileCodeGenerator</Generator>
95+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
96+ <SubType>Designer</SubType>
97+ </EmbeddedResource>
98+ <EmbeddedResource Include="Properties\Resources.tr.resx" />
99+ </ItemGroup>
100+ <ItemGroup>
101+ <None Include="packages.config" />
102+ <None Include="Resources\IndexerDefault.css" />
103+ </ItemGroup>
104+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
105+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
106+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
107+ Other similar extension points exist, see Microsoft.Common.targets.
108+ <Target Name="BeforeBuild">
109+ </Target>
110+ <Target Name="AfterBuild">
111+ </Target>
112+ -->
113+</Project>
\ No newline at end of file
--- /dev/null
+++ b/ShareX.ScreenCaptureLib/Forms/WebpageCaptureForm.ja-JP.resx
@@ -0,0 +1,138 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<root>
3+ <!--
4+ Microsoft ResX Schema
5+
6+ Version 2.0
7+
8+ The primary goals of this format is to allow a simple XML format
9+ that is mostly human readable. The generation and parsing of the
10+ various data types are done through the TypeConverter classes
11+ associated with the data types.
12+
13+ Example:
14+
15+ ... ado.net/XML headers & schema ...
16+ <resheader name="resmimetype">text/microsoft-resx</resheader>
17+ <resheader name="version">2.0</resheader>
18+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+ <value>[base64 mime encoded serialized .NET Framework object]</value>
24+ </data>
25+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+ <comment>This is a comment</comment>
28+ </data>
29+
30+ There are any number of "resheader" rows that contain simple
31+ name/value pairs.
32+
33+ Each data row contains a name, and value. The row also contains a
34+ type or mimetype. Type corresponds to a .NET class that support
35+ text/value conversion through the TypeConverter architecture.
36+ Classes that don't support this are serialized and stored with the
37+ mimetype set.
38+
39+ The mimetype is used for serialized objects, and tells the
40+ ResXResourceReader how to depersist the object. This is currently not
41+ extensible. For a given mimetype the value must be set accordingly:
42+
43+ Note - application/x-microsoft.net.object.binary.base64 is the format
44+ that the ResXResourceWriter will generate, however the reader can
45+ read any of the formats listed below.
46+
47+ mimetype: application/x-microsoft.net.object.binary.base64
48+ value : The object must be serialized with
49+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+ : and then encoded with base64 encoding.
51+
52+ mimetype: application/x-microsoft.net.object.soap.base64
53+ value : The object must be serialized with
54+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+ : and then encoded with base64 encoding.
56+
57+ mimetype: application/x-microsoft.net.object.bytearray.base64
58+ value : The object must be serialized into a byte array
59+ : using a System.ComponentModel.TypeConverter
60+ : and then encoded with base64 encoding.
61+ -->
62+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+ <xsd:element name="root" msdata:IsDataSet="true">
65+ <xsd:complexType>
66+ <xsd:choice maxOccurs="unbounded">
67+ <xsd:element name="metadata">
68+ <xsd:complexType>
69+ <xsd:sequence>
70+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
71+ </xsd:sequence>
72+ <xsd:attribute name="name" use="required" type="xsd:string" />
73+ <xsd:attribute name="type" type="xsd:string" />
74+ <xsd:attribute name="mimetype" type="xsd:string" />
75+ <xsd:attribute ref="xml:space" />
76+ </xsd:complexType>
77+ </xsd:element>
78+ <xsd:element name="assembly">
79+ <xsd:complexType>
80+ <xsd:attribute name="alias" type="xsd:string" />
81+ <xsd:attribute name="name" type="xsd:string" />
82+ </xsd:complexType>
83+ </xsd:element>
84+ <xsd:element name="data">
85+ <xsd:complexType>
86+ <xsd:sequence>
87+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+ </xsd:sequence>
90+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+ <xsd:attribute ref="xml:space" />
94+ </xsd:complexType>
95+ </xsd:element>
96+ <xsd:element name="resheader">
97+ <xsd:complexType>
98+ <xsd:sequence>
99+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+ </xsd:sequence>
101+ <xsd:attribute name="name" type="xsd:string" use="required" />
102+ </xsd:complexType>
103+ </xsd:element>
104+ </xsd:choice>
105+ </xsd:complexType>
106+ </xsd:element>
107+ </xsd:schema>
108+ <resheader name="resmimetype">
109+ <value>text/microsoft-resx</value>
110+ </resheader>
111+ <resheader name="version">
112+ <value>2.0</value>
113+ </resheader>
114+ <resheader name="reader">
115+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+ </resheader>
117+ <resheader name="writer">
118+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+ </resheader>
120+ <data name="btnCapture.Text" xml:space="preserve">
121+ <value>キャプチャー</value>
122+ </data>
123+ <data name="lblCaptureDelay.Text" xml:space="preserve">
124+ <value>遅延:</value>
125+ </data>
126+ <data name="btnCopy.Text" xml:space="preserve">
127+ <value>コピー</value>
128+ </data>
129+ <data name="btnUpload.Text" xml:space="preserve">
130+ <value>アップロード</value>
131+ </data>
132+ <data name="$this.Text" xml:space="preserve">
133+ <value>ShareX - Webページ キャプチャー</value>
134+ </data>
135+ <data name="lblWebpageSize.Text" xml:space="preserve">
136+ <value>ブラウザ サイズ:</value>
137+ </data>
138+</root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.ja-JP.resx
@@ -311,4 +311,10 @@
311311 <data name="RectangleLight_InitializeComponent_Rectangle_capture_light" xml:space="preserve">
312312 <value>領域キャプチャー (ライトモード)</value>
313313 </data>
314+ <data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
315+ <value>キャプチャー</value>
316+ </data>
317+ <data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
318+ <value>停止</value>
319+ </data>
314320 </root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
@@ -72,6 +72,12 @@
7272 <Compile Include="Forms\ScrollingCaptureForm.Designer.cs">
7373 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
7474 </Compile>
75+ <Compile Include="Forms\WebpageCaptureForm.cs">
76+ <SubType>Form</SubType>
77+ </Compile>
78+ <Compile Include="Forms\WebpageCaptureForm.Designer.cs">
79+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
80+ </Compile>
7581 <Compile Include="MonitorRegion.cs" />
7682 <Compile Include="MonitorRegionDefaultCreator.cs" />
7783 <Compile Include="RectangleAnnotateOptions.cs" />
@@ -125,6 +131,7 @@
125131 <Compile Include="Properties\AssemblyInfo.cs" />
126132 <Compile Include="Screenshot_Transparent.cs" />
127133 <Compile Include="WebpageCapture.cs" />
134+ <Compile Include="WebpageCaptureOptions.cs" />
128135 <Compile Include="WindowInfo.cs" />
129136 <Compile Include="WindowsList.cs" />
130137 <Compile Include="WindowsRectangleList.cs" />
@@ -170,6 +177,36 @@
170177 <EmbeddedResource Include="Forms\ScrollingCaptureForm.zh-CN.resx">
171178 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
172179 </EmbeddedResource>
180+ <EmbeddedResource Include="Forms\WebpageCaptureForm.de.resx">
181+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
182+ </EmbeddedResource>
183+ <EmbeddedResource Include="Forms\WebpageCaptureForm.fr.resx">
184+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
185+ </EmbeddedResource>
186+ <EmbeddedResource Include="Forms\WebpageCaptureForm.ja-JP.resx">
187+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
188+ </EmbeddedResource>
189+ <EmbeddedResource Include="Forms\WebpageCaptureForm.nl-NL.resx">
190+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
191+ </EmbeddedResource>
192+ <EmbeddedResource Include="Forms\WebpageCaptureForm.pt-BR.resx">
193+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
194+ </EmbeddedResource>
195+ <EmbeddedResource Include="Forms\WebpageCaptureForm.resx">
196+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
197+ </EmbeddedResource>
198+ <EmbeddedResource Include="Forms\WebpageCaptureForm.ru.resx">
199+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
200+ </EmbeddedResource>
201+ <EmbeddedResource Include="Forms\WebpageCaptureForm.tr.resx">
202+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
203+ </EmbeddedResource>
204+ <EmbeddedResource Include="Forms\WebpageCaptureForm.vi-VN.resx">
205+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
206+ </EmbeddedResource>
207+ <EmbeddedResource Include="Forms\WebpageCaptureForm.zh-CN.resx">
208+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
209+ </EmbeddedResource>
173210 <EmbeddedResource Include="Properties\Resources.de.resx">
174211 <SubType>Designer</SubType>
175212 </EmbeddedResource>
--- a/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx
+++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx
@@ -252,9 +252,6 @@
252252 <data name="lblCustomUploaderThumbnailURL.Text" xml:space="preserve">
253253 <value>サムネイルのURL:</value>
254254 </data>
255- <data name="lblCopyStatus.Text" xml:space="preserve">
256- <value>状態</value>
257- </data>
258255 <data name="lblDropboxStatus.Text" xml:space="preserve">
259256 <value>状態</value>
260257 </data>
@@ -483,9 +480,6 @@
483480 <data name="lblCustomUploaderURLShortener.Text" xml:space="preserve">
484481 <value>URL短縮サービス:</value>
485482 </data>
486- <data name="chkEmailConfirm.Text" xml:space="preserve">
487- <value>送信前に確認する</value>
488- </data>
489483 <data name="btnSeafileLibraryPasswordValidate.Text" xml:space="preserve">
490484 <value>検証</value>
491485 </data>
@@ -528,9 +522,6 @@
528522 <data name="lblPastebinTitle.Text" xml:space="preserve">
529523 <value>タイトル:</value>
530524 </data>
531- <data name="chkGistPublishPublic.Text" xml:space="preserve">
532- <value>公開用 Gist を作成</value>
533- </data>
534525 <data name="lblHastebinSyntaxHighlighting.Text" xml:space="preserve">
535526 <value>構文ハイライト:</value>
536527 </data>
@@ -582,9 +573,6 @@
582573 <data name="gbMinusUpload.Text" xml:space="preserve">
583574 <value>画像のアップロード先</value>
584575 </data>
585- <data name="chkMinusPublic.Text" xml:space="preserve">
586- <value>公開</value>
587- </data>
588576 <data name="btnMinusReadFolderList.Text" xml:space="preserve">
589577 <value>フォルダー一覧を更新</value>
590578 </data>
@@ -720,12 +708,6 @@ store.book[0].title</value>
720708 <data name="btnBoxRefreshFolders.Text" xml:space="preserve">
721709 <value>フォルダー一覧を更新</value>
722710 </data>
723- <data name="lblCopyURLType.Text" xml:space="preserve">
724- <value>URLの種類:</value>
725- </data>
726- <data name="lblCopyPath.Text" xml:space="preserve">
727- <value>アップロード パス:</value>
728- </data>
729711 <data name="lblAmazonS3PathPreviewLabel.Text" xml:space="preserve">
730712 <value>URL プレビュー:</value>
731713 </data>
@@ -828,9 +810,6 @@ store.book[0].title</value>
828810 <data name="cbSeafileIgnoreInvalidCert.Text" xml:space="preserve">
829811 <value>無効なSSL証明書を無視する</value>
830812 </data>
831- <data name="cbOwnCloudIgnoreInvalidCert.Text" xml:space="preserve">
832- <value>無効なSSL証明書を無視する</value>
833- </data>
834813 <data name="tpImageUploaders.Text" xml:space="preserve">
835814 <value>画像アップローダー</value>
836815 </data>
@@ -938,4 +917,40 @@ store.book[0].title</value>
938917 <data name="lblYourlsSignature.Text" xml:space="preserve">
939918 <value>シグネチャ:</value>
940919 </data>
920+ <data name="lblOpenloadApiKey.Text" xml:space="preserve">
921+ <value>API キー:</value>
922+ </data>
923+ <data name="lblOpenloadApiLogin.Text" xml:space="preserve">
924+ <value>API ログイン:</value>
925+ </data>
926+ <data name="gbOpenloadAuthentication.Text" xml:space="preserve">
927+ <value>認証</value>
928+ </data>
929+ <data name="gbOpenloadFolders.Text" xml:space="preserve">
930+ <value>フォルダー</value>
931+ </data>
932+ <data name="lblOpenloadApiLink.Text" xml:space="preserve">
933+ <value>API キーをOpenloadアカウント パネルから入手。</value>
934+ </data>
935+ <data name="btnOpenloadRefreshFolders.Text" xml:space="preserve">
936+ <value>更新</value>
937+ </data>
938+ <data name="cbOpenloadUploadToFolder.Text" xml:space="preserve">
939+ <value>選択フォルダーにファイルをアップロードする</value>
940+ </data>
941+ <data name="cbMinusPublic.Text" xml:space="preserve">
942+ <value>公開</value>
943+ </data>
944+ <data name="cbEmailConfirm.Text" xml:space="preserve">
945+ <value>送信前に確認</value>
946+ </data>
947+ <data name="cbGistUseRawURL.Text" xml:space="preserve">
948+ <value>Raw URLを使用する</value>
949+ </data>
950+ <data name="cbGistPublishPublic.Text" xml:space="preserve">
951+ <value>公開Gistを作成する</value>
952+ </data>
953+ <data name="cbPastebinRaw.Text" xml:space="preserve">
954+ <value>Raw URLを使用する</value>
955+ </data>
941956 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/Forms/UserPassBox.ja-JP.resx
+++ b/ShareX.UploadersLib/Forms/UserPassBox.ja-JP.resx
@@ -135,4 +135,7 @@
135135 <data name="lblFullName.Text" xml:space="preserve">
136136 <value>フル ネーム:</value>
137137 </data>
138+ <data name="$this.Text" xml:space="preserve">
139+ <value>ShareX - アカウント情報</value>
140+ </data>
138141 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.UploadersLib/Properties/Resources.ja-JP.resx
@@ -259,4 +259,10 @@
259259 <data name="UploadersConfigForm_BoxListFolders_Box_refresh_folders_list_failed" xml:space="preserve">
260260 <value>Box フォルダー一覧の更新失敗</value>
261261 </data>
262+ <data name="CustomFileUploader_Upload_Response_parse_failed_" xml:space="preserve">
263+ <value>応答の解析に失敗しました。</value>
264+ </data>
265+ <data name="TaskHelpers_TweetMessage_Unable_to_find_valid_Twitter_account_" xml:space="preserve">
266+ <value>有効なTwitterアカウントが見つかりません。</value>
267+ </data>
262268 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@@ -79,19 +79,19 @@
7979 </PropertyGroup>
8080 <ItemGroup>
8181 <Reference Include="AWSSDK.Core, Version=3.1.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
82- <HintPath>..\packages\AWSSDK.Core.3.1.5.0\lib\net35\AWSSDK.Core.dll</HintPath>
82+ <HintPath>..\packages\AWSSDK.Core.3.1.5.1\lib\net35\AWSSDK.Core.dll</HintPath>
8383 <Private>True</Private>
8484 </Reference>
8585 <Reference Include="AWSSDK.S3, Version=3.1.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
86- <HintPath>..\packages\AWSSDK.S3.3.1.3.13\lib\net35\AWSSDK.S3.dll</HintPath>
86+ <HintPath>..\packages\AWSSDK.S3.3.1.4.0\lib\net35\AWSSDK.S3.dll</HintPath>
8787 <Private>True</Private>
8888 </Reference>
89- <Reference Include="MegaApiClient, Version=1.2.0.124, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
90- <HintPath>..\packages\MegaApiClient.1.2.0\lib\net40\MegaApiClient.dll</HintPath>
89+ <Reference Include="MegaApiClient, Version=1.2.1.150, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
90+ <HintPath>..\packages\MegaApiClient.1.2.1\lib\net40\MegaApiClient.dll</HintPath>
9191 <Private>True</Private>
9292 </Reference>
9393 <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
94- <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
94+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
9595 <Private>True</Private>
9696 </Reference>
9797 <Reference Include="Renci.SshNet, Version=2014.4.6.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
@@ -104,8 +104,8 @@
104104 <Reference Include="System" />
105105 <Reference Include="System.Design" />
106106 <Reference Include="System.Drawing" />
107- <Reference Include="System.Net.FtpClient, Version=1.0.5824.34026, Culture=neutral, PublicKeyToken=fa4be07daa57c2b7, processorArchitecture=MSIL">
108- <HintPath>..\packages\System.Net.FtpClient.1.0.5824.34026\lib\net40\System.Net.FtpClient.dll</HintPath>
107+ <Reference Include="System.Net.FtpClient, Version=1.0.5281.14359, Culture=neutral, PublicKeyToken=fa4be07daa57c2b7, processorArchitecture=MSIL">
108+ <HintPath>..\packages\System.Net.FtpClient.1.0.5281.14359\lib\net40\System.Net.FtpClient.dll</HintPath>
109109 <Private>True</Private>
110110 </Reference>
111111 <Reference Include="System.Runtime.Serialization" />
@@ -120,6 +120,7 @@
120120 <ItemGroup>
121121 <Compile Include="APIKeys\APIKeys.cs" />
122122 <Compile Include="APIKeys\APIKeysLocal.cs" />
123+ <Compile Include="BaseServices\FileUploaderService.cs" />
123124 <Compile Include="FileUploaders\AmazonS3Region.cs" />
124125 <Compile Include="FileUploaders\AmazonS3Settings.cs" />
125126 <Compile Include="FileUploaders\Box.cs" />
@@ -204,12 +205,31 @@
204205 </Compile>
205206 <Compile Include="FileUploaders\Pushbullet.cs" />
206207 <Compile Include="FileUploaders\GfycatUploader.cs" />
207- <Compile Include="HelperClasses\OAuth\IOAuthBase.cs" />
208+ <Compile Include="Helpers\OAuth\IOAuthBase.cs" />
209+ <Compile Include="Helpers\SSLBypassHelper.cs" />
210+ <Compile Include="BaseServices\URLSharingService.cs" />
211+ <Compile Include="SharingServices\DeliciousSharingService.cs" />
212+ <Compile Include="SharingServices\EmailSharingService.cs" />
213+ <Compile Include="SharingServices\FacebookSharingService.cs" />
214+ <Compile Include="SharingServices\GooglePlusSharingService.cs" />
215+ <Compile Include="SharingServices\LinkedInSharingService.cs" />
216+ <Compile Include="SharingServices\PinterestSharingService.cs" />
217+ <Compile Include="SharingServices\PushbulletSharingService.cs" />
218+ <Compile Include="SharingServices\RedditSharingService.cs" />
219+ <Compile Include="SharingServices\SimpleSharingService.cs" />
220+ <Compile Include="SharingServices\StumbleUponSharingService.cs" />
221+ <Compile Include="SharingServices\TumblrSharingService.cs" />
222+ <Compile Include="SharingServices\TwitterSharingService.cs" />
223+ <Compile Include="SharingServices\VkSharingService.cs" />
224+ <Compile Include="Helpers\TaskReferenceHelper.cs" />
225+ <Compile Include="BaseServices\TextUploaderService.cs" />
226+ <Compile Include="UploaderFactory.cs" />
208227 <Compile Include="ImageUploaders\Chevereto.cs" />
209228 <Compile Include="ImageUploaders\CheveretoUploader.cs" />
210229 <Compile Include="ImageUploaders\ImglandUploader.cs" />
211230 <Compile Include="ImageUploaders\SomeImage.cs" />
212231 <Compile Include="ImageUploaders\VgymeUploader.cs" />
232+ <Compile Include="BaseServices\ImageUploaderService.cs" />
213233 <Compile Include="TextUploaders\Hastebin.cs" />
214234 <Compile Include="TextUploaders\OneTimeSecret.cs" />
215235 <Compile Include="TextUploaders\Upaste.cs" />
@@ -232,9 +252,9 @@
232252 <Compile Include="Forms\DropboxFilesForm.Designer.cs">
233253 <DependentUpon>DropboxFilesForm.cs</DependentUpon>
234254 </Compile>
235- <Compile Include="HelperClasses\CertFileNameEditor.cs" />
236- <Compile Include="HelperClasses\ImageListManager.cs" />
237- <Compile Include="FileUploader.cs" />
255+ <Compile Include="Helpers\CertFileNameEditor.cs" />
256+ <Compile Include="Helpers\ImageListManager.cs" />
257+ <Compile Include="BaseUploaders\FileUploader.cs" />
238258 <Compile Include="FileUploaders\Dropbox.cs" />
239259 <Compile Include="FileUploaders\DropIO.cs" />
240260 <Compile Include="FileUploaders\FileBin.cs" />
@@ -246,23 +266,24 @@
246266 <Compile Include="FileUploaders\SendSpace.cs" />
247267 <Compile Include="FileUploaders\SendSpaceManager.cs" />
248268 <Compile Include="FileUploaders\ShareCX.cs" />
249- <Compile Include="HelperClasses\AccountInfo.cs" />
250- <Compile Include="HelperClasses\Argument.cs" />
251- <Compile Include="HelperClasses\KeyFileNameEditor.cs" />
252- <Compile Include="HelperClasses\JSONHelper.cs" />
253- <Compile Include="HelperClasses\OAuth\IOAuth.cs" />
254- <Compile Include="HelperClasses\OAuth\IOAuth2.cs" />
255- <Compile Include="HelperClasses\OAuth\IOAuth2Basic.cs" />
256- <Compile Include="HelperClasses\OAuth\OAuth2Info.cs" />
257- <Compile Include="HelperClasses\OAuth\OAuth2Token.cs" />
258- <Compile Include="HelperClasses\OAuth\OAuthManager.cs" />
259- <Compile Include="HelperClasses\OAuth\OAuthInfo.cs" />
269+ <Compile Include="Helpers\AccountInfo.cs" />
270+ <Compile Include="Helpers\Argument.cs" />
271+ <Compile Include="Helpers\KeyFileNameEditor.cs" />
272+ <Compile Include="Helpers\OAuth\IOAuth.cs" />
273+ <Compile Include="Helpers\OAuth\IOAuth2.cs" />
274+ <Compile Include="Helpers\OAuth\IOAuth2Basic.cs" />
275+ <Compile Include="Helpers\OAuth\OAuth2Info.cs" />
276+ <Compile Include="Helpers\OAuth\OAuth2Token.cs" />
277+ <Compile Include="Helpers\OAuth\OAuthManager.cs" />
278+ <Compile Include="Helpers\OAuth\OAuthInfo.cs" />
260279 <Compile Include="ImageUploaders\CustomImageUploader.cs" />
261280 <Compile Include="ImageUploaders\Imgur.cs" />
262281 <Compile Include="ImageUploaders\Picasa.cs" />
263282 <Compile Include="TextUploaders\CustomTextUploader.cs" />
264- <Compile Include="TextUploaders\Gist.cs" />
283+ <Compile Include="TextUploaders\GitHubGist.cs" />
265284 <Compile Include="TextUploaders\Paste_ee.cs" />
285+ <Compile Include="UploadersConfigValidator.cs" />
286+ <Compile Include="BaseServices\UploaderService.cs" />
266287 <Compile Include="UploadResult.cs" />
267288 <Compile Include="Forms\TwitterTweetForm.cs">
268289 <SubType>Form</SubType>
@@ -271,13 +292,13 @@
271292 <DependentUpon>TwitterTweetForm.cs</DependentUpon>
272293 </Compile>
273294 <Compile Include="Enums.cs" />
274- <Compile Include="HelperClasses\CustomUploaderItem.cs" />
295+ <Compile Include="Helpers\CustomUploaderItem.cs" />
275296 <Compile Include="ImageUploaders\ImmioUploader.cs" />
276297 <Compile Include="ImageUploaders\Photobucket.cs" />
277298 <Compile Include="ImageUploaders\Twitter.cs" />
278- <Compile Include="HelperClasses\ProgressManager.cs" />
279- <Compile Include="HelperClasses\TCPClient.cs" />
280- <Compile Include="ImageUploader.cs" />
299+ <Compile Include="Helpers\ProgressManager.cs" />
300+ <Compile Include="Helpers\TCPClient.cs" />
301+ <Compile Include="BaseUploaders\ImageUploader.cs" />
281302 <Compile Include="FileUploaders\CustomFileUploader.cs" />
282303 <Compile Include="ImageUploaders\FlickrUploader.cs" />
283304 <Compile Include="ImageUploaders\ImageBin.cs" />
@@ -295,14 +316,15 @@
295316 <DesignTime>True</DesignTime>
296317 <DependentUpon>Resources.resx</DependentUpon>
297318 </Compile>
298- <Compile Include="TextUploader.cs" />
319+ <Compile Include="BaseUploaders\TextUploader.cs" />
299320 <Compile Include="TextUploaders\Paste2.cs" />
300321 <Compile Include="TextUploaders\Pastebin_ca.cs" />
301322 <Compile Include="TextUploaders\Pastebin.cs" />
302323 <Compile Include="TextUploaders\Pastee.cs" />
303324 <Compile Include="TextUploaders\Slexy.cs" />
304- <Compile Include="Uploader.cs" />
305- <Compile Include="URLShortener.cs" />
325+ <Compile Include="BaseUploaders\Uploader.cs" />
326+ <Compile Include="BaseUploaders\URLShortener.cs" />
327+ <Compile Include="BaseServices\URLShortenerService.cs" />
306328 <Compile Include="URLShorteners\PolrURLShortener.cs" />
307329 <Compile Include="URLShorteners\TwoGPURLShortener.cs" />
308330 <Compile Include="URLShorteners\AdFlyURLShortener.cs" />
@@ -923,13 +945,13 @@
923945 <None Include="Resources\question-button.png" />
924946 </ItemGroup>
925947 <ItemGroup>
926- <Content Include="Favicons\SomeImage.ico" />
927- <Content Include="Favicons\Streamable.ico" />
928- <Content Include="Favicons\Sul.png" />
929- <Content Include="Favicons\Vgyme.ico" />
948+ <None Include="Favicons\SomeImage.ico" />
949+ <None Include="Favicons\Streamable.ico" />
950+ <None Include="Favicons\Sul.png" />
951+ <None Include="Favicons\Vgyme.ico" />
930952 </ItemGroup>
931953 <ItemGroup>
932- <Analyzer Include="..\packages\AWSSDK.S3.3.1.3.13\analyzers\dotnet\cs\AWSSDK.S3.CodeAnalysis.dll" />
954+ <Analyzer Include="..\packages\AWSSDK.S3.3.1.4.0\analyzers\dotnet\cs\AWSSDK.S3.CodeAnalysis.dll" />
933955 </ItemGroup>
934956 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
935957 <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -76,13 +76,13 @@
7676 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
7777 </PropertyGroup>
7878 <ItemGroup>
79- <Reference Include="MegaApiClient, Version=1.2.0.124, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
80- <HintPath>..\packages\MegaApiClient.1.2.0\lib\net40\MegaApiClient.dll</HintPath>
79+ <Reference Include="MegaApiClient, Version=1.2.1.150, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
80+ <HintPath>..\packages\MegaApiClient.1.2.1\lib\net40\MegaApiClient.dll</HintPath>
8181 <Private>True</Private>
8282 </Reference>
8383 <Reference Include="Microsoft.VisualBasic" />
8484 <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
85- <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
85+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
8686 <Private>True</Private>
8787 </Reference>
8888 <Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL">
@@ -230,12 +230,6 @@
230230 <Compile Include="Forms\AfterUploadForm.designer.cs">
231231 <DependentUpon>AfterUploadForm.cs</DependentUpon>
232232 </Compile>
233- <Compile Include="Forms\WebpageCaptureForm.cs">
234- <SubType>Form</SubType>
235- </Compile>
236- <Compile Include="Forms\WebpageCaptureForm.Designer.cs">
237- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
238- </Compile>
239233 <Compile Include="HotkeysConfig.cs" />
240234 <Compile Include="HotkeyManager.cs" />
241235 <Compile Include="HotkeySettings.cs" />
@@ -874,6 +868,9 @@
874868 <EmbeddedResource Include="Forms\MainForm.zh-CN.resx">
875869 <DependentUpon>MainForm.cs</DependentUpon>
876870 </EmbeddedResource>
871+ <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.fr.resx">
872+ <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
873+ </EmbeddedResource>
877874 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.ja-JP.resx">
878875 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
879876 </EmbeddedResource>
@@ -883,6 +880,9 @@
883880 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.tr.resx">
884881 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
885882 </EmbeddedResource>
883+ <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.fr.resx">
884+ <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
885+ </EmbeddedResource>
886886 <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.ja-JP.resx">
887887 <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
888888 </EmbeddedResource>
@@ -1099,36 +1099,6 @@
10991099 <EmbeddedResource Include="Forms\WatchFolderForm.zh-CN.resx">
11001100 <DependentUpon>WatchFolderForm.cs</DependentUpon>
11011101 </EmbeddedResource>
1102- <EmbeddedResource Include="Forms\WebpageCaptureForm.de.resx">
1103- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
1104- </EmbeddedResource>
1105- <EmbeddedResource Include="Forms\WebpageCaptureForm.fr.resx">
1106- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
1107- </EmbeddedResource>
1108- <EmbeddedResource Include="Forms\WebpageCaptureForm.ja-JP.resx">
1109- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
1110- </EmbeddedResource>
1111- <EmbeddedResource Include="Forms\WebpageCaptureForm.nl-NL.resx">
1112- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
1113- </EmbeddedResource>
1114- <EmbeddedResource Include="Forms\WebpageCaptureForm.pt-BR.resx">
1115- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
1116- </EmbeddedResource>
1117- <EmbeddedResource Include="Forms\WebpageCaptureForm.resx">
1118- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
1119- </EmbeddedResource>
1120- <EmbeddedResource Include="Forms\WebpageCaptureForm.ru.resx">
1121- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
1122- </EmbeddedResource>
1123- <EmbeddedResource Include="Forms\WebpageCaptureForm.tr.resx">
1124- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
1125- </EmbeddedResource>
1126- <EmbeddedResource Include="Forms\WebpageCaptureForm.vi-VN.resx">
1127- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
1128- </EmbeddedResource>
1129- <EmbeddedResource Include="Forms\WebpageCaptureForm.zh-CN.resx">
1130- <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
1131- </EmbeddedResource>
11321102 <EmbeddedResource Include="Properties\Resources.de.resx" />
11331103 <EmbeddedResource Include="Properties\Resources.es.resx" />
11341104 <EmbeddedResource Include="Properties\Resources.fr.resx" />