Cherry Pick WinGui: Fix Presets and Summary FPS labels.

11 files changed, 25 insertions, 32 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index b749f54e4..e278190f5 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -2110,7 +2110,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 {
@@ -2218,11 +2218,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);
             }
         }
         
@@ -5615,6 +5615,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 e2136552b..303edfca5 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.de.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
@@ -1064,9 +1064,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 ea663d777..c78007ba1 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.es.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.es.resx
@@ -1076,9 +1076,6 @@ Tiempo restante: {5},  Transcurrido: {6:d\:hh\:mm\:ss}</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 7dfde0752..d05b73302 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.fr.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.fr.resx
@@ -1078,9 +1078,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.ko.resx b/win/CS/HandBrakeWPF/Properties/Resources.ko.resx
index 7741fbcf3..0d2e6a0b0 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.ko.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.ko.resx
@@ -1072,9 +1072,6 @@ FPS: {3:000.0}, 평균 FPS: {4:000.0}
   <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 eeb82a190..7d6efc3c0 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1054,7 +1054,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>

@@ -1080,9 +1080,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>

@@ -2182,4 +2179,10 @@ Where supported, any user presets will have been imported.</value>
   <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">

     <value>Always use the default path for each new name generated.</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 0cc4e7d3c..8f745c365 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.ru.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.ru.resx
@@ -1076,9 +1076,6 @@ FPS: {3:000.0},  Сред FPS: {4:000.0}
   <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 05b48b11c..3e3da70b2 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.tr.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.tr.resx
@@ -1078,9 +1078,6 @@ Kalan Süre: {5},  Geçen: {6:d\:hh\:mm\:ss}</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 57d4ce6b3..1508a3de8 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.zh.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.zh.resx
@@ -1066,9 +1066,6 @@ FPS: {3:000.0},  平均FPS: {4:000.0}
   <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 161d403a5..fe1fc3317 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 8cf0c992b..6cd729555 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -453,7 +453,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">

@@ -519,7 +519,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>