• 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

Revisionb9b6660897437c79ef3e8099c93cae85b01b84af (tree)
Zeit2018-03-20 08:22:08
Autornotme <notme@user...>
Commiternotme

Log Message

Japanese translation for ShareX 12.1.0

Ändern Zusammenfassung

Diff

--- a/ShareX.HelpersLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.HelpersLib/Properties/Resources.ja-JP.resx
@@ -970,12 +970,6 @@
970970 <data name="ShapeType_DrawingImageScreen" xml:space="preserve">
971971 <value>描画: 画像 (スクリーン)</value>
972972 </data>
973- <data name="ShapeType_DrawingCrop" xml:space="preserve">
974- <value>画像の切り抜き</value>
975- </data>
976- <data name="DownloaderForm_Download_Canceled" xml:space="preserve">
977- <value>ダウンロードを中止しました。</value>
978- </data>
979973 <data name="CustomUploaderDestinationType_URLShortener" xml:space="preserve">
980974 <value>URL短縮サービス</value>
981975 </data>
@@ -988,12 +982,6 @@
988982 <data name="CustomUploaderDestinationType_ImageUploader" xml:space="preserve">
989983 <value>画像 アップローダ</value>
990984 </data>
991- <data name="DownloaderForm_ProxyDetected" xml:space="preserve">
992- <value>プロキシを検出しました。メインメニューからアプリの設定を開きプロキシを選択し、プロキシサーバーの設定を入力してください。</value>
993- </data>
994- <data name="DownloaderForm_ChangeProgress_Progress___0_" xml:space="preserve">
995- <value>進行状況: {0}</value>
996- </data>
997985 <data name="PNGBitDepth_Default" xml:space="preserve">
998986 <value>既定</value>
999987 </data>
@@ -1111,4 +1099,40 @@
11111099 <data name="ImgurThumbnailType_Small_Thumbnail" xml:space="preserve">
11121100 <value>小 160x160</value>
11131101 </data>
1102+ <data name="ShapeType_ToolCrop" xml:space="preserve">
1103+ <value>ツール: 画像の切り抜き</value>
1104+ </data>
1105+ <data name="ShapeType_DrawingSticker" xml:space="preserve">
1106+ <value>描画: ステッカー</value>
1107+ </data>
1108+ <data name="ImageEditorInterpolationMode_NearestNeighbor" xml:space="preserve">
1109+ <value>ニアレストネイバー</value>
1110+ </data>
1111+ <data name="ImageEditorInterpolationMode_Bilinear" xml:space="preserve">
1112+ <value>バイリニア</value>
1113+ </data>
1114+ <data name="ImageEditorInterpolationMode_Bicubic" xml:space="preserve">
1115+ <value>バイキュービック</value>
1116+ </data>
1117+ <data name="ImageEditorInterpolationMode_HighQualityBilinear" xml:space="preserve">
1118+ <value>高画質バイキュービック</value>
1119+ </data>
1120+ <data name="ImageEditorInterpolationMode_HighQualityBicubic" xml:space="preserve">
1121+ <value>高画質バイキュービック</value>
1122+ </data>
1123+ <data name="CodeMenuEntryFilename_RandomAnimal" xml:space="preserve">
1124+ <value>ランダムな動物</value>
1125+ </data>
1126+ <data name="CodeMenuEntryFilename_RandomAdjective" xml:space="preserve">
1127+ <value>ランダムな形容詞</value>
1128+ </data>
1129+ <data name="WavFileNameEditor_EditValue_Browse_for_a_sound_file___" xml:space="preserve">
1130+ <value>サウンドファイルの参照...</value>
1131+ </data>
1132+ <data name="ReplCodeMenuEntry_rf_Random_line_from_file" xml:space="preserve">
1133+ <value>ファイル内のランダムな行。ファイルは {filepath} で指定</value>
1134+ </data>
1135+ <data name="ImageEditorStartMode_AutoSize" xml:space="preserve">
1136+ <value>自動サイズ</value>
1137+ </data>
11141138 </root>
\ No newline at end of file
--- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace>ShareX.HelpersLib</RootNamespace>
1212 <AssemblyName>ShareX.HelpersLib</AssemblyName>
13- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1414 <FileAlignment>512</FileAlignment>
1515 <StartupObject>
1616 </StartupObject>
@@ -19,8 +19,6 @@
1919 <OldToolsVersion>3.5</OldToolsVersion>
2020 <UpgradeBackupLocation />
2121 <TargetFrameworkProfile />
22- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
23- <RestorePackages>true</RestorePackages>
2422 </PropertyGroup>
2523 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2624 <DebugSymbols>true</DebugSymbols>
@@ -60,6 +58,7 @@
6058 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
6159 <ErrorReport>prompt</ErrorReport>
6260 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
61+ <Prefer32Bit>false</Prefer32Bit>
6362 </PropertyGroup>
6463 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStore|AnyCPU'">
6564 <OutputPath>bin\WindowsStore\</OutputPath>
@@ -70,6 +69,7 @@
7069 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
7170 <ErrorReport>prompt</ErrorReport>
7271 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
72+ <Prefer32Bit>false</Prefer32Bit>
7373 </PropertyGroup>
7474 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStoreDebug|AnyCPU'">
7575 <DebugSymbols>true</DebugSymbols>
@@ -81,14 +81,17 @@
8181 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
8282 <ErrorReport>prompt</ErrorReport>
8383 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
84+ <Prefer32Bit>false</Prefer32Bit>
8485 </PropertyGroup>
8586 <ItemGroup>
86- <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
87- <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
87+ <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
88+ <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
8889 </Reference>
8990 <Reference Include="System" />
9091 <Reference Include="System.Data" />
9192 <Reference Include="System.Design" />
93+ <Reference Include="System.IO.Compression" />
94+ <Reference Include="System.IO.Compression.FileSystem" />
9295 <Reference Include="System.Management" />
9396 <Reference Include="System.Runtime.Remoting" />
9497 <Reference Include="System.Web" />
@@ -100,6 +103,9 @@
100103 <Reference Include="System.Xml" />
101104 </ItemGroup>
102105 <ItemGroup>
106+ <Compile Include="..\SharedAssemblyInfo.cs">
107+ <Link>Properties\SharedAssemblyInfo.cs</Link>
108+ </Compile>
103109 <Compile Include="Controls\CustomToolStripProfessionalRenderer.cs" />
104110 <Compile Include="Controls\HotkeySelectionButton.cs">
105111 <SubType>Component</SubType>
@@ -125,7 +131,11 @@
125131 <Compile Include="Controls\ToolStripLabeledComboBox.cs">
126132 <SubType>Component</SubType>
127133 </Compile>
134+ <Compile Include="Controls\ToolStripNumericUpDown.cs">
135+ <SubType>Component</SubType>
136+ </Compile>
128137 <Compile Include="Helpers\JsonHelpers.cs" />
138+ <Compile Include="SevenZipManager.cs" />
129139 <Compile Include="Input\HotkeyForm.cs">
130140 <SubType>Form</SubType>
131141 </Compile>
@@ -458,6 +468,7 @@
458468 <Compile Include="WritablePropertiesOnlyResolver.cs" />
459469 <Compile Include="XmlColor.cs" />
460470 <Compile Include="XmlFont.cs" />
471+ <Compile Include="ZipManager.cs" />
461472 <EmbeddedResource Include="Colors\ColorPickerForm.de.resx">
462473 <DependentUpon>ColorPickerForm.cs</DependentUpon>
463474 </EmbeddedResource>
@@ -1238,9 +1249,6 @@
12381249 </EmbeddedResource>
12391250 </ItemGroup>
12401251 <ItemGroup>
1241- <None Include="packages.config" />
1242- </ItemGroup>
1243- <ItemGroup>
12441252 <COMReference Include="IWshRuntimeLibrary">
12451253 <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
12461254 <VersionMajor>1</VersionMajor>
@@ -1261,25 +1269,21 @@
12611269 </COMReference>
12621270 </ItemGroup>
12631271 <ItemGroup>
1272+ <None Include="packages.config" />
12641273 <None Include="Resources\Loading.gif" />
1265- </ItemGroup>
1266- <ItemGroup>
12671274 <None Include="Resources\Crosshair.cur" />
1268- </ItemGroup>
1269- <ItemGroup>
12701275 <None Include="Resources\ShareX_Icon.ico" />
1271- </ItemGroup>
1272- <ItemGroup>
12731276 <None Include="Resources\ShareX_Logo.png" />
1277+ <None Include="Resources\cross.png" />
1278+ <None Include="Resources\ShareX_Logo_Black.png" />
12741279 </ItemGroup>
12751280 <ItemGroup>
1276- <None Include="Resources\cross.png" />
1281+ <None Include="Resources\adjectives.txt" />
12771282 </ItemGroup>
12781283 <ItemGroup>
1279- <None Include="Resources\ShareX_Logo_Black.png" />
1284+ <None Include="Resources\animals.txt" />
12801285 </ItemGroup>
12811286 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
1282- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
12831287 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
12841288 Other similar extension points exist, see Microsoft.Common.targets.
12851289 <Target Name="BeforeBuild">
--- a/ShareX.HelpersLib/UpdateChecker/DownloaderForm.ja-JP.resx
+++ b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.ja-JP.resx
@@ -129,9 +129,6 @@
129129 <data name="lblProgress.Text" xml:space="preserve">
130130 <value>進行状況:</value>
131131 </data>
132- <data name="cbShowChangelog.Text" xml:space="preserve">
133- <value>更新ノートを表示</value>
134- </data>
135132 <data name="$this.Text" xml:space="preserve">
136133 <value>ShareX ファイルのダウンロード</value>
137134 </data>
--- a/ShareX.HistoryLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.HistoryLib/Properties/Resources.ja-JP.resx
@@ -213,4 +213,13 @@
213213 <data name="HistoryItemManager_InitializeComponent_HTML_linked_image" xml:space="preserve">
214214 <value>HTML リンク付き画像</value>
215215 </data>
216+ <data name="HistoryItemManager_InitializeComponent_Markdown__image" xml:space="preserve">
217+ <value>Markdown 画像</value>
218+ </data>
219+ <data name="HistoryItemManager_InitializeComponent_Markdown__link" xml:space="preserve">
220+ <value>Markdown リンク</value>
221+ </data>
222+ <data name="HistoryItemManager_InitializeComponent_Markdown__linked_image" xml:space="preserve">
223+ <value>Markdown リンク付き画像</value>
224+ </data>
216225 </root>
\ No newline at end of file
--- a/ShareX.HistoryLib/ShareX.HistoryLib.csproj
+++ b/ShareX.HistoryLib/ShareX.HistoryLib.csproj
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,11 +10,9 @@
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace>ShareX.HistoryLib</RootNamespace>
1212 <AssemblyName>ShareX.HistoryLib</AssemblyName>
13- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1414 <FileAlignment>512</FileAlignment>
1515 <TargetFrameworkProfile />
16- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
17- <RestorePackages>true</RestorePackages>
1816 </PropertyGroup>
1917 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2018 <DebugSymbols>true</DebugSymbols>
@@ -53,6 +51,7 @@
5351 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
5452 <ErrorReport>prompt</ErrorReport>
5553 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
54+ <Prefer32Bit>false</Prefer32Bit>
5655 </PropertyGroup>
5756 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStore|AnyCPU'">
5857 <OutputPath>bin\WindowsStore\</OutputPath>
@@ -62,6 +61,7 @@
6261 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
6362 <ErrorReport>prompt</ErrorReport>
6463 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
64+ <Prefer32Bit>false</Prefer32Bit>
6565 </PropertyGroup>
6666 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStoreDebug|AnyCPU'">
6767 <DebugSymbols>true</DebugSymbols>
@@ -72,11 +72,11 @@
7272 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
7373 <ErrorReport>prompt</ErrorReport>
7474 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
75+ <Prefer32Bit>false</Prefer32Bit>
7576 </PropertyGroup>
7677 <ItemGroup>
7778 <Reference Include="ImageListView, Version=11.0.4.0, Culture=neutral, processorArchitecture=MSIL">
7879 <HintPath>..\packages\ImageListView.11.0.4.0\lib\net35\ImageListView.dll</HintPath>
79- <Private>True</Private>
8080 </Reference>
8181 <Reference Include="System" />
8282 <Reference Include="System.Drawing" />
@@ -85,6 +85,9 @@
8585 <Reference Include="System.Xml" />
8686 </ItemGroup>
8787 <ItemGroup>
88+ <Compile Include="..\SharedAssemblyInfo.cs">
89+ <Link>Properties\SharedAssemblyInfo.cs</Link>
90+ </Compile>
8891 <Compile Include="HistoryItemManager_ContextMenu.cs" />
8992 <Compile Include="ImageHistoryForm.cs">
9093 <SubType>Form</SubType>
@@ -282,17 +285,9 @@
282285 </ItemGroup>
283286 <ItemGroup>
284287 <None Include="packages.config" />
285- </ItemGroup>
286- <ItemGroup>
287288 <None Include="Resources\image.png" />
288- </ItemGroup>
289- <ItemGroup>
290289 <None Include="Resources\notebook.png" />
291- </ItemGroup>
292- <ItemGroup>
293290 <None Include="Resources\application-block.png" />
294- </ItemGroup>
295- <ItemGroup>
296291 <None Include="Resources\globe.png" />
297292 </ItemGroup>
298293 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -300,7 +295,6 @@
300295 <PostBuildEvent>
301296 </PostBuildEvent>
302297 </PropertyGroup>
303- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
304298 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
305299 Other similar extension points exist, see Microsoft.Common.targets.
306300 <Target Name="BeforeBuild">
--- a/ShareX.ImageEffectsLib/ImageEffectsForm.ja-JP.resx
+++ b/ShareX.ImageEffectsLib/ImageEffectsForm.ja-JP.resx
@@ -123,9 +123,6 @@
123123 <data name="btnRemove.Text" xml:space="preserve">
124124 <value>削除</value>
125125 </data>
126- <data name="btnRefresh.Text" xml:space="preserve">
127- <value>更新</value>
128- </data>
129126 <data name="btnClear.Text" xml:space="preserve">
130127 <value>消去</value>
131128 </data>
@@ -159,4 +156,7 @@
159156 <data name="btnRemovePreset.Text" xml:space="preserve">
160157 <value>プリセット削除</value>
161158 </data>
159+ <data name="btnOK.Text" xml:space="preserve">
160+ <value>OK</value>
161+ </data>
162162 </root>
\ No newline at end of file
--- a/ShareX.ImageEffectsLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.ImageEffectsLib/Properties/Resources.ja-JP.resx
@@ -132,4 +132,7 @@
132132 <data name="ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms" xml:space="preserve">
133133 <value>画像の効果 - 幅: {0}, 高さ: {1}, 描画時間: {2} ms</value>
134134 </data>
135+ <data name="ImageEffectsForm_EditorMode_Cancel" xml:space="preserve">
136+ <value>キャンセル</value>
137+ </data>
135138 </root>
\ No newline at end of file
--- a/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
+++ b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace>ShareX.ImageEffectsLib</RootNamespace>
1212 <AssemblyName>ShareX.ImageEffectsLib</AssemblyName>
13- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1414 <FileAlignment>512</FileAlignment>
1515 <FileUpgradeFlags>
1616 </FileUpgradeFlags>
@@ -32,8 +32,6 @@
3232 <UseApplicationTrust>false</UseApplicationTrust>
3333 <BootstrapperEnabled>true</BootstrapperEnabled>
3434 <TargetFrameworkProfile />
35- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
36- <RestorePackages>true</RestorePackages>
3735 </PropertyGroup>
3836 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3937 <DebugSymbols>true</DebugSymbols>
@@ -69,6 +67,7 @@
6967 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
7068 <ErrorReport>prompt</ErrorReport>
7169 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
70+ <Prefer32Bit>false</Prefer32Bit>
7271 </PropertyGroup>
7372 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStore|AnyCPU'">
7473 <OutputPath>bin\WindowsStore\</OutputPath>
@@ -79,6 +78,7 @@
7978 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
8079 <ErrorReport>prompt</ErrorReport>
8180 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
81+ <Prefer32Bit>false</Prefer32Bit>
8282 </PropertyGroup>
8383 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStoreDebug|AnyCPU'">
8484 <DebugSymbols>true</DebugSymbols>
@@ -89,10 +89,11 @@
8989 <PlatformTarget>AnyCPU</PlatformTarget>
9090 <ErrorReport>prompt</ErrorReport>
9191 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
92+ <Prefer32Bit>false</Prefer32Bit>
9293 </PropertyGroup>
9394 <ItemGroup>
94- <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
95- <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
95+ <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
96+ <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
9697 </Reference>
9798 <Reference Include="System" />
9899 <Reference Include="System.Design" />
@@ -100,6 +101,9 @@
100101 <Reference Include="System.Windows.Forms" />
101102 </ItemGroup>
102103 <ItemGroup>
104+ <Compile Include="..\SharedAssemblyInfo.cs">
105+ <Link>Properties\SharedAssemblyInfo.cs</Link>
106+ </Compile>
103107 <Compile Include="Adjustments\Alpha.cs" />
104108 <Compile Include="Adjustments\BlackWhite.cs" />
105109 <Compile Include="Adjustments\Polaroid.cs" />
@@ -127,6 +131,7 @@
127131 <Compile Include="Adjustments\Inverse.cs" />
128132 <Compile Include="Adjustments\Saturation.cs" />
129133 <Compile Include="ImageEffectPreset.cs" />
134+ <Compile Include="Manipulations\AutoCrop.cs" />
130135 <Compile Include="Manipulations\Crop.cs" />
131136 <Compile Include="Manipulations\RoundedCorners.cs" />
132137 <Compile Include="Manipulations\Skew.cs" />
@@ -163,23 +168,6 @@
163168 </Compile>
164169 </ItemGroup>
165170 <ItemGroup>
166- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
167- <Visible>False</Visible>
168- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
169- <Install>false</Install>
170- </BootstrapperPackage>
171- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
172- <Visible>False</Visible>
173- <ProductName>.NET Framework 3.5 SP1</ProductName>
174- <Install>true</Install>
175- </BootstrapperPackage>
176- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
177- <Visible>False</Visible>
178- <ProductName>Windows Installer 3.1</ProductName>
179- <Install>true</Install>
180- </BootstrapperPackage>
181- </ItemGroup>
182- <ItemGroup>
183171 <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
184172 <Project>{327750e1-9fb7-4cc3-8aea-9bc42180cad3}</Project>
185173 <Name>ShareX.HelpersLib</Name>
@@ -254,7 +242,6 @@
254242 <None Include="packages.config" />
255243 </ItemGroup>
256244 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
257- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
258245 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
259246 Other similar extension points exist, see Microsoft.Common.targets.
260247 <Target Name="BeforeBuild">
--- a/ShareX.MediaLib/ShareX.MediaLib.csproj
+++ b/ShareX.MediaLib/ShareX.MediaLib.csproj
@@ -9,8 +9,9 @@
99 <AppDesignerFolder>Properties</AppDesignerFolder>
1010 <RootNamespace>ShareX.MediaLib</RootNamespace>
1111 <AssemblyName>ShareX.MediaLib</AssemblyName>
12- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1313 <FileAlignment>512</FileAlignment>
14+ <TargetFrameworkProfile />
1415 </PropertyGroup>
1516 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617 <DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
2122 <ErrorReport>prompt</ErrorReport>
2223 <WarningLevel>4</WarningLevel>
2324 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
25+ <Prefer32Bit>false</Prefer32Bit>
2426 </PropertyGroup>
2527 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2628 <DebugType>none</DebugType>
@@ -30,6 +32,7 @@
3032 <ErrorReport>prompt</ErrorReport>
3133 <WarningLevel>4</WarningLevel>
3234 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
35+ <Prefer32Bit>false</Prefer32Bit>
3336 </PropertyGroup>
3437 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Steam|AnyCPU'">
3538 <OutputPath>bin\Steam\</OutputPath>
@@ -39,6 +42,7 @@
3942 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
4043 <ErrorReport>prompt</ErrorReport>
4144 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
45+ <Prefer32Bit>false</Prefer32Bit>
4246 </PropertyGroup>
4347 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStore|AnyCPU'">
4448 <OutputPath>bin\WindowsStore\</OutputPath>
@@ -48,6 +52,7 @@
4852 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
4953 <ErrorReport>prompt</ErrorReport>
5054 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
55+ <Prefer32Bit>false</Prefer32Bit>
5156 </PropertyGroup>
5257 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStoreDebug|AnyCPU'">
5358 <DebugSymbols>true</DebugSymbols>
@@ -58,12 +63,9 @@
5863 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
5964 <ErrorReport>prompt</ErrorReport>
6065 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
66+ <Prefer32Bit>false</Prefer32Bit>
6167 </PropertyGroup>
6268 <ItemGroup>
63- <Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL">
64- <HintPath>..\packages\SevenZipSharp.0.64\lib\SevenZipSharp.dll</HintPath>
65- <Private>True</Private>
66- </Reference>
6769 <Reference Include="System" />
6870 <Reference Include="System.Core" />
6971 <Reference Include="System.Design" />
@@ -76,6 +78,9 @@
7678 <Reference Include="System.Xml" />
7779 </ItemGroup>
7880 <ItemGroup>
81+ <Compile Include="..\SharedAssemblyInfo.cs">
82+ <Link>Properties\SharedAssemblyInfo.cs</Link>
83+ </Compile>
7984 <Compile Include="Enums.cs" />
8085 <Compile Include="FFmpegCLIManager.cs" />
8186 <Compile Include="FFmpegDownloader.cs" />
@@ -128,6 +133,9 @@
128133 <EmbeddedResource Include="Forms\ImageCombinerForm.ja-JP.resx">
129134 <DependentUpon>ImageCombinerForm.cs</DependentUpon>
130135 </EmbeddedResource>
136+ <EmbeddedResource Include="Forms\ImageCombinerForm.ko-KR.resx">
137+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
138+ </EmbeddedResource>
131139 <EmbeddedResource Include="Forms\ImageCombinerForm.nl-NL.resx">
132140 <DependentUpon>ImageCombinerForm.cs</DependentUpon>
133141 </EmbeddedResource>
@@ -158,6 +166,9 @@
158166 <EmbeddedResource Include="Forms\ImageThumbnailerForm.ja-JP.resx">
159167 <DependentUpon>ImageThumbnailerForm.cs</DependentUpon>
160168 </EmbeddedResource>
169+ <EmbeddedResource Include="Forms\ImageThumbnailerForm.ko-KR.resx">
170+ <DependentUpon>ImageThumbnailerForm.cs</DependentUpon>
171+ </EmbeddedResource>
161172 <EmbeddedResource Include="Forms\ImageThumbnailerForm.resx">
162173 <DependentUpon>ImageThumbnailerForm.cs</DependentUpon>
163174 </EmbeddedResource>
@@ -176,6 +187,9 @@
176187 <EmbeddedResource Include="Forms\VideoThumbnailerForm.ja-JP.resx">
177188 <DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
178189 </EmbeddedResource>
190+ <EmbeddedResource Include="Forms\VideoThumbnailerForm.ko-KR.resx">
191+ <DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
192+ </EmbeddedResource>
179193 <EmbeddedResource Include="Forms\VideoThumbnailerForm.nl-NL.resx">
180194 <DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
181195 </EmbeddedResource>
@@ -204,6 +218,7 @@
204218 <EmbeddedResource Include="Properties\Resources.fr.resx" />
205219 <EmbeddedResource Include="Properties\Resources.it-IT.resx" />
206220 <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />
221+ <EmbeddedResource Include="Properties\Resources.ko-KR.resx" />
207222 <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
208223 <EmbeddedResource Include="Properties\Resources.pt-BR.resx" />
209224 <EmbeddedResource Include="Properties\Resources.resx">
@@ -216,9 +231,6 @@
216231 <EmbeddedResource Include="Properties\Resources.zh-CN.resx" />
217232 <EmbeddedResource Include="Properties\Resources.zh-TW.resx" />
218233 </ItemGroup>
219- <ItemGroup>
220- <None Include="packages.config" />
221- </ItemGroup>
222234 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
223235 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
224236 Other similar extension points exist, see Microsoft.Common.targets.
--- /dev/null
+++ b/ShareX.ScreenCaptureLib/Forms/EditorStartupForm.ja-JP.resx
@@ -0,0 +1,135 @@
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="btnOpenImageFile.Text" xml:space="preserve">
121+ <value>画像ファイルを開く...</value>
122+ </data>
123+ <data name="btnCreateNewImage.Text" xml:space="preserve">
124+ <value>新しい画像を作成...</value>
125+ </data>
126+ <data name="btnLoadImageFromClipboard.Text" xml:space="preserve">
127+ <value>クリップボードから画像読み込み</value>
128+ </data>
129+ <data name="$this.Text" xml:space="preserve">
130+ <value>ShareX - 画像エディター</value>
131+ </data>
132+ <data name="btnCancel.Text" xml:space="preserve">
133+ <value>キャンセル</value>
134+ </data>
135+</root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/Forms/ImageSizeForm.ja-JP.resx
+++ b/ShareX.ScreenCaptureLib/Forms/ImageSizeForm.ja-JP.resx
@@ -141,4 +141,7 @@
141141 <data name="lblHeightPixels.Text" xml:space="preserve">
142142 <value>ピクセル</value>
143143 </data>
144+ <data name="lblResampling.Text" xml:space="preserve">
145+ <value>再サンプリング:</value>
146+ </data>
144147 </root>
\ No newline at end of file
--- /dev/null
+++ b/ShareX.ScreenCaptureLib/Forms/NewImageForm.ja-JP.resx
@@ -0,0 +1,150 @@
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="lblHeight.Text" xml:space="preserve">
121+ <value>高さ:</value>
122+ </data>
123+ <data name="lblWidth.Text" xml:space="preserve">
124+ <value>幅:</value>
125+ </data>
126+ <data name="btnOK.Text" xml:space="preserve">
127+ <value>OK</value>
128+ </data>
129+ <data name="gbBackgroundColor.Text" xml:space="preserve">
130+ <value>背景色</value>
131+ </data>
132+ <data name="$this.Text" xml:space="preserve">
133+ <value>ShareX - 新しい画像</value>
134+ </data>
135+ <data name="cbTransparent.Text" xml:space="preserve">
136+ <value>透明</value>
137+ </data>
138+ <data name="btnChangeColor.Text" xml:space="preserve">
139+ <value>色を変更...</value>
140+ </data>
141+ <data name="btnCancel.Text" xml:space="preserve">
142+ <value>キャンセル</value>
143+ </data>
144+ <data name="lblHeightPixels.Text" xml:space="preserve">
145+ <value>ピクセル</value>
146+ </data>
147+ <data name="lblWidthPixels.Text" xml:space="preserve">
148+ <value>ピクセル</value>
149+ </data>
150+</root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.ja-JP.resx
@@ -473,4 +473,40 @@
473473 <data name="RegionCaptureForm_TipYouCanPanImageByHoldingMouseMiddleButtonAndDragging" xml:space="preserve">
474474 <value>ヒント: 表示領域の移動はマウス中ボタンを押したままドラッグ</value>
475475 </data>
476+ <data name="ShapeManager_CreateToolbar_PasteImageText" xml:space="preserve">
477+ <value>画像/文字を貼り付け</value>
478+ </data>
479+ <data name="ShapeManager_CreateToolbar_AutoCropImage" xml:space="preserve">
480+ <value>自動で画像切り抜き...</value>
481+ </data>
482+ <data name="EditorStartupForm_ClipboardDoesNotContainAnImage" xml:space="preserve">
483+ <value>クリップボードに画像がありません。</value>
484+ </data>
485+ <data name="ShapeManager_CreateToolbar_NewImage" xml:space="preserve">
486+ <value>新しい画像...</value>
487+ </data>
488+ <data name="ShapeManager_CreateToolbar_OpenImageFile" xml:space="preserve">
489+ <value>画像ファイルを開く...</value>
490+ </data>
491+ <data name="ShapeManager_CreateToolbar_InsertImageFile" xml:space="preserve">
492+ <value>画像ファイルを挿入...</value>
493+ </data>
494+ <data name="ShapeManager_CreateToolbar_InsertImageFromScreen" xml:space="preserve">
495+ <value>スクリーンから画像を挿入...</value>
496+ </data>
497+ <data name="ShapeManager_CreateToolbar_CropImage" xml:space="preserve">
498+ <value>画像の切り抜き...</value>
499+ </data>
500+ <data name="ShapeManager_CreateToolbar_FontSize" xml:space="preserve">
501+ <value>文字サイズ:</value>
502+ </data>
503+ <data name="ShapeManager_CreateToolbar_InterpolationMode" xml:space="preserve">
504+ <value>補間方式</value>
505+ </data>
506+ <data name="ShapeManager_CreateToolbar_UseLetters" xml:space="preserve">
507+ <value>アルファベットを使用</value>
508+ </data>
509+ <data name="ShapeManager_CreateToolbar_AutoCloseEditorOnTask" xml:space="preserve">
510+ <value>エディターを自動で閉じる</value>
511+ </data>
476512 </root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,12 +10,10 @@
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace>ShareX.ScreenCaptureLib</RootNamespace>
1212 <AssemblyName>ShareX.ScreenCaptureLib</AssemblyName>
13- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1414 <FileAlignment>512</FileAlignment>
1515 <TargetFrameworkProfile>
1616 </TargetFrameworkProfile>
17- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
18- <RestorePackages>true</RestorePackages>
1917 </PropertyGroup>
2018 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2119 <DebugSymbols>true</DebugSymbols>
@@ -49,6 +47,7 @@
4947 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
5048 <ErrorReport>prompt</ErrorReport>
5149 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
50+ <Prefer32Bit>false</Prefer32Bit>
5251 </PropertyGroup>
5352 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStore|AnyCPU'">
5453 <OutputPath>bin\WindowsStore\</OutputPath>
@@ -58,6 +57,7 @@
5857 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
5958 <ErrorReport>prompt</ErrorReport>
6059 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
60+ <Prefer32Bit>false</Prefer32Bit>
6161 </PropertyGroup>
6262 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStoreDebug|AnyCPU'">
6363 <DebugSymbols>true</DebugSymbols>
@@ -68,8 +68,12 @@
6868 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
6969 <ErrorReport>prompt</ErrorReport>
7070 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
71+ <Prefer32Bit>false</Prefer32Bit>
7172 </PropertyGroup>
7273 <ItemGroup>
74+ <Reference Include="ImageListView, Version=11.0.4.0, Culture=neutral, processorArchitecture=MSIL">
75+ <HintPath>..\packages\ImageListView.11.0.4.0\lib\net35\ImageListView.dll</HintPath>
76+ </Reference>
7377 <Reference Include="System" />
7478 <Reference Include="System.Data" />
7579 <Reference Include="System.Design" />
@@ -78,6 +82,9 @@
7882 <Reference Include="System.Xml" />
7983 </ItemGroup>
8084 <ItemGroup>
85+ <Compile Include="..\SharedAssemblyInfo.cs">
86+ <Link>Properties\SharedAssemblyInfo.cs</Link>
87+ </Compile>
8188 <Compile Include="Animations\BaseAnimation.cs" />
8289 <Compile Include="Animations\PointAnimation.cs" />
8390 <Compile Include="Animations\RectangleAnimation.cs" />
@@ -87,12 +94,39 @@
8794 <Compile Include="Forms\CanvasSizeForm.Designer.cs">
8895 <DependentUpon>CanvasSizeForm.cs</DependentUpon>
8996 </Compile>
97+ <Compile Include="Forms\EditorStartupForm.cs">
98+ <SubType>Form</SubType>
99+ </Compile>
100+ <Compile Include="Forms\EditorStartupForm.Designer.cs">
101+ <DependentUpon>EditorStartupForm.cs</DependentUpon>
102+ </Compile>
103+ <Compile Include="Forms\NewImageForm.cs">
104+ <SubType>Form</SubType>
105+ </Compile>
106+ <Compile Include="Forms\NewImageForm.Designer.cs">
107+ <DependentUpon>NewImageForm.cs</DependentUpon>
108+ </Compile>
90109 <Compile Include="Forms\ImageSizeForm.cs">
91110 <SubType>Form</SubType>
92111 </Compile>
93112 <Compile Include="Forms\ImageSizeForm.Designer.cs">
94113 <DependentUpon>ImageSizeForm.cs</DependentUpon>
95114 </Compile>
115+ <Compile Include="Forms\StickerForm.cs">
116+ <SubType>Form</SubType>
117+ </Compile>
118+ <Compile Include="Forms\StickerForm.Designer.cs">
119+ <DependentUpon>StickerForm.cs</DependentUpon>
120+ </Compile>
121+ <Compile Include="Forms\StickerImageListViewRenderer.cs" />
122+ <Compile Include="Forms\StickerPackForm.cs">
123+ <SubType>Form</SubType>
124+ </Compile>
125+ <Compile Include="Forms\StickerPackForm.Designer.cs">
126+ <DependentUpon>StickerPackForm.cs</DependentUpon>
127+ </Compile>
128+ <Compile Include="RegionHelpers\ButtonObject.cs" />
129+ <Compile Include="RegionHelpers\ScrollbarManager.cs" />
96130 <Compile Include="Shapes\AnnotationOptions.cs" />
97131 <Compile Include="Enums.cs" />
98132 <Compile Include="Forms\RegionCaptureSimpleAnnotateForm.cs">
@@ -125,7 +159,11 @@
125159 <Compile Include="Animations\OpacityAnimation.cs" />
126160 <Compile Include="Shapes\BaseShape.cs" />
127161 <Compile Include="Shapes\Drawing\ArrowDrawingShape.cs" />
128- <Compile Include="Shapes\Drawing\CropDrawingShape.cs" />
162+ <Compile Include="Shapes\Drawing\ImageFileDrawingShape.cs" />
163+ <Compile Include="Shapes\Drawing\StickerDrawingShape.cs" />
164+ <Compile Include="Shapes\StickerPackInfo.cs" />
165+ <Compile Include="Shapes\Tool\BaseTool.cs" />
166+ <Compile Include="Shapes\Tool\CropTool.cs" />
129167 <Compile Include="Shapes\Drawing\CursorDrawingShape.cs" />
130168 <Compile Include="Shapes\Drawing\ImageScreenDrawingShape.cs" />
131169 <Compile Include="Shapes\Drawing\SpeechBalloonDrawingShape.cs" />
@@ -196,12 +234,22 @@
196234 <Project>{327750E1-9FB7-4CC3-8AEA-9BC42180CAD3}</Project>
197235 <Name>ShareX.HelpersLib</Name>
198236 </ProjectReference>
237+ <ProjectReference Include="..\ShareX.ImageEffectsLib\ShareX.ImageEffectsLib.csproj">
238+ <Project>{d13441b6-96e1-4d1b-8a95-58a7d6cb1e24}</Project>
239+ <Name>ShareX.ImageEffectsLib</Name>
240+ </ProjectReference>
199241 <ProjectReference Include="..\ShareX.MediaLib\ShareX.MediaLib.csproj">
200242 <Project>{1a190e53-1419-4cc2-b0e5-3bc7ea861c8b}</Project>
201243 <Name>ShareX.MediaLib</Name>
202244 </ProjectReference>
203245 </ItemGroup>
204246 <ItemGroup>
247+ <None Include="packages.config" />
248+ <None Include="Resources\stamp.png" />
249+ <None Include="Resources\image-saturation.png" />
250+ <None Include="Resources\image-select.png" />
251+ <None Include="Resources\image-empty.png" />
252+ <None Include="Resources\image--plus.png" />
205253 <None Include="Resources\image-resize.png" />
206254 <None Include="Resources\layer-flip.png" />
207255 <None Include="Resources\layer-flip-vertical.png" />
@@ -276,24 +324,51 @@
276324 <EmbeddedResource Include="Forms\CanvasSizeForm.ja-JP.resx">
277325 <DependentUpon>CanvasSizeForm.cs</DependentUpon>
278326 </EmbeddedResource>
327+ <EmbeddedResource Include="Forms\CanvasSizeForm.ko-KR.resx">
328+ <DependentUpon>CanvasSizeForm.cs</DependentUpon>
329+ </EmbeddedResource>
279330 <EmbeddedResource Include="Forms\CanvasSizeForm.resx">
280331 <DependentUpon>CanvasSizeForm.cs</DependentUpon>
281332 </EmbeddedResource>
282333 <EmbeddedResource Include="Forms\CanvasSizeForm.ru.resx">
283334 <DependentUpon>CanvasSizeForm.cs</DependentUpon>
284335 </EmbeddedResource>
336+ <EmbeddedResource Include="Forms\EditorStartupForm.ja-JP.resx">
337+ <DependentUpon>EditorStartupForm.cs</DependentUpon>
338+ </EmbeddedResource>
339+ <EmbeddedResource Include="Forms\EditorStartupForm.resx">
340+ <DependentUpon>EditorStartupForm.cs</DependentUpon>
341+ </EmbeddedResource>
342+ <EmbeddedResource Include="Forms\EditorStartupForm.ru.resx">
343+ <DependentUpon>EditorStartupForm.cs</DependentUpon>
344+ </EmbeddedResource>
285345 <EmbeddedResource Include="Forms\FFmpegOptionsForm.it-IT.resx">
286346 <DependentUpon>FFmpegOptionsForm.cs</DependentUpon>
287347 </EmbeddedResource>
348+ <EmbeddedResource Include="Forms\FFmpegOptionsForm.ja-JP.resx">
349+ <DependentUpon>FFmpegOptionsForm.cs</DependentUpon>
350+ </EmbeddedResource>
288351 <EmbeddedResource Include="Forms\ImageSizeForm.ja-JP.resx">
289352 <DependentUpon>ImageSizeForm.cs</DependentUpon>
290353 </EmbeddedResource>
354+ <EmbeddedResource Include="Forms\NewImageForm.ja-JP.resx">
355+ <DependentUpon>NewImageForm.cs</DependentUpon>
356+ </EmbeddedResource>
357+ <EmbeddedResource Include="Forms\NewImageForm.resx">
358+ <DependentUpon>NewImageForm.cs</DependentUpon>
359+ </EmbeddedResource>
360+ <EmbeddedResource Include="Forms\ImageSizeForm.ko-KR.resx">
361+ <DependentUpon>ImageSizeForm.cs</DependentUpon>
362+ </EmbeddedResource>
291363 <EmbeddedResource Include="Forms\ImageSizeForm.resx">
292364 <DependentUpon>ImageSizeForm.cs</DependentUpon>
293365 </EmbeddedResource>
294366 <EmbeddedResource Include="Forms\ImageSizeForm.ru.resx">
295367 <DependentUpon>ImageSizeForm.cs</DependentUpon>
296368 </EmbeddedResource>
369+ <EmbeddedResource Include="Forms\NewImageForm.ru.resx">
370+ <DependentUpon>NewImageForm.cs</DependentUpon>
371+ </EmbeddedResource>
297372 <EmbeddedResource Include="Forms\ScrollingCaptureForm.de.resx">
298373 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
299374 </EmbeddedResource>
@@ -306,6 +381,9 @@
306381 <EmbeddedResource Include="Forms\ScrollingCaptureForm.ja-JP.resx">
307382 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
308383 </EmbeddedResource>
384+ <EmbeddedResource Include="Forms\ScrollingCaptureForm.ko-KR.resx">
385+ <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
386+ </EmbeddedResource>
309387 <EmbeddedResource Include="Forms\ScrollingCaptureForm.nl-NL.resx">
310388 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
311389 </EmbeddedResource>
@@ -330,6 +408,12 @@
330408 <EmbeddedResource Include="Forms\ScrollingCaptureForm.zh-TW.resx">
331409 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
332410 </EmbeddedResource>
411+ <EmbeddedResource Include="Forms\StickerForm.resx">
412+ <DependentUpon>StickerForm.cs</DependentUpon>
413+ </EmbeddedResource>
414+ <EmbeddedResource Include="Forms\StickerPackForm.resx">
415+ <DependentUpon>StickerPackForm.cs</DependentUpon>
416+ </EmbeddedResource>
333417 <EmbeddedResource Include="Forms\TextDrawingInputBox.fr.resx">
334418 <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
335419 </EmbeddedResource>
@@ -339,6 +423,9 @@
339423 <EmbeddedResource Include="Forms\TextDrawingInputBox.ja-JP.resx">
340424 <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
341425 </EmbeddedResource>
426+ <EmbeddedResource Include="Forms\TextDrawingInputBox.ko-KR.resx">
427+ <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
428+ </EmbeddedResource>
342429 <EmbeddedResource Include="Forms\TextDrawingInputBox.pt-BR.resx">
343430 <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
344431 </EmbeddedResource>
@@ -366,6 +453,9 @@
366453 <EmbeddedResource Include="Forms\WebpageCaptureForm.ja-JP.resx">
367454 <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
368455 </EmbeddedResource>
456+ <EmbeddedResource Include="Forms\WebpageCaptureForm.ko-KR.resx">
457+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
458+ </EmbeddedResource>
369459 <EmbeddedResource Include="Forms\WebpageCaptureForm.nl-NL.resx">
370460 <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
371461 </EmbeddedResource>
@@ -431,9 +521,6 @@
431521 <EmbeddedResource Include="Forms\FFmpegOptionsForm.hu.resx">
432522 <DependentUpon>FFmpegOptionsForm.cs</DependentUpon>
433523 </EmbeddedResource>
434- <EmbeddedResource Include="Forms\FFmpegOptionsForm.ja-JP.resx">
435- <DependentUpon>FFmpegOptionsForm.cs</DependentUpon>
436- </EmbeddedResource>
437524 <EmbeddedResource Include="Forms\FFmpegOptionsForm.ko-KR.resx">
438525 <DependentUpon>FFmpegOptionsForm.cs</DependentUpon>
439526 </EmbeddedResource>
@@ -464,7 +551,6 @@
464551 </ItemGroup>
465552 <ItemGroup />
466553 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
467- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
468554 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
469555 Other similar extension points exist, see Microsoft.Common.targets.
470556 <Target Name="BeforeBuild">
--- a/ShareX.UploadersLib/Controls/OAuthControl.ja-JP.resx
+++ b/ShareX.UploadersLib/Controls/OAuthControl.ja-JP.resx
@@ -120,9 +120,6 @@
120120 <data name="gbUserAccount.Text" xml:space="preserve">
121121 <value>ユーザー アカウント</value>
122122 </data>
123- <data name="lblLoginStatus.Text" xml:space="preserve">
124- <value>状態</value>
125- </data>
126123 <data name="btnOpenAuthorizePage.Text" xml:space="preserve">
127124 <value>ステップ 1: 承認ページを開きます...</value>
128125 </data>
@@ -138,4 +135,7 @@
138135 <data name="btnClearAuthorization.Text" xml:space="preserve">
139136 <value>承認の解除</value>
140137 </data>
138+ <data name="lblStatus.Text" xml:space="preserve">
139+ <value>状態:</value>
140+ </data>
141141 </root>
\ No newline at end of file
--- /dev/null
+++ b/ShareX.UploadersLib/Forms/OCRSpaceForm.ja-JP.resx
@@ -0,0 +1,135 @@
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="lblLanguage.Text" xml:space="preserve">
121+ <value>言語:</value>
122+ </data>
123+ <data name="lblResult.Text" xml:space="preserve">
124+ <value>結果:</value>
125+ </data>
126+ <data name="llGoogleTranslate.Text" xml:space="preserve">
127+ <value>Google翻訳を開き、ウィンドウを閉じる</value>
128+ </data>
129+ <data name="$this.Text" xml:space="preserve">
130+ <value>ShareX - OCR</value>
131+ </data>
132+ <data name="btnStartOCR.Text" xml:space="preserve">
133+ <value>OCR 開始</value>
134+ </data>
135+</root>
\ No newline at end of file
--- a/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx
+++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx
@@ -1077,4 +1077,25 @@ store.book[0].title</value>
10771077 <data name="lblLithiioEmail.Text" xml:space="preserve">
10781078 <value>Eメール:</value>
10791079 </data>
1080+ <data name="lblAmazonS3StripExtension.Text" xml:space="preserve">
1081+ <value>このファイルの拡張子を削除:</value>
1082+ </data>
1083+ <data name="cbAmazonS3StripExtensionText.Text" xml:space="preserve">
1084+ <value>テキスト</value>
1085+ </data>
1086+ <data name="cbAmazonS3StripExtensionVideo.Text" xml:space="preserve">
1087+ <value>ビデオ</value>
1088+ </data>
1089+ <data name="cbAmazonS3StripExtensionImage.Text" xml:space="preserve">
1090+ <value>画像</value>
1091+ </data>
1092+ <data name="cbAmazonS3PublicACL.Text" xml:space="preserve">
1093+ <value>ファイルに public-read アクセス権(ACL)を設定</value>
1094+ </data>
1095+ <data name="gbAmazonS3Advanced.Text" xml:space="preserve">
1096+ <value>高度な設定</value>
1097+ </data>
1098+ <data name="btnSulGetAPIKey.Text" xml:space="preserve">
1099+ <value>API キーを取得...</value>
1100+ </data>
10801101 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.UploadersLib/Properties/Resources.ja-JP.resx
@@ -120,15 +120,6 @@
120120 <data name="UploadersConfigForm_Error" xml:space="preserve">
121121 <value>エラー</value>
122122 </data>
123- <data name="OAuthControl_Status_Status__Not_logged_in_" xml:space="preserve">
124- <value>状態: ログインしていません</value>
125- </data>
126- <data name="OAuthControl_Status_Status__Logged_in_" xml:space="preserve">
127- <value>状態: ログインしました</value>
128- </data>
129- <data name="OAuthControl_Status_Status__Login_failed_" xml:space="preserve">
130- <value>状態: ログイン失敗</value>
131- </data>
132123 <data name="OneDrive_RootFolder_Root_folder" xml:space="preserve">
133124 <value>ルート フォルダー</value>
134125 </data>
@@ -247,4 +238,19 @@
247238 <data name="UploadersConfigForm_An_argument_with_the_same_name_already_exists" xml:space="preserve">
248239 <value>同名の引数がすでに存在します。</value>
249240 </data>
241+ <data name="UploadersConfigForm_UpdatePastebinStatus_NotLoggedIn" xml:space="preserve">
242+ <value>ログインしていません。</value>
243+ </data>
244+ <data name="UploadersConfigForm_UpdatePastebinStatus_LoggedIn" xml:space="preserve">
245+ <value>ログインしました。</value>
246+ </data>
247+ <data name="OAuthControl_Status_NotLoggedIn" xml:space="preserve">
248+ <value>ログインしていません。</value>
249+ </data>
250+ <data name="OAuthControl_Status_LoggedIn" xml:space="preserve">
251+ <value>ログインしました。</value>
252+ </data>
253+ <data name="OAuthControl_Status_LoginFailed" xml:space="preserve">
254+ <value>ログイン失敗。</value>
255+ </data>
250256 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace>ShareX.UploadersLib</RootNamespace>
1212 <AssemblyName>ShareX.UploadersLib</AssemblyName>
13- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1414 <FileAlignment>512</FileAlignment>
1515 <SignAssembly>false</SignAssembly>
1616 <SccProjectName>
@@ -41,8 +41,6 @@
4141 <UseApplicationTrust>false</UseApplicationTrust>
4242 <BootstrapperEnabled>true</BootstrapperEnabled>
4343 <TargetFrameworkProfile />
44- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
45- <RestorePackages>true</RestorePackages>
4644 </PropertyGroup>
4745 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4846 <DebugSymbols>true</DebugSymbols>
@@ -76,6 +74,7 @@
7674 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
7775 <ErrorReport>prompt</ErrorReport>
7876 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
77+ <Prefer32Bit>false</Prefer32Bit>
7978 </PropertyGroup>
8079 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStore|AnyCPU'">
8180 <OutputPath>bin\WindowsStore\</OutputPath>
@@ -85,6 +84,7 @@
8584 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
8685 <ErrorReport>prompt</ErrorReport>
8786 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
87+ <Prefer32Bit>false</Prefer32Bit>
8888 </PropertyGroup>
8989 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStoreDebug|AnyCPU'">
9090 <DebugSymbols>true</DebugSymbols>
@@ -95,14 +95,17 @@
9595 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
9696 <ErrorReport>prompt</ErrorReport>
9797 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
98+ <Prefer32Bit>false</Prefer32Bit>
9899 </PropertyGroup>
99100 <ItemGroup>
100- <Reference Include="MegaApiClient, Version=1.3.1.269, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
101- <HintPath>..\packages\MegaApiClient.1.3.1\lib\net40\MegaApiClient.dll</HintPath>
102- <Private>True</Private>
101+ <Reference Include="FluentFTP, Version=19.1.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
102+ <HintPath>..\packages\FluentFTP.19.1.2\lib\net45\FluentFTP.dll</HintPath>
103103 </Reference>
104- <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
105- <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
104+ <Reference Include="MegaApiClient, Version=1.6.3.409, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
105+ <HintPath>..\packages\MegaApiClient.1.6.3-master-409\lib\net46\MegaApiClient.dll</HintPath>
106+ </Reference>
107+ <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
108+ <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
106109 </Reference>
107110 <Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
108111 <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
@@ -111,10 +114,8 @@
111114 <Reference Include="System.Data" />
112115 <Reference Include="System.Design" />
113116 <Reference Include="System.Drawing" />
114- <Reference Include="System.Net.FtpClient, Version=1.0.5281.14359, Culture=neutral, PublicKeyToken=fa4be07daa57c2b7, processorArchitecture=MSIL">
115- <HintPath>..\packages\System.Net.FtpClient.1.0.5281.14359\lib\net40\System.Net.FtpClient.dll</HintPath>
116- <Private>True</Private>
117- </Reference>
117+ <Reference Include="System.IO.Compression.FileSystem" />
118+ <Reference Include="System.Numerics" />
118119 <Reference Include="System.Runtime.Serialization" />
119120 <Reference Include="System.ServiceModel.Web" />
120121 <Reference Include="System.Web" />
@@ -125,6 +126,9 @@
125126 <Reference Include="System.Xml" />
126127 </ItemGroup>
127128 <ItemGroup>
129+ <Compile Include="..\SharedAssemblyInfo.cs">
130+ <Link>Properties\SharedAssemblyInfo.cs</Link>
131+ </Compile>
128132 <Compile Include="APIKeys\APIKeys.cs" />
129133 <Compile Include="APIKeys\APIKeysLocal.cs" />
130134 <Compile Include="BaseServices\FileUploaderService.cs" />
@@ -233,6 +237,7 @@
233237 </Compile>
234238 <Compile Include="FileUploaders\Pushbullet.cs" />
235239 <Compile Include="FileUploaders\GfycatUploader.cs" />
240+ <Compile Include="Helpers\CustomUploaderArgumentInput.cs" />
236241 <Compile Include="Helpers\OAuth\IOAuthBase.cs" />
237242 <Compile Include="Helpers\SSLBypassHelper.cs" />
238243 <Compile Include="BaseServices\URLSharingService.cs" />
@@ -615,9 +620,18 @@
615620 <EmbeddedResource Include="Forms\OAuthWebForm.zh-TW.resx">
616621 <DependentUpon>OAuthWebForm.cs</DependentUpon>
617622 </EmbeddedResource>
623+ <EmbeddedResource Include="Forms\OCRSpaceForm.de.resx">
624+ <DependentUpon>OCRSpaceForm.cs</DependentUpon>
625+ </EmbeddedResource>
626+ <EmbeddedResource Include="Forms\OCRSpaceForm.ja-JP.resx">
627+ <DependentUpon>OCRSpaceForm.cs</DependentUpon>
628+ </EmbeddedResource>
618629 <EmbeddedResource Include="Forms\OCRSpaceForm.resx">
619630 <DependentUpon>OCRSpaceForm.cs</DependentUpon>
620631 </EmbeddedResource>
632+ <EmbeddedResource Include="Forms\OCRSpaceForm.ru.resx">
633+ <DependentUpon>OCRSpaceForm.cs</DependentUpon>
634+ </EmbeddedResource>
621635 <EmbeddedResource Include="Forms\PuushLoginForm.resx">
622636 <DependentUpon>PuushLoginForm.cs</DependentUpon>
623637 </EmbeddedResource>
@@ -890,21 +904,10 @@
890904 <EmbeddedResource Include="Properties\Resources.zh-TW.resx" />
891905 </ItemGroup>
892906 <ItemGroup>
893- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
894- <Visible>False</Visible>
895- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
896- <Install>false</Install>
897- </BootstrapperPackage>
898- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
899- <Visible>False</Visible>
900- <ProductName>.NET Framework 3.5 SP1</ProductName>
901- <Install>true</Install>
902- </BootstrapperPackage>
903- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
904- <Visible>False</Visible>
905- <ProductName>Windows Installer 3.1</ProductName>
906- <Install>true</Install>
907- </BootstrapperPackage>
907+ <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
908+ <Project>{327750E1-9FB7-4CC3-8AEA-9BC42180CAD3}</Project>
909+ <Name>ShareX.HelpersLib</Name>
910+ </ProjectReference>
908911 </ItemGroup>
909912 <ItemGroup>
910913 <EmbeddedResource Include="APIKeys\jira_sharex.pfx" />
@@ -941,58 +944,27 @@
941944 <None Include="Favicons\Mega.ico" />
942945 <None Include="Favicons\OneTimeSecret.ico" />
943946 <None Include="Favicons\Polr.ico" />
944- <None Include="packages.config" />
945- </ItemGroup>
946- <ItemGroup>
947- <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
948- <Project>{327750E1-9FB7-4CC3-8AEA-9BC42180CAD3}</Project>
949- <Name>ShareX.HelpersLib</Name>
950- </ProjectReference>
951- </ItemGroup>
952- <ItemGroup>
953947 <None Include="Favicons\Pomf.ico" />
954- </ItemGroup>
955- <ItemGroup>
956948 <None Include="Favicons\Seafile.png" />
957- </ItemGroup>
958- <ItemGroup>
959949 <None Include="Favicons\Streamable.ico" />
960950 <None Include="Favicons\Sul.png" />
961951 <None Include="Favicons\Vgyme.ico" />
962- </ItemGroup>
963- <ItemGroup>
964952 <None Include="Favicons\Lithiio.ico" />
965- </ItemGroup>
966- <ItemGroup>
967953 <None Include="Favicons\puush.ico" />
968- </ItemGroup>
969- <ItemGroup>
954+ <None Include="packages.config" />
970955 <None Include="Resources\puush-256.png" />
971- </ItemGroup>
972- <ItemGroup>
973956 <None Include="Resources\folder-network.png" />
974- </ItemGroup>
975- <ItemGroup>
976957 <None Include="Resources\globe-network.png" />
977- </ItemGroup>
978- <ItemGroup>
979958 <None Include="Resources\mail.png" />
980- </ItemGroup>
981- <ItemGroup>
982959 <None Include="Resources\server-network.png" />
983- </ItemGroup>
984- <ItemGroup>
985960 <None Include="Resources\document.png" />
986- </ItemGroup>
987- <ItemGroup>
988961 <None Include="Favicons\Pastie.png" />
989- <Content Include="Favicons\AzureStorage.png" />
962+ <None Include="Favicons\AzureStorage.png" />
990963 <None Include="Favicons\Plik.ico" />
991- <Content Include="Favicons\Gfycat.png" />
992- <Content Include="Favicons\GooglePhotos.ico" />
964+ <None Include="Favicons\Gfycat.png" />
965+ <None Include="Favicons\GooglePhotos.ico" />
993966 </ItemGroup>
994967 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
995- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
996968 <PropertyGroup>
997969 <PreBuildEvent>cd $(ProjectDir)APIKeys\
998970
--- a/ShareX/Forms/ApplicationSettingsForm.ja-JP.resx
+++ b/ShareX/Forms/ApplicationSettingsForm.ja-JP.resx
@@ -261,15 +261,6 @@
261261 <data name="lblSaveImageSubFolderPattern.Text" xml:space="preserve">
262262 <value>サブフォルダーのパターン:</value>
263263 </data>
264- <data name="cbExportLogs.Text" xml:space="preserve">
265- <value>ログをエクスポート</value>
266- </data>
267- <data name="cbExportHistory.Text" xml:space="preserve">
268- <value>履歴をエクスポート</value>
269- </data>
270- <data name="cbExportSettings.Text" xml:space="preserve">
271- <value>設定をエクスポート</value>
272- </data>
273264 <data name="btnExport.Text" xml:space="preserve">
274265 <value>エクスポート...</value>
275266 </data>
--- a/ShareX/Forms/MainForm.ja-JP.resx
+++ b/ShareX/Forms/MainForm.ja-JP.resx
@@ -711,4 +711,10 @@
711711 <data name="pbDiscordHide.ToolTip" xml:space="preserve">
712712 <value>今後Discord ボタンを表示しない</value>
713713 </data>
714+ <data name="tsmiShowCursor.Text" xml:space="preserve">
715+ <value>マウスカーソルを表示</value>
716+ </data>
717+ <data name="tsmiTrayShowCursor.Text" xml:space="preserve">
718+ <value>マウスカーソルを表示</value>
719+ </data>
714720 </root>
\ No newline at end of file
--- a/ShareX/Forms/QRCodeForm.ja-JP.resx
+++ b/ShareX/Forms/QRCodeForm.ja-JP.resx
@@ -1,4 +1,4 @@
1-<?xml version="1.0" encoding="utf-8"?>
1+<?xml version="1.0" encoding="utf-8"?>
22 <root>
33 <!--
44 Microsoft ResX Schema
@@ -141,4 +141,13 @@
141141 <data name="btnDecodeFromScreen.Text" xml:space="preserve">
142142 <value>スクリーンからデコード...</value>
143143 </data>
144+ <data name="tsmiDecode.Text" xml:space="preserve">
145+ <value>デコード</value>
146+ </data>
147+ <data name="tsmiUpload.Text" xml:space="preserve">
148+ <value>画像をアップロード</value>
149+ </data>
150+ <data name="cmsQR.Text" xml:space="preserve">
151+ <value>QR</value>
152+ </data>
144153 </root>
\ No newline at end of file
--- a/ShareX/Properties/Resources.ja-JP.resx
+++ b/ShareX/Properties/Resources.ja-JP.resx
@@ -305,14 +305,6 @@ ShareX を再起動しますか?</value>
305305 <data name="ScreenRecordForm_DownloaderForm_InstallRequested_FFmpeg_successfully_downloaded_" xml:space="preserve">
306306 <value>FFmpegのダウンロードが完了しました。</value>
307307 </data>
308- <data name="TaskHelpers_OpenImageEditor_Your_clipboard_contains_image" xml:space="preserve">
309- <value>クリップボードに画像があります。画像エディタで開きますか?
310-
311-「はい」でクリップボードから画像を開きます。「いいえ」で画像ファイル選択ダイアログを開きます。</value>
312- </data>
313- <data name="TaskHelpers_OpenImageEditor_Image_editor___How_to_load_image_" xml:space="preserve">
314- <value>画像エディタ - 画像の読み込みの確認</value>
315- </data>
316308 <data name="UploadManager_IsUploadConfirmed_Don_t_show_this_message_again_" xml:space="preserve">
317309 <value>このメッセージを再表示しない。</value>
318310 </data>
@@ -520,4 +512,10 @@ ShareX を再起動しますか?</value>
520512 <data name="ApplicationSettingsForm_cbStartWithWindows_Text" xml:space="preserve">
521513 <value>Windows開始時にShareXを起動する</value>
522514 </data>
515+ <data name="UploadManager_ShowShortenURLDialog_ShortenURL" xml:space="preserve">
516+ <value>短縮URLの作成</value>
517+ </data>
518+ <data name="UploadManager_ShowShortenURLDialog_Shorten" xml:space="preserve">
519+ <value>短縮</value>
520+ </data>
523521 </root>
\ No newline at end of file
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -1,5 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace>ShareX</RootNamespace>
1212 <AssemblyName>ShareX</AssemblyName>
13- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1414 <FileAlignment>512</FileAlignment>
1515 <ApplicationIcon>ShareX_Icon.ico</ApplicationIcon>
1616 <FileUpgradeFlags>
@@ -33,8 +33,6 @@
3333 <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
3434 <UseApplicationTrust>false</UseApplicationTrust>
3535 <BootstrapperEnabled>true</BootstrapperEnabled>
36- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
37- <RestorePackages>true</RestorePackages>
3836 </PropertyGroup>
3937 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4038 <DebugSymbols>true</DebugSymbols>
@@ -74,6 +72,7 @@
7472 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
7573 <ErrorReport>prompt</ErrorReport>
7674 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
75+ <Prefer32Bit>false</Prefer32Bit>
7776 </PropertyGroup>
7877 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStore|AnyCPU'">
7978 <OutputPath>bin\WindowsStore\</OutputPath>
@@ -83,7 +82,7 @@
8382 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
8483 <ErrorReport>prompt</ErrorReport>
8584 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
86- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
85+ <Prefer32Bit>false</Prefer32Bit>
8786 </PropertyGroup>
8887 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStoreDebug|AnyCPU'">
8988 <DebugSymbols>true</DebugSymbols>
@@ -94,16 +93,12 @@
9493 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
9594 <ErrorReport>prompt</ErrorReport>
9695 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
97- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
96+ <Prefer32Bit>false</Prefer32Bit>
9897 </PropertyGroup>
9998 <ItemGroup>
10099 <Reference Include="Microsoft.VisualBasic" />
101- <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
102- <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
103- </Reference>
104- <Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL">
105- <HintPath>..\packages\SevenZipSharp.0.64\lib\SevenZipSharp.dll</HintPath>
106- <Private>True</Private>
100+ <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
101+ <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
107102 </Reference>
108103 <Reference Include="System" />
109104 <Reference Include="System.Core">
@@ -135,10 +130,10 @@
135130 <Private>False</Private>
136131 </Reference>
137132 <Reference Include="zxing, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
138- <HintPath>..\packages\ZXing.Net.0.16.2\lib\net40\zxing.dll</HintPath>
133+ <HintPath>..\packages\ZXing.Net.0.16.2\lib\net461\zxing.dll</HintPath>
139134 </Reference>
140135 <Reference Include="zxing.presentation, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
141- <HintPath>..\packages\ZXing.Net.0.16.2\lib\net40\zxing.presentation.dll</HintPath>
136+ <HintPath>..\packages\ZXing.Net.0.16.2\lib\net461\zxing.presentation.dll</HintPath>
142137 </Reference>
143138 </ItemGroup>
144139 <ItemGroup>
@@ -171,6 +166,9 @@
171166 </Compile>
172167 <Compile Include="NewsItem.cs" />
173168 <Compile Include="NewsManager.cs" />
169+ <Compile Include="..\SharedAssemblyInfo.cs">
170+ <Link>Properties\SharedAssemblyInfo.cs</Link>
171+ </Compile>
174172 <Compile Include="SettingManager.cs" />
175173 <Compile Include="Forms\BeforeUploadForm.cs">
176174 <SubType>Form</SubType>
@@ -496,6 +494,9 @@
496494 <EmbeddedResource Include="Forms\ActionsToolbarEditForm.ja-JP.resx">
497495 <DependentUpon>ActionsToolbarEditForm.cs</DependentUpon>
498496 </EmbeddedResource>
497+ <EmbeddedResource Include="Forms\ActionsToolbarEditForm.ko-KR.resx">
498+ <DependentUpon>ActionsToolbarEditForm.cs</DependentUpon>
499+ </EmbeddedResource>
499500 <EmbeddedResource Include="Forms\ActionsToolbarEditForm.ru.resx">
500501 <DependentUpon>ActionsToolbarEditForm.cs</DependentUpon>
501502 </EmbeddedResource>
@@ -872,6 +873,9 @@
872873 <EmbeddedResource Include="Forms\FirstTimeConfigForm.ja-JP.resx">
873874 <DependentUpon>FirstTimeConfigForm.cs</DependentUpon>
874875 </EmbeddedResource>
876+ <EmbeddedResource Include="Forms\FirstTimeConfigForm.ko-KR.resx">
877+ <DependentUpon>FirstTimeConfigForm.cs</DependentUpon>
878+ </EmbeddedResource>
875879 <EmbeddedResource Include="Forms\FirstTimeConfigForm.nl-NL.resx">
876880 <DependentUpon>FirstTimeConfigForm.cs</DependentUpon>
877881 </EmbeddedResource>
@@ -1035,6 +1039,9 @@
10351039 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.ja-JP.resx">
10361040 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
10371041 </EmbeddedResource>
1042+ <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.ko-KR.resx">
1043+ <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
1044+ </EmbeddedResource>
10381045 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.pt-BR.resx">
10391046 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
10401047 </EmbeddedResource>
@@ -1065,6 +1072,9 @@
10651072 <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.ja-JP.resx">
10661073 <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
10671074 </EmbeddedResource>
1075+ <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.ko-KR.resx">
1076+ <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
1077+ </EmbeddedResource>
10681078 <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.pt-BR.resx">
10691079 <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
10701080 </EmbeddedResource>
@@ -1358,10 +1368,6 @@
13581368 <EmbeddedResource Include="Properties\Resources.zh-TW.resx" />
13591369 </ItemGroup>
13601370 <ItemGroup>
1361- <ProjectReference Include="..\Greenshot.ImageEditor\Greenshot.ImageEditor.csproj">
1362- <Project>{cd642bf4-d815-4d67-a0b5-c69f0b8231af}</Project>
1363- <Name>Greenshot.ImageEditor</Name>
1364- </ProjectReference>
13651371 <ProjectReference Include="..\ShareX.HistoryLib\ShareX.HistoryLib.csproj">
13661372 <Project>{E7DE6237-AEA2-498B-8F56-9B392472C490}</Project>
13671373 <Name>ShareX.HistoryLib</Name>
@@ -1410,25 +1416,6 @@
14101416 <None Include="Resources\image.png" />
14111417 <None Include="Resources\application-browser.png" />
14121418 <None Include="Resources\gear.png" />
1413- </ItemGroup>
1414- <ItemGroup>
1415- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
1416- <Visible>False</Visible>
1417- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
1418- <Install>false</Install>
1419- </BootstrapperPackage>
1420- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
1421- <Visible>False</Visible>
1422- <ProductName>.NET Framework 3.5 SP1</ProductName>
1423- <Install>true</Install>
1424- </BootstrapperPackage>
1425- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
1426- <Visible>False</Visible>
1427- <ProductName>Windows Installer 3.1</ProductName>
1428- <Install>true</Install>
1429- </BootstrapperPackage>
1430- </ItemGroup>
1431- <ItemGroup>
14321419 <None Include="Resources\application-task.png" />
14331420 <None Include="Resources\camcorder-image.png" />
14341421 <None Include="Resources\toolbox.png" />
@@ -1436,42 +1423,18 @@
14361423 <None Include="Resources\upload-cloud.png" />
14371424 <None Include="Resources\image-export.png" />
14381425 <None Include="Resources\folder-open-image.png" />
1439- </ItemGroup>
1440- <ItemGroup>
14411426 <None Include="Resources\layer-shape-curve.png" />
1442- </ItemGroup>
1443- <ItemGroup>
14441427 <None Include="Resources\layer-shape-polygon.png" />
1445- </ItemGroup>
1446- <ItemGroup>
14471428 <None Include="Resources\layer-shape.png" />
1448- </ItemGroup>
1449- <ItemGroup>
14501429 <None Include="Resources\monitor.png" />
1451- </ItemGroup>
1452- <ItemGroup>
14531430 <None Include="Resources\application-blue.png" />
1454- </ItemGroup>
1455- <ItemGroup>
14561431 <None Include="Resources\layer.png" />
1457- </ItemGroup>
1458- <ItemGroup>
14591432 <None Include="Resources\control-record.png" />
1460- </ItemGroup>
1461- <ItemGroup>
14621433 <None Include="Resources\checkbox_uncheck.png" />
14631434 <None Include="Resources\checkbox_check.png" />
14641435 <None Include="Resources\network-ip.png" />
14651436 <None Include="Resources\ruler-triangle.png" />
14661437 <None Include="Resources\application-network.png" />
1467- <None Include="..\Lib\7z-x64.dll">
1468- <Link>7z-x64.dll</Link>
1469- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1470- </None>
1471- <None Include="..\Lib\7z.dll">
1472- <Link>7z.dll</Link>
1473- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1474- </None>
14751438 <None Include="Resources\barcode-2d.png" />
14761439 <None Include="Resources\GitHub.png" />
14771440 <None Include="Resources\Twitter.ico" />
@@ -1567,8 +1530,8 @@
15671530 <None Include="Resources\it.png" />
15681531 <None Include="Resources\Discord_Button_01.png" />
15691532 <None Include="Resources\Discord_Button_02.png" />
1570- <Content Include="Resources\tw.png" />
1571- <Content Include="ShareX_Icon.ico" />
1533+ <None Include="Resources\tw.png" />
1534+ <None Include="ShareX_Icon.ico" />
15721535 <None Include="Resources\globe--pencil.png" />
15731536 <None Include="Resources\camcorder--pencil.png" />
15741537 <None Include="Resources\control-record-yellow.png" />
@@ -1578,6 +1541,7 @@
15781541 <None Include="Resources\color.png" />
15791542 <None Include="Resources\image-saturation.png" />
15801543 <None Include="Resources\pipette.png" />
1544+ <None Include="Resources\cursor.png" />
15811545 </ItemGroup>
15821546 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
15831547 <PropertyGroup>
@@ -1588,7 +1552,6 @@
15881552 <PreBuildEvent>
15891553 </PreBuildEvent>
15901554 </PropertyGroup>
1591- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
15921555 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
15931556 Other similar extension points exist, see Microsoft.Common.targets.
15941557 <Target Name="BeforeBuild">