リビジョン | faf82de80458868992bc1600ea8e100ac02d03fe (tree) |
---|---|
日時 | 2016-03-26 08:16:22 |
作者 | notme <notme@user...> |
コミッター | notme |
Japanese translation for ShareX 10.9.1
@@ -124,7 +124,7 @@ | ||
124 | 124 | <value>ShareX - デバッグ ログ</value> |
125 | 125 | </data> |
126 | 126 | <data name="btnOpenLogFile.Text" xml:space="preserve"> |
127 | - <value>ログファイルを開く</value> | |
127 | + <value>ログファイルを開く...</value> | |
128 | 128 | </data> |
129 | 129 | <data name="lblRunningFrom.Text" xml:space="preserve"> |
130 | 130 | <value>開始パス:</value> |
@@ -118,7 +118,7 @@ | ||
118 | 118 | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
119 | 119 | </resheader> |
120 | 120 | <data name="btnOpenLogFile.Text" xml:space="preserve"> |
121 | - <value>ログファイルを開く</value> | |
121 | + <value>ログファイルを開く...</value> | |
122 | 122 | </data> |
123 | 123 | <data name="$this.Text" xml:space="preserve"> |
124 | 124 | <value>ShareX - エラー</value> |
@@ -853,4 +853,7 @@ | ||
853 | 853 | <data name="ReplCodeMenuCategory_Target" xml:space="preserve"> |
854 | 854 | <value>対象</value> |
855 | 855 | </data> |
856 | + <data name="Helpers_OpenFile_File_not_exist_" xml:space="preserve"> | |
857 | + <value>存在しないファイル:</value> | |
858 | + </data> | |
856 | 859 | </root> |
\ No newline at end of file |
@@ -67,7 +67,7 @@ | ||
67 | 67 | <Private>True</Private> |
68 | 68 | </Reference> |
69 | 69 | <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> | |
71 | 71 | <Private>True</Private> |
72 | 72 | </Reference> |
73 | 73 | <Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL"> |
@@ -172,7 +172,6 @@ | ||
172 | 172 | <Compile Include="Forms\MonitorTestForm.Designer.cs"> |
173 | 173 | <DependentUpon>MonitorTestForm.cs</DependentUpon> |
174 | 174 | </Compile> |
175 | - <Compile Include="Helpers\SSLBypassHelper.cs" /> | |
176 | 175 | <Compile Include="Native\NativeConstants.cs" /> |
177 | 176 | <Compile Include="PingHelper.cs" /> |
178 | 177 | <Compile Include="PingResult.cs" /> |
@@ -353,8 +352,7 @@ | ||
353 | 352 | </Compile> |
354 | 353 | <Compile Include="Printer\PrintTextHelper.cs" /> |
355 | 354 | <Compile Include="Helpers\RegistryHelpers.cs" /> |
356 | - <Compile Include="SingleInstanceApplication\ApplicationInstanceManager.cs" /> | |
357 | - <Compile Include="SingleInstanceApplication\InstanceProxy.cs" /> | |
355 | + <Compile Include="ApplicationInstanceManager.cs" /> | |
358 | 356 | <Compile Include="DebugHelper.cs" /> |
359 | 357 | <Compile Include="UpdateChecker\UpdateCheckerLabel.cs"> |
360 | 358 | <SubType>UserControl</SubType> |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -311,4 +311,10 @@ | ||
311 | 311 | <data name="RectangleLight_InitializeComponent_Rectangle_capture_light" xml:space="preserve"> |
312 | 312 | <value>領域キャプチャー (ライトモード)</value> |
313 | 313 | </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> | |
314 | 320 | </root> |
\ No newline at end of file |
@@ -72,6 +72,12 @@ | ||
72 | 72 | <Compile Include="Forms\ScrollingCaptureForm.Designer.cs"> |
73 | 73 | <DependentUpon>ScrollingCaptureForm.cs</DependentUpon> |
74 | 74 | </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> | |
75 | 81 | <Compile Include="MonitorRegion.cs" /> |
76 | 82 | <Compile Include="MonitorRegionDefaultCreator.cs" /> |
77 | 83 | <Compile Include="RectangleAnnotateOptions.cs" /> |
@@ -125,6 +131,7 @@ | ||
125 | 131 | <Compile Include="Properties\AssemblyInfo.cs" /> |
126 | 132 | <Compile Include="Screenshot_Transparent.cs" /> |
127 | 133 | <Compile Include="WebpageCapture.cs" /> |
134 | + <Compile Include="WebpageCaptureOptions.cs" /> | |
128 | 135 | <Compile Include="WindowInfo.cs" /> |
129 | 136 | <Compile Include="WindowsList.cs" /> |
130 | 137 | <Compile Include="WindowsRectangleList.cs" /> |
@@ -170,6 +177,36 @@ | ||
170 | 177 | <EmbeddedResource Include="Forms\ScrollingCaptureForm.zh-CN.resx"> |
171 | 178 | <DependentUpon>ScrollingCaptureForm.cs</DependentUpon> |
172 | 179 | </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> | |
173 | 210 | <EmbeddedResource Include="Properties\Resources.de.resx"> |
174 | 211 | <SubType>Designer</SubType> |
175 | 212 | </EmbeddedResource> |
@@ -252,9 +252,6 @@ | ||
252 | 252 | <data name="lblCustomUploaderThumbnailURL.Text" xml:space="preserve"> |
253 | 253 | <value>サムネイルのURL:</value> |
254 | 254 | </data> |
255 | - <data name="lblCopyStatus.Text" xml:space="preserve"> | |
256 | - <value>状態</value> | |
257 | - </data> | |
258 | 255 | <data name="lblDropboxStatus.Text" xml:space="preserve"> |
259 | 256 | <value>状態</value> |
260 | 257 | </data> |
@@ -483,9 +480,6 @@ | ||
483 | 480 | <data name="lblCustomUploaderURLShortener.Text" xml:space="preserve"> |
484 | 481 | <value>URL短縮サービス:</value> |
485 | 482 | </data> |
486 | - <data name="chkEmailConfirm.Text" xml:space="preserve"> | |
487 | - <value>送信前に確認する</value> | |
488 | - </data> | |
489 | 483 | <data name="btnSeafileLibraryPasswordValidate.Text" xml:space="preserve"> |
490 | 484 | <value>検証</value> |
491 | 485 | </data> |
@@ -528,9 +522,6 @@ | ||
528 | 522 | <data name="lblPastebinTitle.Text" xml:space="preserve"> |
529 | 523 | <value>タイトル:</value> |
530 | 524 | </data> |
531 | - <data name="chkGistPublishPublic.Text" xml:space="preserve"> | |
532 | - <value>公開用 Gist を作成</value> | |
533 | - </data> | |
534 | 525 | <data name="lblHastebinSyntaxHighlighting.Text" xml:space="preserve"> |
535 | 526 | <value>構文ハイライト:</value> |
536 | 527 | </data> |
@@ -582,9 +573,6 @@ | ||
582 | 573 | <data name="gbMinusUpload.Text" xml:space="preserve"> |
583 | 574 | <value>画像のアップロード先</value> |
584 | 575 | </data> |
585 | - <data name="chkMinusPublic.Text" xml:space="preserve"> | |
586 | - <value>公開</value> | |
587 | - </data> | |
588 | 576 | <data name="btnMinusReadFolderList.Text" xml:space="preserve"> |
589 | 577 | <value>フォルダー一覧を更新</value> |
590 | 578 | </data> |
@@ -720,12 +708,6 @@ store.book[0].title</value> | ||
720 | 708 | <data name="btnBoxRefreshFolders.Text" xml:space="preserve"> |
721 | 709 | <value>フォルダー一覧を更新</value> |
722 | 710 | </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> | |
729 | 711 | <data name="lblAmazonS3PathPreviewLabel.Text" xml:space="preserve"> |
730 | 712 | <value>URL プレビュー:</value> |
731 | 713 | </data> |
@@ -828,9 +810,6 @@ store.book[0].title</value> | ||
828 | 810 | <data name="cbSeafileIgnoreInvalidCert.Text" xml:space="preserve"> |
829 | 811 | <value>無効なSSL証明書を無視する</value> |
830 | 812 | </data> |
831 | - <data name="cbOwnCloudIgnoreInvalidCert.Text" xml:space="preserve"> | |
832 | - <value>無効なSSL証明書を無視する</value> | |
833 | - </data> | |
834 | 813 | <data name="tpImageUploaders.Text" xml:space="preserve"> |
835 | 814 | <value>画像アップローダー</value> |
836 | 815 | </data> |
@@ -938,4 +917,40 @@ store.book[0].title</value> | ||
938 | 917 | <data name="lblYourlsSignature.Text" xml:space="preserve"> |
939 | 918 | <value>シグネチャ:</value> |
940 | 919 | </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> | |
941 | 956 | </root> |
\ No newline at end of file |
@@ -135,4 +135,7 @@ | ||
135 | 135 | <data name="lblFullName.Text" xml:space="preserve"> |
136 | 136 | <value>フル ネーム:</value> |
137 | 137 | </data> |
138 | + <data name="$this.Text" xml:space="preserve"> | |
139 | + <value>ShareX - アカウント情報</value> | |
140 | + </data> | |
138 | 141 | </root> |
\ No newline at end of file |
@@ -259,4 +259,10 @@ | ||
259 | 259 | <data name="UploadersConfigForm_BoxListFolders_Box_refresh_folders_list_failed" xml:space="preserve"> |
260 | 260 | <value>Box フォルダー一覧の更新失敗</value> |
261 | 261 | </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> | |
262 | 268 | </root> |
\ No newline at end of file |
@@ -79,19 +79,19 @@ | ||
79 | 79 | </PropertyGroup> |
80 | 80 | <ItemGroup> |
81 | 81 | <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> | |
83 | 83 | <Private>True</Private> |
84 | 84 | </Reference> |
85 | 85 | <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> | |
87 | 87 | <Private>True</Private> |
88 | 88 | </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> | |
91 | 91 | <Private>True</Private> |
92 | 92 | </Reference> |
93 | 93 | <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> | |
95 | 95 | <Private>True</Private> |
96 | 96 | </Reference> |
97 | 97 | <Reference Include="Renci.SshNet, Version=2014.4.6.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL"> |
@@ -104,8 +104,8 @@ | ||
104 | 104 | <Reference Include="System" /> |
105 | 105 | <Reference Include="System.Design" /> |
106 | 106 | <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> | |
109 | 109 | <Private>True</Private> |
110 | 110 | </Reference> |
111 | 111 | <Reference Include="System.Runtime.Serialization" /> |
@@ -120,6 +120,7 @@ | ||
120 | 120 | <ItemGroup> |
121 | 121 | <Compile Include="APIKeys\APIKeys.cs" /> |
122 | 122 | <Compile Include="APIKeys\APIKeysLocal.cs" /> |
123 | + <Compile Include="BaseServices\FileUploaderService.cs" /> | |
123 | 124 | <Compile Include="FileUploaders\AmazonS3Region.cs" /> |
124 | 125 | <Compile Include="FileUploaders\AmazonS3Settings.cs" /> |
125 | 126 | <Compile Include="FileUploaders\Box.cs" /> |
@@ -204,12 +205,31 @@ | ||
204 | 205 | </Compile> |
205 | 206 | <Compile Include="FileUploaders\Pushbullet.cs" /> |
206 | 207 | <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" /> | |
208 | 227 | <Compile Include="ImageUploaders\Chevereto.cs" /> |
209 | 228 | <Compile Include="ImageUploaders\CheveretoUploader.cs" /> |
210 | 229 | <Compile Include="ImageUploaders\ImglandUploader.cs" /> |
211 | 230 | <Compile Include="ImageUploaders\SomeImage.cs" /> |
212 | 231 | <Compile Include="ImageUploaders\VgymeUploader.cs" /> |
232 | + <Compile Include="BaseServices\ImageUploaderService.cs" /> | |
213 | 233 | <Compile Include="TextUploaders\Hastebin.cs" /> |
214 | 234 | <Compile Include="TextUploaders\OneTimeSecret.cs" /> |
215 | 235 | <Compile Include="TextUploaders\Upaste.cs" /> |
@@ -232,9 +252,9 @@ | ||
232 | 252 | <Compile Include="Forms\DropboxFilesForm.Designer.cs"> |
233 | 253 | <DependentUpon>DropboxFilesForm.cs</DependentUpon> |
234 | 254 | </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" /> | |
238 | 258 | <Compile Include="FileUploaders\Dropbox.cs" /> |
239 | 259 | <Compile Include="FileUploaders\DropIO.cs" /> |
240 | 260 | <Compile Include="FileUploaders\FileBin.cs" /> |
@@ -246,23 +266,24 @@ | ||
246 | 266 | <Compile Include="FileUploaders\SendSpace.cs" /> |
247 | 267 | <Compile Include="FileUploaders\SendSpaceManager.cs" /> |
248 | 268 | <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" /> | |
260 | 279 | <Compile Include="ImageUploaders\CustomImageUploader.cs" /> |
261 | 280 | <Compile Include="ImageUploaders\Imgur.cs" /> |
262 | 281 | <Compile Include="ImageUploaders\Picasa.cs" /> |
263 | 282 | <Compile Include="TextUploaders\CustomTextUploader.cs" /> |
264 | - <Compile Include="TextUploaders\Gist.cs" /> | |
283 | + <Compile Include="TextUploaders\GitHubGist.cs" /> | |
265 | 284 | <Compile Include="TextUploaders\Paste_ee.cs" /> |
285 | + <Compile Include="UploadersConfigValidator.cs" /> | |
286 | + <Compile Include="BaseServices\UploaderService.cs" /> | |
266 | 287 | <Compile Include="UploadResult.cs" /> |
267 | 288 | <Compile Include="Forms\TwitterTweetForm.cs"> |
268 | 289 | <SubType>Form</SubType> |
@@ -271,13 +292,13 @@ | ||
271 | 292 | <DependentUpon>TwitterTweetForm.cs</DependentUpon> |
272 | 293 | </Compile> |
273 | 294 | <Compile Include="Enums.cs" /> |
274 | - <Compile Include="HelperClasses\CustomUploaderItem.cs" /> | |
295 | + <Compile Include="Helpers\CustomUploaderItem.cs" /> | |
275 | 296 | <Compile Include="ImageUploaders\ImmioUploader.cs" /> |
276 | 297 | <Compile Include="ImageUploaders\Photobucket.cs" /> |
277 | 298 | <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" /> | |
281 | 302 | <Compile Include="FileUploaders\CustomFileUploader.cs" /> |
282 | 303 | <Compile Include="ImageUploaders\FlickrUploader.cs" /> |
283 | 304 | <Compile Include="ImageUploaders\ImageBin.cs" /> |
@@ -295,14 +316,15 @@ | ||
295 | 316 | <DesignTime>True</DesignTime> |
296 | 317 | <DependentUpon>Resources.resx</DependentUpon> |
297 | 318 | </Compile> |
298 | - <Compile Include="TextUploader.cs" /> | |
319 | + <Compile Include="BaseUploaders\TextUploader.cs" /> | |
299 | 320 | <Compile Include="TextUploaders\Paste2.cs" /> |
300 | 321 | <Compile Include="TextUploaders\Pastebin_ca.cs" /> |
301 | 322 | <Compile Include="TextUploaders\Pastebin.cs" /> |
302 | 323 | <Compile Include="TextUploaders\Pastee.cs" /> |
303 | 324 | <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" /> | |
306 | 328 | <Compile Include="URLShorteners\PolrURLShortener.cs" /> |
307 | 329 | <Compile Include="URLShorteners\TwoGPURLShortener.cs" /> |
308 | 330 | <Compile Include="URLShorteners\AdFlyURLShortener.cs" /> |
@@ -923,13 +945,13 @@ | ||
923 | 945 | <None Include="Resources\question-button.png" /> |
924 | 946 | </ItemGroup> |
925 | 947 | <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" /> | |
930 | 952 | </ItemGroup> |
931 | 953 | <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" /> | |
933 | 955 | </ItemGroup> |
934 | 956 | <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
935 | 957 | <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> |
@@ -76,13 +76,13 @@ | ||
76 | 76 | <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> |
77 | 77 | </PropertyGroup> |
78 | 78 | <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> | |
81 | 81 | <Private>True</Private> |
82 | 82 | </Reference> |
83 | 83 | <Reference Include="Microsoft.VisualBasic" /> |
84 | 84 | <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> | |
86 | 86 | <Private>True</Private> |
87 | 87 | </Reference> |
88 | 88 | <Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL"> |
@@ -230,12 +230,6 @@ | ||
230 | 230 | <Compile Include="Forms\AfterUploadForm.designer.cs"> |
231 | 231 | <DependentUpon>AfterUploadForm.cs</DependentUpon> |
232 | 232 | </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> | |
239 | 233 | <Compile Include="HotkeysConfig.cs" /> |
240 | 234 | <Compile Include="HotkeyManager.cs" /> |
241 | 235 | <Compile Include="HotkeySettings.cs" /> |
@@ -874,6 +868,9 @@ | ||
874 | 868 | <EmbeddedResource Include="Forms\MainForm.zh-CN.resx"> |
875 | 869 | <DependentUpon>MainForm.cs</DependentUpon> |
876 | 870 | </EmbeddedResource> |
871 | + <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.fr.resx"> | |
872 | + <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon> | |
873 | + </EmbeddedResource> | |
877 | 874 | <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.ja-JP.resx"> |
878 | 875 | <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon> |
879 | 876 | </EmbeddedResource> |
@@ -883,6 +880,9 @@ | ||
883 | 880 | <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.tr.resx"> |
884 | 881 | <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon> |
885 | 882 | </EmbeddedResource> |
883 | + <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.fr.resx"> | |
884 | + <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon> | |
885 | + </EmbeddedResource> | |
886 | 886 | <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.ja-JP.resx"> |
887 | 887 | <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon> |
888 | 888 | </EmbeddedResource> |
@@ -1099,36 +1099,6 @@ | ||
1099 | 1099 | <EmbeddedResource Include="Forms\WatchFolderForm.zh-CN.resx"> |
1100 | 1100 | <DependentUpon>WatchFolderForm.cs</DependentUpon> |
1101 | 1101 | </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> | |
1132 | 1102 | <EmbeddedResource Include="Properties\Resources.de.resx" /> |
1133 | 1103 | <EmbeddedResource Include="Properties\Resources.es.resx" /> |
1134 | 1104 | <EmbeddedResource Include="Properties\Resources.fr.resx" /> |