Skip to content

Commit 4c4fe9f

Browse files
committed
roll back ffmpeg updates
updates to translations
1 parent bdaf1ed commit 4c4fe9f

28 files changed

+268
-157
lines changed

AddCamera.Designer.cs

+81-81
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AddCamera.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ private void RenderResources()
658658
label76.Text = LocRm.GetString("ExitThisToEnableAlertsAnd");
659659
label77.Text = LocRm.GetString("Tags");
660660
label79.Text = LocRm.GetString("UploadViaWebsite");
661-
label83.Text = LocRm.GetString("ClickAndDragTodraw");
661+
label83.Text = LocRm.GetString("ClickAndDragTodraw").Trim();
662662
label84.Text = LocRm.GetString("MaskImage");
663663
label86.Text = label100.Text = LocRm.GetString("OverlayText");
664664
linkLabel1.Text = LocRm.GetString("UsageTips");

App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</dependentAssembly>
7676
<dependentAssembly>
7777
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
78-
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
78+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
7979
</dependentAssembly>
8080
<dependentAssembly>
8181
<assemblyIdentity name="Google.Apis" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />

Controls/Ranger.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public Ranger()
6767

6868
private void Ranger_Load(object sender, EventArgs e)
6969
{
70-
70+
label2.Text = LocRm.GetString("GainCamera");
7171
}
7272

7373
private void Ranger_SizeChanged(object sender, EventArgs e)

Controls/Ranger.designer.cs

+45-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)