• 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

Revision512fdd21e2a0e0647fe5c7a41a0122b24b5956e9 (tree)
Zeit2017-01-26 18:44:54
Autornotme <notme@user...>
Commiternotme

Log Message

Japanese translation for ShareX 11.5.0

Ändern Zusammenfassung

Diff

--- a/ShareX.HelpersLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.HelpersLib/Properties/Resources.ja-JP.resx
@@ -192,9 +192,6 @@
192192 <data name="HotkeyType_ImageEditor_Category" xml:space="preserve">
193193 <value>ツール</value>
194194 </data>
195- <data name="HotkeyType_Automate_Category" xml:space="preserve">
196- <value>ツール</value>
197- </data>
198195 <data name="HotkeyType_ColorPicker_Category" xml:space="preserve">
199196 <value>ツール</value>
200197 </data>
@@ -375,9 +372,6 @@
375372 <data name="HotkeyType_RectangleRegion" xml:space="preserve">
376373 <value>領域をキャプチャー</value>
377374 </data>
378- <data name="RegistryHelpers_ShellExtDesc_Upload_with__0_" xml:space="preserve">
379- <value>{0}でアップロード</value>
380- </data>
381375 <data name="ProxyMethod_Automatic" xml:space="preserve">
382376 <value>自動</value>
383377 </data>
@@ -760,9 +754,6 @@
760754 <data name="HotkeyType_StartScreenRecorderGIF" xml:space="preserve">
761755 <value>最近使用した領域の動画キャプチャー (GIF) を開始</value>
762756 </data>
763- <data name="HotkeyType_Automate" xml:space="preserve">
764- <value>自動化ツールを開く/停止する</value>
765- </data>
766757 <data name="HotkeyType_RectangleTransparent" xml:space="preserve">
767758 <value>領域キャプチャー (透過モード)</value>
768759 </data>
@@ -850,9 +841,6 @@
850841 <data name="ShapeType_DrawingRectangle" xml:space="preserve">
851842 <value>描画: 四角形</value>
852843 </data>
853- <data name="ShapeType_DrawingRoundedRectangle" xml:space="preserve">
854- <value>描画: 角丸四角形</value>
855- </data>
856844 <data name="ShapeType_DrawingStep" xml:space="preserve">
857845 <value>描画: ステップ</value>
858846 </data>
@@ -865,9 +853,6 @@
865853 <data name="ShapeType_RegionRectangle" xml:space="preserve">
866854 <value>領域: 四角形</value>
867855 </data>
868- <data name="ShapeType_RegionRoundedRectangle" xml:space="preserve">
869- <value>領域: 角丸四角形</value>
870- </data>
871856 <data name="ShapeType_DrawingArrow" xml:space="preserve">
872857 <value>描画: 矢印</value>
873858 </data>
@@ -964,4 +949,16 @@
964949 <data name="ShapeType_EffectPixelate" xml:space="preserve">
965950 <value>効果: モザイク</value>
966951 </data>
952+ <data name="HotkeyType_ToggleActionsToolbar_Category" xml:space="preserve">
953+ <value>その他</value>
954+ </data>
955+ <data name="HotkeyType_ExitShareX" xml:space="preserve">
956+ <value>ShareXを終了</value>
957+ </data>
958+ <data name="HotkeyType_ExitShareX_Category" xml:space="preserve">
959+ <value>その他</value>
960+ </data>
961+ <data name="HotkeyType_ToggleActionsToolbar" xml:space="preserve">
962+ <value>アクション ツールバーの表示切り替え</value>
963+ </data>
967964 </root>
\ No newline at end of file
--- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
@@ -62,10 +62,6 @@
6262 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
6363 </PropertyGroup>
6464 <ItemGroup>
65- <Reference Include="Gma.QrCodeNet.Encoding, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL">
66- <HintPath>..\packages\QrCode.Net.0.4.0.0\lib\net40\Gma.QrCodeNet.Encoding.dll</HintPath>
67- <Private>True</Private>
68- </Reference>
6965 <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
7066 <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
7167 <Private>True</Private>
@@ -85,19 +81,16 @@
8581 </ItemGroup>
8682 <ItemGroup>
8783 <Compile Include="Controls\CustomToolStripProfessionalRenderer.cs" />
84+ <Compile Include="Controls\HotkeySelectionButton.cs">
85+ <SubType>Component</SubType>
86+ </Compile>
8887 <Compile Include="Controls\ToolStripEx.cs">
8988 <SubType>Component</SubType>
9089 </Compile>
90+ <Compile Include="Helpers\JsonHelpers.cs" />
91+ <Compile Include="Input\HotkeyInfo.cs" />
92+ <Compile Include="Input\KeyboardHook.cs" />
9193 <Compile Include="NameParser\CodeMenuEntryActions.cs" />
92- <Compile Include="Automate\AutomateForm.cs">
93- <SubType>Form</SubType>
94- </Compile>
95- <Compile Include="Automate\AutomateForm.Designer.cs">
96- <DependentUpon>AutomateForm.cs</DependentUpon>
97- </Compile>
98- <Compile Include="Automate\Functions.cs" />
99- <Compile Include="Automate\FunctionManager.cs" />
100- <Compile Include="Automate\ScriptInfo.cs" />
10194 <Compile Include="ClipboardFormat.cs" />
10295 <Compile Include="NameParser\CodeMenu.cs" />
10396 <Compile Include="ColorMatrixManager.cs" />
@@ -170,12 +163,6 @@
170163 <Compile Include="Forms\OutputBox.Designer.cs">
171164 <DependentUpon>OutputBox.cs</DependentUpon>
172165 </Compile>
173- <Compile Include="Forms\QRCodeForm.cs">
174- <SubType>Form</SubType>
175- </Compile>
176- <Compile Include="Forms\QRCodeForm.Designer.cs">
177- <DependentUpon>QRCodeForm.cs</DependentUpon>
178- </Compile>
179166 <Compile Include="Forms\ScreenTearingTestForm.cs">
180167 <SubType>Form</SubType>
181168 </Compile>
@@ -317,9 +304,6 @@
317304 <Compile Include="StringLineReader.cs" />
318305 <Compile Include="Native\TaskbarManager.cs" />
319306 <Compile Include="ThreadWorker.cs" />
320- <Compile Include="Tokenizer\BetweenTagsResult.cs" />
321- <Compile Include="Tokenizer\Token.cs" />
322- <Compile Include="Tokenizer\Tokenizer.cs" />
323307 <Compile Include="Cryptographic\HashCheck.cs" />
324308 <Compile Include="Cryptographic\Translator.cs" />
325309 <Compile Include="Cryptographic\TranslatorHelper.cs" />
@@ -416,6 +400,7 @@
416400 <Compile Include="Controls\MyPictureBox.Designer.cs">
417401 <DependentUpon>MyPictureBox.cs</DependentUpon>
418402 </Compile>
403+ <Compile Include="UpdateChecker\GitHubUpdateManager.cs" />
419404 <Compile Include="UpdateChecker\UpdateMessageBox.cs">
420405 <SubType>Form</SubType>
421406 </Compile>
@@ -429,42 +414,6 @@
429414 <Compile Include="WritablePropertiesOnlyResolver.cs" />
430415 <Compile Include="XmlColor.cs" />
431416 <Compile Include="XmlFont.cs" />
432- <EmbeddedResource Include="Automate\AutomateForm.de.resx">
433- <DependentUpon>AutomateForm.cs</DependentUpon>
434- </EmbeddedResource>
435- <EmbeddedResource Include="Automate\AutomateForm.es.resx">
436- <DependentUpon>AutomateForm.cs</DependentUpon>
437- </EmbeddedResource>
438- <EmbeddedResource Include="Automate\AutomateForm.fr.resx">
439- <DependentUpon>AutomateForm.cs</DependentUpon>
440- </EmbeddedResource>
441- <EmbeddedResource Include="Automate\AutomateForm.ja-JP.resx">
442- <DependentUpon>AutomateForm.cs</DependentUpon>
443- </EmbeddedResource>
444- <EmbeddedResource Include="Automate\AutomateForm.ko-KR.resx">
445- <DependentUpon>AutomateForm.cs</DependentUpon>
446- </EmbeddedResource>
447- <EmbeddedResource Include="Automate\AutomateForm.nl-NL.resx">
448- <DependentUpon>AutomateForm.cs</DependentUpon>
449- </EmbeddedResource>
450- <EmbeddedResource Include="Automate\AutomateForm.pt-BR.resx">
451- <DependentUpon>AutomateForm.cs</DependentUpon>
452- </EmbeddedResource>
453- <EmbeddedResource Include="Automate\AutomateForm.resx">
454- <DependentUpon>AutomateForm.cs</DependentUpon>
455- </EmbeddedResource>
456- <EmbeddedResource Include="Automate\AutomateForm.ru.resx">
457- <DependentUpon>AutomateForm.cs</DependentUpon>
458- </EmbeddedResource>
459- <EmbeddedResource Include="Automate\AutomateForm.tr.resx">
460- <DependentUpon>AutomateForm.cs</DependentUpon>
461- </EmbeddedResource>
462- <EmbeddedResource Include="Automate\AutomateForm.vi-VN.resx">
463- <DependentUpon>AutomateForm.cs</DependentUpon>
464- </EmbeddedResource>
465- <EmbeddedResource Include="Automate\AutomateForm.zh-CN.resx">
466- <DependentUpon>AutomateForm.cs</DependentUpon>
467- </EmbeddedResource>
468417 <EmbeddedResource Include="Colors\ColorPickerForm.de.resx">
469418 <DependentUpon>ColorPickerForm.cs</DependentUpon>
470419 </EmbeddedResource>
@@ -906,33 +855,6 @@
906855 <EmbeddedResource Include="Forms\OutputBox.resx">
907856 <DependentUpon>OutputBox.cs</DependentUpon>
908857 </EmbeddedResource>
909- <EmbeddedResource Include="Forms\QRCodeForm.de.resx">
910- <DependentUpon>QRCodeForm.cs</DependentUpon>
911- </EmbeddedResource>
912- <EmbeddedResource Include="Forms\QRCodeForm.es.resx">
913- <DependentUpon>QRCodeForm.cs</DependentUpon>
914- </EmbeddedResource>
915- <EmbeddedResource Include="Forms\QRCodeForm.fr.resx">
916- <DependentUpon>QRCodeForm.cs</DependentUpon>
917- </EmbeddedResource>
918- <EmbeddedResource Include="Forms\QRCodeForm.hu.resx">
919- <DependentUpon>QRCodeForm.cs</DependentUpon>
920- </EmbeddedResource>
921- <EmbeddedResource Include="Forms\QRCodeForm.ja-JP.resx">
922- <DependentUpon>QRCodeForm.cs</DependentUpon>
923- </EmbeddedResource>
924- <EmbeddedResource Include="Forms\QRCodeForm.ko-KR.resx">
925- <DependentUpon>QRCodeForm.cs</DependentUpon>
926- </EmbeddedResource>
927- <EmbeddedResource Include="Forms\QRCodeForm.nl-NL.resx">
928- <DependentUpon>QRCodeForm.cs</DependentUpon>
929- </EmbeddedResource>
930- <EmbeddedResource Include="Forms\QRCodeForm.pt-BR.resx">
931- <DependentUpon>QRCodeForm.cs</DependentUpon>
932- </EmbeddedResource>
933- <EmbeddedResource Include="Forms\QRCodeForm.resx">
934- <DependentUpon>QRCodeForm.cs</DependentUpon>
935- </EmbeddedResource>
936858 <EmbeddedResource Include="Controls\ExportImportControl.resx">
937859 <DependentUpon>ExportImportControl.cs</DependentUpon>
938860 </EmbeddedResource>
@@ -942,18 +864,6 @@
942864 <EmbeddedResource Include="Controls\TabToTreeView.resx">
943865 <DependentUpon>TabToTreeView.cs</DependentUpon>
944866 </EmbeddedResource>
945- <EmbeddedResource Include="Forms\QRCodeForm.ru.resx">
946- <DependentUpon>QRCodeForm.cs</DependentUpon>
947- </EmbeddedResource>
948- <EmbeddedResource Include="Forms\QRCodeForm.tr.resx">
949- <DependentUpon>QRCodeForm.cs</DependentUpon>
950- </EmbeddedResource>
951- <EmbeddedResource Include="Forms\QRCodeForm.vi-VN.resx">
952- <DependentUpon>QRCodeForm.cs</DependentUpon>
953- </EmbeddedResource>
954- <EmbeddedResource Include="Forms\QRCodeForm.zh-CN.resx">
955- <DependentUpon>QRCodeForm.cs</DependentUpon>
956- </EmbeddedResource>
957867 <EmbeddedResource Include="Printer\PrintForm.de.resx">
958868 <DependentUpon>PrintForm.cs</DependentUpon>
959869 </EmbeddedResource>
@@ -1213,12 +1123,6 @@
12131123 <None Include="Resources\Crosshair.cur" />
12141124 </ItemGroup>
12151125 <ItemGroup>
1216- <ProjectReference Include="..\Greenshot.ImageEditor\Greenshot.ImageEditor.csproj">
1217- <Project>{cd642bf4-d815-4d67-a0b5-c69f0b8231af}</Project>
1218- <Name>Greenshot.ImageEditor</Name>
1219- </ProjectReference>
1220- </ItemGroup>
1221- <ItemGroup>
12221126 <None Include="Resources\ShareX_Icon.ico" />
12231127 </ItemGroup>
12241128 <ItemGroup>
--- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.ja-JP.resx
+++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.ja-JP.resx
@@ -210,9 +210,6 @@
210210 <data name="gbAfterCapture.Text" xml:space="preserve">
211211 <value>キャプチャー後</value>
212212 </data>
213- <data name="cbAutoClose.Text" xml:space="preserve">
214- <value>処理後にこのウィンドウを閉じる</value>
215- </data>
216213 <data name="lblImageCount.Text" xml:space="preserve">
217214 <value>画像数:</value>
218215 </data>
--- a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.ja-JP.resx
+++ b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.ja-JP.resx
@@ -144,4 +144,7 @@
144144 <data name="$this.Text" xml:space="preserve">
145145 <value>ShareX - 文字入力</value>
146146 </data>
147+ <data name="btnOK.Text" xml:space="preserve">
148+ <value>OK</value>
149+ </data>
147150 </root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/Properties/Resources.ja-JP.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.ja-JP.resx
@@ -251,9 +251,6 @@
251251 <data name="RectangleRegionForm_WriteTips__Mouse_wheel__Change_current_tool" xml:space="preserve">
252252 <value>[マウスホイール] 現在のツールを変更</value>
253253 </data>
254- <data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
255- <value>すべてのオブジェクトの削除</value>
256- </data>
257254 <data name="ShapeManager_CreateContextMenu_Border_color___" xml:space="preserve">
258255 <value>枠線の色...</value>
259256 </data>
--- a/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.ja-JP.resx
+++ b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.ja-JP.resx
@@ -232,4 +232,10 @@
232232 <data name="btnTest.Text" xml:space="preserve">
233233 <value>コマンドのテスト</value>
234234 </data>
235+ <data name="lblNVENCPreset.Text" xml:space="preserve">
236+ <value>プリセット:</value>
237+ </data>
238+ <data name="lblNVENCBitrate.Text" xml:space="preserve">
239+ <value>ビットレート:</value>
240+ </data>
235241 </root>
\ No newline at end of file
--- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
@@ -106,7 +106,6 @@
106106 <Compile Include="Shapes\Drawing\LineDrawingShape.cs" />
107107 <Compile Include="Shapes\Effect\PixelateEffectShape.cs" />
108108 <Compile Include="Shapes\Drawing\RectangleDrawingShape.cs" />
109- <Compile Include="Shapes\Drawing\RoundedRectangleDrawingShape.cs" />
110109 <Compile Include="Shapes\Effect\BaseEffectShape.cs" />
111110 <Compile Include="Shapes\Region\EllipseRegionShape.cs" />
112111 <Compile Include="Shapes\Region\RectangleRegionShape.cs" />
@@ -140,7 +139,6 @@
140139 <Compile Include="RegionHelpers\ResizeNode.cs" />
141140 <Compile Include="RegionCaptureTasks.cs" />
142141 <Compile Include="ScrollingCaptureOptions.cs" />
143- <Compile Include="Shapes\Region\RoundedRectangleRegionShape.cs" />
144142 <Compile Include="RegionHelpers\SimpleWindowInfo.cs" />
145143 <Compile Include="RegionHelpers\SnapSize.cs" />
146144 <Compile Include="RegionCaptureOptions.cs" />
@@ -165,6 +163,13 @@
165163 </ProjectReference>
166164 </ItemGroup>
167165 <ItemGroup>
166+ <None Include="Resources\wrench-screwdriver.png" />
167+ <None Include="Resources\layers-stack-arrange.png" />
168+ <None Include="Resources\layers-stack-arrange-back.png" />
169+ <None Include="Resources\layers-arrange-back.png" />
170+ <None Include="Resources\layers-arrange.png" />
171+ <None Include="Resources\layer--minus.png" />
172+ <None Include="Resources\layer.png" />
168173 <None Include="Resources\test_32.png" />
169174 <None Include="Resources\layers.png" />
170175 <None Include="Resources\eraser.png" />
--- a/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx
+++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.ja-JP.resx
@@ -935,9 +935,6 @@ store.book[0].title</value>
935935 <data name="btnLithiioGetAPIKey.Text" xml:space="preserve">
936936 <value>APIキーを取得...</value>
937937 </data>
938- <data name="lblLithiioUploadURL.Text" xml:space="preserve">
939- <value>リンク URL:</value>
940- </data>
941938 <data name="btnPuushLogin.Text" xml:space="preserve">
942939 <value>ログイン</value>
943940 </data>
@@ -986,4 +983,19 @@ store.book[0].title</value>
986983 <data name="cbUpleaIsPremium.Text" xml:space="preserve">
987984 <value>プレミアム メンバー</value>
988985 </data>
986+ <data name="mbCustomUploaderDestinationType.Text" xml:space="preserve">
987+ <value>アップローダの種類</value>
988+ </data>
989+ <data name="mbCustomUploaderDestinationType.ToolTip" xml:space="preserve">
990+ <value>現在のところアップローダの種類は、ユーザーが .sxcu ファイルをダブルクリックして独自のアップローダをインポートした時に使用されます</value>
991+ </data>
992+ <data name="cbPolrUseAPIv1.Text" xml:space="preserve">
993+ <value>旧式のAPI v1を使用</value>
994+ </data>
995+ <data name="cbPolrIsSecret.Text" xml:space="preserve">
996+ <value>非公開のURL</value>
997+ </data>
998+ <data name="cbPastieIsPublic.Text" xml:space="preserve">
999+ <value>公開用アップロード</value>
1000+ </data>
9891001 </root>
\ No newline at end of file
--- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@@ -78,16 +78,16 @@
7878 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
7979 </PropertyGroup>
8080 <ItemGroup>
81- <Reference Include="AWSSDK.Core, Version=3.1.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
82- <HintPath>..\packages\AWSSDK.Core.3.1.11.0\lib\net35\AWSSDK.Core.dll</HintPath>
81+ <Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
82+ <HintPath>..\packages\AWSSDK.Core.3.3.8\lib\net35\AWSSDK.Core.dll</HintPath>
8383 <Private>True</Private>
8484 </Reference>
85- <Reference Include="AWSSDK.S3, Version=3.1.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
86- <HintPath>..\packages\AWSSDK.S3.3.1.10.0\lib\net35\AWSSDK.S3.dll</HintPath>
85+ <Reference Include="AWSSDK.S3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
86+ <HintPath>..\packages\AWSSDK.S3.3.3.5.3\lib\net35\AWSSDK.S3.dll</HintPath>
8787 <Private>True</Private>
8888 </Reference>
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>
89+ <Reference Include="MegaApiClient, Version=1.3.1.269, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
90+ <HintPath>..\packages\MegaApiClient.1.3.1\lib\net40\MegaApiClient.dll</HintPath>
9191 <Private>True</Private>
9292 </Reference>
9393 <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -242,6 +242,7 @@
242242 <Compile Include="SharingServices\VkSharingService.cs" />
243243 <Compile Include="Helpers\TaskReferenceHelper.cs" />
244244 <Compile Include="BaseServices\TextUploaderService.cs" />
245+ <Compile Include="TextUploaders\Pastie.cs" />
245246 <Compile Include="UploaderFactory.cs" />
246247 <Compile Include="ImageUploaders\Chevereto.cs" />
247248 <Compile Include="ImageUploaders\CheveretoUploader.cs" />
@@ -915,10 +916,11 @@
915916 <None Include="Resources\document.png" />
916917 </ItemGroup>
917918 <ItemGroup>
919+ <None Include="Favicons\Pastie.png" />
918920 <Content Include="Favicons\Uplea.ico" />
919921 </ItemGroup>
920922 <ItemGroup>
921- <Analyzer Include="..\packages\AWSSDK.S3.3.1.10.0\analyzers\dotnet\cs\AWSSDK.S3.CodeAnalysis.dll" />
923+ <Analyzer Include="..\packages\AWSSDK.S3.3.3.5.3\analyzers\dotnet\cs\AWSSDK.S3.CodeAnalysis.dll" />
922924 </ItemGroup>
923925 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
924926 <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
--- a/ShareX/Forms/MainForm.ja-JP.resx
+++ b/ShareX/Forms/MainForm.ja-JP.resx
@@ -555,9 +555,6 @@
555555 <data name="tsmiAutoCapture.Text" xml:space="preserve">
556556 <value>自動キャプチャー...</value>
557557 </data>
558- <data name="tsmiAutomate.Text" xml:space="preserve">
559- <value>自動化...</value>
560- </data>
561558 <data name="tsmiImagePreviewAutomatic.Text" xml:space="preserve">
562559 <value>自動</value>
563560 </data>
@@ -579,9 +576,6 @@
579576 <data name="tsmiTrayAutoCapture.Text" xml:space="preserve">
580577 <value>自動キャプチャー...</value>
581578 </data>
582- <data name="tsmiTrayAutomate.Text" xml:space="preserve">
583- <value>自動化...</value>
584- </data>
585579 <data name="tsmiTrayLastRegion.Text" xml:space="preserve">
586580 <value>最近使用した領域</value>
587581 </data>
@@ -660,4 +654,13 @@
660654 <data name="tsmiDownloadSelectedURL.Text" xml:space="preserve">
661655 <value>ダウンロード</value>
662656 </data>
657+ <data name="tsmiOCRImage.Text" xml:space="preserve">
658+ <value>文字認識(OCR)...</value>
659+ </data>
660+ <data name="tsmiCombineImages.Text" xml:space="preserve">
661+ <value>画像の結合...</value>
662+ </data>
663+ <data name="tsmiOpenActionsToolbar.Text" xml:space="preserve">
664+ <value>アクション ツールバーを表示/隠す</value>
665+ </data>
663666 </root>
\ No newline at end of file
--- /dev/null
+++ b/ShareX/Forms/QRCodeForm.ja-JP.resx
@@ -0,0 +1,129 @@
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="tsmiCopy.Text" xml:space="preserve">
121+ <value>クリップボードにコピー</value>
122+ </data>
123+ <data name="tsmiSaveAs.Text" xml:space="preserve">
124+ <value>名前を付けて保存...</value>
125+ </data>
126+ <data name="$this.Text" xml:space="preserve">
127+ <value>ShareX - QR コード</value>
128+ </data>
129+</root>
\ No newline at end of file
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -76,8 +76,8 @@
7676 <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
7777 </PropertyGroup>
7878 <ItemGroup>
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>
79+ <Reference Include="Gma.QrCodeNet.Encoding, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL">
80+ <HintPath>..\packages\QrCode.Net.0.4.0.0\lib\net40\Gma.QrCodeNet.Encoding.dll</HintPath>
8181 <Private>True</Private>
8282 </Reference>
8383 <Reference Include="Microsoft.VisualBasic" />
@@ -174,6 +174,12 @@
174174 <Compile Include="Forms\ImageCombinerForm.Designer.cs">
175175 <DependentUpon>ImageCombinerForm.cs</DependentUpon>
176176 </Compile>
177+ <Compile Include="Forms\QRCodeForm.cs">
178+ <SubType>Form</SubType>
179+ </Compile>
180+ <Compile Include="Forms\QRCodeForm.Designer.cs">
181+ <DependentUpon>QRCodeForm.cs</DependentUpon>
182+ </Compile>
177183 <Compile Include="Forms\QuickTaskMenuEditorForm.cs">
178184 <SubType>Form</SubType>
179185 </Compile>
@@ -198,6 +204,15 @@
198204 <Compile Include="Forms\FirstTimeConfigForm.Designer.cs">
199205 <DependentUpon>FirstTimeConfigForm.cs</DependentUpon>
200206 </Compile>
207+ <Compile Include="Forms\ActionsToolbarEditForm.cs">
208+ <SubType>Form</SubType>
209+ </Compile>
210+ <Compile Include="Forms\ActionsToolbarEditForm.Designer.cs">
211+ <DependentUpon>ActionsToolbarEditForm.cs</DependentUpon>
212+ </Compile>
213+ <Compile Include="Forms\ActionsToolbarForm.cs">
214+ <SubType>Form</SubType>
215+ </Compile>
201216 <Compile Include="HotkeyTypeEnumConverter.cs" />
202217 <Compile Include="ImageCombinerOptions.cs" />
203218 <Compile Include="IntegrationHelpers.cs" />
@@ -238,7 +253,6 @@
238253 <Compile Include="Forms\HotkeyForm.cs">
239254 <SubType>Form</SubType>
240255 </Compile>
241- <Compile Include="HotkeyInfo.cs" />
242256 <Compile Include="Controls\HotkeySelectionControl.cs">
243257 <SubType>UserControl</SubType>
244258 </Compile>
@@ -271,7 +285,6 @@
271285 <Compile Include="Properties\AssemblyInfo.cs" />
272286 <Compile Include="TaskManager.cs" />
273287 <Compile Include="TaskSettings.cs" />
274- <Compile Include="UpdateManager.cs" />
275288 <Compile Include="UploadInfoParser.cs" />
276289 <Compile Include="UploadInfoStatus.cs" />
277290 <Compile Include="Forms\HotkeySettingsForm.cs">
@@ -870,6 +883,45 @@
870883 <EmbeddedResource Include="Forms\MainForm.zh-CN.resx">
871884 <DependentUpon>MainForm.cs</DependentUpon>
872885 </EmbeddedResource>
886+ <EmbeddedResource Include="Forms\QRCodeForm.de.resx">
887+ <DependentUpon>QRCodeForm.cs</DependentUpon>
888+ </EmbeddedResource>
889+ <EmbeddedResource Include="Forms\QRCodeForm.es.resx">
890+ <DependentUpon>QRCodeForm.cs</DependentUpon>
891+ </EmbeddedResource>
892+ <EmbeddedResource Include="Forms\QRCodeForm.fr.resx">
893+ <DependentUpon>QRCodeForm.cs</DependentUpon>
894+ </EmbeddedResource>
895+ <EmbeddedResource Include="Forms\QRCodeForm.hu.resx">
896+ <DependentUpon>QRCodeForm.cs</DependentUpon>
897+ </EmbeddedResource>
898+ <EmbeddedResource Include="Forms\QRCodeForm.ja-JP.resx">
899+ <DependentUpon>QRCodeForm.cs</DependentUpon>
900+ </EmbeddedResource>
901+ <EmbeddedResource Include="Forms\QRCodeForm.ko-KR.resx">
902+ <DependentUpon>QRCodeForm.cs</DependentUpon>
903+ </EmbeddedResource>
904+ <EmbeddedResource Include="Forms\QRCodeForm.nl-NL.resx">
905+ <DependentUpon>QRCodeForm.cs</DependentUpon>
906+ </EmbeddedResource>
907+ <EmbeddedResource Include="Forms\QRCodeForm.pt-BR.resx">
908+ <DependentUpon>QRCodeForm.cs</DependentUpon>
909+ </EmbeddedResource>
910+ <EmbeddedResource Include="Forms\QRCodeForm.resx">
911+ <DependentUpon>QRCodeForm.cs</DependentUpon>
912+ </EmbeddedResource>
913+ <EmbeddedResource Include="Forms\QRCodeForm.ru.resx">
914+ <DependentUpon>QRCodeForm.cs</DependentUpon>
915+ </EmbeddedResource>
916+ <EmbeddedResource Include="Forms\QRCodeForm.tr.resx">
917+ <DependentUpon>QRCodeForm.cs</DependentUpon>
918+ </EmbeddedResource>
919+ <EmbeddedResource Include="Forms\QRCodeForm.vi-VN.resx">
920+ <DependentUpon>QRCodeForm.cs</DependentUpon>
921+ </EmbeddedResource>
922+ <EmbeddedResource Include="Forms\QRCodeForm.zh-CN.resx">
923+ <DependentUpon>QRCodeForm.cs</DependentUpon>
924+ </EmbeddedResource>
873925 <EmbeddedResource Include="Forms\QuickTaskInfoEditForm.de.resx">
874926 <DependentUpon>QuickTaskInfoEditForm.cs</DependentUpon>
875927 <SubType>Designer</SubType>
@@ -1006,6 +1058,9 @@
10061058 <EmbeddedResource Include="Forms\FirstTimeConfigForm.resx">
10071059 <DependentUpon>FirstTimeConfigForm.cs</DependentUpon>
10081060 </EmbeddedResource>
1061+ <EmbeddedResource Include="Forms\ActionsToolbarEditForm.resx">
1062+ <DependentUpon>ActionsToolbarEditForm.cs</DependentUpon>
1063+ </EmbeddedResource>
10091064 <EmbeddedResource Include="Forms\TaskSettingsForm.de.resx">
10101065 <DependentUpon>TaskSettingsForm.cs</DependentUpon>
10111066 </EmbeddedResource>
@@ -1156,6 +1211,10 @@
11561211 <EmbeddedResource Include="Properties\Resources.zh-CN.resx" />
11571212 </ItemGroup>
11581213 <ItemGroup>
1214+ <ProjectReference Include="..\Greenshot.ImageEditor\Greenshot.ImageEditor.csproj">
1215+ <Project>{cd642bf4-d815-4d67-a0b5-c69f0b8231af}</Project>
1216+ <Name>Greenshot.ImageEditor</Name>
1217+ </ProjectReference>
11591218 <ProjectReference Include="..\ShareX.HistoryLib\ShareX.HistoryLib.csproj">
11601219 <Project>{E7DE6237-AEA2-498B-8F56-9B392472C490}</Project>
11611220 <Name>ShareX.HistoryLib</Name>
@@ -1305,7 +1364,6 @@
13051364 <None Include="Resources\globe.png" />
13061365 <None Include="Resources\us.png" />
13071366 <None Include="Resources\clipboard-list.png" />
1308- <None Include="Resources\robot.png" />
13091367 <None Include="Resources\layer-transparent.png" />
13101368 <None Include="Resources\kr.png" />
13111369 <None Include="Resources\es.png" />
@@ -1346,6 +1404,15 @@
13461404 <None Include="Resources\Patreon_Button_02.png" />
13471405 <None Include="Resources\drive-download.png" />
13481406 <None Include="Resources\drive-upload.png" />
1407+ <None Include="Resources\ui-splitter.png" />
1408+ <None Include="Resources\ui-toolbar--arrow.png" />
1409+ <None Include="Resources\layer--arrow.png" />
1410+ <None Include="Resources\clock--arrow.png" />
1411+ <None Include="Resources\camcorder--arrow.png" />
1412+ <None Include="Resources\film--arrow.png" />
1413+ <None Include="Resources\camcorder--exclamation.png" />
1414+ <None Include="Resources\application-home.png" />
1415+ <None Include="Resources\clipboard-task.png" />
13491416 <Content Include="ShareX_Icon.ico" />
13501417 <None Include="Resources\globe--pencil.png" />
13511418 <None Include="Resources\camcorder--pencil.png" />