CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
L1Q 2018-02-19 04:46:32 +02:00 committed by GitHub
commit fb09923626
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Lib/screen-capture-recorder-x64.dll
View file

Binary file not shown.

BIN
Lib/screen-capture-recorder.dll
View file

Binary file not shown.

BIN
Lib/virtual-audio-capturer-x64.dll
View file

Binary file not shown.

BIN
Lib/virtual-audio-capturer.dll
View file

Binary file not shown.

13
ShareX.HelpersLib/Properties/Resources.Designer.cs generated
View file

@ -78,7 +78,7 @@ internal static string ActionsCodeMenuEntry_OutputFilePath_File_path_without_ext
"me_extension_", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to abandoned
///able
@ -377,7 +377,7 @@ internal static string AmazonS3StorageClass_STANDARD_IA {
return ResourceManager.GetString("AmazonS3StorageClass_STANDARD_IA", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to aardvark
///aardwolf
@ -3278,5 +3278,14 @@ internal static string UrlShortenerType_CustomURLShortener {
return ResourceManager.GetString("UrlShortenerType_CustomURLShortener", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Browse for a sound file....
/// </summary>
internal static string WavFileNameEditor_EditValue_Browse_for_a_sound_file___ {
get {
return ResourceManager.GetString("WavFileNameEditor_EditValue_Browse_for_a_sound_file___", resourceCulture);
}
}
}
}

3
ShareX.HelpersLib/Properties/Resources.de.resx
View file

@ -895,4 +895,7 @@ Möchtest du sie herunterladen?</value>
<data name="ShapeType_ToolCrop" xml:space="preserve">
<value>Bild zuschneiden</value>
</data>
<data name="WavFileNameEditor_EditValue_Browse_for_a_sound_file___" xml:space="preserve">
<value>Nach .wav durchsuchen...</value>
</data>
</root>

3
ShareX.HelpersLib/Properties/Resources.resx
View file

@ -1157,4 +1157,7 @@ Would you like to download it?</value>
<data name="CodeMenuEntryFilename_RandomAdjective" xml:space="preserve">
<value>Random adjective</value>
</data>
<data name="WavFileNameEditor_EditValue_Browse_for_a_sound_file___" xml:space="preserve">
<value>Browse for a sound file...</value>
</data>
</root>

2
ShareX.HelpersLib/UITypeEditors/WavFileNameEditor.cs
View file

@ -41,7 +41,7 @@ public override object EditValue(ITypeDescriptorContext context, IServiceProvide
}
using (OpenFileDialog dlg = new OpenFileDialog())
{
dlg.Title = Resources.ExeFileNameEditor_EditValue_Browse_for_executable___;
dlg.Title = Resources.WavFileNameEditor_EditValue_Browse_for_a_sound_file___;
dlg.Filter = "Sound file (*.wav)|*.wav";
if (dlg.ShowDialog() == DialogResult.OK)
{

2
ShareX.Setup/InnoSetup/Recorder-devices-setup.iss
View file

@ -1,5 +1,5 @@
#define MyAppName "Recorder Devices for ShareX"
#define MyAppVersion "0.12.8"
#define MyAppVersion "0.12.10"
#define MyAppRootDirectory "..\.."
#define MyAppOutputDirectory MyAppRootDirectory + "\Output"
#define MyAppLibDirectory MyAppRootDirectory + "\Lib"