1 files changed, 26 insertions, 26 deletions
diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index b5bc6db28..f4ecdf3bb 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -30,27 +30,27 @@
 
             <!-- Size Panel-->
             <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Margin="5,0,0,0"  Grid.Column="0" Grid.Row="0">
-                <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Size}"  FontWeight="Bold" />
+                <Label Content="{x:Static Properties:Resources.PictureSettingsView_Size}"  FontWeight="Bold" />
 
                 <!-- Row 1-->
                 <StackPanel Orientation="Horizontal" Margin="0,0,5,0">
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Source}" />
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_Source}" />
                     <Label Content="{Binding SourceInfo}" Name="sourceResolution"/>
                 </StackPanel>
 
                 <!-- Row 2-->
                 <StackPanel Orientation="Horizontal" Margin="0,0,5,0">
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Width}" />
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_Width}" />
                     <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" UpdateBindingOnTextChange="True" IsEnabled="{Binding WidthControlEnabled}" 
                                         Modulus="{Binding SelectedModulus, Mode=OneWay}"
                                         ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Width}"  Minimum="0" Width="60"
-                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Width}" />
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Height}" />
+                                        AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Width}" />
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_Height}" />
                     <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" UpdateBindingOnTextChange="True" 
                                         Modulus="{Binding SelectedModulus, Mode=OneWay}" 
                                         ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Height}" Minimum="0" Width="60"
-                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Height}" />
-                    <CheckBox Content="{x:Static Properties:ResourcesUI.PictureSettingsView_KeepAR}" IsChecked="{Binding MaintainAspectRatio}"
+                                        AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Height}" />
+                    <CheckBox Content="{x:Static Properties:Resources.PictureSettingsView_KeepAR}" IsChecked="{Binding MaintainAspectRatio}"
                           Visibility="{Binding ShowKeepAR, Converter={StaticResource boolToVisHiddenConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_KeepAR}"
                           VerticalAlignment="Center" Margin="5,0,0,0" />
                 </StackPanel>
@@ -67,17 +67,17 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Anamorphic}" Grid.Row="0" Grid.Column="0" />
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Modulus}" Grid.Row="1" Grid.Column="0" 
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_Anamorphic}" Grid.Row="0" Grid.Column="0" />
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_Modulus}" Grid.Row="1" Grid.Column="0" 
                        Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" />
 
                     <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
                               ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Anamorphic}"
-                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Anamorphic}" />
+                              AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Anamorphic}" />
                     <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}" 
                               Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Modulus}"
                               Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
-                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Modulus}"/>
+                              AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Modulus}"/>
                 </Grid>
 
                 <!-- Custom Anamoprhic -->
@@ -93,12 +93,12 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_DisplayWitdh}" Grid.Row="0" Grid.Column="0" />
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_PAR}" Grid.Row="1" Grid.Column="0" />
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_DisplayWitdh}" Grid.Row="0" Grid.Column="0" />
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_PAR}" Grid.Row="1" Grid.Column="0" />
 
                     <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" 
                                         AllowEmpty="False" IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}"
-                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_DisplayWitdh}" />
+                                        AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_DisplayWitdh}" />
                     <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1">
                         <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" HorizontalAlignment="Left" AllowEmpty="False"
                                                  IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5"
@@ -114,10 +114,10 @@
 
             <!-- Crop Panel -->
             <StackPanel Name="CropPanel" Margin="15,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1">
-                <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Cropping}" FontWeight="Bold" />
-                <RadioButton Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Automatic}" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"
+                <Label Content="{x:Static Properties:Resources.PictureSettingsView_Cropping}" FontWeight="Bold" />
+                <RadioButton Content="{x:Static Properties:Resources.PictureSettingsView_Automatic}" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"
                              ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_AutoCrop}"  />
-                <RadioButton Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Custom}" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0"
+                <RadioButton Content="{x:Static Properties:Resources.PictureSettingsView_Custom}" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0"
                              ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_ManualCrop}"  />
 
                 <Grid Margin="0,10,0,0">
@@ -137,30 +137,30 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Top}" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Bottom}" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Left}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
-                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Right}" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_Top}" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_Bottom}" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_Left}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
+                    <Label Content="{x:Static Properties:Resources.PictureSettingsView_Right}" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
 
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"
                                     Minimum="0" Modulus="2" Number="{Binding CropTop, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
                                         ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropTop}"
-                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Top}" />
+                                        AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Top}" />
 
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"
                                     Minimum="0" Modulus="2" Number="{Binding CropBottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
                                         ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropBottom}"
-                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Bottom}" />
+                                        AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Bottom}" />
 
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"
                                     Minimum="0" Modulus="2" Number="{Binding CropLeft, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
                                       ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropLeft}"
-                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Left}"/>
+                                        AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Left}"/>
 
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
                                     Minimum="0" Modulus="2" Number="{Binding CropRight, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
                                         ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropRight}"
-                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.PictureSettingsView_Right}"/>
+                                        AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Right}"/>
 
                 </Grid>
 
@@ -168,7 +168,7 @@
 
             <!-- Preview Panel -->
             <StackPanel Name="PreviewPanel" Margin="5,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1"  Grid.Column="0">
-                <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Output}" FontWeight="Bold" />
+                <Label Content="{x:Static Properties:Resources.PictureSettingsView_Output}" FontWeight="Bold" />
 
                 <Grid >
                     <Grid.RowDefinitions>