Skip to content

Commit 9970351

Browse files
NickeManarinNickeManarin
committed
Merge branch 'dev'
2 parents d213416 + 9a2073b commit 9970351

37 files changed

+151
-52
lines changed

‎ScreenToGif.Model/Enums/SupportedFFmpegVersions.cs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace ScreenToGif.Domain.Enums;
2+
3+
public enum SupportedFFmpegVersions
4+
{
5+
Version6 = 0,
6+
Version5,
7+
Version4,
8+
}

‎ScreenToGif.Util/Settings/UserSettings.cs

+12
Original file line numberDiff line numberDiff line change
@@ -1544,6 +1544,12 @@ public string FfmpegLocation
15441544
set => SetValue(value);
15451545
}
15461546

1547+
public SupportedFFmpegVersions FfmpegVersion
1548+
{
1549+
get => (SupportedFFmpegVersions)GetValue();
1550+
set => SetValue(value);
1551+
}
1552+
15471553
public string GifskiLocation
15481554
{
15491555
get => (string)GetValue();
@@ -2039,6 +2045,12 @@ public Color FreeTextFontColor
20392045
set => SetValue(value);
20402046
}
20412047

2048+
public Color FreeTextBackgroundColor
2049+
{
2050+
get => (Color)GetValue();
2051+
set => SetValue(value);
2052+
}
2053+
20422054
public TextAlignment FreeTextTextAlignment
20432055
{
20442056
get => (TextAlignment)GetValue();

‎ScreenToGif/Resources/Localization/StringResources.ar.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,7 @@
10931093
<s:String x:Key="S.Caption.Weight">الوزن:</s:String>
10941094
<s:String x:Key="S.Caption.Size">الحجم:</s:String>
10951095
<s:String x:Key="S.Caption.Color">اللون:</s:String>
1096+
<s:String x:Key="S.Caption.BackgroundColor">لون الخلفية:</s:String>
10961097
<s:String x:Key="S.Caption.Outline">خط خارجي</s:String>
10971098
<s:String x:Key="S.Caption.Thickness">سمك:</s:String>
10981099
<s:String x:Key="S.Caption.Layout">تخطيط</s:String>

‎ScreenToGif/Resources/Localization/StringResources.cs.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,7 @@
10931093
<s:String x:Key="S.Caption.Weight">Tloušťka:</s:String>
10941094
<s:String x:Key="S.Caption.Size">Velikost:</s:String>
10951095
<s:String x:Key="S.Caption.Color">Barva:</s:String>
1096+
<s:String x:Key="S.Caption.BackgroundColor">Barva pozadí:</s:String>
10961097
<s:String x:Key="S.Caption.Outline">Obrys</s:String>
10971098
<s:String x:Key="S.Caption.Thickness">Tloušťka:</s:String>
10981099
<s:String x:Key="S.Caption.Layout">Uspořádání</s:String>

‎ScreenToGif/Resources/Localization/StringResources.da.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1317,6 +1317,7 @@
13171317
<s:String x:Key="S.Caption.Weight">Vægt:</s:String>
13181318
<s:String x:Key="S.Caption.Size">Str:</s:String>
13191319
<s:String x:Key="S.Caption.Color">Farve:</s:String>
1320+
<s:String x:Key="S.Caption.BackgroundColor">Baggrundsfarve:</s:String>
13201321
<s:String x:Key="S.Caption.Outline">Omkreds</s:String>
13211322
<s:String x:Key="S.Caption.Thickness">Tykkelse:</s:String>
13221323
<s:String x:Key="S.Caption.Layout">Placering</s:String>
@@ -1884,4 +1885,4 @@
18841885
<s:String x:Key="S.TextDecorations.Strikethrough">Overstreg</s:String>
18851886
<s:String x:Key="S.TextDecorations.OverLine">Toplinie</s:String>
18861887
<s:String x:Key="S.TextDecorations.Baseline">Grundlinie</s:String>
1887-
</ResourceDictionary>
1888+
</ResourceDictionary>

‎ScreenToGif/Resources/Localization/StringResources.de.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">Breite:</s:String>
13261326
<s:String x:Key="S.Caption.Size">Größe:</s:String>
13271327
<s:String x:Key="S.Caption.Color">Farbe:</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">Hintergrundfarbe:</s:String>
13281329
<s:String x:Key="S.Caption.Outline">Kontur</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">Breite:</s:String>
13301331
<s:String x:Key="S.Caption.Layout">Position</s:String>
@@ -1997,4 +1998,4 @@
19971998
<s:String x:Key="S.TextDecorations.Strikethrough">Durchstreichen</s:String>
19981999
<s:String x:Key="S.TextDecorations.OverLine">Überstreichen</s:String>
19992000
<s:String x:Key="S.TextDecorations.Baseline">Grundlinie</s:String>
2000-
</ResourceDictionary>
2001+
</ResourceDictionary>

‎ScreenToGif/Resources/Localization/StringResources.el.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1165,6 +1165,7 @@
11651165
<s:String x:Key="S.Caption.Weight">Βάρος γραμματοσειράς:</s:String>
11661166
<s:String x:Key="S.Caption.Size">Μέγεθος:</s:String>
11671167
<s:String x:Key="S.Caption.Color">Χρώμα</s:String>
1168+
<s:String x:Key="S.Caption.BackgroundColor">Χρώμα του φόντου:</s:String>
11681169
<s:String x:Key="S.Caption.Outline">Περίγραμμα</s:String>
11691170
<s:String x:Key="S.Caption.Thickness">Πάχος:</s:String>
11701171
<s:String x:Key="S.Caption.Layout">Διάταξη</s:String>

‎ScreenToGif/Resources/Localization/StringResources.en.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,7 @@
581581
<s:String x:Key="S.Options.Extras.FfmpegLocation.Select">Select the location of the FFmpeg executable</s:String>
582582
<s:String x:Key="S.Options.Extras.FfmpegLocation.File">FFmpeg executable</s:String>
583583
<s:String x:Key="S.Options.Extras.FfmpegLocation.Invalid">The path of FFMpeg executable contains one or more invalid characters. Please, select a valid location for that executable.</s:String>
584+
<s:String x:Key="S.Options.Extras.FfmpegVersion">FFmpeg Version</s:String>
584585
<s:String x:Key="S.Options.Extras.GifskiLocation">Gifski location</s:String>
585586
<s:String x:Key="S.Options.Extras.GifskiLocation.Select">Select the location of the Gifski library</s:String>
586587
<s:String x:Key="S.Options.Extras.GifskiLocation.File">Gifski library</s:String>
@@ -1325,6 +1326,7 @@
13251326
<s:String x:Key="S.Caption.Weight">Weight:</s:String>
13261327
<s:String x:Key="S.Caption.Size">Size:</s:String>
13271328
<s:String x:Key="S.Caption.Color">Color:</s:String>
1329+
<s:String x:Key="S.Caption.BackgroundColor">Background Color:</s:String>
13281330
<s:String x:Key="S.Caption.Outline">Outline</s:String>
13291331
<s:String x:Key="S.Caption.Thickness">Thickness:</s:String>
13301332
<s:String x:Key="S.Caption.Layout">Layout</s:String>

‎ScreenToGif/Resources/Localization/StringResources.es-AR.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,7 @@
10931093
<s:String x:Key="S.Caption.Weight">Peso:</s:String>
10941094
<s:String x:Key="S.Caption.Size">Tamaño:</s:String>
10951095
<s:String x:Key="S.Caption.Color">Color:</s:String>
1096+
<s:String x:Key="S.Caption.BackgroundColor">Color de fondo:</s:String>
10961097
<s:String x:Key="S.Caption.Outline">Contorno</s:String>
10971098
<s:String x:Key="S.Caption.Thickness">Grosor:</s:String>
10981099
<s:String x:Key="S.Caption.Layout">Diseño</s:String>

‎ScreenToGif/Resources/Localization/StringResources.fi.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:s="clr-namespace:System;assembly=mscorlib"
44
xml:space="preserve">
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">Paino:</s:String>
13261326
<s:String x:Key="S.Caption.Size">Koko:</s:String>
13271327
<s:String x:Key="S.Caption.Color">Väri:</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">Taustaväri:</s:String>
13281329
<s:String x:Key="S.Caption.Outline">Hahmotelma</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">Paksuus:</s:String>
13301331
<s:String x:Key="S.Caption.Layout">Asettelu</s:String>

‎ScreenToGif/Resources/Localization/StringResources.fr.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:s="clr-namespace:System;assembly=mscorlib"
44
xml:space="preserve">
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">Bordure:</s:String>
13261326
<s:String x:Key="S.Caption.Size">Taille:</s:String>
13271327
<s:String x:Key="S.Caption.Color">Couleur:</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">Couleur de l'arrière plan:</s:String>
13281329
<s:String x:Key="S.Caption.Outline">Contour</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">Épaisseur:</s:String>
13301331
<s:String x:Key="S.Caption.Layout">Disposition</s:String>

‎ScreenToGif/Resources/Localization/StringResources.he.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:s="clr-namespace:System;assembly=mscorlib"
44
xml:space="preserve">
@@ -1306,6 +1306,7 @@
13061306
<s:String x:Key="S.Caption.Weight">משקל:</s:String>
13071307
<s:String x:Key="S.Caption.Size">גודל:</s:String>
13081308
<s:String x:Key="S.Caption.Color">צבע:</s:String>
1309+
<s:String x:Key="S.Caption.BackgroundColor">צבע רקע:</s:String>
13091310
<s:String x:Key="S.Caption.Outline">מתאר</s:String>
13101311
<s:String x:Key="S.Caption.Thickness">עובי:</s:String>
13111312
<s:String x:Key="S.Caption.Layout">פריסה</s:String>

‎ScreenToGif/Resources/Localization/StringResources.hu.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:s="clr-namespace:System;assembly=mscorlib"
44
xml:space="preserve">
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">Vastagság:</s:String>
13261326
<s:String x:Key="S.Caption.Size">Méret:</s:String>
13271327
<s:String x:Key="S.Caption.Color">Szín:</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">Háttérszín:</s:String>
13281329
<s:String x:Key="S.Caption.Outline">Körvonal</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">Vastagság:</s:String>
13301331
<s:String x:Key="S.Caption.Layout">Elrendezés</s:String>

‎ScreenToGif/Resources/Localization/StringResources.it.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:s="clr-namespace:System;assembly=mscorlib"
44
xml:space="preserve">
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">Peso:</s:String>
13261326
<s:String x:Key="S.Caption.Size">Dimensione:</s:String>
13271327
<s:String x:Key="S.Caption.Color">Colore:</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">Colore di sfondo:</s:String>
13281329
<s:String x:Key="S.Caption.Outline">Contorno</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">Spessore:</s:String>
13301331
<s:String x:Key="S.Caption.Layout">Disposizione</s:String>

‎ScreenToGif/Resources/Localization/StringResources.ja.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1306,6 +1306,7 @@
13061306
<s:String x:Key="S.Caption.Weight">太さ:</s:String>
13071307
<s:String x:Key="S.Caption.Size">サイズ:</s:String>
13081308
<s:String x:Key="S.Caption.Color">色:</s:String>
1309+
<s:String x:Key="S.Caption.BackgroundColor">背景色:</s:String>
13091310
<s:String x:Key="S.Caption.Outline">アウトライン</s:String>
13101311
<s:String x:Key="S.Caption.Thickness">太さ(厚さ):</s:String>
13111312
<s:String x:Key="S.Caption.Layout">レイアウト</s:String>
@@ -1862,4 +1863,4 @@
18621863
<s:String x:Key="S.TextDecorations.Strikethrough">取り消し線</s:String>
18631864
<s:String x:Key="S.TextDecorations.OverLine">オーバーライン</s:String>
18641865
<s:String x:Key="S.TextDecorations.Baseline">ベースライン</s:String>
1865-
</ResourceDictionary>
1866+
</ResourceDictionary>

‎ScreenToGif/Resources/Localization/StringResources.ko.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1151,6 +1151,7 @@
11511151
<s:String x:Key="S.Caption.Weight">굵기:</s:String>
11521152
<s:String x:Key="S.Caption.Size">크기:</s:String>
11531153
<s:String x:Key="S.Caption.Color">색상:</s:String>
1154+
<s:String x:Key="S.Caption.BackgroundColor">배경색:</s:String>
11541155
<s:String x:Key="S.Caption.Outline">외곽선</s:String>
11551156
<s:String x:Key="S.Caption.Thickness">두께:</s:String>
11561157
<s:String x:Key="S.Caption.Layout">위치 설정</s:String>
@@ -1505,4 +1506,4 @@
15051506
<!--Orientation-->
15061507
<s:String x:Key="S.Orientation.Horizontal">수평</s:String>
15071508
<s:String x:Key="S.Orientation.Vertical">수직</s:String>
1508-
</ResourceDictionary>
1509+
</ResourceDictionary>

‎ScreenToGif/Resources/Localization/StringResources.nl.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">Gewicht:</s:String>
13261326
<s:String x:Key="S.Caption.Size">Grootte:</s:String>
13271327
<s:String x:Key="S.Caption.Color">Kleur:</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">Achtergrond kleur:</s:String>
13281329
<s:String x:Key="S.Caption.Outline">Contour</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">Dikte:</s:String>
13301331
<s:String x:Key="S.Caption.Layout">Opmaak</s:String>

‎ScreenToGif/Resources/Localization/StringResources.pl.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:s="clr-namespace:System;assembly=mscorlib"
44
xml:space="preserve">
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">Waga:</s:String>
13261326
<s:String x:Key="S.Caption.Size">Rozmiar:</s:String>
13271327
<s:String x:Key="S.Caption.Color">Kolor:</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">Kolor tła:</s:String>
13281329
<s:String x:Key="S.Caption.Outline">Kontur</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">Grubość:</s:String>
13301331
<s:String x:Key="S.Caption.Layout">Układ</s:String>

‎ScreenToGif/Resources/Localization/StringResources.pt-PT.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">Peso:</s:String>
13261326
<s:String x:Key="S.Caption.Size">Tamanho:</s:String>
13271327
<s:String x:Key="S.Caption.Color">Cor:</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">Cor de fundo:</s:String>
13281329
<s:String x:Key="S.Caption.Outline">Borda</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">Espessura:</s:String>
13301331
<s:String x:Key="S.Caption.Layout">Posicionamento</s:String>

‎ScreenToGif/Resources/Localization/StringResources.pt.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,7 @@
581581
<s:String x:Key="S.Options.Extras.FfmpegLocation.Select">Selecione a pasta de localização do executável do FFmpeg.</s:String>
582582
<s:String x:Key="S.Options.Extras.FfmpegLocation.File">Executável do FFmpeg</s:String>
583583
<s:String x:Key="S.Options.Extras.FfmpegLocation.Invalid">O caminho do executável FFMpeg contém um ou mais caracteres inválidos. Por favor, selecione um caminho válido para o executável.</s:String>
584+
<s:String x:Key="S.Options.Extras.FfmpegVersion">Versão do FFmpeg</s:String>
584585
<s:String x:Key="S.Options.Extras.GifskiLocation">Localização do Gifski</s:String>
585586
<s:String x:Key="S.Options.Extras.GifskiLocation.Select">Selecione a localização da biblioteca Gifski</s:String>
586587
<s:String x:Key="S.Options.Extras.GifskiLocation.File">Biblioteca Gifski</s:String>
@@ -1325,6 +1326,7 @@
13251326
<s:String x:Key="S.Caption.Weight">Peso:</s:String>
13261327
<s:String x:Key="S.Caption.Size">Tamanho:</s:String>
13271328
<s:String x:Key="S.Caption.Color">Cor:</s:String>
1329+
<s:String x:Key="S.Caption.BackgroundColor">Cor de fundo:</s:String>
13281330
<s:String x:Key="S.Caption.Outline">Borda</s:String>
13291331
<s:String x:Key="S.Caption.Thickness">Espessura:</s:String>
13301332
<s:String x:Key="S.Caption.Layout">Posicionamento</s:String>

‎ScreenToGif/Resources/Localization/StringResources.ru.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">Начертание:</s:String>
13261326
<s:String x:Key="S.Caption.Size">Размер:</s:String>
13271327
<s:String x:Key="S.Caption.Color">Цвет:</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">Фоновый цвет:</s:String>
13281329
<s:String x:Key="S.Caption.Outline">Обводка</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">Толщина:</s:String>
13301331
<s:String x:Key="S.Caption.Layout">Макет</s:String>
@@ -1997,4 +1998,4 @@
19971998
<s:String x:Key="S.TextDecorations.Strikethrough">Зачеркнутый</s:String>
19981999
<s:String x:Key="S.TextDecorations.OverLine">Линия сверху</s:String>
19992000
<s:String x:Key="S.TextDecorations.Baseline">На линии</s:String>
2000-
</ResourceDictionary>
2001+
</ResourceDictionary>

‎ScreenToGif/Resources/Localization/StringResources.sv.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,7 @@
10931093
<s:String x:Key="S.Caption.Weight">Vikt:</s:String>
10941094
<s:String x:Key="S.Caption.Size">Storlek:</s:String>
10951095
<s:String x:Key="S.Caption.Color">Färg:</s:String>
1096+
<s:String x:Key="S.Caption.BackgroundColor">Bakgrundsfärg:</s:String>
10961097
<s:String x:Key="S.Caption.Outline">Översikt</s:String>
10971098
<s:String x:Key="S.Caption.Thickness">Tjocklek:</s:String>
10981099
<s:String x:Key="S.Caption.Layout">Layout</s:String>

‎ScreenToGif/Resources/Localization/StringResources.sw.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,7 @@
10931093
<s:String x:Key="S.Caption.Weight">Uzani:</s:String>
10941094
<s:String x:Key="S.Caption.Size">Ukubwa:</s:String>
10951095
<s:String x:Key="S.Caption.Color">Rangi:</s:String>
1096+
<s:String x:Key="S.Caption.BackgroundColor">Rangi ya Mandharinyuma:</s:String>
10961097
<s:String x:Key="S.Caption.Outline">Kiolezi</s:String>
10971098
<s:String x:Key="S.Caption.Thickness">Unene:</s:String>
10981099
<s:String x:Key="S.Caption.Layout">Mpangilio</s:String>

‎ScreenToGif/Resources/Localization/StringResources.tr.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,7 @@
10931093
<s:String x:Key="S.Caption.Weight">Ağırlık:</s:String>
10941094
<s:String x:Key="S.Caption.Size">Boyut:</s:String>
10951095
<s:String x:Key="S.Caption.Color">Renk:</s:String>
1096+
<s:String x:Key="S.Caption.BackgroundColor">Arka plan rengi:</s:String>
10961097
<s:String x:Key="S.Caption.Outline">Dış çizgi</s:String>
10971098
<s:String x:Key="S.Caption.Thickness">Kalınlık:</s:String>
10981099
<s:String x:Key="S.Caption.Layout">Düzen</s:String>
@@ -1438,4 +1439,4 @@
14381439
<!--Orientation-->
14391440
<s:String x:Key="S.Orientation.Horizontal">Yatay</s:String>
14401441
<s:String x:Key="S.Orientation.Vertical">Düşey</s:String>
1441-
</ResourceDictionary>
1442+
</ResourceDictionary>

‎ScreenToGif/Resources/Localization/StringResources.uk.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:s="clr-namespace:System;assembly=mscorlib"
44
xml:space="preserve">
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">Товщина:</s:String>
13261326
<s:String x:Key="S.Caption.Size">Розмір:</s:String>
13271327
<s:String x:Key="S.Caption.Color">Колір:</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">Колір фону:</s:String>
13281329
<s:String x:Key="S.Caption.Outline">Контур</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">Товщина:</s:String>
13301331
<s:String x:Key="S.Caption.Layout">Розташування</s:String>

‎ScreenToGif/Resources/Localization/StringResources.vi.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,7 @@
10931093
<s:String x:Key="S.Caption.Weight">Độ đậm nét:</s:String>
10941094
<s:String x:Key="S.Caption.Size">Cỡ chữ:</s:String>
10951095
<s:String x:Key="S.Caption.Color">Màu sắc:</s:String>
1096+
<s:String x:Key="S.Caption.BackgroundColor">Màu nền:</s:String>
10961097
<s:String x:Key="S.Caption.Outline">Đường bao</s:String>
10971098
<s:String x:Key="S.Caption.Thickness">Chiều dày:</s:String>
10981099
<s:String x:Key="S.Caption.Layout">Bố trí</s:String>

‎ScreenToGif/Resources/Localization/StringResources.zh-Hant.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">粗細：</s:String>
13261326
<s:String x:Key="S.Caption.Size">大小：</s:String>
13271327
<s:String x:Key="S.Caption.Color">顏色：</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">背景顏色：</s:String>
13281329
<s:String x:Key="S.Caption.Outline">外框</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">粗細：</s:String>
13301331
<s:String x:Key="S.Caption.Layout">配置</s:String>

‎ScreenToGif/Resources/Localization/StringResources.zh.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1325,6 +1325,7 @@
13251325
<s:String x:Key="S.Caption.Weight">字重：</s:String>
13261326
<s:String x:Key="S.Caption.Size">字号：</s:String>
13271327
<s:String x:Key="S.Caption.Color">颜色：</s:String>
1328+
<s:String x:Key="S.Caption.BackgroundColor">背景颜色：</s:String>
13281329
<s:String x:Key="S.Caption.Outline">轮廓</s:String>
13291330
<s:String x:Key="S.Caption.Thickness">粗细：</s:String>
13301331
<s:String x:Key="S.Caption.Layout">布局</s:String>
@@ -1997,4 +1998,4 @@
19971998
<s:String x:Key="S.TextDecorations.Strikethrough">删除线</s:String>
19981999
<s:String x:Key="S.TextDecorations.OverLine">上划线</s:String>
19992000
<s:String x:Key="S.TextDecorations.Baseline">底线</s:String>
2000-
</ResourceDictionary>
2001+
</ResourceDictionary>

‎ScreenToGif/Resources/Settings.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@
193193

194194
<!--Options • Extras-->
195195
<!--<s:String x:Key="FfmpegLocation"></s:String>-->
196+
<e:SupportedFFmpegVersions x:Key="FfmpegVersion">Version4</e:SupportedFFmpegVersions>
196197
<!--<s:String x:Key="GifskiLocation"></s:String>-->
197198
<!--<s:String x:Key="SharpDxLocationFolder"></s:String>-->
198199

@@ -291,6 +292,7 @@
291292
<FontWeight x:Key="FreeTextFontWeight">Normal</FontWeight>
292293
<s:Double x:Key="FreeTextFontSize">16.0</s:Double>
293294
<Color x:Key="FreeTextFontColor">#FF000000</Color>
295+
<Color x:Key="FreeTextBackgroundColor">#00000000</Color>
294296
<TextAlignment x:Key="FreeTextTextAlignment">Left</TextAlignment>
295297
<s:String x:Key="FreeTextTextDecoration">None</s:String>
296298
<s:Boolean x:Key="IsFreeTextShadowGroupExpanded">True</s:Boolean>

0 commit comments

Comments
 (0)