• 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

Revision583ea3bc4089c285b345523b7357eceac6b6e164 (tree)
Zeit2016-07-15 05:47:47
Autornotme <notme@user...>
Commiternotme

Log Message

Japanese translation for ShareX 11.1.0

Ändern Zusammenfassung

Diff

--- a/ShareX.HelpersLib/Automate/AutomateForm.ja-JP.resx
+++ b/ShareX.HelpersLib/Automate/AutomateForm.ja-JP.resx
@@ -126,9 +126,6 @@
126126 <data name="btnSaveScript.Text" xml:space="preserve">
127127 <value>保存</value>
128128 </data>
129- <data name="btnRun.Text" xml:space="preserve">
130- <value>開始</value>
131- </data>
132129 <data name="lblScriptName.Text" xml:space="preserve">
133130 <value>スクリプト名:</value>
134131 </data>
@@ -153,4 +150,7 @@
153150 <data name="btnAddMouseMove.Text" xml:space="preserve">
154151 <value>カーソル位置を追加</value>
155152 </data>
153+ <data name="btnRun.Text" xml:space="preserve">
154+ <value>開始</value>
155+ </data>
156156 </root>
\ No newline at end of file
--- a/ShareX.HelpersLib/Forms/MonitorTestForm.ja-JP.resx
+++ b/ShareX.HelpersLib/Forms/MonitorTestForm.ja-JP.resx
@@ -168,4 +168,7 @@
168168 <data name="lblRed.Text" xml:space="preserve">
169169 <value>赤(R):</value>
170170 </data>
171+ <data name="btnScreenTearingTest.Text" xml:space="preserve">
172+ <value>スクリーン ティアリング テスト</value>
173+ </data>
171174 </root>
\ No newline at end of file
--- a/ShareX.HelpersLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.HelpersLib/Properties/Resources.ja-JP.resx
@@ -387,9 +387,6 @@
387387 <data name="HotkeyType_FreeHandRegion" xml:space="preserve">
388388 <value>フリーハンド領域をキャプチャー</value>
389389 </data>
390- <data name="HashCheckForm_btnFilePathBrowse_Click_Choose_file_path" xml:space="preserve">
391- <value>ファイル パスの選択</value>
392- </data>
393390 <data name="RegistryHelpers_ShellExtDesc_Upload_with__0_" xml:space="preserve">
394391 <value>{0}でアップロード</value>
395392 </data>
@@ -856,4 +853,124 @@
856853 <data name="Helpers_OpenFile_File_not_exist_" xml:space="preserve">
857854 <value>存在しないファイル:</value>
858855 </data>
856+ <data name="HotkeyType_ScreenRecorderCustomRegion_Category" xml:space="preserve">
857+ <value>動画キャプチャー</value>
858+ </data>
859+ <data name="HotkeyType_ScreenRecorderGIFCustomRegion_Category" xml:space="preserve">
860+ <value>動画キャプチャー</value>
861+ </data>
862+ <data name="Helpers_BrowseFile_Choose_file" xml:space="preserve">
863+ <value>ファイルの選択</value>
864+ </data>
865+ <data name="Helpers_BrowseFolder_Choose_folder" xml:space="preserve">
866+ <value>フォルダーの選択</value>
867+ </data>
868+ <data name="ShapeType_DrawingEllipse" xml:space="preserve">
869+ <value>描画: 楕円</value>
870+ </data>
871+ <data name="ShapeType_DrawingHighlight" xml:space="preserve">
872+ <value>効果: ハイライト</value>
873+ </data>
874+ <data name="ShapeType_DrawingBlur" xml:space="preserve">
875+ <value>効果: ぼかし</value>
876+ </data>
877+ <data name="ShapeType_DrawingPixelate" xml:space="preserve">
878+ <value>効果: モザイク</value>
879+ </data>
880+ <data name="ShapeType_DrawingLine" xml:space="preserve">
881+ <value>描画: 直線</value>
882+ </data>
883+ <data name="ShapeType_DrawingRectangle" xml:space="preserve">
884+ <value>描画: 四角形</value>
885+ </data>
886+ <data name="ShapeType_DrawingRoundedRectangle" xml:space="preserve">
887+ <value>描画: 角丸四角形</value>
888+ </data>
889+ <data name="ShapeType_DrawingStep" xml:space="preserve">
890+ <value>描画: ステップ</value>
891+ </data>
892+ <data name="ShapeType_DrawingText" xml:space="preserve">
893+ <value>描画: 文字</value>
894+ </data>
895+ <data name="ShapeType_RegionEllipse" xml:space="preserve">
896+ <value>領域: 楕円</value>
897+ </data>
898+ <data name="ShapeType_RegionRectangle" xml:space="preserve">
899+ <value>領域: 四角形</value>
900+ </data>
901+ <data name="ShapeType_RegionRoundedRectangle" xml:space="preserve">
902+ <value>領域: 角丸四角形</value>
903+ </data>
904+ <data name="ShapeType_DrawingArrow" xml:space="preserve">
905+ <value>描画: 矢印</value>
906+ </data>
907+ <data name="HotkeyType_OpenMainWindow_Category" xml:space="preserve">
908+ <value>その他</value>
909+ </data>
910+ <data name="RegionCaptureAction_CancelCapture" xml:space="preserve">
911+ <value>キャプチャー中止</value>
912+ </data>
913+ <data name="RegionCaptureAction_None" xml:space="preserve">
914+ <value>何もしない</value>
915+ </data>
916+ <data name="RegionCaptureAction_RemoveShapeCancelCapture" xml:space="preserve">
917+ <value>図形の削除 / キャプチャー中止</value>
918+ </data>
919+ <data name="HotkeyType_TextCapture" xml:space="preserve">
920+ <value>テキスト キャプチャー (OCR)</value>
921+ </data>
922+ <data name="HotkeyType_TextCapture_Category" xml:space="preserve">
923+ <value>静止画キャプチャー</value>
924+ </data>
925+ <data name="AfterCaptureTasks_DoOCR" xml:space="preserve">
926+ <value>文字認識 (OCR)</value>
927+ </data>
928+ <data name="ScrollingCaptureScrollMethod_Automatic" xml:space="preserve">
929+ <value>どれかが動作するまですべての方法を自動で試みる</value>
930+ </data>
931+ <data name="RegionCaptureAction_CaptureActiveMonitor" xml:space="preserve">
932+ <value>アクティブ モニターをキャプチャー</value>
933+ </data>
934+ <data name="RegionCaptureAction_CaptureFullscreen" xml:space="preserve">
935+ <value>フルスクリーンをキャプチャー</value>
936+ </data>
937+ <data name="ScrollingCaptureScrollTopMethod_None" xml:space="preserve">
938+ <value>最上部にスクロールしない</value>
939+ </data>
940+ <data name="HotkeyType_OpenMainWindow" xml:space="preserve">
941+ <value>ShareX ウィンドウを表示</value>
942+ </data>
943+ <data name="RegionCaptureAction_OpenOptionsMenu" xml:space="preserve">
944+ <value>オプション メニューを開く</value>
945+ </data>
946+ <data name="RegionCaptureAction_RemoveShape" xml:space="preserve">
947+ <value>図形の削除</value>
948+ </data>
949+ <data name="HotkeyType_ScreenRecorderGIFCustomRegion" xml:space="preserve">
950+ <value>独自領域の動画キャプチャー (GIF) を開始</value>
951+ </data>
952+ <data name="HotkeyType_ScreenRecorderCustomRegion" xml:space="preserve">
953+ <value>独自領域の動画キャプチャーを開始</value>
954+ </data>
955+ <data name="RegionCaptureAction_SwapToolType" xml:space="preserve">
956+ <value>ツールの種類を交換</value>
957+ </data>
958+ <data name="ScrollingCaptureScrollMethod_KeyPressPageDown" xml:space="preserve">
959+ <value>"Page down" キーを送信</value>
960+ </data>
961+ <data name="ScrollingCaptureScrollMethod_MouseWheel" xml:space="preserve">
962+ <value>マウスホイール回転を送信</value>
963+ </data>
964+ <data name="ScrollingCaptureScrollMethod_SendMessageScroll" xml:space="preserve">
965+ <value>スクロール メッセージをウィンドウ/コントロールに送信</value>
966+ </data>
967+ <data name="ScrollingCaptureScrollTopMethod_All" xml:space="preserve">
968+ <value>"Home" キーを送信後、スクロールトップ メッセージを送信</value>
969+ </data>
970+ <data name="ScrollingCaptureScrollTopMethod_KeyPressHome" xml:space="preserve">
971+ <value>"Home" キーを送信</value>
972+ </data>
973+ <data name="ScrollingCaptureScrollTopMethod_SendMessageTop" xml:space="preserve">
974+ <value>スクロールトップ メッセージを送信</value>
975+ </data>
859976 </root>
\ No newline at end of file
--- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
@@ -66,8 +66,8 @@
6666 <HintPath>..\packages\QrCode.Net.0.4.0.0\lib\net40\Gma.QrCodeNet.Encoding.dll</HintPath>
6767 <Private>True</Private>
6868 </Reference>
69- <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
70- <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
69+ <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
70+ <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
7171 <Private>True</Private>
7272 </Reference>
7373 <Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL">
@@ -88,7 +88,7 @@
8888 <Reference Include="System.Xml" />
8989 </ItemGroup>
9090 <ItemGroup>
91- <Compile Include="ActionsCodeMenuEntry.cs" />
91+ <Compile Include="NameParser\ActionsCodeMenuEntry.cs" />
9292 <Compile Include="Automate\AutomateForm.cs">
9393 <SubType>Form</SubType>
9494 </Compile>
@@ -99,7 +99,7 @@
9999 <Compile Include="Automate\FunctionManager.cs" />
100100 <Compile Include="Automate\ScriptInfo.cs" />
101101 <Compile Include="ClipboardFormat.cs" />
102- <Compile Include="CodeMenu.cs" />
102+ <Compile Include="NameParser\CodeMenu.cs" />
103103 <Compile Include="ColorMatrixManager.cs" />
104104 <Compile Include="Colors\CMYK.cs" />
105105 <Compile Include="Colors\ColorEventHandler.cs" />
@@ -120,12 +120,37 @@
120120 <Compile Include="Controls\GreenlightButton.cs">
121121 <SubType>Component</SubType>
122122 </Compile>
123+ <Compile Include="Controls\DoubleLabeledNumericUpDown.cs">
124+ <SubType>UserControl</SubType>
125+ </Compile>
126+ <Compile Include="Controls\DoubleLabeledNumericUpDown.Designer.cs">
127+ <DependentUpon>DoubleLabeledNumericUpDown.cs</DependentUpon>
128+ </Compile>
129+ <Compile Include="Controls\LabeledNumericUpDown.cs">
130+ <SubType>UserControl</SubType>
131+ </Compile>
132+ <Compile Include="Controls\LabeledNumericUpDown.Designer.cs">
133+ <DependentUpon>LabeledNumericUpDown.cs</DependentUpon>
134+ </Compile>
123135 <Compile Include="Controls\LabelNoCopy.cs">
124136 <SubType>Component</SubType>
125137 </Compile>
138+ <Compile Include="Controls\ToolStripCheckedBoldRenderer.cs" />
126139 <Compile Include="Controls\ToolStripButtonColorAnimation.cs">
127140 <SubType>Component</SubType>
128141 </Compile>
142+ <Compile Include="Controls\ToolStripDoubleLabeledNumericUpDown.cs">
143+ <SubType>Component</SubType>
144+ </Compile>
145+ <Compile Include="Controls\ToolStripLabeledNumericUpDown.cs">
146+ <SubType>Component</SubType>
147+ </Compile>
148+ <Compile Include="Controls\BlackStyle\UpdatePanel.cs">
149+ <SubType>UserControl</SubType>
150+ </Compile>
151+ <Compile Include="Controls\BlackStyle\UpdatePanel.Designer.cs">
152+ <DependentUpon>UpdatePanel.cs</DependentUpon>
153+ </Compile>
129154 <Compile Include="ConvolutionMatrix.cs" />
130155 <Compile Include="ConvolutionMatrixManager.cs" />
131156 <Compile Include="DNS\AdapterInfo.cs" />
@@ -155,14 +180,19 @@
155180 <Compile Include="Forms\QRCodeForm.Designer.cs">
156181 <DependentUpon>QRCodeForm.cs</DependentUpon>
157182 </Compile>
183+ <Compile Include="Forms\ScreenTearingTestForm.cs">
184+ <SubType>Form</SubType>
185+ </Compile>
186+ <Compile Include="GraphicsQualityManager.cs" />
158187 <Compile Include="HelpersOptions.cs" />
159188 <Compile Include="Helpers\URLHelpers.cs" />
160189 <Compile Include="Helpers\MathHelpers.cs" />
161- <Compile Include="CodeMenuEntry.cs" />
190+ <Compile Include="NameParser\CodeMenuEntry.cs" />
162191 <Compile Include="Input\InputHelpers.cs" />
163192 <Compile Include="Input\InputManager.cs" />
164193 <Compile Include="ListViewColumnSorter.cs" />
165194 <Compile Include="MimeTypes.cs" />
195+ <Compile Include="NameParser\RegionCaptureInfoTextCodeMenuEntry.cs" />
166196 <Compile Include="Native\LayeredForm.cs">
167197 <SubType>Form</SubType>
168198 </Compile>
@@ -173,6 +203,7 @@
173203 <DependentUpon>MonitorTestForm.cs</DependentUpon>
174204 </Compile>
175205 <Compile Include="Native\NativeConstants.cs" />
206+ <Compile Include="Native\WindowInfo.cs" />
176207 <Compile Include="PingHelper.cs" />
177208 <Compile Include="PingResult.cs" />
178209 <Compile Include="ProxyInfo.cs" />
@@ -197,6 +228,7 @@
197228 <Compile Include="Controls\TabToTreeView.Designer.cs">
198229 <DependentUpon>TabToTreeView.cs</DependentUpon>
199230 </Compile>
231+ <Compile Include="NameParser\ReplCodeMenuEntry.cs" />
200232 <Compile Include="TaskEx.cs" />
201233 <Compile Include="TextBoxTraceListener.cs" />
202234 <Compile Include="UITypeEditors\EnumDescriptionConverter.cs" />
@@ -377,7 +409,7 @@
377409 <Compile Include="FastDateTime.cs" />
378410 <Compile Include="Helpers\Helpers.cs" />
379411 <Compile Include="Logger.cs" />
380- <Compile Include="NameParser.cs" />
412+ <Compile Include="NameParser\NameParser.cs" />
381413 <Compile Include="Properties\AssemblyInfo.cs" />
382414 <Compile Include="Extensions\StreamExtensions.cs" />
383415 <Compile Include="Extensions\StringExtensions.cs" />
@@ -551,6 +583,12 @@
551583 <EmbeddedResource Include="Controls\ExportImportControl.zh-CN.resx">
552584 <DependentUpon>ExportImportControl.cs</DependentUpon>
553585 </EmbeddedResource>
586+ <EmbeddedResource Include="Controls\DoubleLabeledNumericUpDown.resx">
587+ <DependentUpon>DoubleLabeledNumericUpDown.cs</DependentUpon>
588+ </EmbeddedResource>
589+ <EmbeddedResource Include="Controls\LabeledNumericUpDown.resx">
590+ <DependentUpon>LabeledNumericUpDown.cs</DependentUpon>
591+ </EmbeddedResource>
554592 <EmbeddedResource Include="Controls\MyPictureBox.de.resx">
555593 <DependentUpon>MyPictureBox.cs</DependentUpon>
556594 <SubType>Designer</SubType>
@@ -593,6 +631,9 @@
593631 <DependentUpon>MyPictureBox.cs</DependentUpon>
594632 <SubType>Designer</SubType>
595633 </EmbeddedResource>
634+ <EmbeddedResource Include="Controls\BlackStyle\UpdatePanel.resx">
635+ <DependentUpon>UpdatePanel.cs</DependentUpon>
636+ </EmbeddedResource>
596637 <EmbeddedResource Include="DNS\DNSChangerForm.de.resx">
597638 <DependentUpon>DNSChangerForm.cs</DependentUpon>
598639 </EmbeddedResource>
--- a/ShareX.HistoryLib/ImageHistoryForm.ja-JP.resx
+++ b/ShareX.HistoryLib/ImageHistoryForm.ja-JP.resx
@@ -129,13 +129,25 @@
129129 <data name="tsddbThumbnailSize.Text" xml:space="preserve">
130130 <value>サムネイルの大きさ</value>
131131 </data>
132- <data name="tsbQuickList.Text" xml:space="preserve">
133- <value>最近の100画像のみ表示</value>
134- </data>
135132 <data name="tsmiViewModeGallery.Text" xml:space="preserve">
136133 <value>ギャラリー</value>
137134 </data>
138135 <data name="tsmiViewModePane.Text" xml:space="preserve">
139136 <value>分割</value>
140137 </data>
138+ <data name="tsmiMaxImageLimit100.Text" xml:space="preserve">
139+ <value>最近の 100</value>
140+ </data>
141+ <data name="tsmiMaxImageLimit250.Text" xml:space="preserve">
142+ <value>最近の 250</value>
143+ </data>
144+ <data name="tsmiMaxImageLimit1000.Text" xml:space="preserve">
145+ <value>最近の 1000</value>
146+ </data>
147+ <data name="tsmiMaxImageLimit0.Text" xml:space="preserve">
148+ <value>制限なし</value>
149+ </data>
150+ <data name="tsddbMaxImageLimit.Text" xml:space="preserve">
151+ <value>画像数の制限</value>
152+ </data>
141153 </root>
\ No newline at end of file
--- a/ShareX.IndexerLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.IndexerLib/Properties/Resources.ja-JP.resx
@@ -117,7 +117,4 @@
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="DirectoryIndexerForm_BrowseFolder_Choose_folder_path" xml:space="preserve">
121- <value>フォルダーの選択</value>
122- </data>
123120 </root>
\ No newline at end of file
--- a/ShareX.IndexerLib/ShareX.IndexerLib.csproj
+++ b/ShareX.IndexerLib/ShareX.IndexerLib.csproj
@@ -44,8 +44,8 @@
4444 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4545 </PropertyGroup>
4646 <ItemGroup>
47- <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48- <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
47+ <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48+ <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
4949 <Private>True</Private>
5050 </Reference>
5151 <Reference Include="System" />
@@ -95,7 +95,6 @@
9595 <LastGenOutput>Resources.Designer.cs</LastGenOutput>
9696 <SubType>Designer</SubType>
9797 </EmbeddedResource>
98- <EmbeddedResource Include="Properties\Resources.tr.resx" />
9998 </ItemGroup>
10099 <ItemGroup>
101100 <None Include="packages.config" />
--- /dev/null
+++ b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.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="lblFont.Text" xml:space="preserve">
121+ <value>フォント:</value>
122+ </data>
123+ <data name="lblTextSize.Text" xml:space="preserve">
124+ <value>サイズ:</value>
125+ </data>
126+ <data name="btnClose.Text" xml:space="preserve">
127+ <value>閉じる</value>
128+ </data>
129+ <data name="tsmiAlignmentLeft.Text" xml:space="preserve">
130+ <value>左揃え</value>
131+ </data>
132+ <data name="tsmiAlignmentCenter.Text" xml:space="preserve">
133+ <value>中央揃え</value>
134+ </data>
135+ <data name="tsmiAlignmentRight.Text" xml:space="preserve">
136+ <value>右揃え</value>
137+ </data>
138+ <data name="tsmiAlignmentTop.Text" xml:space="preserve">
139+ <value>上揃え</value>
140+ </data>
141+ <data name="tsmiAlignmentBottom.Text" xml:space="preserve">
142+ <value>下揃え</value>
143+ </data>
144+ <data name="tsmiAlignmentMiddle.Text" xml:space="preserve">
145+ <value>上下中央揃え</value>
146+ </data>
147+ <data name="$this.Text" xml:space="preserve">
148+ <value>ShareX - 文字入力</value>
149+ </data>
150+</root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.ja-JP.resx
@@ -120,12 +120,6 @@
120120 <data name="FFmpegOptionsForm_UpdateUI_Quality_" xml:space="preserve">
121121 <value>品質:</value>
122122 </data>
123- <data name="RectangleRegion_WriteTips_top_left" xml:space="preserve">
124- <value>左上</value>
125- </data>
126- <data name="RectangleRegion_WriteTips_Show" xml:space="preserve">
127- <value>表示</value>
128- </data>
129123 <data name="RectangleRegion_WriteTips__Esc__Cancel_capture" xml:space="preserve">
130124 <value>[Esc] キャプチャーをキャンセル</value>
131125 </data>
@@ -133,44 +127,20 @@
133127 <value>[F1] 操作ヒントを隠す</value>
134128 </data>
135129 <data name="RectangleRegion_WriteTips__Hold_Left_click__Start_region_selection" xml:space="preserve">
136- <value>[左ボタンを押す] [Insert] 領域の選択を開始</value>
130+ <value>[左ドラッグ] [Insert] 領域の選択を開始</value>
137131 </data>
138132 <data name="RectangleRegion_WriteTips__Insert__Stop_region_selection" xml:space="preserve">
139133 <value>[左ボタンを離す] [Insert] 領域の選択を終了</value>
140134 </data>
141- <data name="RectangleRegion_WriteTips__M___0__magnifier" xml:space="preserve">
142- <value>[M] ルーペを{0}</value>
143- </data>
144- <data name="RectangleRegion_WriteTips__Mouse_wheel__Change_magnifier_pixel_count" xml:space="preserve">
145- <value>[マウスホイール] ルーペの表示範囲を変更</value>
146- </data>
147- <data name="RectangleRegion_WriteTips__Q__Activate_multi_region_mode" xml:space="preserve">
148- <value>[Q] 複数領域選択モードを有効にする</value>
149- </data>
150- <data name="RectangleRegion_WriteTips__Q__Activate_quick_capture_mode" xml:space="preserve">
151- <value>[Q] クイック キャプチャー モードを有効にする</value>
152- </data>
153- <data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
154- <value>[右クリック] [Esc] キャプチャーをキャンセル</value>
155- </data>
156135 <data name="RectangleRegion_WriteTips__Right_click__Cancel_region_selection" xml:space="preserve">
157136 <value>[右クリック] [Delete] 領域の選択をキャンセル</value>
158137 </data>
159138 <data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
160- <value>[選択領域で右クリック] [Delete] 領域を削除</value>
139+ <value>[Delete] 領域を削除</value>
161140 </data>
162141 <data name="RectangleRegion_WriteTips__Space__Fullscreen_capture" xml:space="preserve">
163142 <value>[Space] フルスクリーン キャプチャー</value>
164143 </data>
165- <data name="RectangleRegion_WriteTips_bottom_right" xml:space="preserve">
166- <value>右下</value>
167- </data>
168- <data name="RectangleRegion_WriteTips_Hide" xml:space="preserve">
169- <value>隠す</value>
170- </data>
171- <data name="RectangleRegion_WriteTips__Ctrl___Mouse_wheel__Change_magnifier_pixel_size" xml:space="preserve">
172- <value>[Ctrl + マウスホイール] ルーペの拡大率を変更</value>
173- </data>
174144 <data name="RectangleRegion_WriteTips__1__2__3_____0__Monitor_capture" xml:space="preserve">
175145 <value>[1, 2, 3 ... 0] モニター キャプチャー</value>
176146 </data>
@@ -189,21 +159,6 @@
189159 <data name="RectangleRegion_WriteTips__Ctrl___C__Copy_info" xml:space="preserve">
190160 <value>[Ctrl + C] 情報をコピー</value>
191161 </data>
192- <data name="RectangleRegion_WriteTips__Numpad_3__Ellipse_shape" xml:space="preserve">
193- <value>[Numpad 3] 楕円形</value>
194- </data>
195- <data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
196- <value>[Numpad 1] 四角形</value>
197- </data>
198- <data name="RectangleRegion_WriteTips__Numpad_2__Rounded_rectangle_shape" xml:space="preserve">
199- <value>[Numpad 2] 角丸四角形</value>
200- </data>
201- <data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
202- <value>[Numpad 4] 三角形</value>
203- </data>
204- <data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
205- <value>[Numpad 5] ひし形</value>
206- </data>
207162 <data name="FFmpegOptionsForm_DownloaderForm_InstallRequested_Download_of_FFmpeg_failed_" xml:space="preserve">
208163 <value>FFmpegのダウンロードに失敗しました。</value>
209164 </data>
@@ -213,39 +168,9 @@
213168 <data name="FFmpegOptionsForm_UpdateUI_Bitrate___0_k" xml:space="preserve">
214169 <value>ビットレート: {0}k</value>
215170 </data>
216- <data name="Surface_InitializeComponent_Region_capture" xml:space="preserve">
217- <value>領域キャプチャー</value>
218- </data>
219- <data name="RectangleRegion_WriteTips__Tab__Swap_resize_anchor_to__0_" xml:space="preserve">
220- <value>[Tab] リサイズのアンカーを{0}に変更</value>
221- </data>
222- <data name="RectangleRegion_WriteTips__C___0__screen_wide_crosshair" xml:space="preserve">
223- <value>[C] 十字線カーソルを{0}</value>
224- </data>
225- <data name="RectangleRegion_WriteTips__Arrow_keys__Resize_selected_region_from__0_" xml:space="preserve">
226- <value>[矢印キー] 選択領域を{0}方向にリサイズ</value>
227- </data>
228- <data name="RectangleRegion_WriteTips__Ctrl___Arrow_keys__Move_cursor_position_faster" xml:space="preserve">
229- <value>[Ctrl + 矢印キー] 高速カーソル移動</value>
230- </data>
231171 <data name="RectangleRegion_WriteTips__Double_Left_click___Enter__Capture_regions" xml:space="preserve">
232172 <value>[左ダブルクリック] [Enter] 領域キャプチャー実行</value>
233173 </data>
234- <data name="RectangleRegion_WriteTips__Hold_Shift__Move_selected_region_instead_of_resizing" xml:space="preserve">
235- <value>[Shift 押す] 選択領域をリサイズではなく移動</value>
236- </data>
237- <data name="RectangleRegion_WriteTips__I___0__position_and_size_info" xml:space="preserve">
238- <value>[I] 位置と大きさの情報を{0}</value>
239- </data>
240- <data name="RectangleRegion_WriteTips__Numpad___or____Change_rounded_rectangle_corner_radius" xml:space="preserve">
241- <value>[Numpad + または -] 角丸の半径を変更</value>
242- </data>
243- <data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
244- <value>[Numpad + または -] 三角形の向きを変更</value>
245- </data>
246- <data name="ScreenRegion_Name_Monitor_0___X__1__Y__2__Width__3__Height__4_" xml:space="preserve">
247- <value>Monitor {0} (X:{1} Y:{2} 幅:{3} 高さ:{4})</value>
248- </data>
249174 <data name="ScrollingCaptureForm_StartCapture_Stop_capture" xml:space="preserve">
250175 <value>キャプチャー停止</value>
251176 </data>
@@ -256,10 +181,10 @@
256181 <value>FFmpegのダウンロードに成功しました。</value>
257182 </data>
258183 <data name="RectangleRegion_WriteTips__Hold_Alt__Snap_resizing_to_preset_sizes" xml:space="preserve">
259- <value>[Alt 押す] 定義されたスナップサイズを表示</value>
184+ <value>[Alt] 定義されたスナップサイズを表示</value>
260185 </data>
261186 <data name="RectangleRegion_WriteTips__Hold_Left_click_on_selection__Move_region" xml:space="preserve">
262- <value>[選択領域で左ボタンを押す] 領域を移動</value>
187+ <value>[選択領域で左ドラッグ] 領域を移動</value>
263188 </data>
264189 <data name="RectangleRegion_GetRulerText_Ruler_info" xml:space="preserve">
265190 <value>X: {0} / Y: {1} / X2: {2} / Y2: {3}
@@ -293,9 +218,6 @@
293218 <data name="RectangleRegion_GetAreaText_Area" xml:space="preserve">
294219 <value>X: {0} Y: {1} 幅: {2} 高さ: {3}</value>
295220 </data>
296- <data name="RectangleRegion_WriteTips__Hold_Ctrl__Resize___Move_faster" xml:space="preserve">
297- <value>[Ctrl 押す] 高速で リサイズ/移動</value>
298- </data>
299221 <data name="FFmpegOptionsForm_buttonFFmpegBrowse_Click_Browse_for_ffmpeg_exe" xml:space="preserve">
300222 <value>ffmpeg.exe の参照</value>
301223 </data>
@@ -306,7 +228,7 @@
306228 <value>領域キャプチャー (透過モード)</value>
307229 </data>
308230 <data name="RectangleRegion_WriteTips__Hold_Shift__Proportional_resizing" xml:space="preserve">
309- <value>[Shift 押す] 縦横比 1:1 でリサイズ</value>
231+ <value>[Shift] 縦横比 1:1 でリサイズ</value>
310232 </data>
311233 <data name="RectangleLight_InitializeComponent_Rectangle_capture_light" xml:space="preserve">
312234 <value>領域キャプチャー (ライトモード)</value>
@@ -317,4 +239,124 @@
317239 <data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
318240 <value>停止</value>
319241 </data>
242+ <data name="RectangleRegionForm_DrawMenuTip_Tip__Right_click_to_open_options_menu" xml:space="preserve">
243+ <value>ヒント: 右クリックでオプション メニューを開く</value>
244+ </data>
245+ <data name="RectangleRegionForm_WriteTips__Right_click___Menu__Open_options_menu" xml:space="preserve">
246+ <value>[右クリック] [Menu] オプション メニューを開く</value>
247+ </data>
248+ <data name="RectangleRegionForm_WriteTips__Arrow_keys__Resize_region_from_top_left_corner" xml:space="preserve">
249+ <value>[矢印キー] 領域を左上方向にリサイズ</value>
250+ </data>
251+ <data name="RectangleRegionForm_WriteTips__Hold_Alt___Arrow_keys__Resize_region_from_bottom_right_corner" xml:space="preserve">
252+ <value>[Alt + 矢印キー] 領域を右下方向にリサイズ</value>
253+ </data>
254+ <data name="RectangleRegionForm_WriteTips__Hold_Ctrl___Arrow_keys__Move_region" xml:space="preserve">
255+ <value>[Ctrl + 矢印キー] 領域を移動</value>
256+ </data>
257+ <data name="RectangleRegionForm_WriteTips__Hold_Shift___Arrow_keys__Resize_or_move_region_faster" xml:space="preserve">
258+ <value>[Shift+ 矢印キー] 領域を高速にリサイズか移動</value>
259+ </data>
260+ <data name="RectangleRegionForm_WriteTips__Hold_Shift___Arrow_keys__Move_cursor_position_faster" xml:space="preserve">
261+ <value>[Shift+ 矢印キー] 高速にカーソル移動</value>
262+ </data>
263+ <data name="RectangleRegionForm_WriteTips__Mouse_wheel__Change_current_tool" xml:space="preserve">
264+ <value>[マウスホイール] 現在のツールを変更</value>
265+ </data>
266+ <data name="ShapeManager_CreateContextMenu_Cancel_capture" xml:space="preserve">
267+ <value>キャプチャーの中止</value>
268+ </data>
269+ <data name="ShapeManager_CreateContextMenu_Close_menu" xml:space="preserve">
270+ <value>メニューを閉じる</value>
271+ </data>
272+ <data name="ShapeManager_CreateContextMenu_Delete_selected_object" xml:space="preserve">
273+ <value>選択オブジェクトの削除</value>
274+ </data>
275+ <data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
276+ <value>すべてのオブジェクトの削除</value>
277+ </data>
278+ <data name="ShapeManager_CreateContextMenu_Border_color___" xml:space="preserve">
279+ <value>枠線の色...</value>
280+ </data>
281+ <data name="ShapeManager_CreateContextMenu_Border_size_" xml:space="preserve">
282+ <value>枠線の太さ:</value>
283+ </data>
284+ <data name="ShapeManager_CreateContextMenu_Fill_color___" xml:space="preserve">
285+ <value>塗りつぶしの色...</value>
286+ </data>
287+ <data name="ShapeManager_CreateContextMenu_Corner_radius_" xml:space="preserve">
288+ <value>角の半径:</value>
289+ </data>
290+ <data name="ShapeManager_CreateContextMenu_Blur_radius_" xml:space="preserve">
291+ <value>ぼかしの半径:</value>
292+ </data>
293+ <data name="ShapeManager_CreateContextMenu_Highlight_color___" xml:space="preserve">
294+ <value>ハイライト色...</value>
295+ </data>
296+ <data name="ShapeManager_CreateContextMenu_Options" xml:space="preserve">
297+ <value>オプション</value>
298+ </data>
299+ <data name="ShapeManager_CreateContextMenu_Show_tips" xml:space="preserve">
300+ <value>操作ヒントを表示</value>
301+ </data>
302+ <data name="ShapeManager_CreateContextMenu_Show_magnifier" xml:space="preserve">
303+ <value>ルーペを表示</value>
304+ </data>
305+ <data name="ShapeManager_CreateContextMenu_Width_" xml:space="preserve">
306+ <value>幅:</value>
307+ </data>
308+ <data name="ShapeManager_CreateContextMenu_Height_" xml:space="preserve">
309+ <value>高さ:</value>
310+ </data>
311+ <data name="ShapeManager_CreateContextMenu_Show_FPS" xml:space="preserve">
312+ <value>FPSを表示</value>
313+ </data>
314+ <data name="ShapeManager_CreateContextMenu_Capture_active_monitor" xml:space="preserve">
315+ <value>アクティブ モニターをキャプチャー</value>
316+ </data>
317+ <data name="ShapeManager_CreateContextMenu_Capture_fullscreen" xml:space="preserve">
318+ <value>フルスクリーンをキャプチャー</value>
319+ </data>
320+ <data name="ShapeManager_CreateContextMenu_Capture_monitor" xml:space="preserve">
321+ <value>モニターをキャプチャー</value>
322+ </data>
323+ <data name="BaseRegionForm_InitializeComponent_Region_capture" xml:space="preserve">
324+ <value>領域キャプチャー</value>
325+ </data>
326+ <data name="RectangleRegionForm_WriteTips__Hold_Ctrl__Move_selection" xml:space="preserve">
327+ <value>[Ctrl] 選択を移動</value>
328+ </data>
329+ <data name="RectangleRegionForm_WriteTips__Ctrl___Mouse_wheel__Change_magnifier_size" xml:space="preserve">
330+ <value>[Ctrl + マウスホイール] ルーペ サイズの変更</value>
331+ </data>
332+ <data name="RectangleRegionForm_WriteTips__Tab___Mouse_4_click__Select_last_annotation_tool" xml:space="preserve">
333+ <value>[Tab] [第4ボタン クリック] 最近使用した注釈ツール</value>
334+ </data>
335+ <data name="RectangleRegionForm_WriteTips__Tab___Mouse_4_click__Select_last_region_tool" xml:space="preserve">
336+ <value>[Tab] [第4ボタン クリック] 最近使用した領域ツール</value>
337+ </data>
338+ <data name="ShapeManager_CreateContextMenu_Pixel_size_" xml:space="preserve">
339+ <value>ピクセルの大きさ:</value>
340+ </data>
341+ <data name="ShapeManager_CreateContextMenu_Multi_region_mode" xml:space="preserve">
342+ <value>複数領域選択モード</value>
343+ </data>
344+ <data name="ShapeManager_CreateContextMenu_Show_position_and_size_info" xml:space="preserve">
345+ <value>位置と大きさの情報を表示</value>
346+ </data>
347+ <data name="ShapeManager_CreateContextMenu_Square_shape_magnifier" xml:space="preserve">
348+ <value>四角形ルーペ</value>
349+ </data>
350+ <data name="ShapeManager_CreateContextMenu_Magnifier_pixel_count_" xml:space="preserve">
351+ <value>ルーペの表示ピクセル数:</value>
352+ </data>
353+ <data name="ShapeManager_CreateContextMenu_Magnifier_pixel_size_" xml:space="preserve">
354+ <value>ルーペのピクセルの大きさ:</value>
355+ </data>
356+ <data name="ShapeManager_CreateContextMenu_Show_screen_wide_crosshair" xml:space="preserve">
357+ <value>十字線カーソルを表示</value>
358+ </data>
359+ <data name="ShapeManager_CreateContextMenu_Fixed_size_region_mode" xml:space="preserve">
360+ <value>固定サイズ領域キャプチャー モード</value>
361+ </data>
320362 </root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
@@ -59,11 +59,12 @@
5959 <Reference Include="System.Xml" />
6060 </ItemGroup>
6161 <ItemGroup>
62+ <Compile Include="Shapes\AnnotationOptions.cs" />
6263 <Compile Include="Enums.cs" />
63- <Compile Include="Forms\RectangleAnnotate.cs">
64+ <Compile Include="Forms\RectangleRegionAnnotateForm.cs">
6465 <SubType>Form</SubType>
6566 </Compile>
66- <Compile Include="Forms\RectangleTransparent.cs">
67+ <Compile Include="Forms\RectangleRegionTransparentForm.cs">
6768 <SubType>Form</SubType>
6869 </Compile>
6970 <Compile Include="Forms\ScrollingCaptureForm.cs">
@@ -72,17 +73,39 @@
7273 <Compile Include="Forms\ScrollingCaptureForm.Designer.cs">
7374 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
7475 </Compile>
76+ <Compile Include="Forms\TextDrawingInputBox.cs">
77+ <SubType>Form</SubType>
78+ </Compile>
79+ <Compile Include="Forms\TextDrawingInputBox.Designer.cs">
80+ <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
81+ </Compile>
7582 <Compile Include="Forms\WebpageCaptureForm.cs">
7683 <SubType>Form</SubType>
7784 </Compile>
7885 <Compile Include="Forms\WebpageCaptureForm.Designer.cs">
7986 <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
8087 </Compile>
81- <Compile Include="MonitorRegion.cs" />
82- <Compile Include="MonitorRegionDefaultCreator.cs" />
8388 <Compile Include="RectangleAnnotateOptions.cs" />
8489 <Compile Include="RegionHelpers\ColorBlinkAnimation.cs" />
85- <Compile Include="RegionHelpers\RegionInfo.cs" />
90+ <Compile Include="RegionHelpers\PointInfo.cs" />
91+ <Compile Include="RegionHelpers\TextAnimation.cs" />
92+ <Compile Include="Shapes\BaseShape.cs" />
93+ <Compile Include="Shapes\Drawing\ArrowDrawingShape.cs" />
94+ <Compile Include="Shapes\Drawing\BaseDrawingShape.cs" />
95+ <Compile Include="Shapes\Drawing\StepDrawingShape.cs" />
96+ <Compile Include="Shapes\TextDrawingOptions.cs" />
97+ <Compile Include="Shapes\Drawing\TextDrawingShape.cs" />
98+ <Compile Include="Shapes\Effect\BlurEffectShape.cs" />
99+ <Compile Include="Shapes\Drawing\EllipseDrawingShape.cs" />
100+ <Compile Include="Shapes\Effect\HighlightEffectShape.cs" />
101+ <Compile Include="Shapes\Drawing\LineDrawingShape.cs" />
102+ <Compile Include="Shapes\Effect\PixelateEffectShape.cs" />
103+ <Compile Include="Shapes\Drawing\RectangleDrawingShape.cs" />
104+ <Compile Include="Shapes\Drawing\RoundedRectangleDrawingShape.cs" />
105+ <Compile Include="Shapes\Effect\BaseEffectShape.cs" />
106+ <Compile Include="Shapes\Region\EllipseRegionShape.cs" />
107+ <Compile Include="Shapes\Region\RectangleRegionShape.cs" />
108+ <Compile Include="Shapes\Region\BaseRegionShape.cs" />
86109 <Compile Include="Screencast\FFmpegOptions.cs" />
87110 <Compile Include="Screencast\FFmpegHelper.cs" />
88111 <Compile Include="Screencast\FFmpegOptionsForm.cs">
@@ -92,10 +115,10 @@
92115 <DependentUpon>FFmpegOptionsForm.cs</DependentUpon>
93116 </Compile>
94117 <Compile Include="Screencast\ScreencastOptions.cs" />
95- <Compile Include="Forms\RectangleLight.cs">
118+ <Compile Include="Forms\RectangleRegionLightForm.cs">
96119 <SubType>Form</SubType>
97120 </Compile>
98- <Compile Include="Forms\Surface.cs">
121+ <Compile Include="Forms\BaseRegionForm.cs">
99122 <SubType>Form</SubType>
100123 </Compile>
101124 <Compile Include="Screencast\ImageCache.cs" />
@@ -105,26 +128,27 @@
105128 <DesignTime>True</DesignTime>
106129 <DependentUpon>Resources.resx</DependentUpon>
107130 </Compile>
108- <Compile Include="RegionHelpers\AreaManager.cs" />
131+ <Compile Include="Shapes\ShapeManager.cs" />
109132 <Compile Include="RegionHelpers\DrawObject.cs" />
110- <Compile Include="Forms\FreeHandRegion.cs">
133+ <Compile Include="Forms\FreeHandRegionForm.cs">
111134 <SubType>Form</SubType>
112135 </Compile>
113- <Compile Include="Forms\PolygonRegion.cs">
136+ <Compile Include="Forms\PolygonRegionForm.cs">
114137 <SubType>Form</SubType>
115138 </Compile>
116- <Compile Include="Forms\RectangleRegion.cs">
139+ <Compile Include="Forms\RectangleRegionForm.cs">
117140 <SubType>Form</SubType>
118141 </Compile>
119142 <Compile Include="RegionHelpers\InputManager.cs" />
120143 <Compile Include="RegionHelpers\MouseState.cs" />
121144 <Compile Include="RegionHelpers\NodeObject.cs" />
122- <Compile Include="RegionHelpers\ResizeManager.cs" />
123- <Compile Include="RegionHelpers\ShapeCaptureHelpers.cs" />
145+ <Compile Include="Shapes\ResizeManager.cs" />
146+ <Compile Include="RegionHelpers\RegionCaptureHelpers.cs" />
124147 <Compile Include="ScrollingCaptureOptions.cs" />
148+ <Compile Include="Shapes\Region\RoundedRectangleRegionShape.cs" />
125149 <Compile Include="SimpleWindowInfo.cs" />
126150 <Compile Include="SnapSize.cs" />
127- <Compile Include="SurfaceOptions.cs" />
151+ <Compile Include="RegionCaptureOptions.cs" />
128152 <Compile Include="Screencast\ScreenRecorder.cs" />
129153 <Compile Include="Screencast\HardDiskCache.cs" />
130154 <Compile Include="Screenshot.cs" />
@@ -132,7 +156,6 @@
132156 <Compile Include="Screenshot_Transparent.cs" />
133157 <Compile Include="WebpageCapture.cs" />
134158 <Compile Include="WebpageCaptureOptions.cs" />
135- <Compile Include="WindowInfo.cs" />
136159 <Compile Include="WindowsList.cs" />
137160 <Compile Include="WindowsRectangleList.cs" />
138161 </ItemGroup>
@@ -143,6 +166,36 @@
143166 </ProjectReference>
144167 </ItemGroup>
145168 <ItemGroup>
169+ <None Include="Resources\edit-vertical-alignment.png" />
170+ <None Include="Resources\edit-vertical-alignment-top.png" />
171+ <None Include="Resources\edit-alignment-right.png" />
172+ <None Include="Resources\edit-alignment.png" />
173+ <None Include="Resources\edit-vertical-alignment-middle.png" />
174+ <None Include="Resources\edit-alignment-center.png" />
175+ <None Include="Resources\edit-underline.png" />
176+ <None Include="Resources\edit-italic.png" />
177+ <None Include="Resources\edit-bold.png" />
178+ <None Include="Resources\layer-shape-text.png" />
179+ <None Include="Resources\gear.png" />
180+ <None Include="Resources\layer_fullscreen.png" />
181+ <None Include="Resources\layer-shade.png" />
182+ <None Include="Resources\layer-shape-ellipse-region.png" />
183+ <None Include="Resources\layer-shape-round-region.png" />
184+ <None Include="Resources\layer-shape-region.png" />
185+ <None Include="Resources\layer-shape-arrow.png" />
186+ <None Include="Resources\grid.png" />
187+ <None Include="Resources\highlighter-text.png" />
188+ <None Include="Resources\monitor-window.png" />
189+ <None Include="Resources\monitor.png" />
190+ <None Include="Resources\layer-shape-line.png" />
191+ <None Include="Resources\layer-shape-ellipse.png" />
192+ <None Include="Resources\layer-shape-round.png" />
193+ <None Include="Resources\layer-shape.png" />
194+ <None Include="Resources\layer--minus.png" />
195+ <None Include="Resources\minus.png" />
196+ <None Include="Resources\prohibition.png" />
197+ <None Include="Resources\cross.png" />
198+ <None Include="Resources\counter-reset.png" />
146199 <Content Include="Resources\Crosshair.cur" />
147200 <None Include="Resources\exclamation-button.png" />
148201 </ItemGroup>
@@ -177,6 +230,21 @@
177230 <EmbeddedResource Include="Forms\ScrollingCaptureForm.zh-CN.resx">
178231 <DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
179232 </EmbeddedResource>
233+ <EmbeddedResource Include="Forms\TextDrawingInputBox.fr.resx">
234+ <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
235+ </EmbeddedResource>
236+ <EmbeddedResource Include="Forms\TextDrawingInputBox.ja-JP.resx">
237+ <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
238+ </EmbeddedResource>
239+ <EmbeddedResource Include="Forms\TextDrawingInputBox.pt-BR.resx">
240+ <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
241+ </EmbeddedResource>
242+ <EmbeddedResource Include="Forms\TextDrawingInputBox.resx">
243+ <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
244+ </EmbeddedResource>
245+ <EmbeddedResource Include="Forms\TextDrawingInputBox.ru.resx">
246+ <DependentUpon>TextDrawingInputBox.cs</DependentUpon>
247+ </EmbeddedResource>
180248 <EmbeddedResource Include="Forms\WebpageCaptureForm.de.resx">
181249 <DependentUpon>WebpageCaptureForm.cs</DependentUpon>
182250 </EmbeddedResource>
@@ -274,6 +342,7 @@
274342 <DependentUpon>FFmpegOptionsForm.cs</DependentUpon>
275343 </EmbeddedResource>
276344 </ItemGroup>
345+ <ItemGroup />
277346 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
278347 <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
279348 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--- a/ShareX.UploadersLib/FTPClient/FTPClientForm.ja-JP.resx
+++ b/ShareX.UploadersLib/FTPClient/FTPClientForm.ja-JP.resx
@@ -126,33 +126,9 @@
126126 <data name="chLastModified.Text" xml:space="preserve">
127127 <value>最終更新日</value>
128128 </data>
129- <data name="openURLToolStripMenuItem.Text" xml:space="preserve">
130- <value>URLを開く</value>
131- </data>
132- <data name="downloadToolStripMenuItem.Text" xml:space="preserve">
133- <value>ダウンロード</value>
134- </data>
135- <data name="refreshToolStripMenuItem.Text" xml:space="preserve">
136- <value>更新</value>
137- </data>
138- <data name="connectToolStripMenuItem.Text" xml:space="preserve">
139- <value>接続</value>
140- </data>
141- <data name="disconnectToolStripMenuItem.Text" xml:space="preserve">
142- <value>切断</value>
143- </data>
144129 <data name="tpConsole.Text" xml:space="preserve">
145130 <value>コンソール</value>
146131 </data>
147- <data name="copyURLsToClipboardToolStripMenuItem.Text" xml:space="preserve">
148- <value>URLをクリップボードにコピー</value>
149- </data>
150- <data name="createDirectoryToolStripMenuItem.Text" xml:space="preserve">
151- <value>ディレクトリを作成</value>
152- </data>
153- <data name="deleteToolStripMenuItem.Text" xml:space="preserve">
154- <value>削除</value>
155- </data>
156132 <data name="$this.Text" xml:space="preserve">
157133 <value>ShareX FTP クライアント</value>
158134 </data>
@@ -162,9 +138,6 @@
162138 <data name="chFiletype.Text" xml:space="preserve">
163139 <value>種類</value>
164140 </data>
165- <data name="renameToolStripMenuItem.Text" xml:space="preserve">
166- <value>名前の変更</value>
167- </data>
168141 <data name="tpAccount.Text" xml:space="preserve">
169142 <value>アカウント</value>
170143 </data>
@@ -174,4 +147,31 @@
174147 <data name="lblConnecting.Text" xml:space="preserve">
175148 <value>FTPサーバーに接続しています...</value>
176149 </data>
150+ <data name="tsmiConnect.Text" xml:space="preserve">
151+ <value>接続</value>
152+ </data>
153+ <data name="tsmiDisconnect.Text" xml:space="preserve">
154+ <value>切断</value>
155+ </data>
156+ <data name="tsmiDownload.Text" xml:space="preserve">
157+ <value>ダウンロード</value>
158+ </data>
159+ <data name="tsmiOpenURL.Text" xml:space="preserve">
160+ <value>URLを開く</value>
161+ </data>
162+ <data name="tsmiRename.Text" xml:space="preserve">
163+ <value>名前の変更</value>
164+ </data>
165+ <data name="tsmiDelete.Text" xml:space="preserve">
166+ <value>削除</value>
167+ </data>
168+ <data name="tsmiRefresh.Text" xml:space="preserve">
169+ <value>更新</value>
170+ </data>
171+ <data name="tsmiCopyURL.Text" xml:space="preserve">
172+ <value>URLをクリップボードにコピー</value>
173+ </data>
174+ <data name="tsmiCreateDirectory.Text" xml:space="preserve">
175+ <value>ディレクトリを作成</value>
176+ </data>
177177 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx
+++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx
@@ -606,9 +606,6 @@
606606 <data name="lblPomfUploaders.Text" xml:space="preserve">
607607 <value>アップローダー:</value>
608608 </data>
609- <data name="btnDropboxShowFiles.Text" xml:space="preserve">
610- <value>選択...</value>
611- </data>
612609 <data name="cbDropboxAutoCreateShareableLink.Text" xml:space="preserve">
613610 <value>共有可能なURLを作成:</value>
614611 </data>
@@ -917,40 +914,58 @@ store.book[0].title</value>
917914 <data name="lblYourlsSignature.Text" xml:space="preserve">
918915 <value>シグネチャ:</value>
919916 </data>
920- <data name="lblOpenloadApiKey.Text" xml:space="preserve">
917+ <data name="cbMinusPublic.Text" xml:space="preserve">
918+ <value>公開</value>
919+ </data>
920+ <data name="cbGistUseRawURL.Text" xml:space="preserve">
921+ <value>Raw URLを使用する</value>
922+ </data>
923+ <data name="cbGistPublishPublic.Text" xml:space="preserve">
924+ <value>公開Gistを作成する</value>
925+ </data>
926+ <data name="cbPastebinRaw.Text" xml:space="preserve">
927+ <value>Raw URLを使用する</value>
928+ </data>
929+ <data name="lblLithiioApiKey.Text" xml:space="preserve">
930+ <value>API キー:</value>
931+ </data>
932+ <data name="lblPuushAPIKey.Text" xml:space="preserve">
921933 <value>API キー:</value>
922934 </data>
923- <data name="lblOpenloadApiLogin.Text" xml:space="preserve">
924- <value>API ログイン:</value>
935+ <data name="llPuushCreateAccount.Text" xml:space="preserve">
936+ <value>アカウントを作成...</value>
925937 </data>
926- <data name="gbOpenloadAuthentication.Text" xml:space="preserve">
927- <value>認証</value>
938+ <data name="lblPuushEmail.Text" xml:space="preserve">
939+ <value>Eメール:</value>
928940 </data>
929- <data name="gbOpenloadFolders.Text" xml:space="preserve">
930- <value>フォルダー</value>
941+ <data name="llPuushForgottenPassword.Text" xml:space="preserve">
942+ <value>パスワードを忘れましたか?</value>
931943 </data>
932- <data name="lblOpenloadApiLink.Text" xml:space="preserve">
933- <value>API キーをOpenloadアカウント パネルから入手。</value>
944+ <data name="btnLithiioGetAPIKey.Text" xml:space="preserve">
945+ <value>APIキーを取得...</value>
934946 </data>
935- <data name="btnOpenloadRefreshFolders.Text" xml:space="preserve">
936- <value>更新</value>
947+ <data name="lblLithiioInfo.Text" xml:space="preserve">
948+ <value>匿名使用ではAPIキーを空白のままに。</value>
937949 </data>
938- <data name="cbOpenloadUploadToFolder.Text" xml:space="preserve">
939- <value>選択フォルダーにファイルをアップロードする</value>
950+ <data name="lblLithiioUploadURL.Text" xml:space="preserve">
951+ <value>リンク URL:</value>
940952 </data>
941- <data name="cbMinusPublic.Text" xml:space="preserve">
942- <value>公開</value>
953+ <data name="btnPuushLogin.Text" xml:space="preserve">
954+ <value>ログイン</value>
943955 </data>
944- <data name="cbEmailConfirm.Text" xml:space="preserve">
945- <value>送信前に確認</value>
956+ <data name="lblPuushPassword.Text" xml:space="preserve">
957+ <value>パスワード:</value>
946958 </data>
947- <data name="cbGistUseRawURL.Text" xml:space="preserve">
948- <value>Raw URLを使用する</value>
959+ <data name="cbEmailAutomaticSend.Text" xml:space="preserve">
960+ <value>ダイアログを表示せずにEメールを送信する送信先:</value>
949961 </data>
950- <data name="cbGistPublishPublic.Text" xml:space="preserve">
951- <value>公開Gistを作成する</value>
962+ <data name="cbGoogleDriveDirectLink.Text" xml:space="preserve">
963+ <value>ダイレクト リンクを使用</value>
952964 </data>
953- <data name="cbPastebinRaw.Text" xml:space="preserve">
954- <value>Raw URLを使用する</value>
965+ <data name="cbStreamableUseDirectURL.Text" xml:space="preserve">
966+ <value>ダイレクト リンクを使用</value>
967+ </data>
968+ <data name="cbHastebinUseFileExtension.Text" xml:space="preserve">
969+ <value>構文ハイライトにファイル拡張子を使用 (.txt を除く)</value>
955970 </data>
956971 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.UploadersLib/Properties/Resources.ja-JP.resx
@@ -150,9 +150,6 @@
150150 <data name="UploadersConfigForm_UpdateDropboxStatus_Email_" xml:space="preserve">
151151 <value>Eメール:</value>
152152 </data>
153- <data name="DropboxFilesForm_tsmiDelete_Click_Delete_file_" xml:space="preserve">
154- <value>ファイルを削除しますか?</value>
155- </data>
156153 <data name="UploadersConfigForm_Login_successful" xml:space="preserve">
157154 <value>ログイン成功</value>
158155 </data>
@@ -174,9 +171,6 @@
174171 <data name="UploadersConfigForm_PhotobucketCreateAlbum__0__successfully_created_" xml:space="preserve">
175172 <value>{0} を作成しました。</value>
176173 </data>
177- <data name="DropboxFilesForm_tsmiDelete_Click_Are_you_sure_you_want_to_delete___0___from_your_Dropbox_" xml:space="preserve">
178- <value>本当に「{0}」を Dropbox から削除しますか?</value>
179- </data>
180174 <data name="UploadersConfigForm_ListFolders_Authentication_required_" xml:space="preserve">
181175 <value>認証が必要です。</value>
182176 </data>
@@ -202,9 +196,6 @@
202196 <data name="FTPClientForm_FTPCreateDirectory_Directory_name_to_create" xml:space="preserve">
203197 <value>作成するディレクトリ名</value>
204198 </data>
205- <data name="DropboxFilesForm_tsmiCreateDirectory_Click_Directory_name_to_create" xml:space="preserve">
206- <value>作成するディレクトリ名</value>
207- </data>
208199 <data name="UploadersConfigForm_UpdateDropboxStatus_Download_path_" xml:space="preserve">
209200 <value>ダウンロード パス:</value>
210201 </data>
@@ -223,12 +214,6 @@
223214 <data name="UploadersConfigForm_LoadSettings_Parent_album_path_e_g_" xml:space="preserve">
224215 <value>親アルバムのパス たとえば</value>
225216 </data>
226- <data name="DropboxFilesForm_OpenDirectory_Path_not_exist_" xml:space="preserve">
227- <value>存在しないパス:</value>
228- </data>
229- <data name="Pomf_Upload_Please_select_one_of_the_Pomf_uploaders_from__Destination_settings_window____Pomf_tab__" xml:space="preserve">
230- <value>「アップロード先の設定 -&gt; Pomf」でアップローダーを選択してください。</value>
231- </data>
232217 <data name="UploadersConfigForm_LoadSettings_Selected_folder_" xml:space="preserve">
233218 <value>フォルダーの選択:</value>
234219 </data>
@@ -253,16 +238,13 @@
253238 <data name="UploadersConfigForm_OneDriveAddFolder_Querying_folders___" xml:space="preserve">
254239 <value>フォルダーの照会中...</value>
255240 </data>
256- <data name="UploadersConfigForm_HubicListFolders_Hubic_refresh_folders_list_failed" xml:space="preserve">
257- <value>Hubic フォルダー一覧の更新失敗</value>
258- </data>
259241 <data name="UploadersConfigForm_BoxListFolders_Box_refresh_folders_list_failed" xml:space="preserve">
260242 <value>Box フォルダー一覧の更新失敗</value>
261243 </data>
262244 <data name="CustomFileUploader_Upload_Response_parse_failed_" xml:space="preserve">
263245 <value>応答の解析に失敗しました。</value>
264246 </data>
265- <data name="TaskHelpers_TweetMessage_Unable_to_find_valid_Twitter_account_" xml:space="preserve">
266- <value>有効なTwitterアカウントが見つかりません。</value>
247+ <data name="UploadersConfigForm_Remove_all_custom_uploaders_Confirmation" xml:space="preserve">
248+ <value>すべての独自のアップローダーを削除しますか?</value>
267249 </data>
268250 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@@ -79,19 +79,19 @@
7979 </PropertyGroup>
8080 <ItemGroup>
8181 <Reference Include="AWSSDK.Core, Version=3.1.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
82- <HintPath>..\packages\AWSSDK.Core.3.1.5.1\lib\net35\AWSSDK.Core.dll</HintPath>
82+ <HintPath>..\packages\AWSSDK.Core.3.1.9.0\lib\net35\AWSSDK.Core.dll</HintPath>
8383 <Private>True</Private>
8484 </Reference>
8585 <Reference Include="AWSSDK.S3, Version=3.1.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
86- <HintPath>..\packages\AWSSDK.S3.3.1.4.0\lib\net35\AWSSDK.S3.dll</HintPath>
86+ <HintPath>..\packages\AWSSDK.S3.3.1.8.1\lib\net35\AWSSDK.S3.dll</HintPath>
8787 <Private>True</Private>
8888 </Reference>
89- <Reference Include="MegaApiClient, Version=1.2.1.150, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
90- <HintPath>..\packages\MegaApiClient.1.2.1\lib\net40\MegaApiClient.dll</HintPath>
89+ <Reference Include="MegaApiClient, Version=1.2.2.209, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
90+ <HintPath>..\packages\MegaApiClient.1.2.2\lib\net40\MegaApiClient.dll</HintPath>
9191 <Private>True</Private>
9292 </Reference>
93- <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
94- <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
93+ <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
94+ <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
9595 <Private>True</Private>
9696 </Reference>
9797 <Reference Include="Renci.SshNet, Version=2014.4.6.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
@@ -102,6 +102,7 @@
102102 <HintPath>..\Lib\Security.Cryptography.dll</HintPath>
103103 </Reference>
104104 <Reference Include="System" />
105+ <Reference Include="System.Data" />
105106 <Reference Include="System.Design" />
106107 <Reference Include="System.Drawing" />
107108 <Reference Include="System.Net.FtpClient, Version=1.0.5281.14359, Culture=neutral, PublicKeyToken=fa4be07daa57c2b7, processorArchitecture=MSIL">
@@ -121,9 +122,14 @@
121122 <Compile Include="APIKeys\APIKeys.cs" />
122123 <Compile Include="APIKeys\APIKeysLocal.cs" />
123124 <Compile Include="BaseServices\FileUploaderService.cs" />
125+ <Compile Include="BaseServices\IGenericUploaderService.cs" />
126+ <Compile Include="BaseServices\IUploaderService.cs" />
127+ <Compile Include="BaseUploaders\GenericUploader.cs" />
124128 <Compile Include="FileUploaders\AmazonS3Region.cs" />
125129 <Compile Include="FileUploaders\AmazonS3Settings.cs" />
126130 <Compile Include="FileUploaders\Box.cs" />
131+ <Compile Include="FileUploaders\Lithiio.cs" />
132+ <Compile Include="FileUploaders\Puush.cs" />
127133 <Compile Include="FileUploaders\Sul.cs" />
128134 <Compile Include="FileUploaders\Dropfile.cs" />
129135 <Compile Include="FileUploaders\Lambda.cs" />
@@ -147,6 +153,18 @@
147153 <Compile Include="FileUploaders\SharedFolderUploader.cs" />
148154 <Compile Include="FileUploaders\Uguu.cs" />
149155 <Compile Include="FileUploaders\VideoBin.cs" />
156+ <Compile Include="Forms\OCRSpaceForm.cs">
157+ <SubType>Form</SubType>
158+ </Compile>
159+ <Compile Include="Forms\OCRSpaceForm.Designer.cs">
160+ <DependentUpon>OCRSpaceForm.cs</DependentUpon>
161+ </Compile>
162+ <Compile Include="Forms\PuushLoginForm.cs">
163+ <SubType>Form</SubType>
164+ </Compile>
165+ <Compile Include="Forms\PuushLoginForm.Designer.cs">
166+ <DependentUpon>PuushLoginForm.cs</DependentUpon>
167+ </Compile>
150168 <Compile Include="FTPClient\FTPClientForm.cs">
151169 <SubType>Form</SubType>
152170 </Compile>
@@ -208,6 +226,8 @@
208226 <Compile Include="Helpers\OAuth\IOAuthBase.cs" />
209227 <Compile Include="Helpers\SSLBypassHelper.cs" />
210228 <Compile Include="BaseServices\URLSharingService.cs" />
229+ <Compile Include="ImageUploaders\Slimg.cs" />
230+ <Compile Include="OtherServices\OCRSpace.cs" />
211231 <Compile Include="SharingServices\DeliciousSharingService.cs" />
212232 <Compile Include="SharingServices\EmailSharingService.cs" />
213233 <Compile Include="SharingServices\FacebookSharingService.cs" />
@@ -246,21 +266,14 @@
246266 <Compile Include="Controls\AccountsControl.Designer.cs">
247267 <DependentUpon>AccountsControl.cs</DependentUpon>
248268 </Compile>
249- <Compile Include="Forms\DropboxFilesForm.cs">
250- <SubType>Form</SubType>
251- </Compile>
252- <Compile Include="Forms\DropboxFilesForm.Designer.cs">
253- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
254- </Compile>
255269 <Compile Include="Helpers\CertFileNameEditor.cs" />
256- <Compile Include="Helpers\ImageListManager.cs" />
257270 <Compile Include="BaseUploaders\FileUploader.cs" />
258271 <Compile Include="FileUploaders\Dropbox.cs" />
259272 <Compile Include="FileUploaders\DropIO.cs" />
260273 <Compile Include="FileUploaders\FileBin.cs" />
261274 <Compile Include="FileUploaders\FileSonic.cs" />
262- <Compile Include="FileUploaders\FTP\FTPAccount.cs" />
263- <Compile Include="FileUploaders\FTP\FTPAdapter.cs" />
275+ <Compile Include="FileUploaders\FTPAccount.cs" />
276+ <Compile Include="FileUploaders\FTPAdapter.cs" />
264277 <Compile Include="FileUploaders\FTP.cs" />
265278 <Compile Include="FileUploaders\RapidShare.cs" />
266279 <Compile Include="FileUploaders\SendSpace.cs" />
@@ -309,7 +322,7 @@
309322 <Compile Include="ImageUploaders\TwitSnapsUploader.cs" />
310323 <Compile Include="ImageUploaders\UploadScreenshot.cs" />
311324 <Compile Include="ImageUploaders\YfrogUploader.cs" />
312- <Compile Include="FileUploaders\Localhost\LocalhostAccount.cs" />
325+ <Compile Include="FileUploaders\LocalhostAccount.cs" />
313326 <Compile Include="Properties\AssemblyInfo.cs" />
314327 <Compile Include="Properties\Resources.Designer.cs">
315328 <AutoGen>True</AutoGen>
@@ -452,42 +465,6 @@
452465 <EmbeddedResource Include="Controls\OAuthControl.zh-CN.resx">
453466 <DependentUpon>OAuthControl.cs</DependentUpon>
454467 </EmbeddedResource>
455- <EmbeddedResource Include="Forms\DropboxFilesForm.de.resx">
456- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
457- </EmbeddedResource>
458- <EmbeddedResource Include="Forms\DropboxFilesForm.es.resx">
459- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
460- </EmbeddedResource>
461- <EmbeddedResource Include="Forms\DropboxFilesForm.fr.resx">
462- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
463- </EmbeddedResource>
464- <EmbeddedResource Include="Forms\DropboxFilesForm.hu.resx">
465- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
466- </EmbeddedResource>
467- <EmbeddedResource Include="Forms\DropboxFilesForm.ja-JP.resx">
468- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
469- </EmbeddedResource>
470- <EmbeddedResource Include="Forms\DropboxFilesForm.ko-KR.resx">
471- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
472- </EmbeddedResource>
473- <EmbeddedResource Include="Forms\DropboxFilesForm.nl-NL.resx">
474- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
475- </EmbeddedResource>
476- <EmbeddedResource Include="Forms\DropboxFilesForm.pt-BR.resx">
477- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
478- </EmbeddedResource>
479- <EmbeddedResource Include="Forms\DropboxFilesForm.ru.resx">
480- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
481- </EmbeddedResource>
482- <EmbeddedResource Include="Forms\DropboxFilesForm.tr.resx">
483- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
484- </EmbeddedResource>
485- <EmbeddedResource Include="Forms\DropboxFilesForm.vi-VN.resx">
486- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
487- </EmbeddedResource>
488- <EmbeddedResource Include="Forms\DropboxFilesForm.zh-CN.resx">
489- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
490- </EmbeddedResource>
491468 <EmbeddedResource Include="Forms\EmailForm.de.resx">
492469 <DependentUpon>EmailForm.cs</DependentUpon>
493470 </EmbeddedResource>
@@ -596,6 +573,12 @@
596573 <EmbeddedResource Include="Forms\OAuthWebForm.zh-CN.resx">
597574 <DependentUpon>OAuthWebForm.cs</DependentUpon>
598575 </EmbeddedResource>
576+ <EmbeddedResource Include="Forms\OCRSpaceForm.resx">
577+ <DependentUpon>OCRSpaceForm.cs</DependentUpon>
578+ </EmbeddedResource>
579+ <EmbeddedResource Include="Forms\PuushLoginForm.resx">
580+ <DependentUpon>PuushLoginForm.cs</DependentUpon>
581+ </EmbeddedResource>
599582 <EmbeddedResource Include="Forms\ResponseForm.de.resx">
600583 <DependentUpon>ResponseForm.cs</DependentUpon>
601584 </EmbeddedResource>
@@ -796,9 +779,6 @@
796779 <EmbeddedResource Include="Controls\AccountsControl.resx">
797780 <DependentUpon>AccountsControl.cs</DependentUpon>
798781 </EmbeddedResource>
799- <EmbeddedResource Include="Forms\DropboxFilesForm.resx">
800- <DependentUpon>DropboxFilesForm.cs</DependentUpon>
801- </EmbeddedResource>
802782 <EmbeddedResource Include="Forms\TwitterTweetForm.resx">
803783 <DependentUpon>TwitterTweetForm.cs</DependentUpon>
804784 <SubType>Designer</SubType>
@@ -892,42 +872,6 @@
892872 <None Include="Favicons\OneTimeSecret.ico" />
893873 <None Include="Favicons\Polr.ico" />
894874 <None Include="packages.config" />
895- <None Include="Resources\server-network.png" />
896- <None Include="Resources\mail.png" />
897- <None Include="Resources\globe-network.png" />
898- <None Include="Resources\folder-network.png" />
899- <None Include="Resources\page_white_powerpoint.gif" />
900- <None Include="Resources\page_white_picture.gif" />
901- <None Include="Resources\page_white_php.gif" />
902- <None Include="Resources\page_white_paint.gif" />
903- <None Include="Resources\page_white_gear.gif" />
904- <None Include="Resources\page_white_flash.gif" />
905- <None Include="Resources\page_white_film.gif" />
906- <None Include="Resources\page_white_excel.gif" />
907- <None Include="Resources\page_white_dvd.gif" />
908- <None Include="Resources\page_white_cup.gif" />
909- <None Include="Resources\page_white_csharp.gif" />
910- <None Include="Resources\page_white_cplusplus.gif" />
911- <None Include="Resources\page_white_compressed.gif" />
912- <None Include="Resources\page_white_code.gif" />
913- <None Include="Resources\page_white_c.gif" />
914- <None Include="Resources\page_white_actionscript.gif" />
915- <None Include="Resources\page_white_acrobat.gif" />
916- <None Include="Resources\page_white.gif" />
917- <None Include="Resources\package.gif" />
918- <None Include="Resources\folder_user.gif" />
919- <None Include="Resources\folder_star.gif" />
920- <None Include="Resources\folder_public.gif" />
921- <None Include="Resources\folder_photos.gif" />
922- <None Include="Resources\folder_gray.gif" />
923- <None Include="Resources\folder.gif" />
924- <None Include="Resources\page_white_word.gif" />
925- <None Include="Resources\page_white_visualstudio.gif" />
926- <None Include="Resources\page_white_vector.gif" />
927- <None Include="Resources\page_white_tux.gif" />
928- <None Include="Resources\page_white_text.gif" />
929- <None Include="Resources\page_white_sound.gif" />
930- <None Include="Resources\page_white_ruby.gif" />
931875 </ItemGroup>
932876 <ItemGroup>
933877 <ProjectReference Include="..\ShareX.HelpersLib\ShareX.HelpersLib.csproj">
@@ -942,16 +886,37 @@
942886 <None Include="Favicons\Seafile.png" />
943887 </ItemGroup>
944888 <ItemGroup>
945- <None Include="Resources\question-button.png" />
946- </ItemGroup>
947- <ItemGroup>
948889 <None Include="Favicons\SomeImage.ico" />
949890 <None Include="Favicons\Streamable.ico" />
950891 <None Include="Favicons\Sul.png" />
951892 <None Include="Favicons\Vgyme.ico" />
952893 </ItemGroup>
953894 <ItemGroup>
954- <Analyzer Include="..\packages\AWSSDK.S3.3.1.4.0\analyzers\dotnet\cs\AWSSDK.S3.CodeAnalysis.dll" />
895+ <None Include="Favicons\Lithiio.ico" />
896+ </ItemGroup>
897+ <ItemGroup>
898+ <None Include="Favicons\puush.ico" />
899+ </ItemGroup>
900+ <ItemGroup>
901+ <None Include="Resources\puush-256.png" />
902+ </ItemGroup>
903+ <ItemGroup>
904+ <None Include="Resources\folder-network.png" />
905+ </ItemGroup>
906+ <ItemGroup>
907+ <None Include="Resources\globe-network.png" />
908+ </ItemGroup>
909+ <ItemGroup>
910+ <None Include="Resources\mail.png" />
911+ </ItemGroup>
912+ <ItemGroup>
913+ <None Include="Resources\server-network.png" />
914+ </ItemGroup>
915+ <ItemGroup>
916+ <None Include="Resources\document.png" />
917+ </ItemGroup>
918+ <ItemGroup>
919+ <Analyzer Include="..\packages\AWSSDK.S3.3.1.8.1\analyzers\dotnet\cs\AWSSDK.S3.CodeAnalysis.dll" />
955920 </ItemGroup>
956921 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
957922 <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
--- a/ShareX/Forms/AboutForm.ja-JP.resx
+++ b/ShareX/Forms/AboutForm.ja-JP.resx
@@ -123,4 +123,13 @@
123123 <data name="lblSteamBuild.Text" xml:space="preserve">
124124 <value>Steam ビルド</value>
125125 </data>
126+ <data name="btnClose.Text" xml:space="preserve">
127+ <value>閉じる</value>
128+ </data>
129+ <data name="btnShareXLicense.Text" xml:space="preserve">
130+ <value>ShareXの使用許諾...</value>
131+ </data>
132+ <data name="btnLicenses.Text" xml:space="preserve">
133+ <value>使用許諾...</value>
134+ </data>
126135 </root>
\ No newline at end of file
--- a/ShareX/Forms/ApplicationSettingsForm.ja-JP.resx
+++ b/ShareX/Forms/ApplicationSettingsForm.ja-JP.resx
@@ -288,9 +288,6 @@
288288 <data name="btnEditQuickTaskMenu.Text" xml:space="preserve">
289289 <value>クイック タスク メニューの編集...</value>
290290 </data>
291- <data name="llTranslators.Text" xml:space="preserve">
292- <value>ShareXをあなたの母国語に翻訳する手助けをする</value>
293- </data>
294291 <data name="lblNotePersonalFolderPath.Text" xml:space="preserve">
295292 <value>メモ: 個人フォルダーの変更は、ShareXの再起動後に反映されます。</value>
296293 </data>
@@ -327,4 +324,13 @@
327324 <data name="tpHistory.Text" xml:space="preserve">
328325 <value>履歴</value>
329326 </data>
327+ <data name="lblTrayMiddleClickAction.Text" xml:space="preserve">
328+ <value>トレイアイコンの中クリック:</value>
329+ </data>
330+ <data name="lblTrayLeftDoubleClickAction.Text" xml:space="preserve">
331+ <value>トレイアイコンの左ダブルクリック:</value>
332+ </data>
333+ <data name="lblTrayLeftClickAction.Text" xml:space="preserve">
334+ <value>トレイアイコンの左クリック:</value>
335+ </data>
330336 </root>
\ No newline at end of file
--- a/ShareX/Forms/MainForm.ja-JP.resx
+++ b/ShareX/Forms/MainForm.ja-JP.resx
@@ -354,12 +354,6 @@
354354 <data name="tsmiOpenThumbnailURL.Text" xml:space="preserve">
355355 <value>サムネイルのURL</value>
356356 </data>
357- <data name="tsmiRectangleAnnotate.Text" xml:space="preserve">
358- <value>領域 (注釈モード)</value>
359- </data>
360- <data name="tsmiTrayRectangleAnnotate.Text" xml:space="preserve">
361- <value>領域 (注釈モード)</value>
362- </data>
363357 <data name="tsmiRectangleLight.Text" xml:space="preserve">
364358 <value>領域 (ライトモード)</value>
365359 </data>
@@ -660,4 +654,19 @@
660654 <data name="tsmiHideColumns.Text" xml:space="preserve">
661655 <value>列を隠す</value>
662656 </data>
657+ <data name="pbTips.ToolTip" xml:space="preserve">
658+ <value>操作ヒントとホットキーを表示</value>
659+ </data>
660+ <data name="pbPatreonOpen.ToolTip" xml:space="preserve">
661+ <value>ShareXのPatreonキャンペーン ウェブページを開く</value>
662+ </data>
663+ <data name="pbPatreonHide.ToolTip" xml:space="preserve">
664+ <value>Patreonボタンを今後表示しない</value>
665+ </data>
666+ <data name="tsmiTextCapture.Text" xml:space="preserve">
667+ <value>テキスト キャプチャー (OCR)...</value>
668+ </data>
669+ <data name="tsmiTrayTextCapture.Text" xml:space="preserve">
670+ <value>テキスト キャプチャー (OCR)...</value>
671+ </data>
663672 </root>
\ No newline at end of file
--- a/ShareX/Forms/ScreenColorPicker.ja-JP.resx
+++ b/ShareX/Forms/ScreenColorPicker.ja-JP.resx
@@ -123,10 +123,31 @@
123123 <data name="lblCursorPosition.Text" xml:space="preserve">
124124 <value>カーソル位置:</value>
125125 </data>
126- <data name="btnCopyAll.Text" xml:space="preserve">
127- <value>すべてコピー</value>
128- </data>
129126 <data name="btnColorPicker.Text" xml:space="preserve">
130127 <value>色取得開始</value>
131128 </data>
129+ <data name="btnCopy.Text" xml:space="preserve">
130+ <value>コピー</value>
131+ </data>
132+ <data name="tsmiCopyAll.Text" xml:space="preserve">
133+ <value>すべてコピー</value>
134+ </data>
135+ <data name="tsmiCopyCMYK.Text" xml:space="preserve">
136+ <value>CMYKをコピー</value>
137+ </data>
138+ <data name="tsmiCopyHSB.Text" xml:space="preserve">
139+ <value>HSBをコピー</value>
140+ </data>
141+ <data name="tsmiCopyDecimal.Text" xml:space="preserve">
142+ <value>10進数でコピー</value>
143+ </data>
144+ <data name="tsmiCopyHex.Text" xml:space="preserve">
145+ <value>16進数でコピー</value>
146+ </data>
147+ <data name="tsmiCopyPosition.Text" xml:space="preserve">
148+ <value>位置をコピー</value>
149+ </data>
150+ <data name="tsmiCopyRGB.Text" xml:space="preserve">
151+ <value>RGBをコピー</value>
152+ </data>
132153 </root>
\ No newline at end of file
--- a/ShareX/Forms/TaskSettingsForm.ja-JP.resx
+++ b/ShareX/Forms/TaskSettingsForm.ja-JP.resx
@@ -381,9 +381,6 @@
381381 <data name="lblAfterTaskNotification.Text" xml:space="preserve">
382382 <value>タスク完了後:</value>
383383 </data>
384- <data name="tpRectangleAnnotate.Text" xml:space="preserve">
385- <value>注釈モード</value>
386- </data>
387384 <data name="btnResetAutoIncrementNumber.Text" xml:space="preserve">
388385 <value>自動連番カウンターをリセット</value>
389386 </data>
@@ -435,13 +432,91 @@
435432 <data name="cbShowCursor.Text" xml:space="preserve">
436433 <value>スクリーンショットにマウスカーソルを含める</value>
437434 </data>
438- <data name="lblCaptureCustomRegionSelectedMonitor.Text" xml:space="preserve">
439- <value>独自領域を設定するモニターを選択:</value>
440- </data>
441435 <data name="chkRunScreencastCLI.Text" xml:space="preserve">
442436 <value>録画後にCLIを実行:</value>
443437 </data>
444438 <data name="cbScreenRecorderFixedDuration.Text" xml:space="preserve">
445439 <value>録画時間を固定:</value>
446440 </data>
441+ <data name="btnRegionCaptureSnapSizesDialogAdd.Text" xml:space="preserve">
442+ <value>追加</value>
443+ </data>
444+ <data name="btnRegionCaptureSnapSizesDialogCancel.Text" xml:space="preserve">
445+ <value>キャンセル</value>
446+ </data>
447+ <data name="lblCaptureCustomRegion.Text" xml:space="preserve">
448+ <value>独自の領域</value>
449+ </data>
450+ <data name="cbRegionCaptureShowMagnifier.Text" xml:space="preserve">
451+ <value>カーソル付近にルーペを表示する</value>
452+ </data>
453+ <data name="cbRegionCaptureShowInfo.Text" xml:space="preserve">
454+ <value>位置と大きさの情報を表示する</value>
455+ </data>
456+ <data name="lblRegionCaptureFixedSizeHeight.Text" xml:space="preserve">
457+ <value>高さ:</value>
458+ </data>
459+ <data name="lblRegionCaptureFixedSizeWidth.Text" xml:space="preserve">
460+ <value>幅:</value>
461+ </data>
462+ <data name="cbRegionCaptureShowFPS.Text" xml:space="preserve">
463+ <value>左上にFPSを表示する</value>
464+ </data>
465+ <data name="cbRegionCaptureShowCrosshair.Text" xml:space="preserve">
466+ <value>十字線カーソルを表示する</value>
467+ </data>
468+ <data name="cbRegionCaptureUseSquareMagnifier.Text" xml:space="preserve">
469+ <value>ルーペの形状は丸でなく四角にする</value>
470+ </data>
471+ <data name="cbRegionCaptureShowTips.Text" xml:space="preserve">
472+ <value>ホットキーと操作ヒントを右上に表示する</value>
473+ </data>
474+ <data name="RegionCaptureSnapSizesHeight.Text" xml:space="preserve">
475+ <value>高さ:</value>
476+ </data>
477+ <data name="lblRegionCaptureSnapSizesWidth.Text" xml:space="preserve">
478+ <value>幅:</value>
479+ </data>
480+ <data name="btnCaptureCustomRegionSelectRectangle.Text" xml:space="preserve">
481+ <value>領域の選択...</value>
482+ </data>
483+ <data name="cbRegionCaptureUseDimming.Text" xml:space="preserve">
484+ <value>背景を暗くして、選択範囲を区別しやすくする (起動速度に影響します)</value>
485+ </data>
486+ <data name="cbRegionCaptureUseCustomInfoText.Text" xml:space="preserve">
487+ <value>カーソル付近に独自の情報テキストを表示する:</value>
488+ </data>
489+ <data name="lblRegionCaptureSnapSizes.Text" xml:space="preserve">
490+ <value>"Alt" キー押下で表示する、スナップ可能な領域サイズ:</value>
491+ </data>
492+ <data name="cbRegionCaptureDetectWindows.Text" xml:space="preserve">
493+ <value>ウィンドウ領域を検出し、マウスオーバーでキャプチャー可能にする</value>
494+ </data>
495+ <data name="cbRegionCaptureDetectControls.Text" xml:space="preserve">
496+ <value>ウィンドウ内のコントロール領域も検出する</value>
497+ </data>
498+ <data name="cbRegionCaptureMultiRegionMode.Text" xml:space="preserve">
499+ <value>領域のリサイズ、移動が可能な複数領域選択モードを使用する</value>
500+ </data>
501+ <data name="cbRegionCaptureIsFixedSize.Text" xml:space="preserve">
502+ <value>固定サイズ領域キャプチャー モード:</value>
503+ </data>
504+ <data name="lblRegionCaptureMagnifierPixelCount.Text" xml:space="preserve">
505+ <value>ルーペの表示ピクセル数:</value>
506+ </data>
507+ <data name="lblRegionCaptureMagnifierPixelSize.Text" xml:space="preserve">
508+ <value>ルーペのピクセルの大きさ:</value>
509+ </data>
510+ <data name="lblRegionCaptureMouse4ClickAction.Text" xml:space="preserve">
511+ <value>第4ボタン クリック時の操作:</value>
512+ </data>
513+ <data name="lblRegionCaptureMouse5ClickAction.Text" xml:space="preserve">
514+ <value>第5ボタン クリック時の操作:</value>
515+ </data>
516+ <data name="lblRegionCaptureMouseMiddleClickAction.Text" xml:space="preserve">
517+ <value>中ボタン クリック時の操作:</value>
518+ </data>
519+ <data name="lblRegionCaptureMouseRightClickAction.Text" xml:space="preserve">
520+ <value>右ボタン クリック時の操作:</value>
521+ </data>
447522 </root>
\ No newline at end of file
--- a/ShareX/Properties/Resources.ja-JP.resx
+++ b/ShareX/Properties/Resources.ja-JP.resx
@@ -141,9 +141,6 @@
141141 <data name="AutoCaptureForm_Execute_Stop" xml:space="preserve">
142142 <value>停止</value>
143143 </data>
144- <data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
145- <value>停止</value>
146- </data>
147144 <data name="TaskSettingsForm_UpdateUploaderMenuNames_Task___0_" xml:space="preserve">
148145 <value>タスク: {0}</value>
149146 </data>
@@ -171,9 +168,6 @@
171168 <data name="MainForm_UpdateWorkflowsMenu_You_can_add_workflows_from_hotkey_settings___" xml:space="preserve">
172169 <value>ホットキーの設定からワークフローを追加できます...</value>
173170 </data>
174- <data name="MainForm_UpdateMainFormTip_You_can_drag_and_drop_files_to_this_window_" xml:space="preserve">
175- <value>このウィンドウにファイルをドラッグ&ドロップできます。</value>
176- </data>
177171 <data name="HotkeySelectionControl_StartEditing_Select_a_hotkey___" xml:space="preserve">
178172 <value>ホットキーを入力...</value>
179173 </data>
@@ -200,18 +194,9 @@
200194 <data name="AboutForm_AboutForm_Changelog" xml:space="preserve">
201195 <value>更新履歴</value>
202196 </data>
203- <data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
204- <value>キャプチャー</value>
205- </data>
206197 <data name="UploadTask_DoAfterCaptureJobs_Choose_a_folder_to_save" xml:space="preserve">
207198 <value>保存フォルダーの選択</value>
208199 </data>
209- <data name="ActionsForm_btnPathBrowse_Click_Choose_file_path" xml:space="preserve">
210- <value>ファイル パスの選択</value>
211- </data>
212- <data name="WatchFolderForm_btnPathBrowse_Click_Choose_folder_path" xml:space="preserve">
213- <value>フォルダー パスの選択</value>
214- </data>
215200 <data name="RecentManager_UpdateRecentMenu_Left_click_to_copy_URL_to_clipboard__Right_click_to_open_URL_" xml:space="preserve">
216201 <value>左クリックでクリップボードにURLをコピー、右クリックでURLを開く。</value>
217202 </data>
@@ -309,9 +294,6 @@ ShareX を再起動しますか?</value>
309294 <data name="MainForm_tsmiDeleteSelectedFile_Click_Do_you_really_want_to_delete_this_file_" xml:space="preserve">
310295 <value>本当にこのファイルを削除しますか?</value>
311296 </data>
312- <data name="MainForm_AfterShownJobs_You_can_single_left_click_the_ShareX_tray_icon_to_start_region_capture_" xml:space="preserve">
313- <value>ShareX のシステムトレイ アイコンを左クリックで、領域キャプチャーを開始します。</value>
314- </data>
315297 <data name="ScreenColorPicker_UpdateControls_Stop_screen_color_picker" xml:space="preserve">
316298 <value>色取得停止</value>
317299 </data>
@@ -479,4 +461,55 @@ ShareX を再起動しますか?</value>
479461 <data name="ScreenRecordForm_StartRecording_Missing" xml:space="preserve">
480462 <value>参照不可</value>
481463 </data>
464+ <data name="QuickTaskMenu_ShowMenu_Cancel" xml:space="preserve">
465+ <value>キャンセル</value>
466+ </data>
467+ <data name="QuickTaskMenu_ShowMenu_Continue" xml:space="preserve">
468+ <value>続行</value>
469+ </data>
470+ <data name="QuickTaskMenu_ShowMenu_Edit_this_menu___" xml:space="preserve">
471+ <value>このメニューを編集...</value>
472+ </data>
473+ <data name="MainForm_UpdateMainFormTip_Tips" xml:space="preserve">
474+ <value>メイン ウィンドウのヒント:
475+- ファイル、画像、テキストをメイン ウィンドウにドラッグしてアップロードできます。
476+- タスク一覧から項目をドラッグすることでファイルをどこにでもコピーできます。
477+ ドラッグ開始時に、"Ctrl" キーを押すことで、ファイルではなく、URLやファイルのパスをコピーします。
478+
479+メイン ウィンドウのタスク一覧のホットキー:
480+[Enter] URLまたはファイルを開きます。
481+[Ctrl + Enter] ファイルを開きます。
482+[Ctrl + C] URLまたはファイルのパスをコピーします。
483+[Shift + C] ファイルをコピーします。
484+[Ctrl + Shift + C] ファイルのパスをコピーします。
485+[Ctrl + X] URLまたはファイルのパスをコピーし、選択項目を一覧から削除します。
486+[Ctrl + V] クリップボードの内容をビューアーで表示し、そこから直接アップロードできます。
487+[Delete] 選択項目を一覧から削除します。
488+[Shift + Delete] ファイルをローカル ディスクから削除し、一覧からも削除します。
489+[Esc] メイン ウィンドウを閉じます。
490+
491+トレイアイコンの操作:
492+[左ボタン クリック] {0}
493+[左ボタン ダブルクリック] {1}
494+[中ボタン クリック] {2}
495+- これらのトレイアイコンの操作は「アプリの設定」から変更できます。</value>
496+ </data>
497+ <data name="MainForm_UpdateMainWindowLayout_Show_columns" xml:space="preserve">
498+ <value>列を表示</value>
499+ </data>
500+ <data name="TaskManager_CreateListViewItem_History" xml:space="preserve">
501+ <value>履歴</value>
502+ </data>
503+ <data name="MainForm_UpdateMainWindowLayout_Hide_columns" xml:space="preserve">
504+ <value>列を隠す</value>
505+ </data>
506+ <data name="HotkeySettingsForm_Reset_all_hotkeys_to_defaults_Confirmation" xml:space="preserve">
507+ <value>すべてのホットキーを既定に戻しますか?</value>
508+ </data>
509+ <data name="QuickTaskMenuEditorForm_Reset_all_quick_tasks_to_defaults_Confirmation" xml:space="preserve">
510+ <value>すべてのクイックタスクを既定に戻しますか?</value>
511+ </data>
512+ <data name="WorkerTask_GetInvalidConfigResult__0__configuration_is_invalid_or_missing__Please_check__Destination_settings__window_to_configure_it_" xml:space="preserve">
513+ <value>{0} の構成が正しくないか存在しません。"アップロード先の設定" ウィンドウで構成を確認してください。</value>
514+ </data>
482515 </root>
\ No newline at end of file
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -76,13 +76,13 @@
7676 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
7777 </PropertyGroup>
7878 <ItemGroup>
79- <Reference Include="MegaApiClient, Version=1.2.1.150, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
80- <HintPath>..\packages\MegaApiClient.1.2.1\lib\net40\MegaApiClient.dll</HintPath>
79+ <Reference Include="MegaApiClient, Version=1.2.2.209, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
80+ <HintPath>..\packages\MegaApiClient.1.2.2\lib\net40\MegaApiClient.dll</HintPath>
8181 <Private>True</Private>
8282 </Reference>
8383 <Reference Include="Microsoft.VisualBasic" />
84- <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
85- <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
84+ <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
85+ <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
8686 <Private>True</Private>
8787 </Reference>
8888 <Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL">
@@ -96,6 +96,7 @@
9696 <Reference Include="System.Data" />
9797 <Reference Include="System.Design" />
9898 <Reference Include="System.Drawing" />
99+ <Reference Include="System.Speech" />
99100 <Reference Include="System.Web" />
100101 <Reference Include="System.Windows.Forms" />
101102 <Reference Include="System.Xml" />
@@ -257,7 +258,6 @@
257258 <DependentUpon>MainForm.cs</DependentUpon>
258259 </Compile>
259260 <Compile Include="ImageTag.cs" />
260- <Compile Include="PointInfo.cs" />
261261 <Compile Include="Properties\Resources.Designer.cs">
262262 <AutoGen>True</AutoGen>
263263 <DesignTime>True</DesignTime>
@@ -868,27 +868,46 @@
868868 <EmbeddedResource Include="Forms\MainForm.zh-CN.resx">
869869 <DependentUpon>MainForm.cs</DependentUpon>
870870 </EmbeddedResource>
871+ <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.de.resx">
872+ <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
873+ <SubType>Designer</SubType>
874+ </EmbeddedResource>
871875 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.fr.resx">
872876 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
873877 </EmbeddedResource>
874878 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.ja-JP.resx">
875879 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
876880 </EmbeddedResource>
881+ <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.pt-BR.resx">
882+ <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
883+ </EmbeddedResource>
877884 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.resx">
878885 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
879886 </EmbeddedResource>
887+ <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.ru.resx">
888+ <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
889+ </EmbeddedResource>
880890 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.tr.resx">
881891 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
882892 </EmbeddedResource>
893+ <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.de.resx">
894+ <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
895+ </EmbeddedResource>
883896 <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.fr.resx">
884897 <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
885898 </EmbeddedResource>
886899 <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.ja-JP.resx">
887900 <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
888901 </EmbeddedResource>
902+ <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.pt-BR.resx">
903+ <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
904+ </EmbeddedResource>
889905 <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.resx">
890906 <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
891907 </EmbeddedResource>
908+ <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.ru.resx">
909+ <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
910+ </EmbeddedResource>
892911 <EmbeddedResource Include="Forms\QuickTaskMenuEditorForm.tr.resx">
893912 <DependentUpon>QuickTaskMenuEditorForm.cs</DependentUpon>
894913 </EmbeddedResource>
@@ -1164,13 +1183,7 @@
11641183 <SubType>Designer</SubType>
11651184 </None>
11661185 <None Include="packages.config" />
1167- <None Include="Resources\RoundedRectangle.png" />
11681186 <None Include="Resources\Rectangle.png" />
1169- <None Include="Resources\Polygon.png" />
1170- <None Include="Resources\Fullscreen.png" />
1171- <None Include="Resources\FreeHand.png" />
1172- <None Include="Resources\Ellipse.png" />
1173- <None Include="Resources\Triangle.png" />
11741187 <None Include="Resources\camera.png" />
11751188 <None Include="Resources\navigation-090-button.png" />
11761189 <None Include="Resources\cross-button.png" />
@@ -1179,7 +1192,6 @@
11791192 <None Include="Resources\application-block.png" />
11801193 <None Include="Resources\edit-scale.png" />
11811194 <None Include="Resources\drive-globe.png" />
1182- <None Include="Resources\diamond.png" />
11831195 <None Include="Resources\notebook.png" />
11841196 <None Include="Resources\image.png" />
11851197 <None Include="Resources\application-browser.png" />
@@ -1216,21 +1228,12 @@
12161228 <None Include="Resources\layer-shape-curve.png" />
12171229 </ItemGroup>
12181230 <ItemGroup>
1219- <None Include="Resources\layer-shape-ellipse.png" />
1220- </ItemGroup>
1221- <ItemGroup>
1222- <None Include="Resources\layer-shape-round.png" />
1223- </ItemGroup>
1224- <ItemGroup>
12251231 <None Include="Resources\layer-shape-polygon.png" />
12261232 </ItemGroup>
12271233 <ItemGroup>
12281234 <None Include="Resources\layer-shape.png" />
12291235 </ItemGroup>
12301236 <ItemGroup>
1231- <None Include="Resources\layers-ungroup.png" />
1232- </ItemGroup>
1233- <ItemGroup>
12341237 <None Include="Resources\monitor.png" />
12351238 </ItemGroup>
12361239 <ItemGroup>
@@ -1240,9 +1243,6 @@
12401243 <None Include="Resources\layer.png" />
12411244 </ItemGroup>
12421245 <ItemGroup>
1243- <None Include="Resources\layers-arrange.png" />
1244- </ItemGroup>
1245- <ItemGroup>
12461246 <None Include="Resources\control-record.png" />
12471247 </ItemGroup>
12481248 <ItemGroup>
@@ -1275,7 +1275,6 @@
12751275 <None Include="Resources\clock.png" />
12761276 <None Include="Resources\heart.png" />
12771277 <None Include="Resources\crown.png" />
1278- <None Include="Resources\layer--pencil.png" />
12791278 <None Include="Resources\globe-share.png" />
12801279 <None Include="Resources\document-copy.png" />
12811280 <None Include="Resources\image--pencil.png" />
@@ -1318,6 +1317,25 @@
13181317 <None Include="Resources\layout-select.png" />
13191318 <None Include="Resources\disk-black.png" />
13201319 <None Include="Resources\control.png" />
1320+ <None Include="Resources\information.png" />
1321+ <None Include="Resources\layer_fullscreen.png" />
1322+ <None Include="Resources\layers.png" />
1323+ <None Include="Resources\edit-drop-cap.png" />
1324+ <None Include="Resources\ui-menu-blue.png" />
1325+ <None Include="Resources\application-text-image.png" />
1326+ <None Include="Resources\clipboard-paste-image.png" />
1327+ <None Include="Resources\printer.png" />
1328+ <None Include="Resources\disk.png" />
1329+ <None Include="Resources\disk-rename.png" />
1330+ <None Include="Resources\disk-small.png" />
1331+ <None Include="Resources\application-terminal.png" />
1332+ <None Include="Resources\clipboard-block.png" />
1333+ <None Include="Resources\folder-stand.png" />
1334+ <None Include="Resources\application--arrow.png" />
1335+ <None Include="Resources\clipboard-paste-document-text.png" />
1336+ <None Include="Resources\globe--arrow.png" />
1337+ <None Include="Resources\Patreon_Button_01.png" />
1338+ <None Include="Resources\Patreon_Button_02.png" />
13211339 <Content Include="ShareX_Icon.ico" />
13221340 <None Include="Resources\globe--pencil.png" />
13231341 <None Include="Resources\camcorder--pencil.png" />