• 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

Revision80dceeafc26a2236fd89007bc463dd3cf6567d66 (tree)
Zeit2017-11-28 08:28:58
Autornotme <notme@user...>
Commiternotme

Log Message

Japanese translation for ShareX 12.0.0

Ändern Zusammenfassung

Diff

--- a/ShareX.HelpersLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.HelpersLib/Properties/Resources.ja-JP.resx
@@ -163,7 +163,7 @@
163163 <value>OK</value>
164164 </data>
165165 <data name="AfterCaptureTasks_AnnotateImage" xml:space="preserve">
166- <value>画像の注釈編集</value>
166+ <value>画像エディタで開く</value>
167167 </data>
168168 <data name="AfterUploadTasks_OpenURL" xml:space="preserve">
169169 <value>URLを開く</value>
@@ -994,4 +994,121 @@
994994 <data name="DownloaderForm_ChangeProgress_Progress___0_" xml:space="preserve">
995995 <value>進行状況: {0}</value>
996996 </data>
997+ <data name="PNGBitDepth_Default" xml:space="preserve">
998+ <value>既定</value>
999+ </data>
1000+ <data name="PNGBitDepth_Automatic" xml:space="preserve">
1001+ <value>自動検出</value>
1002+ </data>
1003+ <data name="PNGBitDepth_Bit32" xml:space="preserve">
1004+ <value>32 bit</value>
1005+ </data>
1006+ <data name="PNGBitDepth_Bit24" xml:space="preserve">
1007+ <value>24 bit</value>
1008+ </data>
1009+ <data name="ShapeType_DrawingCursor" xml:space="preserve">
1010+ <value>描画: カーソル</value>
1011+ </data>
1012+ <data name="HotkeyType_ShortenURL" xml:space="preserve">
1013+ <value>短縮URLの作成</value>
1014+ </data>
1015+ <data name="HotkeyType_ShortenURL_Category" xml:space="preserve">
1016+ <value>アップロード</value>
1017+ </data>
1018+ <data name="HotkeyType_UploadText" xml:space="preserve">
1019+ <value>テキストのアップロード</value>
1020+ </data>
1021+ <data name="HotkeyType_UploadText_Category" xml:space="preserve">
1022+ <value>アップロード</value>
1023+ </data>
1024+ <data name="CustomUploaderDestinationType_URLSharingService" xml:space="preserve">
1025+ <value>URL共有サービス</value>
1026+ </data>
1027+ <data name="URLSharingServices_CustomURLSharingService" xml:space="preserve">
1028+ <value>独自のURL共有サービス</value>
1029+ </data>
1030+ <data name="LinearGradientMode_ForwardDiagonal" xml:space="preserve">
1031+ <value>右上がり対角線</value>
1032+ </data>
1033+ <data name="LinearGradientMode_BackwardDiagonal" xml:space="preserve">
1034+ <value>右下がり対角線</value>
1035+ </data>
1036+ <data name="LinearGradientMode_Horizontal" xml:space="preserve">
1037+ <value>水平方向</value>
1038+ </data>
1039+ <data name="LinearGradientMode_Vertical" xml:space="preserve">
1040+ <value>垂直方向</value>
1041+ </data>
1042+ <data name="PastebinExpiration_M10" xml:space="preserve">
1043+ <value>10分</value>
1044+ </data>
1045+ <data name="PastebinExpiration_H1" xml:space="preserve">
1046+ <value>1時間</value>
1047+ </data>
1048+ <data name="PastebinExpiration_D1" xml:space="preserve">
1049+ <value>1日</value>
1050+ </data>
1051+ <data name="PastebinExpiration_W1" xml:space="preserve">
1052+ <value>1週間</value>
1053+ </data>
1054+ <data name="PastebinExpiration_W2" xml:space="preserve">
1055+ <value>2週間</value>
1056+ </data>
1057+ <data name="PastebinExpiration_M1" xml:space="preserve">
1058+ <value>1ヶ月</value>
1059+ </data>
1060+ <data name="PastebinPrivacy_Public" xml:space="preserve">
1061+ <value>公開</value>
1062+ </data>
1063+ <data name="PastebinPrivacy_Private" xml:space="preserve">
1064+ <value>プライベート (メンバーのみ)</value>
1065+ </data>
1066+ <data name="PastebinPrivacy_Unlisted" xml:space="preserve">
1067+ <value>限定公開</value>
1068+ </data>
1069+ <data name="PastebinExpiration_N" xml:space="preserve">
1070+ <value>期限なし</value>
1071+ </data>
1072+ <data name="AmazonS3StorageClass_STANDARD_IA" xml:space="preserve">
1073+ <value>標準 – 低頻度アクセス ストレージ</value>
1074+ </data>
1075+ <data name="AmazonS3StorageClass_STANDARD" xml:space="preserve">
1076+ <value>標準ストレージ</value>
1077+ </data>
1078+ <data name="UpdateMessageBox_UpdateMessageBox_CurrentVersion" xml:space="preserve">
1079+ <value>現在のバージョン</value>
1080+ </data>
1081+ <data name="UpdateMessageBox_UpdateMessageBox_LatestVersion" xml:space="preserve">
1082+ <value>最新バージョン</value>
1083+ </data>
1084+ <data name="ImageEditorStartMode_Normal" xml:space="preserve">
1085+ <value>通常</value>
1086+ </data>
1087+ <data name="ImageEditorStartMode_Maximized" xml:space="preserve">
1088+ <value>最大化</value>
1089+ </data>
1090+ <data name="ImageEditorStartMode_PreviousState" xml:space="preserve">
1091+ <value>前回の状態</value>
1092+ </data>
1093+ <data name="ImageEditorStartMode_Fullscreen" xml:space="preserve">
1094+ <value>フルスクリーン</value>
1095+ </data>
1096+ <data name="ImgurThumbnailType_Big_Square" xml:space="preserve">
1097+ <value>大 (正方形) 160x160</value>
1098+ </data>
1099+ <data name="ImgurThumbnailType_Huge_Thumbnail" xml:space="preserve">
1100+ <value>特大 1024x1024</value>
1101+ </data>
1102+ <data name="ImgurThumbnailType_Large_Thumbnail" xml:space="preserve">
1103+ <value>大 640x640</value>
1104+ </data>
1105+ <data name="ImgurThumbnailType_Medium_Thumbnail" xml:space="preserve">
1106+ <value>中 320x320</value>
1107+ </data>
1108+ <data name="ImgurThumbnailType_Small_Square" xml:space="preserve">
1109+ <value>小 (正方形) 90x90</value>
1110+ </data>
1111+ <data name="ImgurThumbnailType_Small_Thumbnail" xml:space="preserve">
1112+ <value>小 160x160</value>
1113+ </data>
9971114 </root>
\ No newline at end of file
--- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
@@ -84,7 +84,7 @@
8484 </PropertyGroup>
8585 <ItemGroup>
8686 <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
87- <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
87+ <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
8888 </Reference>
8989 <Reference Include="System" />
9090 <Reference Include="System.Data" />
@@ -104,16 +104,31 @@
104104 <Compile Include="Controls\HotkeySelectionButton.cs">
105105 <SubType>Component</SubType>
106106 </Compile>
107+ <Compile Include="Controls\LabeledComboBox.cs">
108+ <SubType>UserControl</SubType>
109+ </Compile>
110+ <Compile Include="Controls\LabeledComboBox.Designer.cs">
111+ <DependentUpon>LabeledComboBox.cs</DependentUpon>
112+ </Compile>
107113 <Compile Include="Controls\ToolStripBorderRight.cs">
108114 <SubType>Component</SubType>
109115 </Compile>
116+ <Compile Include="Controls\ToolStripButtonCounter.cs">
117+ <SubType>Component</SubType>
118+ </Compile>
110119 <Compile Include="Controls\ToolStripButtonExtraImage.cs">
111120 <SubType>Component</SubType>
112121 </Compile>
113122 <Compile Include="Controls\ToolStripEx.cs">
114123 <SubType>Component</SubType>
115124 </Compile>
125+ <Compile Include="Controls\ToolStripLabeledComboBox.cs">
126+ <SubType>Component</SubType>
127+ </Compile>
116128 <Compile Include="Helpers\JsonHelpers.cs" />
129+ <Compile Include="Input\HotkeyForm.cs">
130+ <SubType>Form</SubType>
131+ </Compile>
117132 <Compile Include="Input\HotkeyInfo.cs" />
118133 <Compile Include="Input\KeyboardHook.cs" />
119134 <Compile Include="NameParser\CodeMenuEntryActions.cs" />
@@ -202,6 +217,7 @@
202217 <Compile Include="ListViewColumnSorter.cs" />
203218 <Compile Include="MimeTypes.cs" />
204219 <Compile Include="NameParser\CodeMenuEntryPixelInfo.cs" />
220+ <Compile Include="NameParser\CodeMenuItem.cs" />
205221 <Compile Include="Native\LayeredForm.cs">
206222 <SubType>Form</SubType>
207223 </Compile>
@@ -337,6 +353,8 @@
337353 <Compile Include="UITypeEditors\StringCollectionToStringTypeConverter.cs" />
338354 <Compile Include="UITypeEditors\WavFileNameEditor.cs" />
339355 <Compile Include="UnsafeBitmap.cs" />
356+ <Compile Include="UpdateChecker\AppVeyor.cs" />
357+ <Compile Include="UpdateChecker\AppVeyorUpdateChecker.cs" />
340358 <Compile Include="UpdateChecker\GitHubUpdateChecker.cs" />
341359 <Compile Include="UpdateChecker\UpdateChecker.cs" />
342360 <Compile Include="UpdateChecker\DownloaderForm.cs">
@@ -452,6 +470,9 @@
452470 <EmbeddedResource Include="Colors\ColorPickerForm.hu.resx">
453471 <DependentUpon>ColorPickerForm.cs</DependentUpon>
454472 </EmbeddedResource>
473+ <EmbeddedResource Include="Colors\ColorPickerForm.it-IT.resx">
474+ <DependentUpon>ColorPickerForm.cs</DependentUpon>
475+ </EmbeddedResource>
455476 <EmbeddedResource Include="Colors\ColorPickerForm.ja-JP.resx">
456477 <DependentUpon>ColorPickerForm.cs</DependentUpon>
457478 </EmbeddedResource>
@@ -494,6 +515,9 @@
494515 <EmbeddedResource Include="Colors\GradientPickerForm.hu.resx">
495516 <DependentUpon>GradientPickerForm.cs</DependentUpon>
496517 </EmbeddedResource>
518+ <EmbeddedResource Include="Colors\GradientPickerForm.it-IT.resx">
519+ <DependentUpon>GradientPickerForm.cs</DependentUpon>
520+ </EmbeddedResource>
497521 <EmbeddedResource Include="Colors\GradientPickerForm.ja-JP.resx">
498522 <DependentUpon>GradientPickerForm.cs</DependentUpon>
499523 </EmbeddedResource>
@@ -536,6 +560,9 @@
536560 <EmbeddedResource Include="Controls\ExportImportControl.hu.resx">
537561 <DependentUpon>ExportImportControl.cs</DependentUpon>
538562 </EmbeddedResource>
563+ <EmbeddedResource Include="Controls\ExportImportControl.it-IT.resx">
564+ <DependentUpon>ExportImportControl.cs</DependentUpon>
565+ </EmbeddedResource>
539566 <EmbeddedResource Include="Controls\ExportImportControl.ja-JP.resx">
540567 <DependentUpon>ExportImportControl.cs</DependentUpon>
541568 </EmbeddedResource>
@@ -566,6 +593,9 @@
566593 <EmbeddedResource Include="Controls\ExportImportControl.zh-TW.resx">
567594 <DependentUpon>ExportImportControl.cs</DependentUpon>
568595 </EmbeddedResource>
596+ <EmbeddedResource Include="Controls\LabeledComboBox.resx">
597+ <DependentUpon>LabeledComboBox.cs</DependentUpon>
598+ </EmbeddedResource>
569599 <EmbeddedResource Include="Controls\LabeledNumericUpDown.resx">
570600 <DependentUpon>LabeledNumericUpDown.cs</DependentUpon>
571601 </EmbeddedResource>
@@ -584,6 +614,9 @@
584614 <DependentUpon>MyPictureBox.cs</DependentUpon>
585615 <SubType>Designer</SubType>
586616 </EmbeddedResource>
617+ <EmbeddedResource Include="Controls\MyPictureBox.it-IT.resx">
618+ <DependentUpon>MyPictureBox.cs</DependentUpon>
619+ </EmbeddedResource>
587620 <EmbeddedResource Include="Controls\MyPictureBox.ja-JP.resx">
588621 <DependentUpon>MyPictureBox.cs</DependentUpon>
589622 </EmbeddedResource>
@@ -617,9 +650,6 @@
617650 <EmbeddedResource Include="Controls\MyPictureBox.zh-TW.resx">
618651 <DependentUpon>MyPictureBox.cs</DependentUpon>
619652 </EmbeddedResource>
620- <EmbeddedResource Include="Controls\ToolStripButtonColorAnimation.resx">
621- <DependentUpon>ToolStripButtonColorAnimation.cs</DependentUpon>
622- </EmbeddedResource>
623653 <EmbeddedResource Include="DNS\DNSChangerForm.de.resx">
624654 <DependentUpon>DNSChangerForm.cs</DependentUpon>
625655 </EmbeddedResource>
@@ -632,6 +662,9 @@
632662 <EmbeddedResource Include="DNS\DNSChangerForm.hu.resx">
633663 <DependentUpon>DNSChangerForm.cs</DependentUpon>
634664 </EmbeddedResource>
665+ <EmbeddedResource Include="DNS\DNSChangerForm.it-IT.resx">
666+ <DependentUpon>DNSChangerForm.cs</DependentUpon>
667+ </EmbeddedResource>
635668 <EmbeddedResource Include="DNS\DNSChangerForm.ja-JP.resx">
636669 <DependentUpon>DNSChangerForm.cs</DependentUpon>
637670 </EmbeddedResource>
@@ -674,6 +707,9 @@
674707 <EmbeddedResource Include="Forms\ClipboardContentViewer.hu.resx">
675708 <DependentUpon>ClipboardContentViewer.cs</DependentUpon>
676709 </EmbeddedResource>
710+ <EmbeddedResource Include="Forms\ClipboardContentViewer.it-IT.resx">
711+ <DependentUpon>ClipboardContentViewer.cs</DependentUpon>
712+ </EmbeddedResource>
677713 <EmbeddedResource Include="Forms\ClipboardContentViewer.ja-JP.resx">
678714 <DependentUpon>ClipboardContentViewer.cs</DependentUpon>
679715 </EmbeddedResource>
@@ -713,6 +749,9 @@
713749 <EmbeddedResource Include="Forms\DebugForm.hu.resx">
714750 <DependentUpon>DebugForm.cs</DependentUpon>
715751 </EmbeddedResource>
752+ <EmbeddedResource Include="Forms\DebugForm.it-IT.resx">
753+ <DependentUpon>DebugForm.cs</DependentUpon>
754+ </EmbeddedResource>
716755 <EmbeddedResource Include="Forms\DebugForm.ja-JP.resx">
717756 <DependentUpon>DebugForm.cs</DependentUpon>
718757 </EmbeddedResource>
@@ -758,6 +797,9 @@
758797 <EmbeddedResource Include="Forms\ErrorForm.hu.resx">
759798 <DependentUpon>ErrorForm.cs</DependentUpon>
760799 </EmbeddedResource>
800+ <EmbeddedResource Include="Forms\ErrorForm.it-IT.resx">
801+ <DependentUpon>ErrorForm.cs</DependentUpon>
802+ </EmbeddedResource>
761803 <EmbeddedResource Include="Forms\ErrorForm.ja-JP.resx">
762804 <DependentUpon>ErrorForm.cs</DependentUpon>
763805 </EmbeddedResource>
@@ -800,6 +842,9 @@
800842 <EmbeddedResource Include="Forms\HashCheckForm.hu.resx">
801843 <DependentUpon>HashCheckForm.cs</DependentUpon>
802844 </EmbeddedResource>
845+ <EmbeddedResource Include="Forms\HashCheckForm.it-IT.resx">
846+ <DependentUpon>HashCheckForm.cs</DependentUpon>
847+ </EmbeddedResource>
803848 <EmbeddedResource Include="Forms\HashCheckForm.ja-JP.resx">
804849 <DependentUpon>HashCheckForm.cs</DependentUpon>
805850 </EmbeddedResource>
@@ -842,6 +887,9 @@
842887 <EmbeddedResource Include="Forms\InputBox.hu.resx">
843888 <DependentUpon>InputBox.cs</DependentUpon>
844889 </EmbeddedResource>
890+ <EmbeddedResource Include="Forms\InputBox.it-IT.resx">
891+ <DependentUpon>InputBox.cs</DependentUpon>
892+ </EmbeddedResource>
845893 <EmbeddedResource Include="Forms\InputBox.ja-JP.resx">
846894 <DependentUpon>InputBox.cs</DependentUpon>
847895 </EmbeddedResource>
@@ -884,6 +932,9 @@
884932 <EmbeddedResource Include="Forms\MonitorTestForm.hu.resx">
885933 <DependentUpon>MonitorTestForm.cs</DependentUpon>
886934 </EmbeddedResource>
935+ <EmbeddedResource Include="Forms\MonitorTestForm.it-IT.resx">
936+ <DependentUpon>MonitorTestForm.cs</DependentUpon>
937+ </EmbeddedResource>
887938 <EmbeddedResource Include="Forms\MonitorTestForm.ja-JP.resx">
888939 <DependentUpon>MonitorTestForm.cs</DependentUpon>
889940 </EmbeddedResource>
@@ -938,6 +989,9 @@
938989 <EmbeddedResource Include="Printer\PrintForm.hu.resx">
939990 <DependentUpon>PrintForm.cs</DependentUpon>
940991 </EmbeddedResource>
992+ <EmbeddedResource Include="Printer\PrintForm.it-IT.resx">
993+ <DependentUpon>PrintForm.cs</DependentUpon>
994+ </EmbeddedResource>
941995 <EmbeddedResource Include="Printer\PrintForm.ja-JP.resx">
942996 <DependentUpon>PrintForm.cs</DependentUpon>
943997 </EmbeddedResource>
@@ -977,6 +1031,9 @@
9771031 <EmbeddedResource Include="Printer\PrintTextForm.hu.resx">
9781032 <DependentUpon>PrintTextForm.cs</DependentUpon>
9791033 </EmbeddedResource>
1034+ <EmbeddedResource Include="Printer\PrintTextForm.it-IT.resx">
1035+ <DependentUpon>PrintTextForm.cs</DependentUpon>
1036+ </EmbeddedResource>
9801037 <EmbeddedResource Include="Printer\PrintTextForm.ja-JP.resx">
9811038 <DependentUpon>PrintTextForm.cs</DependentUpon>
9821039 </EmbeddedResource>
@@ -1008,6 +1065,7 @@
10081065 <EmbeddedResource Include="Properties\Resources.es.resx" />
10091066 <EmbeddedResource Include="Properties\Resources.fr.resx" />
10101067 <EmbeddedResource Include="Properties\Resources.hu.resx" />
1068+ <EmbeddedResource Include="Properties\Resources.it-IT.resx" />
10111069 <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />
10121070 <EmbeddedResource Include="Properties\Resources.ko-KR.resx" />
10131071 <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
@@ -1032,6 +1090,9 @@
10321090 <DependentUpon>DownloaderForm.cs</DependentUpon>
10331091 <SubType>Designer</SubType>
10341092 </EmbeddedResource>
1093+ <EmbeddedResource Include="UpdateChecker\DownloaderForm.it-IT.resx">
1094+ <DependentUpon>DownloaderForm.cs</DependentUpon>
1095+ </EmbeddedResource>
10351096 <EmbeddedResource Include="UpdateChecker\DownloaderForm.ja-JP.resx">
10361097 <DependentUpon>DownloaderForm.cs</DependentUpon>
10371098 </EmbeddedResource>
@@ -1092,6 +1153,9 @@
10921153 <EmbeddedResource Include="UpdateChecker\UpdateCheckerLabel.hu.resx">
10931154 <DependentUpon>UpdateCheckerLabel.cs</DependentUpon>
10941155 </EmbeddedResource>
1156+ <EmbeddedResource Include="UpdateChecker\UpdateCheckerLabel.it-IT.resx">
1157+ <DependentUpon>UpdateCheckerLabel.cs</DependentUpon>
1158+ </EmbeddedResource>
10951159 <EmbeddedResource Include="UpdateChecker\UpdateCheckerLabel.ja-JP.resx">
10961160 <DependentUpon>UpdateCheckerLabel.cs</DependentUpon>
10971161 </EmbeddedResource>
@@ -1139,6 +1203,9 @@
11391203 <EmbeddedResource Include="UpdateChecker\UpdateMessageBox.hu.resx">
11401204 <DependentUpon>UpdateMessageBox.cs</DependentUpon>
11411205 </EmbeddedResource>
1206+ <EmbeddedResource Include="UpdateChecker\UpdateMessageBox.it-IT.resx">
1207+ <DependentUpon>UpdateMessageBox.cs</DependentUpon>
1208+ </EmbeddedResource>
11421209 <EmbeddedResource Include="UpdateChecker\UpdateMessageBox.ja-JP.resx">
11431210 <DependentUpon>UpdateMessageBox.cs</DependentUpon>
11441211 </EmbeddedResource>
@@ -1172,7 +1239,6 @@
11721239 </ItemGroup>
11731240 <ItemGroup>
11741241 <None Include="packages.config" />
1175- <None Include="Resources\Icon.png" />
11761242 </ItemGroup>
11771243 <ItemGroup>
11781244 <COMReference Include="IWshRuntimeLibrary">
--- a/ShareX.HistoryLib/ShareX.HistoryLib.csproj
+++ b/ShareX.HistoryLib/ShareX.HistoryLib.csproj
@@ -138,6 +138,9 @@
138138 <EmbeddedResource Include="HistoryForm.hu.resx">
139139 <DependentUpon>HistoryForm.cs</DependentUpon>
140140 </EmbeddedResource>
141+ <EmbeddedResource Include="HistoryForm.it-IT.resx">
142+ <DependentUpon>HistoryForm.cs</DependentUpon>
143+ </EmbeddedResource>
141144 <EmbeddedResource Include="HistoryForm.ja-JP.resx">
142145 <DependentUpon>HistoryForm.cs</DependentUpon>
143146 </EmbeddedResource>
@@ -180,6 +183,9 @@
180183 <EmbeddedResource Include="HistoryItemInfoForm.hu.resx">
181184 <DependentUpon>HistoryItemInfoForm.cs</DependentUpon>
182185 </EmbeddedResource>
186+ <EmbeddedResource Include="HistoryItemInfoForm.it-IT.resx">
187+ <DependentUpon>HistoryItemInfoForm.cs</DependentUpon>
188+ </EmbeddedResource>
183189 <EmbeddedResource Include="HistoryItemInfoForm.ja-JP.resx">
184190 <DependentUpon>HistoryItemInfoForm.cs</DependentUpon>
185191 </EmbeddedResource>
@@ -222,6 +228,9 @@
222228 <EmbeddedResource Include="ImageHistoryForm.hu.resx">
223229 <DependentUpon>ImageHistoryForm.cs</DependentUpon>
224230 </EmbeddedResource>
231+ <EmbeddedResource Include="ImageHistoryForm.it-IT.resx">
232+ <DependentUpon>ImageHistoryForm.cs</DependentUpon>
233+ </EmbeddedResource>
225234 <EmbeddedResource Include="ImageHistoryForm.ja-JP.resx">
226235 <DependentUpon>ImageHistoryForm.cs</DependentUpon>
227236 </EmbeddedResource>
@@ -256,6 +265,7 @@
256265 <EmbeddedResource Include="Properties\Resources.es.resx" />
257266 <EmbeddedResource Include="Properties\Resources.fr.resx" />
258267 <EmbeddedResource Include="Properties\Resources.hu.resx" />
268+ <EmbeddedResource Include="Properties\Resources.it-IT.resx" />
259269 <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />
260270 <EmbeddedResource Include="Properties\Resources.ko-KR.resx" />
261271 <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
--- a/ShareX.ImageEffectsLib/ImageEffectsForm.ja-JP.resx
+++ b/ShareX.ImageEffectsLib/ImageEffectsForm.ja-JP.resx
@@ -117,15 +117,9 @@
117117 <resheader name="writer">
118118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119 </resheader>
120- <data name="btnCancel.Text" xml:space="preserve">
121- <value>キャンセル</value>
122- </data>
123120 <data name="btnAdd.Text" xml:space="preserve">
124121 <value>追加</value>
125122 </data>
126- <data name="btnOK.Text" xml:space="preserve">
127- <value>OK</value>
128- </data>
129123 <data name="btnRemove.Text" xml:space="preserve">
130124 <value>削除</value>
131125 </data>
@@ -153,4 +147,16 @@
153147 <data name="tsmiLoadImageFromFile.Text" xml:space="preserve">
154148 <value>ファイルから...</value>
155149 </data>
150+ <data name="btnClose.Text" xml:space="preserve">
151+ <value>閉じる</value>
152+ </data>
153+ <data name="lblPresetName.Text" xml:space="preserve">
154+ <value>名前:</value>
155+ </data>
156+ <data name="btnAddPreset.Text" xml:space="preserve">
157+ <value>新規プリセット</value>
158+ </data>
159+ <data name="btnRemovePreset.Text" xml:space="preserve">
160+ <value>プリセット削除</value>
161+ </data>
156162 </root>
\ No newline at end of file
--- a/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
+++ b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
@@ -91,6 +91,9 @@
9191 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
9292 </PropertyGroup>
9393 <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>
96+ </Reference>
9497 <Reference Include="System" />
9598 <Reference Include="System.Design" />
9699 <Reference Include="System.Drawing" />
@@ -115,7 +118,6 @@
115118 <Compile Include="Filters\Pixelate.cs" />
116119 <Compile Include="Filters\Sharpen.cs" />
117120 <Compile Include="Filters\Smooth.cs" />
118- <Compile Include="ImageEffectManager.cs" />
119121 <Compile Include="Adjustments\Brightness.cs" />
120122 <Compile Include="Adjustments\Colorize.cs" />
121123 <Compile Include="Adjustments\Contrast.cs" />
@@ -124,6 +126,7 @@
124126 <Compile Include="Adjustments\Hue.cs" />
125127 <Compile Include="Adjustments\Inverse.cs" />
126128 <Compile Include="Adjustments\Saturation.cs" />
129+ <Compile Include="ImageEffectPreset.cs" />
127130 <Compile Include="Manipulations\Crop.cs" />
128131 <Compile Include="Manipulations\RoundedCorners.cs" />
129132 <Compile Include="Manipulations\Skew.cs" />
@@ -195,6 +198,9 @@
195198 <EmbeddedResource Include="ImageEffectsForm.hu.resx">
196199 <DependentUpon>ImageEffectsForm.cs</DependentUpon>
197200 </EmbeddedResource>
201+ <EmbeddedResource Include="ImageEffectsForm.it-IT.resx">
202+ <DependentUpon>ImageEffectsForm.cs</DependentUpon>
203+ </EmbeddedResource>
198204 <EmbeddedResource Include="ImageEffectsForm.ja-JP.resx">
199205 <DependentUpon>ImageEffectsForm.cs</DependentUpon>
200206 </EmbeddedResource>
@@ -229,6 +235,7 @@
229235 <EmbeddedResource Include="Properties\Resources.es.resx" />
230236 <EmbeddedResource Include="Properties\Resources.fr.resx" />
231237 <EmbeddedResource Include="Properties\Resources.hu.resx" />
238+ <EmbeddedResource Include="Properties\Resources.it-IT.resx" />
232239 <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />
233240 <EmbeddedResource Include="Properties\Resources.ko-KR.resx" />
234241 <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
@@ -243,6 +250,9 @@
243250 <EmbeddedResource Include="Properties\Resources.zh-CN.resx" />
244251 <EmbeddedResource Include="Properties\Resources.zh-TW.resx" />
245252 </ItemGroup>
253+ <ItemGroup>
254+ <None Include="packages.config" />
255+ </ItemGroup>
246256 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
247257 <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
248258 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--- /dev/null
+++ b/ShareX.MediaLib/Forms/ImageCombinerForm.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="btnAdd.Text" xml:space="preserve">
121+ <value>追加...</value>
122+ </data>
123+ <data name="btnRemove.Text" xml:space="preserve">
124+ <value>削除</value>
125+ </data>
126+ <data name="btnMoveUp.Text" xml:space="preserve">
127+ <value>一つ上に</value>
128+ </data>
129+ <data name="btnMoveDown.Text" xml:space="preserve">
130+ <value>一つ下に</value>
131+ </data>
132+ <data name="chFilepath.Text" xml:space="preserve">
133+ <value>画像ファイルの場所</value>
134+ </data>
135+ <data name="lblOrientation.Text" xml:space="preserve">
136+ <value>結合方向:</value>
137+ </data>
138+ <data name="lblSpacePixel.Text" xml:space="preserve">
139+ <value>ピクセル</value>
140+ </data>
141+ <data name="$this.Text" xml:space="preserve">
142+ <value>ShareX - 画像の結合</value>
143+ </data>
144+ <data name="lblSpace.Text" xml:space="preserve">
145+ <value>画像の間隔:</value>
146+ </data>
147+ <data name="btnCombine.Text" xml:space="preserve">
148+ <value>画像を結合し、キャプチャー後の設定にしたがい、アップロード/保存を実行する</value>
149+ </data>
150+</root>
\ No newline at end of file
--- /dev/null
+++ b/ShareX.MediaLib/Forms/ImageThumbnailerForm.ja-JP.resx
@@ -0,0 +1,144 @@
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="btnRemove.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="lblHeight.Text" xml:space="preserve">
127+ <value>高さ:</value>
128+ </data>
129+ <data name="lblOutputFilename.Text" xml:space="preserve">
130+ <value>出力ファイル名:</value>
131+ </data>
132+ <data name="btnGenerate.Text" xml:space="preserve">
133+ <value>サムネイルを作成する</value>
134+ </data>
135+ <data name="lblOutputFolder.Text" xml:space="preserve">
136+ <value>出力フォルダー:</value>
137+ </data>
138+ <data name="btnAdd.Text" xml:space="preserve">
139+ <value>追加...</value>
140+ </data>
141+ <data name="$this.Text" xml:space="preserve">
142+ <value>ShareX - 画像サムネイル作成</value>
143+ </data>
144+</root>
\ No newline at end of file
--- a/ShareX.MediaLib/ShareX.MediaLib.csproj
+++ b/ShareX.MediaLib/ShareX.MediaLib.csproj
@@ -79,12 +79,25 @@
7979 <Compile Include="Enums.cs" />
8080 <Compile Include="FFmpegCLIManager.cs" />
8181 <Compile Include="FFmpegDownloader.cs" />
82+ <Compile Include="Forms\ImageCombinerForm.cs">
83+ <SubType>Form</SubType>
84+ </Compile>
85+ <Compile Include="Forms\ImageCombinerForm.Designer.cs">
86+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
87+ </Compile>
88+ <Compile Include="Forms\ImageThumbnailerForm.cs">
89+ <SubType>Form</SubType>
90+ </Compile>
91+ <Compile Include="Forms\ImageThumbnailerForm.Designer.cs">
92+ <DependentUpon>ImageThumbnailerForm.cs</DependentUpon>
93+ </Compile>
8294 <Compile Include="Forms\VideoThumbnailerForm.cs">
8395 <SubType>Form</SubType>
8496 </Compile>
8597 <Compile Include="Forms\VideoThumbnailerForm.Designer.cs">
8698 <DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
8799 </Compile>
100+ <Compile Include="ImageCombinerOptions.cs" />
88101 <Compile Include="Properties\Resources.Designer.cs">
89102 <AutoGen>True</AutoGen>
90103 <DesignTime>True</DesignTime>
@@ -103,12 +116,63 @@
103116 </ProjectReference>
104117 </ItemGroup>
105118 <ItemGroup>
119+ <EmbeddedResource Include="Forms\ImageCombinerForm.de.resx">
120+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
121+ </EmbeddedResource>
122+ <EmbeddedResource Include="Forms\ImageCombinerForm.fr.resx">
123+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
124+ </EmbeddedResource>
125+ <EmbeddedResource Include="Forms\ImageCombinerForm.it-IT.resx">
126+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
127+ </EmbeddedResource>
128+ <EmbeddedResource Include="Forms\ImageCombinerForm.ja-JP.resx">
129+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
130+ </EmbeddedResource>
131+ <EmbeddedResource Include="Forms\ImageCombinerForm.nl-NL.resx">
132+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
133+ </EmbeddedResource>
134+ <EmbeddedResource Include="Forms\ImageCombinerForm.pt-BR.resx">
135+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
136+ </EmbeddedResource>
137+ <EmbeddedResource Include="Forms\ImageCombinerForm.resx">
138+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
139+ </EmbeddedResource>
140+ <EmbeddedResource Include="Forms\ImageCombinerForm.ru.resx">
141+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
142+ </EmbeddedResource>
143+ <EmbeddedResource Include="Forms\ImageCombinerForm.tr.resx">
144+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
145+ </EmbeddedResource>
146+ <EmbeddedResource Include="Forms\ImageCombinerForm.vi-VN.resx">
147+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
148+ </EmbeddedResource>
149+ <EmbeddedResource Include="Forms\ImageCombinerForm.zh-CN.resx">
150+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
151+ </EmbeddedResource>
152+ <EmbeddedResource Include="Forms\ImageCombinerForm.zh-TW.resx">
153+ <DependentUpon>ImageCombinerForm.cs</DependentUpon>
154+ </EmbeddedResource>
155+ <EmbeddedResource Include="Forms\ImageThumbnailerForm.fr.resx">
156+ <DependentUpon>ImageThumbnailerForm.cs</DependentUpon>
157+ </EmbeddedResource>
158+ <EmbeddedResource Include="Forms\ImageThumbnailerForm.ja-JP.resx">
159+ <DependentUpon>ImageThumbnailerForm.cs</DependentUpon>
160+ </EmbeddedResource>
161+ <EmbeddedResource Include="Forms\ImageThumbnailerForm.resx">
162+ <DependentUpon>ImageThumbnailerForm.cs</DependentUpon>
163+ </EmbeddedResource>
164+ <EmbeddedResource Include="Forms\ImageThumbnailerForm.ru.resx">
165+ <DependentUpon>ImageThumbnailerForm.cs</DependentUpon>
166+ </EmbeddedResource>
106167 <EmbeddedResource Include="Forms\VideoThumbnailerForm.de.resx">
107168 <DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
108169 </EmbeddedResource>
109170 <EmbeddedResource Include="Forms\VideoThumbnailerForm.fr.resx">
110171 <DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
111172 </EmbeddedResource>
173+ <EmbeddedResource Include="Forms\VideoThumbnailerForm.it-IT.resx">
174+ <DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
175+ </EmbeddedResource>
112176 <EmbeddedResource Include="Forms\VideoThumbnailerForm.ja-JP.resx">
113177 <DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
114178 </EmbeddedResource>
@@ -138,6 +202,7 @@
138202 </EmbeddedResource>
139203 <EmbeddedResource Include="Properties\Resources.de.resx" />
140204 <EmbeddedResource Include="Properties\Resources.fr.resx" />
205+ <EmbeddedResource Include="Properties\Resources.it-IT.resx" />
141206 <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />
142207 <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
143208 <EmbeddedResource Include="Properties\Resources.pt-BR.resx" />
--- /dev/null
+++ b/ShareX.ScreenCaptureLib/Forms/CanvasSizeForm.ja-JP.resx
@@ -0,0 +1,141 @@
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="lblLeft.Text" xml:space="preserve">
121+ <value>左:</value>
122+ </data>
123+ <data name="lblRight.Text" xml:space="preserve">
124+ <value>右:</value>
125+ </data>
126+ <data name="lblTop.Text" xml:space="preserve">
127+ <value>上:</value>
128+ </data>
129+ <data name="lblBottom.Text" xml:space="preserve">
130+ <value>下:</value>
131+ </data>
132+ <data name="btnCancel.Text" xml:space="preserve">
133+ <value>キャンセル</value>
134+ </data>
135+ <data name="$this.Text" xml:space="preserve">
136+ <value>ShareX - キャンバスの大きさ</value>
137+ </data>
138+ <data name="btnOK.Text" xml:space="preserve">
139+ <value>OK</value>
140+ </data>
141+</root>
\ No newline at end of file
--- /dev/null
+++ b/ShareX.ScreenCaptureLib/Forms/ImageSizeForm.ja-JP.resx
@@ -0,0 +1,144 @@
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="lblWidth.Text" xml:space="preserve">
121+ <value>幅:</value>
122+ </data>
123+ <data name="lblHeight.Text" xml:space="preserve">
124+ <value>高さ:</value>
125+ </data>
126+ <data name="btnCancel.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="btnOK.Text" xml:space="preserve">
133+ <value>OK</value>
134+ </data>
135+ <data name="cbAspectRatio.Text" xml:space="preserve">
136+ <value>アスペクト比を保つ</value>
137+ </data>
138+ <data name="lblWidthPixels.Text" xml:space="preserve">
139+ <value>ピクセル</value>
140+ </data>
141+ <data name="lblHeightPixels.Text" xml:space="preserve">
142+ <value>ピクセル</value>
143+ </data>
144+</root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.ja-JP.resx
@@ -425,4 +425,52 @@
425425 <data name="ShapeManager_CreateToolbar_RunAfterCaptureTasks" xml:space="preserve">
426426 <value>キャプチャー後のタスクを実行</value>
427427 </data>
428+ <data name="ShapeManager_CreateToolbar_AnnotateMenu" xml:space="preserve">
429+ <value>注釈メニュー</value>
430+ </data>
431+ <data name="ShapeManager_CreateToolbar_Image" xml:space="preserve">
432+ <value>画像</value>
433+ </data>
434+ <data name="ShapeManager_CreateToolbar_ImageSize" xml:space="preserve">
435+ <value>画像の大きさ...</value>
436+ </data>
437+ <data name="ShapeManager_CreateToolbar_CanvasSize" xml:space="preserve">
438+ <value>キャンバスの大きさ...</value>
439+ </data>
440+ <data name="ShapeManager_CreateToolbar_Rotate90Clockwise" xml:space="preserve">
441+ <value>右に90° 回転</value>
442+ </data>
443+ <data name="ShapeManager_CreateToolbar_Rotate90CounterClockwise" xml:space="preserve">
444+ <value>左に90° 回転</value>
445+ </data>
446+ <data name="ShapeManager_CreateToolbar_Rotate180" xml:space="preserve">
447+ <value>180° 回転</value>
448+ </data>
449+ <data name="ShapeManager_CreateToolbar_FlipHorizontal" xml:space="preserve">
450+ <value>左右反転</value>
451+ </data>
452+ <data name="ShapeManager_CreateToolbar_FlipVertical" xml:space="preserve">
453+ <value>上下反転</value>
454+ </data>
455+ <data name="ShapeManager_ArrowsOnBothEnds" xml:space="preserve">
456+ <value>両端に矢印</value>
457+ </data>
458+ <data name="ShapeManager_CursorType" xml:space="preserve">
459+ <value>カーソルの種類:</value>
460+ </data>
461+ <data name="RegionCaptureForm_InitializeComponent_ImageEditor" xml:space="preserve">
462+ <value>画像エディター</value>
463+ </data>
464+ <data name="ShapeManager_CenterPoints" xml:space="preserve">
465+ <value>中間点:</value>
466+ </data>
467+ <data name="ShapeManager_CreateToolbar_EditorBackgroundColor" xml:space="preserve">
468+ <value>エディターの背景色...</value>
469+ </data>
470+ <data name="ShapeManager_CreateToolbar_EditorStartMode" xml:space="preserve">
471+ <value>エディターの起動モード:</value>
472+ </data>
473+ <data name="RegionCaptureForm_TipYouCanPanImageByHoldingMouseMiddleButtonAndDragging" xml:space="preserve">
474+ <value>ヒント: 表示領域の移動はマウス中ボタンを押したままドラッグ</value>
475+ </data>
428476 </root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
@@ -81,6 +81,18 @@
8181 <Compile Include="Animations\BaseAnimation.cs" />
8282 <Compile Include="Animations\PointAnimation.cs" />
8383 <Compile Include="Animations\RectangleAnimation.cs" />
84+ <Compile Include="Forms\CanvasSizeForm.cs">
85+ <SubType>Form</SubType>
86+ </Compile>
87+ <Compile Include="Forms\CanvasSizeForm.Designer.cs">
88+ <DependentUpon>CanvasSizeForm.cs</DependentUpon>
89+ </Compile>
90+ <Compile Include="Forms\ImageSizeForm.cs">
91+ <SubType>Form</SubType>
92+ </Compile>
93+ <Compile Include="Forms\ImageSizeForm.Designer.cs">
94+ <DependentUpon>ImageSizeForm.cs</DependentUpon>
95+ </Compile>
8496 <Compile Include="Shapes\AnnotationOptions.cs" />
8597 <Compile Include="Enums.cs" />
8698 <Compile Include="Forms\RegionCaptureSimpleAnnotateForm.cs">
@@ -114,6 +126,7 @@
114126 <Compile Include="Shapes\BaseShape.cs" />
115127 <Compile Include="Shapes\Drawing\ArrowDrawingShape.cs" />
116128 <Compile Include="Shapes\Drawing\CropDrawingShape.cs" />
129+ <Compile Include="Shapes\Drawing\CursorDrawingShape.cs" />
117130 <Compile Include="Shapes\Drawing\ImageScreenDrawingShape.cs" />
118131 <Compile Include="Shapes\Drawing\SpeechBalloonDrawingShape.cs" />
119132 <Compile Include="Shapes\Drawing\BaseDrawingShape.cs" />
@@ -189,6 +202,12 @@
189202 </ProjectReference>
190203 </ItemGroup>
191204 <ItemGroup>
205+ <None Include="Resources\image-resize.png" />
206+ <None Include="Resources\layer-flip.png" />
207+ <None Include="Resources\layer-flip-vertical.png" />
208+ <None Include="Resources\image--pencil.png" />
209+ <None Include="Resources\image-resize-actual.png" />
210+ <None Include="Resources\cursor.png" />
192211 <None Include="Resources\monitor-image.png" />
193212 <None Include="Resources\folder-open-image.png" />
194213 <None Include="Resources\image-crop.png" />
@@ -246,16 +265,44 @@
246265 <None Include="Resources\camera.png" />
247266 <None Include="Resources\control.png" />
248267 <None Include="Resources\cross.png" />
268+ <None Include="Resources\CircleNode.png" />
269+ <None Include="Resources\arrow-circle-135-left.png" />
270+ <None Include="Resources\arrow-circle.png" />
271+ <None Include="Resources\arrow-circle-double.png" />
249272 <Content Include="Resources\Crosshair.cur" />
250273 <None Include="Resources\exclamation-button.png" />
251274 </ItemGroup>
252275 <ItemGroup>
276+ <EmbeddedResource Include="Forms\CanvasSizeForm.ja-JP.resx">
277+ <DependentUpon>CanvasSizeForm.cs</DependentUpon>
278+ </EmbeddedResource>
279+ <EmbeddedResource Include="Forms\CanvasSizeForm.resx">
280+ <DependentUpon>CanvasSizeForm.cs</DependentUpon>
281+ </EmbeddedResource>
282+ <EmbeddedResource Include="Forms\CanvasSizeForm.ru.resx">
283+ <DependentUpon>CanvasSizeForm.cs</DependentUpon>
284+ </EmbeddedResource>
285+ <EmbeddedResource Include="Forms\FFmpegOptionsForm.it-IT.resx">
286+ <DependentUpon>FFmpegOptionsForm.cs</DependentUpon>
287+ </EmbeddedResource>
288+ <EmbeddedResource Include="Forms\ImageSizeForm.ja-JP.resx">
289+ <DependentUpon>ImageSizeForm.cs</DependentUpon>
290+ </EmbeddedResource>
291+ <EmbeddedResource Include="Forms\ImageSizeForm.resx">
292+ <DependentUpon>ImageSizeForm.cs</DependentUpon>
293+ </EmbeddedResource>
294+ <EmbeddedResource Include="Forms\ImageSizeForm.ru.resx">
295+ <DependentUpon>ImageSizeForm.cs</DependentUpon>
296+ </EmbeddedResource>
253297 <EmbeddedResource Include="Forms\ScrollingCaptureForm.de.resx">
254298 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
255299 </EmbeddedResource>
256300 <EmbeddedResource Include="Forms\ScrollingCaptureForm.fr.resx">
257301 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
258302 </EmbeddedResource>
303+ <EmbeddedResource Include="Forms\ScrollingCaptureForm.it-IT.resx">
304+ <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
305+ </EmbeddedResource>
259306 <EmbeddedResource Include="Forms\ScrollingCaptureForm.ja-JP.resx">
260307 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
261308 </EmbeddedResource>
@@ -286,6 +333,9 @@
286333 <EmbeddedResource Include="Forms\TextDrawingInputBox.fr.resx">
287334 <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
288335 </EmbeddedResource>
336+ <EmbeddedResource Include="Forms\TextDrawingInputBox.it-IT.resx">
337+ <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
338+ </EmbeddedResource>
289339 <EmbeddedResource Include="Forms\TextDrawingInputBox.ja-JP.resx">
290340 <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
291341 </EmbeddedResource>
@@ -310,6 +360,9 @@
310360 <EmbeddedResource Include="Forms\WebpageCaptureForm.fr.resx">
311361 <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
312362 </EmbeddedResource>
363+ <EmbeddedResource Include="Forms\WebpageCaptureForm.it-IT.resx">
364+ <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
365+ </EmbeddedResource>
313366 <EmbeddedResource Include="Forms\WebpageCaptureForm.ja-JP.resx">
314367 <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
315368 </EmbeddedResource>
@@ -349,6 +402,7 @@
349402 <EmbeddedResource Include="Properties\Resources.hu.resx">
350403 <SubType>Designer</SubType>
351404 </EmbeddedResource>
405+ <EmbeddedResource Include="Properties\Resources.it-IT.resx" />
352406 <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />
353407 <EmbeddedResource Include="Properties\Resources.ko-KR.resx">
354408 <SubType>Designer</SubType>
--- a/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx
+++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx
@@ -192,9 +192,6 @@
192192 <data name="lblLocalhostrPassword.Text" xml:space="preserve">
193193 <value>パスワード:</value>
194194 </data>
195- <data name="lblMinusPassword.Text" xml:space="preserve">
196- <value>パスワード:</value>
197- </data>
198195 <data name="lblImageShackPassword.Text" xml:space="preserve">
199196 <value>パスワード:</value>
200197 </data>
@@ -225,9 +222,6 @@
225222 <data name="lblImageShackUsername.Text" xml:space="preserve">
226223 <value>ユーザー名:</value>
227224 </data>
228- <data name="lblMinusUsername.Text" xml:space="preserve">
229- <value>ユーザー名:</value>
230- </data>
231225 <data name="lblSendSpaceUsername.Text" xml:space="preserve">
232226 <value>ユーザー名:</value>
233227 </data>
@@ -252,24 +246,15 @@
252246 <data name="lblMegaStatusTitle.Text" xml:space="preserve">
253247 <value>状態:</value>
254248 </data>
255- <data name="btnFlickrOpenAuthorize.Text" xml:space="preserve">
256- <value>ステップ 1: 承認ページを開きます...</value>
257- </data>
258249 <data name="btnPhotobucketAuthOpen.Text" xml:space="preserve">
259250 <value>ステップ 1: 承認ページを開きます...</value>
260251 </data>
261252 <data name="btnPhotobucketAuthComplete.Text" xml:space="preserve">
262253 <value>ステップ 2: 承認を完了します</value>
263254 </data>
264- <data name="btnFlickrCompleteAuth.Text" xml:space="preserve">
265- <value>ステップ 2: 承認を完了します</value>
266- </data>
267255 <data name="tpSharedFolder.Text" xml:space="preserve">
268256 <value>共有フォルダー</value>
269257 </data>
270- <data name="btnMinusFolderRemove.Text" xml:space="preserve">
271- <value>フォルダーを削除</value>
272- </data>
273258 <data name="btnMegaRefreshFolders.Text" xml:space="preserve">
274259 <value>更新</value>
275260 </data>
@@ -304,7 +289,7 @@
304289 <value>ユーザー名:</value>
305290 </data>
306291 <data name="lblPaste_eeUserAPIKey.Text" xml:space="preserve">
307- <value>ユーザー API キー:</value>
292+ <value>ユーザー キー:</value>
308293 </data>
309294 <data name="lblPushbulletUserKey.Text" xml:space="preserve">
310295 <value>ユーザー API キー:</value>
@@ -411,9 +396,6 @@
411396 <data name="lblPhotobucketAccountStatus.Text" xml:space="preserve">
412397 <value>ログインが必要です。</value>
413398 </data>
414- <data name="lblMinusAuthStatus.Text" xml:space="preserve">
415- <value>ログイン状態:</value>
416- </data>
417399 <data name="lblSeafilePassword.Text" xml:space="preserve">
418400 <value>パスワード:</value>
419401 </data>
@@ -513,9 +495,6 @@
513495 <data name="lblCheveretoUploaders.Text" xml:space="preserve">
514496 <value>アップローダー:</value>
515497 </data>
516- <data name="lblSomeImageAPIKey.Text" xml:space="preserve">
517- <value>API キー:</value>
518- </data>
519498 <data name="lblCheveretoUploadURL.Text" xml:space="preserve">
520499 <value>アップロード URL:</value>
521500 </data>
@@ -543,24 +522,6 @@
543522 <data name="btnMegaRegister.Text" xml:space="preserve">
544523 <value>登録...</value>
545524 </data>
546- <data name="btnMinusFolderAdd.Text" xml:space="preserve">
547- <value>フォルダーを追加</value>
548- </data>
549- <data name="gbMinusUpload.Text" xml:space="preserve">
550- <value>画像のアップロード先</value>
551- </data>
552- <data name="btnMinusReadFolderList.Text" xml:space="preserve">
553- <value>フォルダー一覧を更新</value>
554- </data>
555- <data name="gbMinusUserPass.Text" xml:space="preserve">
556- <value>認証</value>
557- </data>
558- <data name="btnMinusAuth.Text" xml:space="preserve">
559- <value>承認する</value>
560- </data>
561- <data name="lblMinusURLType.Text" xml:space="preserve">
562- <value>URLの種類:</value>
563- </data>
564525 <data name="lblJiraHost.Text" xml:space="preserve">
565526 <value>Jira ホスト: </value>
566527 </data>
@@ -591,9 +552,6 @@
591552 <data name="gbCustomUploaders.Text" xml:space="preserve">
592553 <value>アップローダー</value>
593554 </data>
594- <data name="btnCustomUploaderUpdate.Text" xml:space="preserve">
595- <value>更新</value>
596- </data>
597555 <data name="btnCustomUploaderArgUpdate.Text" xml:space="preserve">
598556 <value>更新</value>
599557 </data>
@@ -624,9 +582,6 @@ store.book[0].title</value>
624582 <data name="btnCustomUploaderClearUploaders.Text" xml:space="preserve">
625583 <value>すべてのアップローダーを消去</value>
626584 </data>
627- <data name="btnCustomUploaderClear.Text" xml:space="preserve">
628- <value>すべてのフィールドを消去</value>
629- </data>
630585 <data name="lblCustomUploaderResponseType.Text" xml:space="preserve">
631586 <value>応答の種類:</value>
632587 </data>
@@ -718,7 +673,7 @@ store.book[0].title</value>
718673 <value>既定のアルバム名</value>
719674 </data>
720675 <data name="lblPhotobucketVerificationCode.Text" xml:space="preserve">
721- <value>認証コード (認証コードは承認ページから入手):</value>
676+ <value>認証コード (認証コードは承認ページから取得):</value>
722677 </data>
723678 <data name="btnPicasaRefreshAlbumList.Text" xml:space="preserve">
724679 <value>アルバム一覧の更新</value>
@@ -730,7 +685,7 @@ store.book[0].title</value>
730685 <value>ユーザー キー:</value>
731686 </data>
732687 <data name="llVgymeAccountDetailsPage.Text" xml:space="preserve">
733- <value>ユーザー キーはアカウントの詳細ページから入手できます。</value>
688+ <value>ユーザー キーはアカウントの詳細ページから取得できます。</value>
734689 </data>
735690 <data name="$this.Text" xml:space="preserve">
736691 <value>ShareX - アップロード先の設定</value>
@@ -817,27 +772,15 @@ store.book[0].title</value>
817772 <data name="lblLambdaInfo.Text" xml:space="preserve">
818773 <value>API キーの取得方法は、Lambda (https://lambda.sx/) にログインし、あなたのユーザー名をクリックし、アカウントの管理をクリック。</value>
819774 </data>
820- <data name="llSomeImageAPIKey.Text" xml:space="preserve">
821- <value>https://someimage.com/api からAPIキーを取得</value>
822- </data>
823775 <data name="cbAmazonS3CustomCNAME.Text" xml:space="preserve">
824776 <value>独自のドメインを使用:</value>
825777 </data>
826778 <data name="cbMediaFireUseLongLink.Text" xml:space="preserve">
827779 <value>ファイル名を含む、長いリンクを使用する</value>
828780 </data>
829- <data name="cbAmazonS3UseRRS.Text" xml:space="preserve">
830- <value>低冗長化ストレージを使用</value>
831- </data>
832- <data name="btnFlickrOpenImages.Text" xml:space="preserve">
833- <value>あなたのフォトストリーム...</value>
834- </data>
835781 <data name="cbCheveretoDirectURL.Text" xml:space="preserve">
836782 <value>ダイレクトURL</value>
837783 </data>
838- <data name="cbSomeImageDirectURL.Text" xml:space="preserve">
839- <value>ダイレクトURL</value>
840- </data>
841784 <data name="cbImgurDirectLink.Text" xml:space="preserve">
842785 <value>ダイレクト リンクを使用</value>
843786 </data>
@@ -847,12 +790,6 @@ store.book[0].title</value>
847790 <data name="cbOwnCloudDirectLink.Text" xml:space="preserve">
848791 <value>ダイレクト リンク (「&amp;download」をURLに追加)</value>
849792 </data>
850- <data name="btnMinusRefreshAuth.Text" xml:space="preserve">
851- <value>承認の更新</value>
852- </data>
853- <data name="btnFlickrCheckToken.Text" xml:space="preserve">
854- <value>承認の更新</value>
855- </data>
856793 <data name="btnCheveretoTestAll.Text" xml:space="preserve">
857794 <value>すべてテスト</value>
858795 </data>
@@ -865,11 +802,6 @@ store.book[0].title</value>
865802 <data name="lblJiraIssuePrefix.Text" xml:space="preserve">
866803 <value>Jira issue 接頭辞:</value>
867804 </data>
868- <data name="cbAmazonS3UseRRS.ToolTip" xml:space="preserve">
869- <value>オブジェクトを格納するストレージクラスに低冗長化ストレージを使用します。
870-このオプションは、安価にオブジェクトを格納できますが、耐久性が99.999999999%ではなく、99.99%になります。
871-言い換えればある時点でAmazon S3から消失する可能性があるということです。</value>
872- </data>
873805 <data name="cbAmazonS3CustomCNAME.ToolTip" xml:space="preserve">
874806 <value>独自のドメインにバケットを設置している場合に、このオプションを使用します。
875807 フィールドが空の場合は、バケット名をURLとして使用します。
@@ -884,9 +816,6 @@ store.book[0].title</value>
884816 <data name="lblYourlsSignature.Text" xml:space="preserve">
885817 <value>シグネチャ:</value>
886818 </data>
887- <data name="cbMinusPublic.Text" xml:space="preserve">
888- <value>公開</value>
889- </data>
890819 <data name="cbGistUseRawURL.Text" xml:space="preserve">
891820 <value>Raw URLを使用する</value>
892821 </data>
@@ -902,9 +831,6 @@ store.book[0].title</value>
902831 <data name="lblPuushAPIKey.Text" xml:space="preserve">
903832 <value>API キー:</value>
904833 </data>
905- <data name="llPuushCreateAccount.Text" xml:space="preserve">
906- <value>アカウントを作成...</value>
907- </data>
908834 <data name="lblPuushEmail.Text" xml:space="preserve">
909835 <value>Eメール:</value>
910836 </data>
@@ -912,7 +838,7 @@ store.book[0].title</value>
912838 <value>パスワードを忘れましたか?</value>
913839 </data>
914840 <data name="btnLithiioGetAPIKey.Text" xml:space="preserve">
915- <value>APIキーを取得...</value>
841+ <value>アカウント ページを開く..</value>
916842 </data>
917843 <data name="btnPuushLogin.Text" xml:space="preserve">
918844 <value>ログイン</value>
@@ -935,33 +861,6 @@ store.book[0].title</value>
935861 <data name="lblOwnCloudHostExample.Text" xml:space="preserve">
936862 <value>例: http://example.com/owncloud</value>
937863 </data>
938- <data name="lblUpleaPassword.Text" xml:space="preserve">
939- <value>パスワード:</value>
940- </data>
941- <data name="lblUpleaUsername.Text" xml:space="preserve">
942- <value>ユーザー名:</value>
943- </data>
944- <data name="lblUpleaApiKey.Text" xml:space="preserve">
945- <value>API キー: </value>
946- </data>
947- <data name="lblUpleaEmailAddress.Text" xml:space="preserve">
948- <value>Eメール アドレス: </value>
949- </data>
950- <data name="btnUpleaLogin.Text" xml:space="preserve">
951- <value>APIキーを取得</value>
952- </data>
953- <data name="gbUpleaLoginCredentials.Text" xml:space="preserve">
954- <value>ログイン資格情報</value>
955- </data>
956- <data name="gbUpleaUserInformation.Text" xml:space="preserve">
957- <value>ユーザー情報</value>
958- </data>
959- <data name="cbUpleaInstantDownloadEnabled.Text" xml:space="preserve">
960- <value>即時ダウンロード利用可能</value>
961- </data>
962- <data name="cbUpleaIsPremium.Text" xml:space="preserve">
963- <value>プレミアム メンバー</value>
964- </data>
965864 <data name="mbCustomUploaderDestinationType.Text" xml:space="preserve">
966865 <value>アップローダの種類</value>
967866 </data>
@@ -1052,9 +951,6 @@ store.book[0].title</value>
1052951 <data name="lblGistCustomURLExample.Text" xml:space="preserve">
1053952 <value>例: https://api.github.com</value>
1054953 </data>
1055- <data name="cbImgurUseHTTPS.Text" xml:space="preserve">
1056- <value>"https://" リンクを使用する</value>
1057- </data>
1058954 <data name="btnFTPClient.Text" xml:space="preserve">
1059955 <value>クライアント...</value>
1060956 </data>
@@ -1151,7 +1047,34 @@ store.book[0].title</value>
11511047 <data name="lblSFTPKeyLocation.Text" xml:space="preserve">
11521048 <value>鍵の場所:</value>
11531049 </data>
1154- <data name="sulKeyLink.Text" xml:space="preserve">
1155- <value>ここをクリックしてAPI キーを入手します。</value>
1050+ <data name="lblAzureStorageCustomDomain.Text" xml:space="preserve">
1051+ <value>独自のドメイン:</value>
1052+ </data>
1053+ <data name="btnCustomUploaderDuplicate.Text" xml:space="preserve">
1054+ <value>複製</value>
1055+ </data>
1056+ <data name="lblCustomUploaderURLSharingService.Text" xml:space="preserve">
1057+ <value>URL 共有サービス</value>
1058+ </data>
1059+ <data name="lblCustomUploaderName.Text" xml:space="preserve">
1060+ <value>名前:</value>
1061+ </data>
1062+ <data name="btnPaste_eeGetUserKey.Text" xml:space="preserve">
1063+ <value>ユーザー キーを取得する...</value>
1064+ </data>
1065+ <data name="lblAmazonS3StorageClass.Text" xml:space="preserve">
1066+ <value>ストレージ クラス:</value>
1067+ </data>
1068+ <data name="cbFlickrDirectLink.Text" xml:space="preserve">
1069+ <value>ダイレクト リンクを使用</value>
1070+ </data>
1071+ <data name="btnLithiioFetchAPIKey.Text" xml:space="preserve">
1072+ <value>APIキーを取得...</value>
1073+ </data>
1074+ <data name="lblLithiioPassword.Text" xml:space="preserve">
1075+ <value>パスワード:</value>
1076+ </data>
1077+ <data name="lblLithiioEmail.Text" xml:space="preserve">
1078+ <value>Eメール:</value>
11561079 </data>
11571080 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.UploadersLib/Properties/Resources.ja-JP.resx
@@ -132,12 +132,6 @@
132132 <data name="OneDrive_RootFolder_Root_folder" xml:space="preserve">
133133 <value>ルート フォルダー</value>
134134 </data>
135- <data name="UploadersConfigForm_MinusUpdateControls_Not_logged_in_" xml:space="preserve">
136- <value>ログインしていません。</value>
137- </data>
138- <data name="UploadersConfigForm_MinusUpdateControls_Logged_in_as__0__" xml:space="preserve">
139- <value>{0}でログインしました。</value>
140- </data>
141135 <data name="OAuthInfo_OAuthInfo_New_account" xml:space="preserve">
142136 <value>新規アカウント</value>
143137 </data>
@@ -229,10 +223,28 @@
229223 <data name="UploadersConfigForm_Remove_all_custom_uploaders_Confirmation" xml:space="preserve">
230224 <value>すべての独自のアップローダーを削除しますか?</value>
231225 </data>
232- <data name="UploadersConfigForm_CustomUploader_Name" xml:space="preserve">
233- <value>名前</value>
234- </data>
235226 <data name="OAuthControl_OAuthControl_PasteVerificationCodeHere" xml:space="preserve">
236227 <value>確認コードをここに貼り付けます</value>
237228 </data>
229+ <data name="UploadersConfigForm_ConnectSFTPAccount_Key_file_not_found" xml:space="preserve">
230+ <value>キー ファイルがありません。</value>
231+ </data>
232+ <data name="UploadersConfigForm_A_header_with_the_same_name_already_exists" xml:space="preserve">
233+ <value>同名のヘッダがすでに存在します。</value>
234+ </data>
235+ <data name="UploadersConfigForm_eiCustomUploaders_ExportRequested_RequestURLMustBeConfigured" xml:space="preserve">
236+ <value>「リクエストURL」を構成してください。</value>
237+ </data>
238+ <data name="CustomUploaderItem_GetRequestURL_RequestURLMustBeConfigured" xml:space="preserve">
239+ <value>「リクエストURL」を構成してください。</value>
240+ </data>
241+ <data name="UploadersConfigForm_eiCustomUploaders_ExportRequested_DestinationTypeMustBeConfigured" xml:space="preserve">
242+ <value>「アップローダの種類」を構成してください。</value>
243+ </data>
244+ <data name="CustomUploaderItem_GetFileFormName_FileFormNameMustBeConfigured" xml:space="preserve">
245+ <value>「ファイル形式名」を構成してください。</value>
246+ </data>
247+ <data name="UploadersConfigForm_An_argument_with_the_same_name_already_exists" xml:space="preserve">
248+ <value>同名の引数がすでに存在します。</value>
249+ </data>
238250 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@@ -102,11 +102,10 @@
102102 <Private>True</Private>
103103 </Reference>
104104 <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
105- <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
105+ <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
106106 </Reference>
107- <Reference Include="Renci.SshNet, Version=2014.4.6.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
108- <HintPath>..\packages\SSH.NET.2014.4.6-beta2\lib\net40\Renci.SshNet.dll</HintPath>
109- <Private>True</Private>
107+ <Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
108+ <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
110109 </Reference>
111110 <Reference Include="System" />
112111 <Reference Include="System.Data" />
@@ -132,6 +131,7 @@
132131 <Compile Include="BaseServices\IGenericUploaderService.cs" />
133132 <Compile Include="BaseServices\IUploaderService.cs" />
134133 <Compile Include="BaseUploaders\GenericUploader.cs" />
134+ <Compile Include="BaseUploaders\URLSharer.cs" />
135135 <Compile Include="FileUploaders\AmazonS3.cs" />
136136 <Compile Include="FileUploaders\AmazonS3Endpoint.cs" />
137137 <Compile Include="FileUploaders\AmazonS3Settings.cs" />
@@ -159,11 +159,9 @@
159159 <Compile Include="FileUploaders\Pomf.cs" />
160160 <Compile Include="FileUploaders\PomfUploader.cs" />
161161 <Compile Include="FileUploaders\SFTP.cs" />
162- <Compile Include="FileUploaders\Minus.cs" />
163162 <Compile Include="FileUploaders\SharedFolderUploader.cs" />
164163 <Compile Include="FileUploaders\Transfersh.cs" />
165164 <Compile Include="FileUploaders\Uguu.cs" />
166- <Compile Include="FileUploaders\Uplea.cs" />
167165 <Compile Include="FileUploaders\VideoBin.cs" />
168166 <Compile Include="Forms\OCRSpaceForm.cs">
169167 <SubType>Form</SubType>
@@ -244,6 +242,7 @@
244242 <DesignTime>True</DesignTime>
245243 <DependentUpon>Resources.resx</DependentUpon>
246244 </Compile>
245+ <Compile Include="SharingServices\CustomURLSharingService.cs" />
247246 <Compile Include="SharingServices\DeliciousSharingService.cs" />
248247 <Compile Include="SharingServices\EmailSharingService.cs" />
249248 <Compile Include="SharingServices\FacebookSharingService.cs" />
@@ -253,7 +252,7 @@
253252 <Compile Include="SharingServices\PinterestSharingService.cs" />
254253 <Compile Include="SharingServices\PushbulletSharingService.cs" />
255254 <Compile Include="SharingServices\RedditSharingService.cs" />
256- <Compile Include="SharingServices\SimpleSharingService.cs" />
255+ <Compile Include="SharingServices\SimpleURLSharingService.cs" />
257256 <Compile Include="SharingServices\StumbleUponSharingService.cs" />
258257 <Compile Include="SharingServices\TumblrSharingService.cs" />
259258 <Compile Include="SharingServices\TwitterSharingService.cs" />
@@ -264,8 +263,6 @@
264263 <Compile Include="UploaderFactory.cs" />
265264 <Compile Include="ImageUploaders\Chevereto.cs" />
266265 <Compile Include="ImageUploaders\CheveretoUploader.cs" />
267- <Compile Include="ImageUploaders\ImglandUploader.cs" />
268- <Compile Include="ImageUploaders\SomeImage.cs" />
269266 <Compile Include="ImageUploaders\VgymeUploader.cs" />
270267 <Compile Include="BaseServices\ImageUploaderService.cs" />
271268 <Compile Include="TextUploaders\Hastebin.cs" />
@@ -308,7 +305,7 @@
308305 <Compile Include="Helpers\OAuth\OAuthInfo.cs" />
309306 <Compile Include="ImageUploaders\CustomImageUploader.cs" />
310307 <Compile Include="ImageUploaders\Imgur.cs" />
311- <Compile Include="ImageUploaders\Picasa.cs" />
308+ <Compile Include="ImageUploaders\GooglePhotos.cs" />
312309 <Compile Include="TextUploaders\CustomTextUploader.cs" />
313310 <Compile Include="TextUploaders\GitHubGist.cs" />
314311 <Compile Include="TextUploaders\Paste_ee.cs" />
@@ -327,7 +324,6 @@
327324 <Compile Include="ImageUploaders\Photobucket.cs" />
328325 <Compile Include="ImageUploaders\Twitter.cs" />
329326 <Compile Include="Helpers\ProgressManager.cs" />
330- <Compile Include="Helpers\TCPClient.cs" />
331327 <Compile Include="BaseUploaders\ImageUploader.cs" />
332328 <Compile Include="FileUploaders\CustomFileUploader.cs" />
333329 <Compile Include="ImageUploaders\FlickrUploader.cs" />
@@ -379,6 +375,9 @@
379375 <EmbeddedResource Include="Controls\AccountsControl.hu.resx">
380376 <DependentUpon>AccountsControl.cs</DependentUpon>
381377 </EmbeddedResource>
378+ <EmbeddedResource Include="Controls\AccountsControl.it-IT.resx">
379+ <DependentUpon>AccountsControl.cs</DependentUpon>
380+ </EmbeddedResource>
382381 <EmbeddedResource Include="Controls\AccountsControl.ja-JP.resx">
383382 <DependentUpon>AccountsControl.cs</DependentUpon>
384383 </EmbeddedResource>
@@ -418,6 +417,9 @@
418417 <EmbeddedResource Include="Controls\AccountTypeControl.hu.resx">
419418 <DependentUpon>AccountTypeControl.cs</DependentUpon>
420419 </EmbeddedResource>
420+ <EmbeddedResource Include="Controls\AccountTypeControl.it-IT.resx">
421+ <DependentUpon>AccountTypeControl.cs</DependentUpon>
422+ </EmbeddedResource>
421423 <EmbeddedResource Include="Controls\AccountTypeControl.ja-JP.resx">
422424 <DependentUpon>AccountTypeControl.cs</DependentUpon>
423425 </EmbeddedResource>
@@ -457,6 +459,9 @@
457459 <EmbeddedResource Include="Controls\OAuthControl.hu.resx">
458460 <DependentUpon>OAuthControl.cs</DependentUpon>
459461 </EmbeddedResource>
462+ <EmbeddedResource Include="Controls\OAuthControl.it-IT.resx">
463+ <DependentUpon>OAuthControl.cs</DependentUpon>
464+ </EmbeddedResource>
460465 <EmbeddedResource Include="Controls\OAuthControl.ja-JP.resx">
461466 <DependentUpon>OAuthControl.cs</DependentUpon>
462467 </EmbeddedResource>
@@ -496,6 +501,9 @@
496501 <EmbeddedResource Include="Forms\EmailForm.hu.resx">
497502 <DependentUpon>EmailForm.cs</DependentUpon>
498503 </EmbeddedResource>
504+ <EmbeddedResource Include="Forms\EmailForm.it-IT.resx">
505+ <DependentUpon>EmailForm.cs</DependentUpon>
506+ </EmbeddedResource>
499507 <EmbeddedResource Include="Forms\EmailForm.ja-JP.resx">
500508 <DependentUpon>EmailForm.cs</DependentUpon>
501509 </EmbeddedResource>
@@ -535,6 +543,9 @@
535543 <EmbeddedResource Include="Forms\JiraUpload.hu.resx">
536544 <DependentUpon>JiraUpload.cs</DependentUpon>
537545 </EmbeddedResource>
546+ <EmbeddedResource Include="Forms\JiraUpload.it-IT.resx">
547+ <DependentUpon>JiraUpload.cs</DependentUpon>
548+ </EmbeddedResource>
538549 <EmbeddedResource Include="Forms\JiraUpload.ja-JP.resx">
539550 <DependentUpon>JiraUpload.cs</DependentUpon>
540551 </EmbeddedResource>
@@ -562,7 +573,6 @@
562573 <EmbeddedResource Include="Forms\JiraUpload.zh-TW.resx">
563574 <DependentUpon>JiraUpload.cs</DependentUpon>
564575 </EmbeddedResource>
565- <EmbeddedResource Include="Forms\OAuthControl.zh-TW.resx" />
566576 <EmbeddedResource Include="Forms\OAuthWebForm.de.resx">
567577 <DependentUpon>OAuthWebForm.cs</DependentUpon>
568578 </EmbeddedResource>
@@ -575,6 +585,9 @@
575585 <EmbeddedResource Include="Forms\OAuthWebForm.hu.resx">
576586 <DependentUpon>OAuthWebForm.cs</DependentUpon>
577587 </EmbeddedResource>
588+ <EmbeddedResource Include="Forms\OAuthWebForm.it-IT.resx">
589+ <DependentUpon>OAuthWebForm.cs</DependentUpon>
590+ </EmbeddedResource>
578591 <EmbeddedResource Include="Forms\OAuthWebForm.ja-JP.resx">
579592 <DependentUpon>OAuthWebForm.cs</DependentUpon>
580593 </EmbeddedResource>
@@ -620,6 +633,9 @@
620633 <EmbeddedResource Include="Forms\ResponseForm.hu.resx">
621634 <DependentUpon>ResponseForm.cs</DependentUpon>
622635 </EmbeddedResource>
636+ <EmbeddedResource Include="Forms\ResponseForm.it-IT.resx">
637+ <DependentUpon>ResponseForm.cs</DependentUpon>
638+ </EmbeddedResource>
623639 <EmbeddedResource Include="Forms\ResponseForm.ja-JP.resx">
624640 <DependentUpon>ResponseForm.cs</DependentUpon>
625641 </EmbeddedResource>
@@ -659,6 +675,9 @@
659675 <EmbeddedResource Include="Forms\TwitterTweetForm.hu.resx">
660676 <DependentUpon>TwitterTweetForm.cs</DependentUpon>
661677 </EmbeddedResource>
678+ <EmbeddedResource Include="Forms\TwitterTweetForm.it-IT.resx">
679+ <DependentUpon>TwitterTweetForm.cs</DependentUpon>
680+ </EmbeddedResource>
662681 <EmbeddedResource Include="Forms\TwitterTweetForm.ja-JP.resx">
663682 <DependentUpon>TwitterTweetForm.cs</DependentUpon>
664683 </EmbeddedResource>
@@ -698,6 +717,9 @@
698717 <EmbeddedResource Include="Forms\UploadersConfigForm.hu.resx">
699718 <DependentUpon>UploadersConfigForm.cs</DependentUpon>
700719 </EmbeddedResource>
720+ <EmbeddedResource Include="Forms\UploadersConfigForm.it-IT.resx">
721+ <DependentUpon>UploadersConfigForm.cs</DependentUpon>
722+ </EmbeddedResource>
701723 <EmbeddedResource Include="Forms\UploadersConfigForm.ja-JP.resx">
702724 <DependentUpon>UploadersConfigForm.cs</DependentUpon>
703725 </EmbeddedResource>
@@ -737,6 +759,9 @@
737759 <EmbeddedResource Include="Forms\UserPassBox.hu.resx">
738760 <DependentUpon>UserPassBox.cs</DependentUpon>
739761 </EmbeddedResource>
762+ <EmbeddedResource Include="Forms\UserPassBox.it-IT.resx">
763+ <DependentUpon>UserPassBox.cs</DependentUpon>
764+ </EmbeddedResource>
740765 <EmbeddedResource Include="Forms\UserPassBox.ja-JP.resx">
741766 <DependentUpon>UserPassBox.cs</DependentUpon>
742767 </EmbeddedResource>
@@ -776,6 +801,9 @@
776801 <EmbeddedResource Include="FTPClient\FTPClientForm.hu.resx">
777802 <DependentUpon>FTPClientForm.cs</DependentUpon>
778803 </EmbeddedResource>
804+ <EmbeddedResource Include="FTPClient\FTPClientForm.it-IT.resx">
805+ <DependentUpon>FTPClientForm.cs</DependentUpon>
806+ </EmbeddedResource>
779807 <EmbeddedResource Include="FTPClient\FTPClientForm.ja-JP.resx">
780808 <DependentUpon>FTPClientForm.cs</DependentUpon>
781809 </EmbeddedResource>
@@ -845,6 +873,7 @@
845873 <EmbeddedResource Include="Properties\Resources.es.resx" />
846874 <EmbeddedResource Include="Properties\Resources.fr.resx" />
847875 <EmbeddedResource Include="Properties\Resources.hu.resx" />
876+ <EmbeddedResource Include="Properties\Resources.it-IT.resx" />
848877 <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />
849878 <EmbeddedResource Include="Properties\Resources.ko-KR.resx" />
850879 <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
@@ -890,7 +919,6 @@
890919 <None Include="Favicons\GoogleDrive.ico" />
891920 <None Include="Favicons\ImageShack.ico" />
892921 <None Include="Favicons\Imgur.ico" />
893- <None Include="Favicons\Minus.ico" />
894922 <None Include="Favicons\jira.png" />
895923 <None Include="Favicons\Pastebin.ico" />
896924 <None Include="Favicons\Photobucket.ico" />
@@ -908,11 +936,9 @@
908936 <None Include="Favicons\OneDrive.ico" />
909937 <None Include="Favicons\Chevereto.png" />
910938 <None Include="Favicons\Hastebin.png" />
911- <None Include="Favicons\Up1.ico" />
912939 <None Include="Favicons\CoinURL.ico" />
913940 <None Include="Favicons\Lambda.ico" />
914941 <None Include="Favicons\Mega.ico" />
915- <None Include="Favicons\Picasa.ico" />
916942 <None Include="Favicons\OneTimeSecret.ico" />
917943 <None Include="Favicons\Polr.ico" />
918944 <None Include="packages.config" />
@@ -930,7 +956,6 @@
930956 <None Include="Favicons\Seafile.png" />
931957 </ItemGroup>
932958 <ItemGroup>
933- <None Include="Favicons\SomeImage.ico" />
934959 <None Include="Favicons\Streamable.ico" />
935960 <None Include="Favicons\Sul.png" />
936961 <None Include="Favicons\Vgyme.ico" />
@@ -964,7 +989,7 @@
964989 <Content Include="Favicons\AzureStorage.png" />
965990 <None Include="Favicons\Plik.ico" />
966991 <Content Include="Favicons\Gfycat.png" />
967- <Content Include="Favicons\Uplea.ico" />
992+ <Content Include="Favicons\GooglePhotos.ico" />
968993 </ItemGroup>
969994 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
970995 <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
--- a/ShareX/Forms/ApplicationSettingsForm.ja-JP.resx
+++ b/ShareX/Forms/ApplicationSettingsForm.ja-JP.resx
@@ -159,9 +159,6 @@
159159 <data name="tpPrint.Text" xml:space="preserve">
160160 <value>印刷</value>
161161 </data>
162- <data name="cbStartWithWindows.Text" xml:space="preserve">
163- <value>Windowsの起動時にShareXを実行する</value>
164- </data>
165162 <data name="tpPaths.Text" xml:space="preserve">
166163 <value>パス</value>
167164 </data>
--- a/ShareX/Forms/MainForm.ja-JP.resx
+++ b/ShareX/Forms/MainForm.ja-JP.resx
@@ -472,7 +472,7 @@
472472 <value>アップロード先の設定...</value>
473473 </data>
474474 <data name="tsmiEditSelectedFile.Text" xml:space="preserve">
475- <value>画像の注釈編集...</value>
475+ <value>画像編集...</value>
476476 </data>
477477 <data name="tsmiCopyFileNameWithExtension.Text" xml:space="preserve">
478478 <value>ファイル名と拡張子</value>
@@ -651,12 +651,6 @@
651651 <data name="tsmiDeleteSelectedItem.Text" xml:space="preserve">
652652 <value>一覧からタスクを取り除く</value>
653653 </data>
654- <data name="tsmiAnnotateImage.Text" xml:space="preserve">
655- <value>画像の注釈編集...</value>
656- </data>
657- <data name="tsmiTrayAnnotateImage.Text" xml:space="preserve">
658- <value>画像の注釈編集...</value>
659- </data>
660654 <data name="tsmiSearchImage.Text" xml:space="preserve">
661655 <value>Google 画像検索...</value>
662656 </data>
@@ -672,4 +666,49 @@
672666 <data name="tsbAbout.Text" xml:space="preserve">
673667 <value>ShareX について...</value>
674668 </data>
669+ <data name="tsmiImageThumbnailer.Text" xml:space="preserve">
670+ <value>画像のサムネイル作成...</value>
671+ </data>
672+ <data name="tsmiTrayImageThumbnailer.Text" xml:space="preserve">
673+ <value>画像のサムネイル作成...</value>
674+ </data>
675+ <data name="tsmiUploadText.Text" xml:space="preserve">
676+ <value>テキストをアップロード...</value>
677+ </data>
678+ <data name="tsmiShortenURL.Text" xml:space="preserve">
679+ <value>短縮URLの作成...</value>
680+ </data>
681+ <data name="tsmiImageEditor.Text" xml:space="preserve">
682+ <value>画像エディター...</value>
683+ </data>
684+ <data name="tsmiCopyMarkdownLink.Text" xml:space="preserve">
685+ <value>Markdown リンク</value>
686+ </data>
687+ <data name="tsmiCopyMarkdownImage.Text" xml:space="preserve">
688+ <value>Markdown 画像</value>
689+ </data>
690+ <data name="tsmiCopyMarkdownLinkedImage.Text" xml:space="preserve">
691+ <value>Markdown リンク付き画像</value>
692+ </data>
693+ <data name="tsmiImagePreviewSide.Text" xml:space="preserve">
694+ <value>横</value>
695+ </data>
696+ <data name="tsmiImagePreviewBottom.Text" xml:space="preserve">
697+ <value>下</value>
698+ </data>
699+ <data name="tsmiTrayUploadText.Text" xml:space="preserve">
700+ <value>テキストをアップロード...</value>
701+ </data>
702+ <data name="tsmiTrayShortenURL.Text" xml:space="preserve">
703+ <value>短縮URLの作成...</value>
704+ </data>
705+ <data name="tsmiTrayImageEditor.Text" xml:space="preserve">
706+ <value>画像エディター...</value>
707+ </data>
708+ <data name="pbDiscordOpen.ToolTip" xml:space="preserve">
709+ <value>ShareX Discord サーバーの招待リンクを開く</value>
710+ </data>
711+ <data name="pbDiscordHide.ToolTip" xml:space="preserve">
712+ <value>今後Discord ボタンを表示しない</value>
713+ </data>
675714 </root>
\ No newline at end of file
--- a/ShareX/Forms/QRCodeForm.ja-JP.resx
+++ b/ShareX/Forms/QRCodeForm.ja-JP.resx
@@ -126,4 +126,19 @@
126126 <data name="$this.Text" xml:space="preserve">
127127 <value>ShareX - QR コード</value>
128128 </data>
129+ <data name="tpEncode.Text" xml:space="preserve">
130+ <value>エンコード</value>
131+ </data>
132+ <data name="tpDecode.Text" xml:space="preserve">
133+ <value>デコード</value>
134+ </data>
135+ <data name="btnDecodeFromFile.Text" xml:space="preserve">
136+ <value>画像ファイルからデコード...</value>
137+ </data>
138+ <data name="lblDecodeResult.Text" xml:space="preserve">
139+ <value>結果:</value>
140+ </data>
141+ <data name="btnDecodeFromScreen.Text" xml:space="preserve">
142+ <value>スクリーンからデコード...</value>
143+ </data>
129144 </root>
\ No newline at end of file
--- a/ShareX/Forms/TaskSettingsForm.ja-JP.resx
+++ b/ShareX/Forms/TaskSettingsForm.ja-JP.resx
@@ -537,4 +537,7 @@
537537 <data name="lblImagePNGBitDepth.Text" xml:space="preserve">
538538 <value>PNG ビットの深さ:</value>
539539 </data>
540+ <data name="btnWatchFolderEdit.Text" xml:space="preserve">
541+ <value>編集...</value>
542+ </data>
540543 </root>
\ No newline at end of file
--- a/ShareX/Properties/Resources.ja-JP.resx
+++ b/ShareX/Properties/Resources.ja-JP.resx
@@ -511,4 +511,13 @@ ShareX を再起動しますか?</value>
511511 <data name="ActionsToolbar_OpenAtShareXStartup" xml:space="preserve">
512512 <value>ShareX 起動時に開く</value>
513513 </data>
514+ <data name="QRCodeForm_InputTextToEncode" xml:space="preserve">
515+ <value>エンコードするテキストを入力</value>
516+ </data>
517+ <data name="ApplicationSettingsForm_cbStartWithWindows_DisabledByUser_Text" xml:space="preserve">
518+ <value>スタートアップはタスクマネージャーで無効にされています</value>
519+ </data>
520+ <data name="ApplicationSettingsForm_cbStartWithWindows_Text" xml:space="preserve">
521+ <value>Windows開始時にShareXを起動する</value>
522+ </data>
514523 </root>
\ No newline at end of file
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -83,6 +83,7 @@
8383 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
8484 <ErrorReport>prompt</ErrorReport>
8585 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
86+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
8687 </PropertyGroup>
8788 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WindowsStoreDebug|AnyCPU'">
8889 <DebugSymbols>true</DebugSymbols>
@@ -93,15 +94,12 @@
9394 <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
9495 <ErrorReport>prompt</ErrorReport>
9596 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
97+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
9698 </PropertyGroup>
9799 <ItemGroup>
98- <Reference Include="Gma.QrCodeNet.Encoding, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL">
99- <HintPath>..\packages\QrCode.Net.0.4.0.0\lib\net40\Gma.QrCodeNet.Encoding.dll</HintPath>
100- <Private>True</Private>
101- </Reference>
102100 <Reference Include="Microsoft.VisualBasic" />
103101 <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
104- <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
102+ <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
105103 </Reference>
106104 <Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL">
107105 <HintPath>..\packages\SevenZipSharp.0.64\lib\SevenZipSharp.dll</HintPath>
@@ -114,10 +112,34 @@
114112 <Reference Include="System.Data" />
115113 <Reference Include="System.Design" />
116114 <Reference Include="System.Drawing" />
115+ <Reference Include="System.Runtime.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" Condition="'$(Configuration)' == 'WindowsStore' Or '$(Configuration)' == 'WindowsStoreDebug'">
116+ <SpecificVersion>False</SpecificVersion>
117+ <HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5\System.Runtime.WindowsRuntime.dll</HintPath>
118+ <Private>False</Private>
119+ </Reference>
117120 <Reference Include="System.Speech" />
118121 <Reference Include="System.Web" />
119122 <Reference Include="System.Windows.Forms" />
120123 <Reference Include="System.Xml" />
124+ <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL" Condition="'$(Configuration)' == 'WindowsStore' Or '$(Configuration)' == 'WindowsStoreDebug'">
125+ <SpecificVersion>False</SpecificVersion>
126+ <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\Facade\Windows.WinMD</HintPath>
127+ <Private>False</Private>
128+ </Reference>
129+ <Reference Include="Windows.ApplicationModel.StartupTaskContract" Condition="'$(Configuration)' == 'WindowsStore' Or '$(Configuration)' == 'WindowsStoreDebug'">
130+ <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.15063.0\Windows.ApplicationModel.StartupTaskContract\1.0.0.0\Windows.ApplicationModel.StartupTaskContract.winmd</HintPath>
131+ <Private>False</Private>
132+ </Reference>
133+ <Reference Include="Windows.Foundation.FoundationContract" Condition="'$(Configuration)' == 'WindowsStore' Or '$(Configuration)' == 'WindowsStoreDebug'">
134+ <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.15063.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
135+ <Private>False</Private>
136+ </Reference>
137+ <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>
139+ </Reference>
140+ <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>
142+ </Reference>
121143 </ItemGroup>
122144 <ItemGroup>
123145 <Compile Include="CaptureHelpers\CaptureActiveMonitor.cs" />
@@ -141,6 +163,12 @@
141163 <Compile Include="Controls\NewsListControl.Designer.cs">
142164 <DependentUpon>NewsListControl.cs</DependentUpon>
143165 </Compile>
166+ <Compile Include="Forms\TextUploadForm.cs">
167+ <SubType>Form</SubType>
168+ </Compile>
169+ <Compile Include="Forms\TextUploadForm.Designer.cs">
170+ <DependentUpon>TextUploadForm.cs</DependentUpon>
171+ </Compile>
144172 <Compile Include="NewsItem.cs" />
145173 <Compile Include="NewsManager.cs" />
146174 <Compile Include="SettingManager.cs" />
@@ -196,12 +224,6 @@
196224 <DependentUpon>AboutForm.cs</DependentUpon>
197225 </Compile>
198226 <Compile Include="Enums.cs" />
199- <Compile Include="Forms\ImageCombinerForm.cs">
200- <SubType>Form</SubType>
201- </Compile>
202- <Compile Include="Forms\ImageCombinerForm.Designer.cs">
203- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
204- </Compile>
205227 <Compile Include="Forms\QRCodeForm.cs">
206228 <SubType>Form</SubType>
207229 </Compile>
@@ -242,7 +264,6 @@
242264 <SubType>Form</SubType>
243265 </Compile>
244266 <Compile Include="HotkeyTypeEnumConverter.cs" />
245- <Compile Include="ImageCombinerOptions.cs" />
246267 <Compile Include="IntegrationHelpers.cs" />
247268 <Compile Include="QuickTaskInfo.cs" />
248269 <Compile Include="QuickTaskMenu.cs" />
@@ -278,9 +299,6 @@
278299 <Compile Include="HotkeysConfig.cs" />
279300 <Compile Include="HotkeyManager.cs" />
280301 <Compile Include="HotkeySettings.cs" />
281- <Compile Include="Forms\HotkeyForm.cs">
282- <SubType>Form</SubType>
283- </Compile>
284302 <Compile Include="Controls\HotkeySelectionControl.cs">
285303 <SubType>UserControl</SubType>
286304 </Compile>
@@ -308,6 +326,12 @@
308326 </Compile>
309327 <Compile Include="LanguageHelper.cs" />
310328 <Compile Include="RecentTaskManager.cs" />
329+ <Compile Include="StartupManagers\CentennialStartupManager.cs" />
330+ <Compile Include="StartupManagers\DesktopStartupManager.cs" />
331+ <Compile Include="StartupManagers\GenericStartupManager.cs" />
332+ <Compile Include="StartupManagers\IStartupManager.cs" />
333+ <Compile Include="StartupManagers\StartupManagerFactory.cs" />
334+ <Compile Include="StartupManagers\SteamStartupManager.cs" />
311335 <Compile Include="TaskHelpers.cs" />
312336 <Compile Include="Program.cs" />
313337 <Compile Include="Properties\AssemblyInfo.cs" />
@@ -342,6 +366,9 @@
342366 <EmbeddedResource Include="Controls\HotkeySelectionControl.hu.resx">
343367 <DependentUpon>HotkeySelectionControl.cs</DependentUpon>
344368 </EmbeddedResource>
369+ <EmbeddedResource Include="Controls\HotkeySelectionControl.it-IT.resx">
370+ <DependentUpon>HotkeySelectionControl.cs</DependentUpon>
371+ </EmbeddedResource>
345372 <EmbeddedResource Include="Controls\HotkeySelectionControl.ja-JP.resx">
346373 <DependentUpon>HotkeySelectionControl.cs</DependentUpon>
347374 </EmbeddedResource>
@@ -384,6 +411,9 @@
384411 <EmbeddedResource Include="Forms\AboutForm.hu.resx">
385412 <DependentUpon>AboutForm.cs</DependentUpon>
386413 </EmbeddedResource>
414+ <EmbeddedResource Include="Forms\AboutForm.it-IT.resx">
415+ <DependentUpon>AboutForm.cs</DependentUpon>
416+ </EmbeddedResource>
387417 <EmbeddedResource Include="Forms\AboutForm.ja-JP.resx">
388418 <DependentUpon>AboutForm.cs</DependentUpon>
389419 </EmbeddedResource>
@@ -427,6 +457,9 @@
427457 <EmbeddedResource Include="Forms\ActionsForm.hu.resx">
428458 <DependentUpon>ActionsForm.cs</DependentUpon>
429459 </EmbeddedResource>
460+ <EmbeddedResource Include="Forms\ActionsForm.it-IT.resx">
461+ <DependentUpon>ActionsForm.cs</DependentUpon>
462+ </EmbeddedResource>
430463 <EmbeddedResource Include="Forms\ActionsForm.ja-JP.resx">
431464 <DependentUpon>ActionsForm.cs</DependentUpon>
432465 </EmbeddedResource>
@@ -457,12 +490,18 @@
457490 <EmbeddedResource Include="Forms\ActionsToolbarEditForm.fr.resx">
458491 <DependentUpon>ActionsToolbarEditForm.cs</DependentUpon>
459492 </EmbeddedResource>
493+ <EmbeddedResource Include="Forms\ActionsToolbarEditForm.it-IT.resx">
494+ <DependentUpon>ActionsToolbarEditForm.cs</DependentUpon>
495+ </EmbeddedResource>
460496 <EmbeddedResource Include="Forms\ActionsToolbarEditForm.ja-JP.resx">
461497 <DependentUpon>ActionsToolbarEditForm.cs</DependentUpon>
462498 </EmbeddedResource>
463499 <EmbeddedResource Include="Forms\ActionsToolbarEditForm.ru.resx">
464500 <DependentUpon>ActionsToolbarEditForm.cs</DependentUpon>
465501 </EmbeddedResource>
502+ <EmbeddedResource Include="Forms\ActionsToolbarEditForm.zh-CN.resx">
503+ <DependentUpon>ActionsToolbarEditForm.cs</DependentUpon>
504+ </EmbeddedResource>
466505 <EmbeddedResource Include="Forms\AfterCaptureForm.de.resx">
467506 <DependentUpon>AfterCaptureForm.cs</DependentUpon>
468507 </EmbeddedResource>
@@ -475,6 +514,9 @@
475514 <EmbeddedResource Include="Forms\AfterCaptureForm.hu.resx">
476515 <DependentUpon>AfterCaptureForm.cs</DependentUpon>
477516 </EmbeddedResource>
517+ <EmbeddedResource Include="Forms\AfterCaptureForm.it-IT.resx">
518+ <DependentUpon>AfterCaptureForm.cs</DependentUpon>
519+ </EmbeddedResource>
478520 <EmbeddedResource Include="Forms\AfterCaptureForm.ja-JP.resx">
479521 <DependentUpon>AfterCaptureForm.cs</DependentUpon>
480522 </EmbeddedResource>
@@ -517,6 +559,9 @@
517559 <EmbeddedResource Include="Forms\AfterUploadForm.hu.resx">
518560 <DependentUpon>AfterUploadForm.cs</DependentUpon>
519561 </EmbeddedResource>
562+ <EmbeddedResource Include="Forms\AfterUploadForm.it-IT.resx">
563+ <DependentUpon>AfterUploadForm.cs</DependentUpon>
564+ </EmbeddedResource>
520565 <EmbeddedResource Include="Forms\AfterUploadForm.ja-JP.resx">
521566 <DependentUpon>AfterUploadForm.cs</DependentUpon>
522567 </EmbeddedResource>
@@ -556,6 +601,9 @@
556601 <EmbeddedResource Include="Forms\ApplicationSettingsForm.hu.resx">
557602 <DependentUpon>ApplicationSettingsForm.cs</DependentUpon>
558603 </EmbeddedResource>
604+ <EmbeddedResource Include="Forms\ApplicationSettingsForm.it-IT.resx">
605+ <DependentUpon>ApplicationSettingsForm.cs</DependentUpon>
606+ </EmbeddedResource>
559607 <EmbeddedResource Include="Forms\ApplicationSettingsForm.ja-JP.resx">
560608 <DependentUpon>ApplicationSettingsForm.cs</DependentUpon>
561609 </EmbeddedResource>
@@ -595,6 +643,9 @@
595643 <EmbeddedResource Include="Forms\AutoCaptureForm.hu.resx">
596644 <DependentUpon>AutoCaptureForm.cs</DependentUpon>
597645 </EmbeddedResource>
646+ <EmbeddedResource Include="Forms\AutoCaptureForm.it-IT.resx">
647+ <DependentUpon>AutoCaptureForm.cs</DependentUpon>
648+ </EmbeddedResource>
598649 <EmbeddedResource Include="Forms\AutoCaptureForm.ja-JP.resx">
599650 <DependentUpon>AutoCaptureForm.cs</DependentUpon>
600651 </EmbeddedResource>
@@ -637,6 +688,9 @@
637688 <EmbeddedResource Include="Forms\BeforeUploadForm.hu.resx">
638689 <DependentUpon>BeforeUploadForm.cs</DependentUpon>
639690 </EmbeddedResource>
691+ <EmbeddedResource Include="Forms\BeforeUploadForm.it-IT.resx">
692+ <DependentUpon>BeforeUploadForm.cs</DependentUpon>
693+ </EmbeddedResource>
640694 <EmbeddedResource Include="Forms\BeforeUploadForm.ja-JP.resx">
641695 <DependentUpon>BeforeUploadForm.cs</DependentUpon>
642696 </EmbeddedResource>
@@ -680,6 +734,9 @@
680734 <EmbeddedResource Include="Forms\ClipboardFormatForm.hu.resx">
681735 <DependentUpon>ClipboardFormatForm.cs</DependentUpon>
682736 </EmbeddedResource>
737+ <EmbeddedResource Include="Forms\ClipboardFormatForm.it-IT.resx">
738+ <DependentUpon>ClipboardFormatForm.cs</DependentUpon>
739+ </EmbeddedResource>
683740 <EmbeddedResource Include="Forms\ClipboardFormatForm.ja-JP.resx">
684741 <DependentUpon>ClipboardFormatForm.cs</DependentUpon>
685742 </EmbeddedResource>
@@ -722,6 +779,9 @@
722779 <EmbeddedResource Include="Forms\EncoderProgramForm.hu.resx">
723780 <DependentUpon>EncoderProgramForm.cs</DependentUpon>
724781 </EmbeddedResource>
782+ <EmbeddedResource Include="Forms\EncoderProgramForm.it-IT.resx">
783+ <DependentUpon>EncoderProgramForm.cs</DependentUpon>
784+ </EmbeddedResource>
725785 <EmbeddedResource Include="Forms\EncoderProgramForm.ja-JP.resx">
726786 <DependentUpon>EncoderProgramForm.cs</DependentUpon>
727787 </EmbeddedResource>
@@ -767,6 +827,9 @@
767827 <EmbeddedResource Include="Forms\FileExistForm.hu.resx">
768828 <DependentUpon>FileExistForm.cs</DependentUpon>
769829 </EmbeddedResource>
830+ <EmbeddedResource Include="Forms\FileExistForm.it-IT.resx">
831+ <DependentUpon>FileExistForm.cs</DependentUpon>
832+ </EmbeddedResource>
770833 <EmbeddedResource Include="Forms\FileExistForm.ja-JP.resx">
771834 <DependentUpon>FileExistForm.cs</DependentUpon>
772835 </EmbeddedResource>
@@ -803,6 +866,9 @@
803866 <EmbeddedResource Include="Forms\FirstTimeConfigForm.fr.resx">
804867 <DependentUpon>FirstTimeConfigForm.cs</DependentUpon>
805868 </EmbeddedResource>
869+ <EmbeddedResource Include="Forms\FirstTimeConfigForm.it-IT.resx">
870+ <DependentUpon>FirstTimeConfigForm.cs</DependentUpon>
871+ </EmbeddedResource>
806872 <EmbeddedResource Include="Forms\FirstTimeConfigForm.ja-JP.resx">
807873 <DependentUpon>FirstTimeConfigForm.cs</DependentUpon>
808874 </EmbeddedResource>
@@ -839,6 +905,9 @@
839905 <EmbeddedResource Include="Forms\HotkeySettingsForm.hu.resx">
840906 <DependentUpon>HotkeySettingsForm.cs</DependentUpon>
841907 </EmbeddedResource>
908+ <EmbeddedResource Include="Forms\HotkeySettingsForm.it-IT.resx">
909+ <DependentUpon>HotkeySettingsForm.cs</DependentUpon>
910+ </EmbeddedResource>
842911 <EmbeddedResource Include="Forms\HotkeySettingsForm.ja-JP.resx">
843912 <DependentUpon>HotkeySettingsForm.cs</DependentUpon>
844913 </EmbeddedResource>
@@ -866,39 +935,6 @@
866935 <EmbeddedResource Include="Forms\HotkeySettingsForm.zh-TW.resx">
867936 <DependentUpon>HotkeySettingsForm.cs</DependentUpon>
868937 </EmbeddedResource>
869- <EmbeddedResource Include="Forms\ImageCombinerForm.de.resx">
870- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
871- </EmbeddedResource>
872- <EmbeddedResource Include="Forms\ImageCombinerForm.fr.resx">
873- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
874- </EmbeddedResource>
875- <EmbeddedResource Include="Forms\ImageCombinerForm.ja-JP.resx">
876- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
877- </EmbeddedResource>
878- <EmbeddedResource Include="Forms\ImageCombinerForm.nl-NL.resx">
879- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
880- </EmbeddedResource>
881- <EmbeddedResource Include="Forms\ImageCombinerForm.pt-BR.resx">
882- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
883- </EmbeddedResource>
884- <EmbeddedResource Include="Forms\ImageCombinerForm.resx">
885- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
886- </EmbeddedResource>
887- <EmbeddedResource Include="Forms\ImageCombinerForm.ru.resx">
888- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
889- </EmbeddedResource>
890- <EmbeddedResource Include="Forms\ImageCombinerForm.tr.resx">
891- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
892- </EmbeddedResource>
893- <EmbeddedResource Include="Forms\ImageCombinerForm.vi-VN.resx">
894- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
895- </EmbeddedResource>
896- <EmbeddedResource Include="Forms\ImageCombinerForm.zh-CN.resx">
897- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
898- </EmbeddedResource>
899- <EmbeddedResource Include="Forms\ImageCombinerForm.zh-TW.resx">
900- <DependentUpon>ImageCombinerForm.cs</DependentUpon>
901- </EmbeddedResource>
902938 <EmbeddedResource Include="Forms\MainForm.de.resx">
903939 <DependentUpon>MainForm.cs</DependentUpon>
904940 </EmbeddedResource>
@@ -911,6 +947,9 @@
911947 <EmbeddedResource Include="Forms\MainForm.hu.resx">
912948 <DependentUpon>MainForm.cs</DependentUpon>
913949 </EmbeddedResource>
950+ <EmbeddedResource Include="Forms\MainForm.it-IT.resx">
951+ <DependentUpon>MainForm.cs</DependentUpon>
952+ </EmbeddedResource>
914953 <EmbeddedResource Include="Forms\MainForm.ja-JP.resx">
915954 <DependentUpon>MainForm.cs</DependentUpon>
916955 </EmbeddedResource>
@@ -950,6 +989,9 @@
950989 <EmbeddedResource Include="Forms\QRCodeForm.hu.resx">
951990 <DependentUpon>QRCodeForm.cs</DependentUpon>
952991 </EmbeddedResource>
992+ <EmbeddedResource Include="Forms\QRCodeForm.it-IT.resx">
993+ <DependentUpon>QRCodeForm.cs</DependentUpon>
994+ </EmbeddedResource>
953995 <EmbeddedResource Include="Forms\QRCodeForm.ja-JP.resx">
954996 <DependentUpon>QRCodeForm.cs</DependentUpon>
955997 </EmbeddedResource>
@@ -987,6 +1029,9 @@
9871029 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.fr.resx">
9881030 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
9891031 </EmbeddedResource>
1032+ <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.it-IT.resx">
1033+ <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
1034+ </EmbeddedResource>
9901035 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.ja-JP.resx">
9911036 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
9921037 </EmbeddedResource>
@@ -1014,6 +1059,9 @@
10141059 <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.fr.resx">
10151060 <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
10161061 </EmbeddedResource>
1062+ <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.it-IT.resx">
1063+ <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
1064+ </EmbeddedResource>
10171065 <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.ja-JP.resx">
10181066 <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
10191067 </EmbeddedResource>
@@ -1047,6 +1095,9 @@
10471095 <EmbeddedResource Include="Forms\ScreenColorPicker.hu.resx">
10481096 <DependentUpon>ScreenColorPicker.cs</DependentUpon>
10491097 </EmbeddedResource>
1098+ <EmbeddedResource Include="Forms\ScreenColorPicker.it-IT.resx">
1099+ <DependentUpon>ScreenColorPicker.cs</DependentUpon>
1100+ </EmbeddedResource>
10501101 <EmbeddedResource Include="Forms\ScreenColorPicker.ja-JP.resx">
10511102 <DependentUpon>ScreenColorPicker.cs</DependentUpon>
10521103 </EmbeddedResource>
@@ -1089,6 +1140,9 @@
10891140 <EmbeddedResource Include="Forms\ScreenRecordForm.hu.resx">
10901141 <DependentUpon>ScreenRecordForm.cs</DependentUpon>
10911142 </EmbeddedResource>
1143+ <EmbeddedResource Include="Forms\ScreenRecordForm.it-IT.resx">
1144+ <DependentUpon>ScreenRecordForm.cs</DependentUpon>
1145+ </EmbeddedResource>
10921146 <EmbeddedResource Include="Forms\ScreenRecordForm.ja-JP.resx">
10931147 <DependentUpon>ScreenRecordForm.cs</DependentUpon>
10941148 </EmbeddedResource>
@@ -1143,6 +1197,9 @@
11431197 <EmbeddedResource Include="Forms\TaskSettingsForm.hu.resx">
11441198 <DependentUpon>TaskSettingsForm.cs</DependentUpon>
11451199 </EmbeddedResource>
1200+ <EmbeddedResource Include="Forms\TaskSettingsForm.it-IT.resx">
1201+ <DependentUpon>TaskSettingsForm.cs</DependentUpon>
1202+ </EmbeddedResource>
11461203 <EmbeddedResource Include="Forms\TaskSettingsForm.ja-JP.resx">
11471204 <DependentUpon>TaskSettingsForm.cs</DependentUpon>
11481205 </EmbeddedResource>
@@ -1170,6 +1227,9 @@
11701227 <EmbeddedResource Include="Forms\TaskSettingsForm.zh-TW.resx">
11711228 <DependentUpon>TaskSettingsForm.cs</DependentUpon>
11721229 </EmbeddedResource>
1230+ <EmbeddedResource Include="Forms\TextUploadForm.resx">
1231+ <DependentUpon>TextUploadForm.cs</DependentUpon>
1232+ </EmbeddedResource>
11731233 <EmbeddedResource Include="Forms\VideoEncodersForm.de.resx">
11741234 <DependentUpon>VideoEncodersForm.cs</DependentUpon>
11751235 </EmbeddedResource>
@@ -1182,6 +1242,9 @@
11821242 <EmbeddedResource Include="Forms\VideoEncodersForm.hu.resx">
11831243 <DependentUpon>VideoEncodersForm.cs</DependentUpon>
11841244 </EmbeddedResource>
1245+ <EmbeddedResource Include="Forms\VideoEncodersForm.it-IT.resx">
1246+ <DependentUpon>VideoEncodersForm.cs</DependentUpon>
1247+ </EmbeddedResource>
11851248 <EmbeddedResource Include="Forms\VideoEncodersForm.ja-JP.resx">
11861249 <DependentUpon>VideoEncodersForm.cs</DependentUpon>
11871250 </EmbeddedResource>
@@ -1221,6 +1284,9 @@
12211284 <EmbeddedResource Include="Forms\WatchFolderForm.hu.resx">
12221285 <DependentUpon>WatchFolderForm.cs</DependentUpon>
12231286 </EmbeddedResource>
1287+ <EmbeddedResource Include="Forms\WatchFolderForm.it-IT.resx">
1288+ <DependentUpon>WatchFolderForm.cs</DependentUpon>
1289+ </EmbeddedResource>
12241290 <EmbeddedResource Include="Forms\WatchFolderForm.ja-JP.resx">
12251291 <DependentUpon>WatchFolderForm.cs</DependentUpon>
12261292 </EmbeddedResource>
@@ -1264,6 +1330,7 @@
12641330 <EmbeddedResource Include="Properties\Resources.es.resx" />
12651331 <EmbeddedResource Include="Properties\Resources.fr.resx" />
12661332 <EmbeddedResource Include="Properties\Resources.hu.resx" />
1333+ <EmbeddedResource Include="Properties\Resources.it-IT.resx" />
12671334 <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />
12681335 <EmbeddedResource Include="Properties\Resources.ko-KR.resx" />
12691336 <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
@@ -1496,6 +1563,10 @@
14961563 <None Include="Resources\Google.png" />
14971564 <None Include="Resources\megaphone.png" />
14981565 <None Include="Resources\Exclamation-16.png" />
1566+ <None Include="Resources\image-resize-actual.png" />
1567+ <None Include="Resources\it.png" />
1568+ <None Include="Resources\Discord_Button_01.png" />
1569+ <None Include="Resources\Discord_Button_02.png" />
14991570 <Content Include="Resources\tw.png" />
15001571 <Content Include="ShareX_Icon.ico" />
15011572 <None Include="Resources\globe--pencil.png" />