summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs17
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.de.resx3
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.es.resx3
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.fr.resx3
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.ja.resx3
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.ko.resx3
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx11
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.ru.resx3
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.tr.resx3
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.zh.resx3
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs5
-rw-r--r--win/CS/HandBrakeWPF/Views/MainView.xaml3
12 files changed, 25 insertions, 35 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 876e5f43a..1f4eb6c9f 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -2119,7 +2119,7 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Preset:.
+ /// Looks up a localized string similar to Presets.
/// </summary>
public static string MainView_Presets {
get {
@@ -2227,11 +2227,11 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Selected Preset:.
+ /// Looks up a localized string similar to Preset:.
/// </summary>
- public static string MainView_SelectedPreset {
+ public static string MainView_SelectedPresets {
get {
- return ResourceManager.GetString("MainView_SelectedPreset", resourceCulture);
+ return ResourceManager.GetString("MainView_SelectedPresets", resourceCulture);
}
}
@@ -5753,6 +5753,15 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
+ /// Looks up a localized string similar to Same as source.
+ /// </summary>
+ public static string SummaryView_SameAsSource {
+ get {
+ return ResourceManager.GetString("SummaryView_SameAsSource", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to storage.
/// </summary>
public static string SummaryView_storage {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.de.resx b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
index a3f22724c..52ebb4dfc 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.de.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
@@ -1072,9 +1072,6 @@ Soll sie überschrieben werden?</value>
<data name="MainView_Searching" xml:space="preserve">
<value>Nach der Startzeit suchen</value>
</data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>Ausgewählte Voreinstellung:</value>
- </data>
<data name="MainView_SetDefault" xml:space="preserve">
<value>Standard definieren</value>
</data>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.es.resx b/win/CS/HandBrakeWPF/Properties/Resources.es.resx
index eb0befdef..c8350ba18 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.es.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.es.resx
@@ -1063,9 +1063,6 @@ Tiempo restante: {4}</value>
<data name="MainView_Searching" xml:space="preserve">
<value>Buscando la hora de inicio</value>
</data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>Ajuste preestablecido seleccionado:</value>
- </data>
<data name="MainView_SetDefault" xml:space="preserve">
<value>Establecer predeterminado</value>
</data>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.fr.resx b/win/CS/HandBrakeWPF/Properties/Resources.fr.resx
index da93b5d98..46fc78fd9 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.fr.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.fr.resx
@@ -1066,9 +1066,6 @@ Souhaitez-vous l'écraser ?</value>
<data name="MainView_Searching" xml:space="preserve">
<value>Recherche de l'heure de démarage</value>
</data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>Pré-réglage sélectionné :</value>
- </data>
<data name="MainView_SetDefault" xml:space="preserve">
<value>Définir la valeur par défaut</value>
</data>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.ja.resx b/win/CS/HandBrakeWPF/Properties/Resources.ja.resx
index 9566dbc84..7a47c223f 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.ja.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.ja.resx
@@ -1068,9 +1068,6 @@ VLCがインストールされ、HandBrakeの設定で指定されたディレ�
<data name="MainView_Searching" xml:space="preserve">
<value>開始時間を検索中</value>
</data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>選択中のプリセット</value>
- </data>
<data name="MainView_SetDefault" xml:space="preserve">
<value>既定に設定</value>
</data>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.ko.resx b/win/CS/HandBrakeWPF/Properties/Resources.ko.resx
index 5704eeebd..83272faa4 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.ko.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.ko.resx
@@ -1065,9 +1065,6 @@ VLC가 설치되었는지 확인하고 HandBrake의 옵션에 지정된 폴더�
<data name="MainView_Searching" xml:space="preserve">
<value>시작 시간 검색</value>
</data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>선택된 환경 설정:</value>
- </data>
<data name="MainView_SetDefault" xml:space="preserve">
<value>기본값 설정</value>
</data>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index de06cc56c..79aea5a0d 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1044,7 +1044,7 @@ Would you like to overwrite it?</value>
<value>Delete Preset</value>
</data>
<data name="MainView_Presets" xml:space="preserve">
- <value>Preset:</value>
+ <value>Presets</value>
</data>
<data name="MainView_Preview" xml:space="preserve">
<value>Preview</value>
@@ -1070,9 +1070,6 @@ Would you like to overwrite it?</value>
<data name="MainView_Searching" xml:space="preserve">
<value>Searching for start time</value>
</data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>Selected Preset:</value>
- </data>
<data name="MainView_SetDefault" xml:space="preserve">
<value>Set Default</value>
</data>
@@ -2229,4 +2226,10 @@ Please choose a different preset.</value>
<data name="StaticPreviewView_CancelPreview" xml:space="preserve">
<value>Cancel</value>
</data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>Preset:</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>Same as source</value>
+ </data>
</root> \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.ru.resx b/win/CS/HandBrakeWPF/Properties/Resources.ru.resx
index f1f709888..fbca0c400 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.ru.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.ru.resx
@@ -1068,9 +1068,6 @@ Foreign Audio Preferred, else First - Если существует дорожк
<data name="MainView_Searching" xml:space="preserve">
<value>Поиск начального времени</value>
</data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>Выбранный пресет:</value>
- </data>
<data name="MainView_SetDefault" xml:space="preserve">
<value>Установить по умолчанию</value>
</data>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.tr.resx b/win/CS/HandBrakeWPF/Properties/Resources.tr.resx
index 0102da37f..1a1ca277c 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.tr.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.tr.resx
@@ -1068,9 +1068,6 @@ Kalan Süre: {4}</value>
<data name="MainView_Searching" xml:space="preserve">
<value>Başlangıç ​​zamanı aranıyor</value>
</data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>Seçilen Ön Ayar:</value>
- </data>
<data name="MainView_SetDefault" xml:space="preserve">
<value>Varsayılana Ayarla</value>
</data>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.zh.resx b/win/CS/HandBrakeWPF/Properties/Resources.zh.resx
index 213ff6e0d..4574c16ca 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.zh.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.zh.resx
@@ -1058,9 +1058,6 @@ Foreign Audio Preferred, else First - 如果存在外语轨道，则会将其烧
<data name="MainView_Searching" xml:space="preserve">
<value>正在寻找开始时间</value>
</data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>选中的预设：</value>
- </data>
<data name="MainView_SetDefault" xml:space="preserve">
<value>设置为默认</value>
</data>
diff --git a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
index 1fcef8347..544956916 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
@@ -521,7 +521,10 @@ namespace HandBrakeWPF.ViewModels
}
// Dimension Section
- this.VideoTrackInfo = string.Format("{0}, {1} FPS {2}", EnumHelper<VideoEncoder>.GetDisplay(this.Task.VideoEncoder), this.Task.Framerate, this.Task.FramerateMode);
+ this.VideoTrackInfo = this.Task.Framerate == null
+ ? string.Format("{0}, {1} FPS {2}", EnumHelper<VideoEncoder>.GetDisplay(this.Task.VideoEncoder), Resources.SummaryView_SameAsSource, this.Task.FramerateMode)
+ : string.Format("{0}, {1} FPS {2}", EnumHelper<VideoEncoder>.GetDisplay(this.Task.VideoEncoder), this.Task.Framerate, this.Task.FramerateMode);
+
this.NotifyOfPropertyChange(() => this.VideoTrackInfo);
this.AudioTrackInfo = this.GetAudioDescription();
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index df77fc923..8857e7b3c 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -447,7 +447,7 @@
<!-- Presets Options -->
<StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,10,10,5" IsEnabled="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}">
- <Label Content="{x:Static Properties:Resources.MainView_Presets}" FontWeight="Bold" VerticalAlignment="Center" Margin="0,0,5,0" />
+ <Label Content="{x:Static Properties:Resources.MainView_SelectedPresets}" FontWeight="Bold" VerticalAlignment="Center" Margin="0,0,5,0" />
<StackPanel Orientation="Horizontal" Margin="5,0,0,0" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
<Button x:Name="SelectPresetsButton" VerticalAlignment="Center" Click="SelectPreset_OnClick" Width="255">
@@ -513,7 +513,6 @@
</Button>
</StackPanel>
<StackPanel Margin="8,0,0,0" Orientation="Horizontal" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
- <TextBlock Text="{x:Static Properties:Resources.MainView_SelectedPreset}" Margin="5,0,0,0" />
<TextBlock Text="{Binding SelectedPreset.Name}" Margin="5,0,0,0" />
<TextBlock Text="{x:Static Properties:Resources.MainView_ModifiedPreset}" FontStyle="Italic" Visibility="{Binding IsModifiedPreset, Converter={StaticResource boolToVisConverter}}" Margin="5,0,0,0" />
</StackPanel>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 15:32:16 +0000