WinGui: Simplify the Language Resource Files.

25 files changed, 427 insertions, 427 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index 6c640b459..7672bf06a 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -35,7 +35,7 @@
                 <StackPanel Grid.Row="0"

                             Margin="5,10,0,0"

                             Orientation="Horizontal">

-                    <TextBlock Margin="0,0,5,0" FontSize="16" FontFamily="Segoe UI Light" Text="{x:Static Properties:ResourcesUI.AboutView_Version}" />

+                    <TextBlock Margin="0,0,5,0" FontSize="16" FontFamily="Segoe UI Light" Text="{x:Static Properties:Resources.AboutView_Version}" />

                     <TextBlock Margin="0,0,0,1" FontSize="16" FontFamily="Segoe UI Light" VerticalAlignment="Bottom" Text="{Binding Version}" />

                 </StackPanel>

 

@@ -46,7 +46,7 @@
                     </TextBlock>

                 </StackPanel>

 

-                <TextBlock Grid.Row="2" Margin="5,10,0,5" Text="{x:Static Properties:ResourcesUI.AboutView_License}" />

+                <TextBlock Grid.Row="2" Margin="5,10,0,5" Text="{x:Static Properties:Resources.AboutView_License}" />

 

                 <TextBox Text="{x:Static Properties:Resources.About_GPL}" Grid.Row="3" Margin="10,0,10,10" HorizontalAlignment="Stretch"

                          VerticalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" />

diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
index 6b90aa828..6741e4989 100644
--- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
@@ -33,7 +33,7 @@
             <RowDefinition Height="Auto" />

         </Grid.RowDefinitions>

 

-        <TextBlock Text="{x:Static Properties:ResourcesUI.AddPresetView_AddPreset}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />

+        <TextBlock Text="{x:Static Properties:Resources.AddPresetView_AddPreset}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />

 

         <!--  Header  -->

         <Grid Grid.Row="1" Margin="10,0,10,0">

@@ -57,7 +57,7 @@
             <!--  Name  -->

             <TextBlock Grid.Row="0"

                        Grid.Column="0"

-                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Name}" />

+                       Text="{x:Static Properties:Resources.AddPresetView_Name}" />

             <TextBox Grid.Row="0"

                      Grid.Column="1"

                      HorizontalAlignment="Stretch"

@@ -67,7 +67,7 @@
             <!--  Description  -->

             <TextBlock Grid.Row="2"

                        Grid.Column="0" Margin="0,10,0,0"

-                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Description}" />

+                       Text="{x:Static Properties:Resources.AddPresetView_Description}" />

             <TextBox Grid.Row="2"

                      Grid.Column="1" Margin="0,10,0,0"

                      

@@ -75,7 +75,7 @@
 

             <TextBlock Grid.Row="3"

                        Grid.Column="0" Margin="0,10,0,0"

-                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Category}" />

+                       Text="{x:Static Properties:Resources.AddPresetView_Category}" />

             <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Vertical" Margin="0,10,0,0">

 

                 <ComboBox ItemsSource="{Binding PresetCategories}" SelectedItem="{Binding SelectedPresetCategory}" DisplayMemberPath="Category" />

@@ -89,7 +89,7 @@
                        Style="{StaticResource LongToolTipHolder}"

                        VerticalAlignment="Center"

                        ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"

-                       Text="{x:Static Properties:ResourcesUI.AddPresetView_SavePictureSize}" />

+                       Text="{x:Static Properties:Resources.AddPresetView_SavePictureSize}" />

             <ComboBox Grid.Row="4" Margin="0,10,0,0"

                       Grid.Column="1"

                       Width="125"

@@ -139,13 +139,13 @@
             <Button Grid.Column="1"

                     Margin="0,5,10,10"

                     cal:Message.Attach="[Event Click] = [Action Cancel]"

-                    Content="{x:Static Properties:ResourcesUI.Generic_Cancel}"

+                    Content="{x:Static Properties:Resources.Generic_Cancel}"

                     IsCancel="True"

                     Padding="8,2" />

             <Button Grid.Column="2"

                     Margin="0,5,10,10"

                     cal:Message.Attach="[Event Click] = [Action Add]"

-                    Content="{x:Static Properties:ResourcesUI.Generic_Add}"

+                    Content="{x:Static Properties:Resources.Generic_Add}"

                     IsDefault="True"

                     Padding="8,2" />

         </Grid>

diff --git a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
index bf6ee04ae..9bfd716eb 100644
--- a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
@@ -59,21 +59,21 @@
             </Grid.ColumnDefinitions>
 
             <!-- Audio -->
-            <TextBlock Text="{x:Static Properties:ResourcesUI.AudioDefaultView_Behaviours}" FontWeight="Bold" Margin="0,10,0,5" />
+            <TextBlock Text="{x:Static Properties:Resources.AudioDefaultView_Behaviours}" FontWeight="Bold" Margin="0,10,0,5" />
 
-            <TextBlock Text="{x:Static Properties:ResourcesUI.AudioView_TrackSelectionBehaviour}" Grid.Column="0" Grid.Row="1" Margin="0,0,5,0" HorizontalAlignment="Left"  VerticalAlignment="Center" />
+            <TextBlock Text="{x:Static Properties:Resources.AudioView_TrackSelectionBehaviour}" Grid.Column="0" Grid.Row="1" Margin="0,0,5,0" HorizontalAlignment="Left"  VerticalAlignment="Center" />
             <ComboBox Name="autoAudioMode" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left"
                           ItemsSource="{Binding AudioBehaviourModeList, Converter={StaticResource audioBehaviourConverter}}" 
                           SelectedItem="{Binding AudioBehaviours.SelectedBehaviour, Converter={StaticResource audioBehaviourConverter}}" Width="210" Margin="0,0,5,0" />
 
-            <TextBlock Text="{x:Static Properties:ResourcesUI.AudioView_TrackSettingDefaultBehaviour}" Grid.Column="0" Grid.Row="2" Margin="0,5,5,0" HorizontalAlignment="Left"  VerticalAlignment="Center" />
+            <TextBlock Text="{x:Static Properties:Resources.AudioView_TrackSettingDefaultBehaviour}" Grid.Column="0" Grid.Row="2" Margin="0,5,5,0" HorizontalAlignment="Left"  VerticalAlignment="Center" />
             <ComboBox Name="audioTrackBeahaviorMode" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left"
                            ItemsSource="{Binding AudioTrackDefaultBehaviourModeList, Converter={StaticResource audioTrackDefaultBehaviourConverter}}" 
                            SelectedItem="{Binding AudioBehaviours.SelectedTrackDefaultBehaviour, Converter={StaticResource audioTrackDefaultBehaviourConverter}}" Width="210" Margin="0,5,5,0" />
         </Grid>
 
         <!-- Language Selection -->
-        <TextBlock Text="{x:Static Properties:ResourcesUI.Shared_ChooseLanguages}" Margin="0,10,0,0" Grid.Row="1" Grid.Column="0"  />
+        <TextBlock Text="{x:Static Properties:Resources.Shared_ChooseLanguages}" Margin="0,10,0,0" Grid.Row="1" Grid.Column="0"  />
         <Grid Margin="20,5,0,0" Grid.Row="2" Grid.Column="0" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
@@ -88,7 +88,7 @@
                     </Grid.ColumnDefinitions>
 
                     <StackPanel Orientation="Vertical" Grid.Column="0">
-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Shared_AvailableLanguages}" Margin="0,0,0,5"/>
+                        <TextBlock Text="{x:Static Properties:Resources.Shared_AvailableLanguages}" Margin="0,0,0,5"/>
                         <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" 
                                      helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 
                                              SelectionMode="Extended" Width="140" Height="120" />
@@ -96,14 +96,14 @@
 
                     <DockPanel Grid.Column="1" Margin="10,0,10,0">
                         <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                            <Button Content="{x:Static Properties:ResourcesUI.Generic_MoveRight}"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
-                            <Button Content="{x:Static Properties:ResourcesUI.Generic_MoveLeft}"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />
-                            <Button Content="{x:Static Properties:ResourcesUI.Generic_Clear}" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
+                            <Button Content="{x:Static Properties:Resources.Generic_MoveRight}"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
+                            <Button Content="{x:Static Properties:Resources.Generic_MoveLeft}"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />
+                            <Button Content="{x:Static Properties:Resources.Generic_Clear}" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
                         </StackPanel>
                     </DockPanel>
 
                     <StackPanel Orientation="Vertical" Grid.Column="2">
-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Shared_ChosenLangages}"  Margin="0,0,0,5"/>
+                        <TextBlock Text="{x:Static Properties:Resources.Shared_ChosenLangages}"  Margin="0,0,0,5"/>
                         <ListBox Name="selectedLangauges" ItemsSource="{Binding AudioBehaviours.SelectedLangauges}" 
                                      helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" 
                                              SelectionMode="Extended" Width="140" Height="120"
@@ -118,11 +118,11 @@
 
         <!-- Auto Passthru -->
         <StackPanel Orientation="Vertical" Margin="10,0,0,5"  Grid.Row="0" Grid.Column="1" Grid.RowSpan="3" HorizontalAlignment="Left">
-            <TextBlock Text="{x:Static Properties:ResourcesUI.AudioView_AutoPassthruBehaviour}" FontWeight="Bold" Margin="0,10,0,5" />
+            <TextBlock Text="{x:Static Properties:Resources.AudioView_AutoPassthruBehaviour}" FontWeight="Bold" Margin="0,10,0,5" />
             <StackPanel Margin="5,10,0,0"
                         Orientation="Vertical">
-                <TextBlock Margin="5,0,5,0" Text="{x:Static Properties:ResourcesUI.AudioView_WhenAutoPassthru}" VerticalAlignment="Center" />
-                <TextBlock Margin="5,0,5,0" Text="{x:Static Properties:ResourcesUI.AudioView_AllowPassThruOf}" VerticalAlignment="Center" />
+                <TextBlock Margin="5,0,5,0" Text="{x:Static Properties:Resources.AudioView_WhenAutoPassthru}" VerticalAlignment="Center" />
+                <TextBlock Margin="5,0,5,0" Text="{x:Static Properties:Resources.AudioView_AllowPassThruOf}" VerticalAlignment="Center" />
             </StackPanel>
             <StackPanel Margin="10,10,0,0" 
                         Orientation="Vertical">
@@ -153,7 +153,7 @@
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
-                <TextBlock Margin="10,0,5,0" Text="{x:Static Properties:ResourcesUI.AudioView_OtherwiseFallbackEncoder}" />
+                <TextBlock Margin="10,0,5,0" Text="{x:Static Properties:Resources.AudioView_OtherwiseFallbackEncoder}" />
 
                 <ComboBox VerticalAlignment="Center" Width="105" Height="22" Margin="5,0,5,0">
                     <ComboBox.SelectedItem>
@@ -197,7 +197,7 @@
 
             <ListBox.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Clear}" cal:Message.Attach="[Event Click] = [Action ClearTracks]" />
+                    <MenuItem Header="{x:Static Properties:Resources.Generic_Clear}" cal:Message.Attach="[Event Click] = [Action ClearTracks]" />
                 </ContextMenu>
             </ListBox.ContextMenu>
 
@@ -239,7 +239,7 @@
                             </Grid.RowDefinitions>
 
                             <!--  Row 1  -->
-                            <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Codec}" />
+                            <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Codec}" />
                             <ComboBox Grid.Column="3" Width="100" Height="22" Margin="5,0,5,0">
                                 <ComboBox.SelectedItem>
                                     <MultiBinding Converter="{StaticResource audioEncoderConverter}">
@@ -267,23 +267,23 @@
                                       SelectedItem="{Binding Bitrate}"
                                       Visibility="{Binding IsBitrateVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
 
-                            <TextBlock Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Mixdown}" />
+                            <TextBlock Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Mixdown}" />
                             <ComboBox Grid.Row="0" Grid.Column="7" Height="22" Width="120" Margin="5,0,5,0" HorizontalAlignment="Stretch"
                                       ItemsSource="{Binding Mixdowns}" SelectedItem="{Binding MixDown}"
                                       DisplayMemberPath="DisplayName" />
 
 
-                            <TextBlock VerticalAlignment="Center" Grid.Column="8" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Samplerate}" />
+                            <TextBlock VerticalAlignment="Center" Grid.Column="8" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Samplerate}" />
                             <ComboBox Width="70" Height="22" Margin="5,0,5,0" Grid.Column="9" 
                                       ItemsSource="{Binding DataContext.SampleRates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
                                       SelectedItem="{Binding SampleRateDisplayValue}" />
 
-                            <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_DRC}" Grid.Column="10" />
+                            <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_DRC}" Grid.Column="10" />
                             <controls:NumberBox Name="drcNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left" Grid.Column="11" 
                                                 Minimum="0" Modulus="0.1" Maximum="4" Number="{Binding DRC, Mode=TwoWay}" UpdateBindingOnTextChange="True" 
                                                 ShowIncrementButtons="True" AllowEmpty="False" />
 
-                            <TextBlock  VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Gain}" Grid.Column="12"  />
+                            <TextBlock  VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Gain}" Grid.Column="12"  />
                             <controls:NumberBox Name="gainNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left" Grid.Column="13" 
                                                 Minimum="-20" Modulus="1" Maximum="20" Number="{Binding Gain, Mode=TwoWay}" UpdateBindingOnTextChange="True" 
                                                 ShowIncrementButtons="True" AllowEmpty="False" />
diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 36a9bfa45..818498549 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -66,7 +66,7 @@
                         <StackPanel Orientation="Horizontal">

                             <TextBlock Margin="0,0,5,0" Padding="0"

                                        VerticalAlignment="Center"

-                                       Text="{x:Static Properties:ResourcesUI.Shared_AddTrack}" />

+                                       Text="{x:Static Properties:Resources.Shared_AddTrack}" />

 

                             <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"

                                   Data="M 0 0 L 4 4 L 8 0 Z"

@@ -76,9 +76,9 @@
 

                     <Button.ContextMenu>

                         <ContextMenu x:Name="MainContextMenu" PlacementRectangle="{Binding RelativeSource={RelativeSource Self}}">

-                            <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />

-                            <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddAllRemaining}" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />

-                            <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddAllForSelected}" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />

+                            <MenuItem Header="{x:Static Properties:Resources.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />

+                            <MenuItem Header="{x:Static Properties:Resources.Shared_AddAllRemaining}" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />

+                            <MenuItem Header="{x:Static Properties:Resources.Shared_AddAllForSelected}" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />

                         </ContextMenu>

                     </Button.ContextMenu>

                 </Button>

@@ -86,7 +86,7 @@
                 <Button MinWidth="65" Grid.Column="1"

                     Margin="0,0,10,0"

                     cal:Message.Attach="[Event Click] = [Action Clear]"

-                    Content="{x:Static Properties:ResourcesUI.Generic_Clear}" />

+                    Content="{x:Static Properties:Resources.Generic_Clear}" />

 

                 <Button MinWidth="65" Grid.Column="3"

                     Margin="0,0,10,0"

@@ -95,7 +95,7 @@
 

                 <Button MinWidth="65" Grid.Column="4"

                     cal:Message.Attach="[Event Click] = [Action ReloadDefaults]"

-                    Content="{x:Static Properties:ResourcesUI.AudioView_ReloadDefaults}" />

+                    Content="{x:Static Properties:Resources.AudioView_ReloadDefaults}" />

 

 

             </Grid>

@@ -119,13 +119,13 @@
 

             <ListBox.ContextMenu>

                 <ContextMenu>

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddAllRemaining}" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddAllForSelected}" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />

+                    <MenuItem Header="{x:Static Properties:Resources.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />

+                    <MenuItem Header="{x:Static Properties:Resources.Shared_AddAllRemaining}" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />

+                    <MenuItem Header="{x:Static Properties:Resources.Shared_AddAllForSelected}" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />

                     <Separator />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Clear}" cal:Message.Attach="[Event Click] = [Action Clear]" />

+                    <MenuItem Header="{x:Static Properties:Resources.Generic_Clear}" cal:Message.Attach="[Event Click] = [Action Clear]" />

                     <Separator />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_ConfigureDefaultBehaviours}" cal:Message.Attach="[Event Click] = [Action ShowAudioDefaults]" />

+                    <MenuItem Header="{x:Static Properties:Resources.Shared_ConfigureDefaultBehaviours}" cal:Message.Attach="[Event Click] = [Action ShowAudioDefaults]" />

                 </ContextMenu>

             </ListBox.ContextMenu>

 

@@ -175,7 +175,7 @@
                                       ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"

                                       SelectedItem="{Binding ScannedTrack}" />

 

-                            <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Codec}" />

+                            <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Codec}" />

                             <ComboBox Grid.Column="3" Width="100" Height="22" Margin="5,0,5,0">

                                 <ComboBox.SelectedItem>

                                     <MultiBinding Converter="{StaticResource audioEncoderConverter}">

@@ -204,7 +204,7 @@
                                       Visibility="{Binding IsBitrateVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

 

                             <!--  Row 2  -->

-                            <TextBlock Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Mixdown}"

+                            <TextBlock Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Mixdown}"

                                        Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

                             <ComboBox Grid.Row="0" Grid.Column="7" Height="22" Width="120" Margin="5,0,5,0" HorizontalAlignment="Stretch"

                                       ItemsSource="{Binding TrackReference,  Converter={StaticResource audioMixdownListConverter}}"

@@ -250,28 +250,28 @@
                         <Grid Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Visibility="{Binding IsChecked, ElementName=advancedOptionsToggle, Converter={StaticResource boolToVisConverter}}">

                             <StackPanel Orientation="Horizontal" Margin="0,5,0,5" >

 

-                                <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Samplerate}"

+                                <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Samplerate}"

                                        Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

                                 <ComboBox Width="70" Height="22" Margin="5,0,5,0"

                                       ItemsSource="{Binding DataContext.SampleRates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"

                                       SelectedItem="{Binding SampleRateDisplayValue}"

                                       Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

 

-                                <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_DRC}"

+                                <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_DRC}"

                                        Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

 

                                 <controls:NumberBox Name="drcNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left"

                                                     Minimum="0" Modulus="0.1" Maximum="4" Number="{Binding DRC, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"

                                                     Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>

 

-                                <TextBlock  VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Gain}"

+                                <TextBlock  VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Gain}"

                                        Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

 

                                 <controls:NumberBox Name="gainNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left"

                                                     Minimum="-20" Modulus="1" Maximum="20" Number="{Binding Gain, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"

                                                     Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>

 

-                                <TextBlock Text="{x:Static Properties:ResourcesUI.AudioView_TrackName}" VerticalAlignment="Center" FontWeight="Bold" Margin="5,0,5,0" />

+                                <TextBlock Text="{x:Static Properties:Resources.AudioView_TrackName}" VerticalAlignment="Center" FontWeight="Bold" Margin="5,0,5,0" />

                                 <TextBox Text="{Binding TrackName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="138" Height="22" />

 

                             </StackPanel>

diff --git a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
index 824f19e11..3f0ae31ae 100644
--- a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
@@ -14,7 +14,7 @@
             <RowDefinition Height="*" />

         </Grid.RowDefinitions>

 

-        <TextBlock Text="{x:Static Properties:ResourcesUI.ChaptersView_ChapterMarkers}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>

+        <TextBlock Text="{x:Static Properties:Resources.ChaptersView_ChapterMarkers}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>

 

         <Grid Grid.Row="1" Margin="10,5,10,0">

             <Grid.ColumnDefinitions>

@@ -23,9 +23,9 @@
                 <ColumnDefinition Width="Auto" />

                 <ColumnDefinition Width="Auto" />

             </Grid.ColumnDefinitions>

-            <CheckBox Content="{x:Static Properties:ResourcesUI.ChaptersView_CreateChapterMarkers}" IsChecked="{Binding IncludeChapterMarkers}" Grid.Column="0" VerticalAlignment="Center" />

-            <Button Content="{x:Static Properties:ResourcesUI.ChaptersView_Import}" Name="import" Grid.Column="2" Width="75" Margin="0,0,10,0" cal:Message.Attach="[Event Click] = [Action Import]" />

-            <Button Content="{x:Static Properties:ResourcesUI.ChaptersView_Export}" Name="export" Grid.Column="3" Width="75" cal:Message.Attach="[Event Click] = [Action Export]" />

+            <CheckBox Content="{x:Static Properties:Resources.ChaptersView_CreateChapterMarkers}" IsChecked="{Binding IncludeChapterMarkers}" Grid.Column="0" VerticalAlignment="Center" />

+            <Button Content="{x:Static Properties:Resources.ChaptersView_Import}" Name="import" Grid.Column="2" Width="75" Margin="0,0,10,0" cal:Message.Attach="[Event Click] = [Action Import]" />

+            <Button Content="{x:Static Properties:Resources.ChaptersView_Export}" Name="export" Grid.Column="3" Width="75" cal:Message.Attach="[Event Click] = [Action Export]" />

         </Grid>

 

         <DataGrid Grid.Row="2" Margin="10" ItemsSource="{Binding Chapters}" 

@@ -40,16 +40,16 @@
             </DataGrid.CellStyle>

             <DataGrid.ContextMenu>

                 <ContextMenu>

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.ChapterView_ImportNames}" cal:Message.Attach="[Event Click] = [Action Import]" />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.ChapterView_ExportNames}" cal:Message.Attach="[Event Click] = [Action Export]" />

+                    <MenuItem Header="{x:Static Properties:Resources.ChapterView_ImportNames}" cal:Message.Attach="[Event Click] = [Action Import]" />

+                    <MenuItem Header="{x:Static Properties:Resources.ChapterView_ExportNames}" cal:Message.Attach="[Event Click] = [Action Export]" />

                     <Separator />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.ChapterView_ResetChapterNames}" cal:Message.Attach="[Event Click] = [Action Reset]" />

+                    <MenuItem Header="{x:Static Properties:Resources.ChapterView_ResetChapterNames}" cal:Message.Attach="[Event Click] = [Action Reset]" />

                 </ContextMenu>

             </DataGrid.ContextMenu>

             <DataGrid.Columns>

-                <DataGridTextColumn Header="{x:Static Properties:ResourcesUI.ChaptersView_ChapterNumber}" Width="120" Binding="{Binding ChapterNumber}" IsReadOnly="True" />

-                <DataGridTextColumn Header="{x:Static Properties:ResourcesUI.ChaptersView_Duration}" Width="100" Binding="{Binding Duration}" IsReadOnly="True" />

-                <DataGridTextColumn Header="{x:Static Properties:ResourcesUI.ChaptersView_ChapterName}"  Width="*" Binding="{Binding ChapterName}" IsReadOnly="False" />

+                <DataGridTextColumn Header="{x:Static Properties:Resources.ChaptersView_ChapterNumber}" Width="120" Binding="{Binding ChapterNumber}" IsReadOnly="True" />

+                <DataGridTextColumn Header="{x:Static Properties:Resources.ChaptersView_Duration}" Width="100" Binding="{Binding Duration}" IsReadOnly="True" />

+                <DataGridTextColumn Header="{x:Static Properties:Resources.ChaptersView_ChapterName}"  Width="*" Binding="{Binding ChapterName}" IsReadOnly="False" />

             </DataGrid.Columns>

         </DataGrid>

 

diff --git a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
index 069af0bc2..2f8a83d7a 100644
--- a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
+++ b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
@@ -12,15 +12,15 @@
             <RowDefinition Height="Auto" />

         </Grid.RowDefinitions>

 

-        <TextBlock Text="{x:Static Properties:ResourcesUI.CountdownAlterView_WhenDoneAction}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />

+        <TextBlock Text="{x:Static Properties:Resources.CountdownAlterView_WhenDoneAction}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />

         

         <TextBlock Text="{Binding NoticeMessage}" Grid.Row="1" Margin="40,0,10,0"/>

 

         <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,10,10,5" HorizontalAlignment="Right">

-            <Button Content="{x:Static Properties:ResourcesUI.CountdownAlterView_Proceed}"  HorizontalAlignment="Right"

+            <Button Content="{x:Static Properties:Resources.CountdownAlterView_Proceed}"  HorizontalAlignment="Right"

                 cal:Message.Attach="[Event Click] = [Action Proceed]" Padding="8,2" Margin="0,10,10,5"/>

 

-            <Button Content="{x:Static Properties:ResourcesUI.CountdownAlterView_CancelAction}"  HorizontalAlignment="Right" Margin="0,10,10,5"

+            <Button Content="{x:Static Properties:Resources.CountdownAlterView_CancelAction}"  HorizontalAlignment="Right" Margin="0,10,10,5"

                 cal:Message.Attach="[Event Click] = [Action Cancel]" Padding="8,2" IsDefault="True" />

         </StackPanel>

 

diff --git a/win/CS/HandBrakeWPF/Views/ErrorView.xaml b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
index ba103dedb..f8ab63c6f 100644
--- a/win/CS/HandBrakeWPF/Views/ErrorView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
@@ -45,7 +45,7 @@
                            Margin="0,0,0,2"

                            VerticalAlignment="Bottom"

                            FontWeight="Bold"

-                           Text="{x:Static Properties:ResourcesUI.ErrorView_ErrorDetails}" />

+                           Text="{x:Static Properties:Resources.ErrorView_ErrorDetails}" />

             </Grid>

         </StackPanel>

 

@@ -82,14 +82,14 @@
                            Height="16"

                            Margin="0,0,5,0"

                            Source="Images/copy.png" />

-                    <TextBlock Grid.Column="1" Text="{x:Static Properties:ResourcesUI.Generic_CopyToClipboard}" />

+                    <TextBlock Grid.Column="1" Text="{x:Static Properties:Resources.Generic_CopyToClipboard}" />

                 </Grid>

             </Button>

 

             <Button Grid.Column="2"

                     Margin="0,5,10,5"

                     cal:Message.Attach="[Event Click] = [Action Close]"

-                    Content="{x:Static Properties:ResourcesUI.Generic_Close}"

+                    Content="{x:Static Properties:Resources.Generic_Close}"

                     Padding="8,2" />

         </Grid>

     </Grid>

diff --git a/win/CS/HandBrakeWPF/Views/FiltersView.xaml b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
index 5ad267656..24730338b 100644
--- a/win/CS/HandBrakeWPF/Views/FiltersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
@@ -27,7 +27,7 @@
             <ColumnDefinition Width="Auto" />

         </Grid.ColumnDefinitions>

 

-        <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Filters}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>

+        <TextBlock Text="{x:Static Properties:Resources.FiltersView_Filters}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>

 

         <StackPanel Orientation="Vertical" Grid.Row="1" Grid.Column="0" Margin="10,10,0,0">

             <Grid>

@@ -50,20 +50,20 @@
                 </Grid.ColumnDefinitions>

 

                 <!-- Detelecine -->

-                <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Detelecine}" Grid.Row="0" Grid.Column="0" Margin="0,0,0,10" />

+                <TextBlock Text="{x:Static Properties:Resources.FiltersView_Detelecine}" Grid.Row="0" Grid.Column="0" Margin="0,0,0,10" />

                 <ComboBox Width="120" Grid.Row="0" ItemsSource="{Binding DetelecineOptions, Converter={StaticResource boolComboConverter}}" 

                           SelectedItem="{Binding SelectedDetelecine, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"

                           ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Detelecine}"

-                          HorizontalAlignment="Left" AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Detelecine}" />

+                          HorizontalAlignment="Left" AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Detelecine}" />

                 <TextBox Width="120" Grid.Row="0" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDetelecine, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left"

                          Visibility="{Binding ShowDetelecineCustom, Converter={StaticResource boolToVisConverter}}"/>

 

                 <!-- Interlace Detection -->

-                <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_InterlaceDetection}" VerticalAlignment="Center" Margin="0,0,5,0" Grid.Row="1"  />

+                <TextBlock Text="{x:Static Properties:Resources.FiltersView_InterlaceDetection}" VerticalAlignment="Center" Margin="0,0,5,0" Grid.Row="1"  />

 

                 <ComboBox Width="120" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding CombDetectPresets, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center"

                           SelectedItem="{Binding SelectedCombDetectPreset, Converter={StaticResource boolComboConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_InterlaceDetection}"

-                          VerticalContentAlignment="Center" AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_InterlaceDetection}"/>

+                          VerticalContentAlignment="Center" AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_InterlaceDetection}"/>

 

                 <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="2">

                 <TextBlock Text="Custom:" VerticalAlignment="Center" Margin="0,0,5,0" Visibility="{Binding ShowCombDetectCustom, Converter={StaticResource boolToVisConverter}}" />

@@ -72,18 +72,18 @@
                 </StackPanel>

 

                 <!-- Deinterlace -->

-                <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Deinterlace}" VerticalAlignment="Center" Grid.Row="2" Grid.Column="0" Margin="0,0,0,10" />

+                <TextBlock Text="{x:Static Properties:Resources.FiltersView_Deinterlace}" VerticalAlignment="Center" Grid.Row="2" Grid.Column="0" Margin="0,0,0,10" />

                 <StackPanel Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="0,0,0,10">

                     <ComboBox Width="120" ItemsSource="{Binding DeinterlaceFilterOptions, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left"

                               SelectedItem="{Binding SelectedDeinterlaceFilter, Converter={StaticResource boolComboConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Deinterlace}"

-                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Deinterlace}" />

+                              AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Deinterlace}" />

                 </StackPanel>

 

                 <StackPanel Grid.Row="2" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,10">

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_DeinterlacePreset}" VerticalAlignment="Center" Margin="0,0,5,0" Visibility="{Binding IsDeinterlaceEnabled, Converter={StaticResource boolToVisConverter}}"  />

+                    <TextBlock Text="{x:Static Properties:Resources.FiltersView_DeinterlacePreset}" VerticalAlignment="Center" Margin="0,0,5,0" Visibility="{Binding IsDeinterlaceEnabled, Converter={StaticResource boolToVisConverter}}"  />

                     <ComboBox Width="120" ItemsSource="{Binding DeinterlacePresets}" HorizontalAlignment="Left" VerticalAlignment="Center"

                               SelectedItem="{Binding SelectedDeInterlacePreset}" DisplayMemberPath="Name" Visibility="{Binding IsDeinterlaceEnabled, Converter={StaticResource boolToVisConverter}}"

-                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_DeinterlacePresetAuto}" />

+                              AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_DeinterlacePresetAuto}" />

 

                     <TextBlock Text="Custom:" VerticalAlignment="Center" Margin="5,0,5,0"  Visibility="{Binding ShowCustomDeinterlace, Converter={StaticResource boolToVisConverter}}" />

                     <TextBox Width="120" Text="{Binding CustomDeinterlaceSettings, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Left"

@@ -92,17 +92,17 @@
 

 

                 <!-- Denoise -->

-                <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Denoise}" Grid.Row="3" Grid.Column="0" Margin="0,0,0,10"/>

+                <TextBlock Text="{x:Static Properties:Resources.FiltersView_Denoise}" Grid.Row="3" Grid.Column="0" Margin="0,0,0,10"/>

                 <ComboBox Width="120" Grid.Row="3" ItemsSource="{Binding DenoiseOptions, Converter={StaticResource boolComboConverter}}" 

                           SelectedItem="{Binding SelectedDenoise, Converter={StaticResource boolComboConverter}}" Grid.Column="1"

                           HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,10" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Denoise}"

-                          AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Denoise}"/>

+                          AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Denoise}"/>

 

                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="3" Grid.Column="2" Margin="0,0,0,10" 

                             Visibility="{Binding ShowDenoiseOptions, Converter={StaticResource boolToVisConverter}}">

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Preset}" Margin="0,0,5,0" />

+                    <TextBlock Text="{x:Static Properties:Resources.FiltersView_Preset}" Margin="0,0,5,0" />

                     <ComboBox SelectedItem="{Binding SelectedDenoisePreset}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DenoisePreset}"

-                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_DenoisePresetAuto}"

+                              AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_DenoisePresetAuto}"

                               MinWidth="100"  HorizontalAlignment="Center" VerticalAlignment="Center">

                         <ComboBox.ItemsSource>

                             <MultiBinding Converter="{StaticResource DenoisePresetConverter}">

@@ -113,14 +113,14 @@
                     </ComboBox>

 

                     <StackPanel Orientation="Horizontal" Visibility="{Binding ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}">

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Tune}" Margin="5,0,5,0" />

+                        <TextBlock Text="{x:Static Properties:Resources.FiltersView_Tune}" Margin="5,0,5,0" />

                         <ComboBox ItemsSource="{Binding DenoiseTunes}" SelectedItem="{Binding SelectedDenoiseTune}" MinWidth="100" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DenoiseTune}"

-                                  AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_DenoiseTuneAuto}"

+                                  AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_DenoiseTuneAuto}"

                           Visibility="{Binding ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}" VerticalAlignment="Center" />

                     </StackPanel>

 

                     <StackPanel Orientation="Horizontal" Visibility="{Binding ShowDenoiseCustom, Converter={StaticResource boolToVisConverter}}">

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Custom}" Margin="5,0,5,0" />

+                        <TextBlock Text="{x:Static Properties:Resources.FiltersView_Custom}" Margin="5,0,5,0" />

                         <TextBox Width="120" Margin="0" Text="{Binding CustomDenoise, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" MinHeight="22"

                                  ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_CustomDenoiseParams}" />

                     </StackPanel>

@@ -128,19 +128,19 @@
                 </StackPanel>

                 

                 <!-- Sharpen -->

-                <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Sharpen}" Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"/>

+                <TextBlock Text="{x:Static Properties:Resources.FiltersView_Sharpen}" Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"/>

                 <ComboBox Width="120" Grid.Row="4" ItemsSource="{Binding SharpenOptions, Converter={StaticResource boolComboConverter}}" 

                           SelectedItem="{Binding SelectedSharpen, Converter={StaticResource boolComboConverter}}" Grid.Column="1"

-                          AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Sharpen}"

+                          AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Sharpen}"

                           HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,10" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Sharpen}" />

                 

                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="4" Grid.Column="2" Margin="0,0,0,10" 

                             Visibility="{Binding ShowSharpenOptions, Converter={StaticResource boolToVisConverter}}">

                     

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Preset}" Margin="0,0,5,0" />

+                    <TextBlock Text="{x:Static Properties:Resources.FiltersView_Preset}" Margin="0,0,5,0" />

                     <ComboBox SelectedItem="{Binding SelectedSharpenPreset}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_SharpenPreset}"

                               MinWidth="100"  HorizontalAlignment="Center" VerticalAlignment="Center" DisplayMemberPath="DisplayName"

-                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_SharpenPresetAuto}" >

+                              AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_SharpenPresetAuto}" >

                         <ComboBox.ItemsSource>

                             <MultiBinding Converter="{StaticResource SharpenPresetConverter}">

                                 <Binding Path="SharpenPresets" />

@@ -150,9 +150,9 @@
                     </ComboBox>

 

                     <StackPanel Orientation="Horizontal" Visibility="{Binding ShowSharpenTune, Converter={StaticResource boolToVisConverter}}">

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Tune}" Margin="5,0,5,0" />

+                        <TextBlock Text="{x:Static Properties:Resources.FiltersView_Tune}" Margin="5,0,5,0" />

                         <ComboBox SelectedItem="{Binding SelectedSharpenTune}" MinWidth="100" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_SharpenTune}" VerticalAlignment="Center" DisplayMemberPath="DisplayName" 

-                                  AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_SharpenTuneAuto}" >

+                                  AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_SharpenTuneAuto}" >

                             <ComboBox.ItemsSource>

                                 <MultiBinding Converter="{StaticResource SharpenTuneConverter}">

                                     <Binding Path="SharpenTunes" />

@@ -163,7 +163,7 @@
                     </StackPanel>

 

                     <StackPanel Orientation="Horizontal" Visibility="{Binding ShowSharpenCustom, Converter={StaticResource boolToVisConverter}}">

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Custom}" Margin="5,0,5,0" />

+                        <TextBlock Text="{x:Static Properties:Resources.FiltersView_Custom}" Margin="5,0,5,0" />

                         <TextBox Width="120" Margin="0" Text="{Binding CustomSharpen, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" MinHeight="22"

                                  ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_CustomSharpenParams}" />

                     </StackPanel>

@@ -171,23 +171,23 @@
                 </StackPanel>

 

                 <!-- Deblock -->

-                <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Deblock}" Grid.Row="5" Grid.Column="0" Margin="0,0,0,10"/>

+                <TextBlock Text="{x:Static Properties:Resources.FiltersView_Deblock}" Grid.Row="5" Grid.Column="0" Margin="0,0,0,10"/>

                 <Slider Width="120" Value="{Binding DeblockValue}" TickPlacement="BottomRight" Minimum="4" Maximum="15" Grid.Row="5" Grid.Column="1" Margin="0,0,0,10"

                         HorizontalAlignment="Left" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Deblock}"

-                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Deblock}" />

+                        AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Deblock}" />

                 <TextBlock Text="{Binding DeblockText}" Grid.Row="5" Grid.Column="2" Margin="0,0,0,10"/>

 

-                <CheckBox Content="{x:Static Properties:ResourcesUI.FiltersView_Grayscale}" IsChecked="{Binding Grayscale}" Grid.Row="6" Grid.Column="1" Margin="0,0,0,10"

+                <CheckBox Content="{x:Static Properties:Resources.FiltersView_Grayscale}" IsChecked="{Binding Grayscale}" Grid.Row="6" Grid.Column="1" Margin="0,0,0,10"

                           ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Grayscale}" />

 

                 <!-- Rotation -->

-                <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Rotate}" Grid.Row="7" Grid.Column="0" Margin="0,0,0,0"/>

+                <TextBlock Text="{x:Static Properties:Resources.FiltersView_Rotate}" Grid.Row="7" Grid.Column="0" Margin="0,0,0,0"/>

                 <ComboBox Width="120" ItemsSource="{Binding RotationOptions}" Grid.Row="7" Grid.Column="1"

                               SelectedItem="{Binding SelectedRotation}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Rotate}"

-                          AutomationProperties.Name="{x:Static Properties:ResourcesUI.FiltersView_Rotate}"

+                          AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Rotate}"

                               HorizontalAlignment="Left" VerticalAlignment="Center" />

 

-                <CheckBox Content="{x:Static Properties:ResourcesUI.FiltersView_FlipVideo}" Margin="5,0,0,0" VerticalAlignment="Center" Grid.Row="7" Grid.Column="2" IsChecked="{Binding FlipVideo, UpdateSourceTrigger=PropertyChanged}"

+                <CheckBox Content="{x:Static Properties:Resources.FiltersView_FlipVideo}" Margin="5,0,0,0" VerticalAlignment="Center" Grid.Row="7" Grid.Column="2" IsChecked="{Binding FlipVideo, UpdateSourceTrigger=PropertyChanged}"

                           ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Flip}"/>

             </Grid>

 

diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml
index 3c4eb57f4..f8f185644 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml
@@ -25,17 +25,17 @@
                      >

 

                 <Button cal:Message.Attach="[Event Click] = [Action CopyLog]" Margin="10,0,0,0" 

-                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.LogView_CopyClipboard}" >

+                        AutomationProperties.Name="{x:Static Properties:Resources.LogView_CopyClipboard}" >

                     <StackPanel Orientation="Horizontal">

                         <Image Width="16" Source="Images/copy.png" />

-                        <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:ResourcesUI.LogView_CopyClipboard}" />

+                        <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:Resources.LogView_CopyClipboard}" />

                     </StackPanel>

                 </Button>

                 <Button Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]"

-                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.LogView_OpenLogDir}" >

+                        AutomationProperties.Name="{x:Static Properties:Resources.LogView_OpenLogDir}" >

                     <StackPanel Orientation="Horizontal">

                         <Image Width="16" Source="Images/folder.png" />

-                        <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:ResourcesUI.LogView_OpenLogDir}" />

+                        <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:Resources.LogView_OpenLogDir}" />

                     </StackPanel>

                 </Button>

 

@@ -45,12 +45,12 @@
 

                 <TextBox.ContextMenu>

                     <ContextMenu>

-                        <MenuItem Header="{x:Static Properties:ResourcesUI.LogView_CopyClipboard}" cal:Message.Attach="[Event Click] = [Action CopyLog]" >

+                        <MenuItem Header="{x:Static Properties:Resources.LogView_CopyClipboard}" cal:Message.Attach="[Event Click] = [Action CopyLog]" >

                             <MenuItem.Icon>

                                 <Image Width="16" Source="Images/copy.png" />

                             </MenuItem.Icon>

                         </MenuItem>

-                        <MenuItem Header="{x:Static Properties:ResourcesUI.LogView_OpenLogDir}" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">

+                        <MenuItem Header="{x:Static Properties:Resources.LogView_OpenLogDir}" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">

                             <MenuItem.Icon>

                                 <Image Width="16" Source="Images/folder.png" />

                             </MenuItem.Icon>

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 0c27e9ff1..d6b796918 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -73,7 +73,7 @@
                     </Style>

                 </Menu.Resources>

                 <MenuItem Header="_File">

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SourceOpen}" cal:Message.Attach="[Event Click] = [Action SelectSourceWindow]" InputGestureText="Alt + O" />

+                    <MenuItem Header="{x:Static Properties:Resources.MainView_SourceOpen}" cal:Message.Attach="[Event Click] = [Action SelectSourceWindow]" InputGestureText="Alt + O" />

                     <Separator />

                     <MenuItem Header="_Exit" cal:Message.Attach="[Event Click] = [Action ExitApplication]"  InputGestureText="Alt + F4" />

                 </MenuItem>

@@ -101,9 +101,9 @@
 

                     <MenuItem Header="_Presets" ItemsSource="{Binding PresetsCategories, Converter={StaticResource presetsMenuConverter}}" />

                     <Separator />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_PresetManage}" cal:Message.Attach="[Event Click] = [Action PresetManage]" />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_PresetRemove}" cal:Message.Attach="[Event Click] = [Action PresetRemove]" />

+                    <MenuItem Header="{x:Static Properties:Resources.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />

+                    <MenuItem Header="{x:Static Properties:Resources.MainView_PresetManage}" cal:Message.Attach="[Event Click] = [Action PresetManage]" />

+                    <MenuItem Header="{x:Static Properties:Resources.MainView_PresetRemove}" cal:Message.Attach="[Event Click] = [Action PresetRemove]" />

                     <Separator />

                     <MenuItem Header="_Import from file" cal:Message.Attach="[Event Click] = [Action PresetImport]" />

                     <MenuItem Header="_Export to file" cal:Message.Attach="[Event Click] = [Action PresetExport]" />

@@ -120,11 +120,11 @@
                     <MenuItem Header="Add to Queue" cal:Message.Attach="[Event Click] = [Action AddAllToQueue]"  InputGestureText="Ctrl + A" />

                     <MenuItem Header="All Selection to Queue" cal:Message.Attach="[Event Click] = [Action AddSelectionToQueue]" />

                     <Separator Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

-                    <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearCompleted}" Header="{x:Static Properties:ResourcesUI.QueueView_ClearCompleted}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

-                    <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearAll}" Header="{x:Static Properties:ResourcesUI.QueueView_ClearAll}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

-                    <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearSelected}" Header="{x:Static Properties:ResourcesUI.QueueView_ClearSelected}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

+                    <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearCompleted}" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

+                    <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearAll}" Header="{x:Static Properties:Resources.QueueView_ClearAll}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

+                    <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearSelected}" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

                     <Separator Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

-                    <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.Export}" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

+                    <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.Export}" Header="{x:Static Properties:Resources.QueueView_Export}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

                 </MenuItem>

 

                 <MenuItem Header="_Help">

@@ -149,7 +149,7 @@
                      ToolBarTray.IsLocked="True"

                      KeyboardNavigation.TabNavigation="Continue">

 

-                <Button Name="SelectSource" x:Uid="Choose Source" AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_SourceOpen}"

+                <Button Name="SelectSource" x:Uid="Choose Source" AutomationProperties.Name="{x:Static Properties:Resources.MainView_SourceOpen}"

                         cal:Message.Attach="[Event Click] = [Action SelectSourceWindow]">

                     <StackPanel Orientation="Horizontal">

                         <Image Width="32"

@@ -157,17 +157,17 @@
                                Source="Images/Movies_small.png"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

-                               Content="{x:Static Properties:ResourcesUI.MainView_SourceOpen}"/>

+                               Content="{x:Static Properties:Resources.MainView_SourceOpen}"/>

                     </StackPanel>

                 </Button>

 

                 <Separator />

 

-                <Button PreviewMouseLeftButtonDown="AddToQueue_PreviewMouseDown" ContextMenuService.IsEnabled="False" AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_AddToQueue}">

+                <Button PreviewMouseLeftButtonDown="AddToQueue_PreviewMouseDown" ContextMenuService.IsEnabled="False" AutomationProperties.Name="{x:Static Properties:Resources.MainView_AddToQueue}">

                     <StackPanel Orientation="Horizontal">

                         <StackPanel Orientation="Horizontal">

                             <Image Width="32" Height="32" SnapsToDevicePixels="True" Source="Images/AddToQueue_small.png" />

-                            <Label Margin="8,0,0,0" VerticalAlignment="Center" Content="{x:Static Properties:ResourcesUI.MainView_AddToQueue}" />

+                            <Label Margin="8,0,0,0" VerticalAlignment="Center" Content="{x:Static Properties:Resources.MainView_AddToQueue}" />

                         </StackPanel>

 

                         <Grid x:Name="dropdown" Background="Transparent" >

@@ -179,15 +179,15 @@
                     </StackPanel>

                     <Button.ContextMenu>

                         <ContextMenu>

-                            <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_AddCurrent}" cal:Message.Attach="[Event Click] = [Action AddToQueue]" AutomationProperties.Name="Add Current" />

-                            <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_AddAll}" cal:Message.Attach="[Event Click] = [Action AddAllToQueue]" AutomationProperties.Name="Add all to Queue" />

-                            <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_AddSelection}" cal:Message.Attach="[Event Click] = [Action AddSelectionToQueue]" AutomationProperties.Name="Add Selection to Queue" />

+                            <MenuItem Header="{x:Static Properties:Resources.MainView_AddCurrent}" cal:Message.Attach="[Event Click] = [Action AddToQueue]" AutomationProperties.Name="Add Current" />

+                            <MenuItem Header="{x:Static Properties:Resources.MainView_AddAll}" cal:Message.Attach="[Event Click] = [Action AddAllToQueue]" AutomationProperties.Name="Add all to Queue" />

+                            <MenuItem Header="{x:Static Properties:Resources.MainView_AddSelection}" cal:Message.Attach="[Event Click] = [Action AddSelectionToQueue]" AutomationProperties.Name="Add Selection to Queue" />

                         </ContextMenu>

                     </Button.ContextMenu>

 

                 </Button>

 

-                <Button Name="Start" AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_StartEncode}"

+                <Button Name="Start" AutomationProperties.Name="{x:Static Properties:Resources.MainView_StartEncode}"

                         cal:Message.Attach="[Event Click] = [Action StartEncode]"

                         Visibility="{Binding IsEncoding,

                                              Converter={StaticResource boolToVisConverter},

@@ -198,11 +198,11 @@
                                Source="Images/Play.png"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

-                               Content="{Binding StartLabel, FallbackValue='{x:Static Properties:ResourcesUI.MainView_StartEncode}'}"/>

+                               Content="{Binding StartLabel, FallbackValue='{x:Static Properties:Resources.MainView_StartEncode}'}"/>

                     </StackPanel>

                 </Button>

 

-                <Button Name="Stop" AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_Stop}"

+                <Button Name="Stop" AutomationProperties.Name="{x:Static Properties:Resources.MainView_Stop}"

                         cal:Message.Attach="[Event Click] = [Action StopEncode]"

                         Visibility="{Binding IsEncoding,

                                              Converter={StaticResource boolToVisConverter},

@@ -214,11 +214,11 @@
                                Source="Images/stop.png"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

-                               Content="{x:Static Properties:ResourcesUI.MainView_Stop}"/>

+                               Content="{x:Static Properties:Resources.MainView_Stop}"/>

                     </StackPanel>

                 </Button>

 

-                <Button Name="Pause" AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_Pause}"

+                <Button Name="Pause" AutomationProperties.Name="{x:Static Properties:Resources.MainView_Pause}"

                         cal:Message.Attach="[Event Click] = [Action PauseEncode]"

                         Visibility="{Binding CanPause,

                                              Converter={StaticResource boolToVisConverter},

@@ -230,7 +230,7 @@
                                Source="Images/Pause.png"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

-                               Content="{x:Static Properties:ResourcesUI.MainView_Pause}"/>

+                               Content="{x:Static Properties:Resources.MainView_Pause}"/>

                     </StackPanel>

                 </Button>

 

@@ -244,7 +244,7 @@
                                Source="Images/Queue_small.png"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

-                               Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:ResourcesUI.MainView_ShowQueue}'}"/>

+                               Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:Resources.MainView_ShowQueue}'}"/>

                     </StackPanel>

                 </Button>

 

@@ -256,7 +256,7 @@
                                Source="Images/picture_small.png"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

-                               Content="{x:Static Properties:ResourcesUI.MainView_ShowPreview}"/>

+                               Content="{x:Static Properties:Resources.MainView_ShowPreview}"/>

                     </StackPanel>

                 </Button>

 

@@ -317,7 +317,7 @@
                         <ColumnDefinition Width="*" />

                     </Grid.ColumnDefinitions>

 

-                    <Label Content="{x:Static Properties:ResourcesUI.MainView_Source}" FontWeight="Bold" Grid.Column="0" />

+                    <Label Content="{x:Static Properties:Resources.MainView_Source}" FontWeight="Bold" Grid.Column="0" />

                     <TextBlock Text="{Binding Path=SourceLabel}" ToolTip="{Binding Path=SourceLabel}" TextTrimming="CharacterEllipsis" MaxWidth="595" Grid.Column="1" Margin="7,0,0,0" />

                     <TextBlock Text="{Binding SourceInfo}" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="DimGray" Grid.Column="2" Margin="10,0,0,0" MaxWidth="360" />

                 </Grid>

@@ -329,7 +329,7 @@
                         <ColumnDefinition Width="Auto" />

                     </Grid.ColumnDefinitions>

 

-                    <Label FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Title}"  Grid.Column="0"  />

+                    <Label FontWeight="Bold" Content="{x:Static Properties:Resources.MainView_Title}"  Grid.Column="0"  />

                     <ComboBox Name="Titles"  Grid.Column="1" 

                               MinWidth="100" Margin="16,0,0,0"

                               ItemsSource="{Binding ScannedSource.Titles}"

@@ -350,7 +350,7 @@
                         </ComboBox.Style>

                     </ComboBox>

                     <StackPanel Orientation="Horizontal" Grid.Column="2" >

-                        <Label Margin="5,0,0,0" FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Angle}" />

+                        <Label Margin="5,0,0,0" FontWeight="Bold" Content="{x:Static Properties:Resources.MainView_Angle}" />

 

                         <ComboBox Name="Angles"

                                   MinWidth="60"

@@ -359,7 +359,7 @@
                                   SelectedItem="{Binding SelectedAngle}"

                                   ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Angle}" />

 

-                        <Label Margin="2,0,0,0" FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Range}" />

+                        <Label Margin="2,0,0,0" FontWeight="Bold" Content="{x:Static Properties:Resources.MainView_Range}" />

                         <ComboBox Name="PointToPointMode"

                                   MinWidth="80"

                                   Margin="5,0,0,0"

@@ -381,7 +381,7 @@
                                                        Converter={StaticResource boolToVisConverter},

                                                        ConverterParameter=false}" />

 

-                        <Label Margin="4,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_through}" />

+                        <Label Margin="4,0,0,0" Content="{x:Static Properties:Resources.MainView_through}" />

                         <ComboBox Name="EndPoint"

                                   MinWidth="60"

                                   Margin="4,0,0,0"

@@ -398,7 +398,7 @@
                                                        Converter={StaticResource boolToVisConverter},

                                                        ConverterParameter=false}" />

 

-                        <Label Margin="2,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Duration}" FontWeight="Bold" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />

+                        <Label Margin="2,0,0,0" Content="{x:Static Properties:Resources.MainView_Duration}" FontWeight="Bold" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />

                         <Label Margin="0,0,0,0" Content="{Binding Duration}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />

 

                     </StackPanel>

@@ -438,16 +438,16 @@
                         </Button.ContextMenu>

                     </Button>

 

-                    <Button Content="{x:Static Properties:ResourcesUI.MainView_Reload}" cal:Message.Attach="[Event Click] = [Action PresetSelect]"  Margin="15,0,0,0" VerticalAlignment="Center" />

-                    <Button Content="{x:Static Properties:ResourcesUI.MainView_SaveNewPreset}" cal:Message.Attach="[Event Click] = [Action PresetAdd]"  Margin="5,0,0,0" VerticalAlignment="Center" />

+                    <Button Content="{x:Static Properties:Resources.MainView_Reload}" cal:Message.Attach="[Event Click] = [Action PresetSelect]"  Margin="15,0,0,0" VerticalAlignment="Center" />

+                    <Button Content="{x:Static Properties:Resources.MainView_SaveNewPreset}" cal:Message.Attach="[Event Click] = [Action PresetAdd]"  Margin="5,0,0,0" VerticalAlignment="Center" />

                     

                     <Button x:Name="MorePresetOptionsButton"  Margin="15,0,0,0" VerticalAlignment="Center" Click="MorePresetOptionsButton_OnClick" Visibility="Collapsed">

                         <Button.Content>

                             <StackPanel Orientation="Horizontal">

                                 <TextBlock Margin="0,0,5,0" Padding="0"

                                        VerticalAlignment="Center"

-                                       Text="{x:Static Properties:ResourcesUI.MainView_Options}"

-                                       AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_PresetOptionsContextMenu}"

+                                       Text="{x:Static Properties:Resources.MainView_Options}"

+                                       AutomationProperties.Name="{x:Static Properties:Resources.MainView_PresetOptionsContextMenu}"

                                            ToolTip="{x:Static Properties:ResourcesTooltips.MainView_PresetOptionsContextMenu}"/> 

 

                                 <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"

@@ -458,24 +458,24 @@
 

                         <Button.ContextMenu>

                             <ContextMenu x:Name="MainContextMenu">

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />

+                                <MenuItem Header="{x:Static Properties:Resources.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />

                                 <Separator />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_PresetManage}" cal:Message.Attach="[Event Click] = [Action PresetManage]" />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_PresetRemove}" cal:Message.Attach="[Event Click] = [Action PresetRemove]" />

+                                <MenuItem Header="{x:Static Properties:Resources.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />

+                                <MenuItem Header="{x:Static Properties:Resources.MainView_PresetManage}" cal:Message.Attach="[Event Click] = [Action PresetManage]" />

+                                <MenuItem Header="{x:Static Properties:Resources.MainView_PresetRemove}" cal:Message.Attach="[Event Click] = [Action PresetRemove]" />

                                 <Separator />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />

+                                <MenuItem Header="{x:Static Properties:Resources.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />

+                                <MenuItem Header="{x:Static Properties:Resources.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />

                                 <Separator />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />

+                                <MenuItem Header="{x:Static Properties:Resources.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />

                             </ContextMenu>

                         </Button.ContextMenu>

                     </Button>

                 </StackPanel>

                 <StackPanel Margin="8,0,0,0" Orientation="Horizontal" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.MainView_SelectedPreset}" Margin="5,0,0,0" />

+                    <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:ResourcesUI.MainView_ModifiedPreset}" FontStyle="Italic" Visibility="{Binding IsModifiedPreset, Converter={StaticResource boolToVisConverter}}" 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>

             </StackPanel>

 

@@ -487,28 +487,28 @@
                         VerticalAlignment="Stretch"

                         SelectionChanged="TabControl_OnSelectionChanged"

                         Visibility="{Binding IsQueueShowingInLine,  Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">

-                <TabItem Name="summaryTab" Header="{x:Static Properties:ResourcesUI.MainView_SummaryTab}">

+                <TabItem Name="summaryTab" Header="{x:Static Properties:Resources.MainView_SummaryTab}">

                     <ContentControl x:Name="SummaryViewModel" />

                 </TabItem>

-                <TabItem Name="pictureTab" Header="{x:Static Properties:ResourcesUI.MainView_PictureTab}">

+                <TabItem Name="pictureTab" Header="{x:Static Properties:Resources.MainView_PictureTab}">

                     <ContentControl x:Name="PictureSettingsViewModel" />

                 </TabItem>

-                <TabItem Name="filtersTab" Header="{x:Static Properties:ResourcesUI.MainView_FiltersTab}">

+                <TabItem Name="filtersTab" Header="{x:Static Properties:Resources.MainView_FiltersTab}">

                     <ContentControl x:Name="FiltersViewModel" />

                 </TabItem>

-                <TabItem Name="videoTab" Header="{x:Static Properties:ResourcesUI.MainView_VideoTab}">

+                <TabItem Name="videoTab" Header="{x:Static Properties:Resources.MainView_VideoTab}">

                     <ContentControl x:Name="VideoViewModel" VerticalAlignment="Stretch" />

                 </TabItem>

-                <TabItem Name="audioTab" Header="{x:Static Properties:ResourcesUI.MainView_AudioTab}">

+                <TabItem Name="audioTab" Header="{x:Static Properties:Resources.MainView_AudioTab}">

                     <ContentControl x:Name="AudioViewModel" />

                 </TabItem>

-                <TabItem Name="subtitlesTab" Header="{x:Static Properties:ResourcesUI.MainView_SubtitlesTab}">

+                <TabItem Name="subtitlesTab" Header="{x:Static Properties:Resources.MainView_SubtitlesTab}">

                     <ContentControl x:Name="SubtitleViewModel" />

                 </TabItem>

-                <TabItem Name="chaptersTab" Header="{x:Static Properties:ResourcesUI.MainView_ChaptersTab}">

+                <TabItem Name="chaptersTab" Header="{x:Static Properties:Resources.MainView_ChaptersTab}">

                     <ContentControl x:Name="ChaptersViewModel" />

                 </TabItem>

-                <TabItem Name="advancedTab" Header="{x:Static Properties:ResourcesUI.MainView_AdvancedTab}" Visibility="{Binding CurrentTask.ShowAdvancedTab, Converter={StaticResource boolToVisConverter}}">

+                <TabItem Name="advancedTab" Header="{x:Static Properties:Resources.MainView_AdvancedTab}" Visibility="{Binding CurrentTask.ShowAdvancedTab, Converter={StaticResource boolToVisConverter}}">

                     <ContentControl x:Name="AdvancedViewModel" />

                 </TabItem>

             </TabControl>

@@ -524,7 +524,7 @@
                         <ColumnDefinition Width="*"/>

                         <ColumnDefinition Width="Auto" />

                     </Grid.ColumnDefinitions>

-                    <Label Margin="0,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_File}" FontWeight="Bold" />

+                    <Label Margin="0,0,0,0" Content="{x:Static Properties:Resources.MainView_File}" FontWeight="Bold" />

                     <TextBox Name="Destination"

                              Grid.Column="1"

                              Margin="5,0,0,0" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Destination}"

@@ -630,15 +630,15 @@
 

                         <TreeView.ContextMenu>

                             <ContextMenu AutomationProperties.Name="Presets List Context Menu">

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />

+                                <MenuItem Header="{x:Static Properties:Resources.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />

                                 <Separator />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_PresetManage}" cal:Message.Attach="[Event Click] = [Action PresetManage]" />

+                                <MenuItem Header="{x:Static Properties:Resources.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />

+                                <MenuItem Header="{x:Static Properties:Resources.MainView_PresetManage}" cal:Message.Attach="[Event Click] = [Action PresetManage]" />

                                 <Separator />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />

+                                <MenuItem Header="{x:Static Properties:Resources.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />

+                                <MenuItem Header="{x:Static Properties:Resources.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />

                                 <Separator />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />

+                                <MenuItem Header="{x:Static Properties:Resources.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />

                             </ContextMenu>

 

                         </TreeView.ContextMenu>

@@ -686,7 +686,7 @@
                                         <TextBlock Margin="2,0,0,0"

                                                    VerticalAlignment="Center"

                                                    Style="{StaticResource textBlockOrangeStyle}"

-                                                   Text="{x:Static Properties:ResourcesUI.Generic_Add}"

+                                                   Text="{x:Static Properties:Resources.Generic_Add}"

                                         />

                                     </StackPanel>

                                 </Button.Content>

@@ -703,7 +703,7 @@
                                         <TextBlock Margin="2,0,0,0"

                                                    VerticalAlignment="Center"

                                                    Style="{StaticResource textBlockOrangeStyle}"

-                                                   Text="{x:Static Properties:ResourcesUI.MainView_Remove}"

+                                                   Text="{x:Static Properties:Resources.MainView_Remove}"

                                         />

                                     </StackPanel>

                                 </Button.Content>

@@ -721,18 +721,18 @@
                                             <TextBlock Margin="2,0,0,0"

                                                        VerticalAlignment="Center"

                                                        Style="{StaticResource textBlockOrangeStyle}"

-                                                       Text="{x:Static Properties:ResourcesUI.MainView_Options}"

+                                                       Text="{x:Static Properties:Resources.MainView_Options}"

                                             />

                                         </StackPanel>

                                     </MenuItem.Header>

-                                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />

+                                    <MenuItem Header="{x:Static Properties:Resources.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />

                                     <Separator />

-                                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />

+                                    <MenuItem Header="{x:Static Properties:Resources.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />

                                     <Separator />

-                                    <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />

-                                    <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />

+                                    <MenuItem Header="{x:Static Properties:Resources.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />

+                                    <MenuItem Header="{x:Static Properties:Resources.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />

                                     <Separator />

-                                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />

+                                    <MenuItem Header="{x:Static Properties:Resources.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />

                                 </MenuItem>

                             </Menu>

                         </ToolBarOverflowPanel>

@@ -793,7 +793,7 @@
                     <MenuItem>

                         <MenuItem.Header>

                             <StackPanel VerticalAlignment="Center" Orientation="Horizontal" MinHeight="26">

-                                <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_WhenDone}" />

+                                <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_WhenDone}" />

                                 <TextBlock Margin="8,0,0,0" VerticalAlignment="Center" Text="{Binding QueueViewModel.WhenDoneAction}" />

                                 <Path Height="5"

                                       Margin="2,2,2,0"

@@ -804,25 +804,25 @@
 

                         <MenuItem x:Name="doNothing"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(doNothing.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_DoNothing}" />

+                                  Header="{x:Static Properties:Resources.QueueView_DoNothing}" />

                         <MenuItem x:Name="shutdownSystem"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(shutdownSystem.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Shutdown}" />

+                                  Header="{x:Static Properties:Resources.QueueView_Shutdown}" />

                         <MenuItem x:Name="suspend"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(suspend.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Suspend}"/>

+                                  Header="{x:Static Properties:Resources.QueueView_Suspend}"/>

                         <MenuItem x:Name="hibernate"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(hibernate.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Hibernate}" />

+                                  Header="{x:Static Properties:Resources.QueueView_Hibernate}" />

                         <MenuItem x:Name="lock"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(lock.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_LockSystem}" />

+                                  Header="{x:Static Properties:Resources.QueueView_LockSystem}" />

                         <MenuItem x:Name="logoff"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(logoff.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Logoff}"/>

+                                  Header="{x:Static Properties:Resources.QueueView_Logoff}"/>

                         <MenuItem x:Name="quit"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(quit.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_QuitHandBrake}" />

+                                  Header="{x:Static Properties:Resources.QueueView_QuitHandBrake}" />

                     </MenuItem>

                 </Menu>

             </StatusBarItem>

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml.cs b/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
index 957eeaeaf..01acb6aa3 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
@@ -69,7 +69,7 @@ namespace HandBrakeWPF.Views
             if (e.Source is TabControl && e.AddedItems.Count > 0)

             {

                 TabItem tab = e.AddedItems[0] as TabItem;

-                if (tab != null && Properties.ResourcesUI.MainView_SummaryTab.Equals(tab.Header))

+                if (tab != null && Properties.Resources.MainView_SummaryTab.Equals(tab.Header))

                 {

                     ((MainViewModel)this.DataContext).SummaryViewModel.UpdateDisplayedInfo();

                 }

diff --git a/win/CS/HandBrakeWPF/Views/ManagePresetView.xaml b/win/CS/HandBrakeWPF/Views/ManagePresetView.xaml
index fb16780e0..d8d78eb51 100644
--- a/win/CS/HandBrakeWPF/Views/ManagePresetView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ManagePresetView.xaml
@@ -33,7 +33,7 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <TextBlock Text="{x:Static Properties:ResourcesUI.ManagePresetView_ManagePreset}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />
+        <TextBlock Text="{x:Static Properties:Resources.ManagePresetView_ManagePreset}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />
 
         <!--  Header  -->
         <Grid Grid.Row="1" Margin="10,0,10,0">
@@ -56,7 +56,7 @@
             <!--  Name  -->
             <TextBlock Grid.Row="0"
                        Grid.Column="0"
-                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Name}" />
+                       Text="{x:Static Properties:Resources.AddPresetView_Name}" />
             <TextBox Grid.Row="0"
                      Grid.Column="1"
                      HorizontalAlignment="Stretch"
@@ -66,7 +66,7 @@
             <!--  Description  -->
             <TextBlock Grid.Row="2"
                        Grid.Column="0" Margin="0,10,0,0"
-                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Description}" />
+                       Text="{x:Static Properties:Resources.AddPresetView_Description}" />
             <TextBox Grid.Row="2"
                      Grid.Column="1" Margin="0,10,0,0"
                      
@@ -96,13 +96,13 @@
             <Button Grid.Column="1"
                     Margin="0,5,10,10"
                     cal:Message.Attach="[Event Click] = [Action Cancel]"
-                    Content="{x:Static Properties:ResourcesUI.Generic_Cancel}"
+                    Content="{x:Static Properties:Resources.Generic_Cancel}"
                     IsCancel="True"
                     Padding="8,2" />
             <Button Grid.Column="2"
                     Margin="0,5,10,10"
                     cal:Message.Attach="[Event Click] = [Action Save]"
-                    Content="{x:Static Properties:ResourcesUI.Generic_Save}"
+                    Content="{x:Static Properties:Resources.Generic_Save}"
                     IsDefault="True"
                     Padding="8,2" />
         </Grid>
diff --git a/win/CS/HandBrakeWPF/Views/MetaDataView.xaml b/win/CS/HandBrakeWPF/Views/MetaDataView.xaml
index 34c328529..f8c62a6da 100644
--- a/win/CS/HandBrakeWPF/Views/MetaDataView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MetaDataView.xaml
@@ -22,7 +22,7 @@
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
-        <TextBlock Text="{x:Static Properties:ResourcesUI.MetaDataView_Title}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />
+        <TextBlock Text="{x:Static Properties:Resources.MetaDataView_Title}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />
 
         <!-- Metadata Input Area -->
         <Grid Grid.Row="1"  Margin="10,10,0,0">
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index ae6dccfca..fa0e88940 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -91,25 +91,25 @@
                 <StackPanel Name="General" Orientation="Vertical" Margin="10,5,0,0"

                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.General}}">

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.Options_General}" FontSize="20" FontFamily="Segoe UI Light"  />

+                    <TextBlock Text="{x:Static Properties:Resources.Options_General}" FontSize="20" FontFamily="Segoe UI Light"  />

 

                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_OnStartup}" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="{x:Static Properties:Resources.Options_OnStartup}" FontSize="14" Margin="0,0,0,10"/>

 

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_CheckForUpdates}" IsChecked="{Binding CheckForUpdates}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_CheckForUpdates}" IsChecked="{Binding CheckForUpdates}" />

                             <ComboBox Name="checkForUpdateFrequency" ItemsSource="{Binding CheckForUpdatesFrequencies}" SelectedIndex="{Binding CheckForUpdatesFrequency}" Margin="25,0,0,5" HorizontalAlignment="Left" Width="120"></ComboBox>

                         </StackPanel>

                     </StackPanel>

 

                     <StackPanel Orientation="Vertical" Margin="0,0,0,20">

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_WhenDone}" FontSize="14" Margin="0,0,0,10" />

+                        <TextBlock Text="{x:Static Properties:Resources.Options_WhenDone}" FontSize="14" Margin="0,0,0,10" />

 

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

                             <StackPanel Orientation="Horizontal">

                                 <ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions}" SelectedItem="{Binding WhenDone}" Width="120"  HorizontalAlignment="Left" />

-                                <CheckBox Content="{x:Static Properties:ResourcesUI.Options_ResetDoNothing}" VerticalAlignment="Center" Margin="5,0,0,0" IsChecked="{Binding ResetWhenDoneAction}" />

+                                <CheckBox Content="{x:Static Properties:Resources.Options_ResetDoNothing}" VerticalAlignment="Center" Margin="5,0,0,0" IsChecked="{Binding ResetWhenDoneAction}" />

                             </StackPanel>

 

                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

@@ -119,7 +119,7 @@
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

                                 <CheckBox VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding SendFileAfterEncode}" Margin="0,1,0,0">

                                     <StackPanel Orientation="Horizontal">

-                                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_SendFileTo}" VerticalAlignment="Center" />

+                                        <TextBlock Text="{x:Static Properties:Resources.Options_SendFileTo}" VerticalAlignment="Center" />

                                         <TextBlock Text="{Binding SendFileTo}" VerticalAlignment="Center" Margin="5,0,5,0"  />

                                     </StackPanel>

                                 </CheckBox>

@@ -128,14 +128,14 @@
                             </StackPanel>

 

                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

-                                <TextBlock VerticalAlignment="Center"  Margin="25,0,5,0" Text="{x:Static Properties:ResourcesUI.Options_Arguments}" />

+                                <TextBlock VerticalAlignment="Center"  Margin="25,0,5,0" Text="{x:Static Properties:Resources.Options_Arguments}" />

                                 <TextBox Name="SendToArguments" Text="{Binding Arguments}" Width="250" />

                             </StackPanel>

 

                             <StackPanel Orientation="Vertical" Margin="0,7,0,0">

-                                <CheckBox Content="{x:Static Properties:ResourcesUI.OptionsView_PlaySoundWhenDone}"  

+                                <CheckBox Content="{x:Static Properties:Resources.OptionsView_PlaySoundWhenDone}"  

                                           VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding PlaySoundWhenDone}" Margin="0,1,0,0" />

-                                <CheckBox Content="{x:Static Properties:ResourcesUI.OptionsView_PlaySoundWhenQueueDone}"  

+                                <CheckBox Content="{x:Static Properties:Resources.OptionsView_PlaySoundWhenQueueDone}"  

                                           VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding PlaySoundWhenQueueDone}" Margin="0,5,0,0" />

                                 <StackPanel Orientation="Horizontal" Margin="25,2,0,0">

                                     <TextBlock Text="{Binding WhenDoneAudioFile}" VerticalAlignment="Center" Margin="5,2,5,0"  />

@@ -150,16 +150,16 @@
 

                     <StackPanel Orientation="Vertical" Margin="0,0,0,20">

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_PathToVLC}" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="{x:Static Properties:Resources.Options_PathToVLC}" FontSize="14" Margin="0,0,0,10"/>

 

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

 

                             <StackPanel Orientation="Horizontal">

-                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:ResourcesUI.Options_Path}" />

+                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.Options_Path}" />

                                 <TextBox Name="vlcPath" Text="{Binding VLCPath}"  Width="250" />

                                 <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" />

                             </StackPanel>

-                            <TextBlock Margin="35,0,0,0" Text="{x:Static Properties:ResourcesUI.Options_VideoPreviewPath}" />

+                            <TextBlock Margin="35,0,0,0" Text="{x:Static Properties:Resources.Options_VideoPreviewPath}" />

 

                         </StackPanel>

                     </StackPanel>

@@ -167,26 +167,26 @@
 

                     <StackPanel Orientation="Vertical" Margin="0,0,0,20">

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_UserInterface}" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="{x:Static Properties:Resources.Options_UserInterface}" FontSize="14" Margin="0,0,0,10"/>

 

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_MinimiseTray}" IsChecked="{Binding MinimiseToTray}" />

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_ClearCompleted}" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_AdvancedTab}" IsChecked="{Binding ShowAdvancedTab}" />

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.OptionsView_ShowStatusInTitleBar}" IsChecked="{Binding ShowStatusInTitleBar}" />

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.OptionsView_ShowPreviewOnSummaryTab}" IsChecked="{Binding ShowPreviewOnSummaryTab}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_MinimiseTray}" IsChecked="{Binding MinimiseToTray}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_ClearCompleted}" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_AdvancedTab}" IsChecked="{Binding ShowAdvancedTab}" />

+                            <CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowStatusInTitleBar}" IsChecked="{Binding ShowStatusInTitleBar}" />

+                            <CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowPreviewOnSummaryTab}" IsChecked="{Binding ShowPreviewOnSummaryTab}" />

                         </StackPanel>

                     </StackPanel>

 

                     <StackPanel Orientation="Vertical" Margin="0,0,0,20">

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Experimental}" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="{x:Static Properties:Resources.Options_Experimental}" FontSize="14" Margin="0,0,0,10"/>

 

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

-                            <TextBlock Text="{x:Static  Properties:ResourcesUI.Options_ExperimentalFeatures}" Margin="0,0,0,10" />

+                            <TextBlock Text="{x:Static  Properties:Resources.Options_ExperimentalFeatures}" Margin="0,0,0,10" />

                            

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_ShowExperimentalQueueDesign}" IsChecked="{Binding ShowExperimentalQueue}" />

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_ShowQueueInline}" IsChecked="{Binding ShowQueueInline}" Margin="20,5,0,0" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_ShowExperimentalQueueDesign}" IsChecked="{Binding ShowExperimentalQueue}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_ShowQueueInline}" IsChecked="{Binding ShowQueueInline}" Margin="20,5,0,0" />

                         </StackPanel>

                     </StackPanel>

                 </StackPanel>

@@ -194,14 +194,14 @@
                 <StackPanel Name="Output" Orientation="Vertical" Margin="10,5,0,0"

                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.OutputFiles}}">

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Output}" FontSize="20" FontFamily="Segoe UI Light"  />

+                    <TextBlock Text="{x:Static Properties:Resources.Options_Output}" FontSize="20" FontFamily="Segoe UI Light"  />

 

                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_AutomaticFileNaming}" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="{x:Static Properties:Resources.Options_AutomaticFileNaming}" FontSize="14" Margin="0,0,0,10"/>

 

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_AutoNameOutput}" IsChecked="{Binding AutomaticallyNameFiles}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_AutoNameOutput}" IsChecked="{Binding AutomaticallyNameFiles}" />

 

                             <Grid Margin="0,5,0,0">

                                 <Grid.RowDefinitions>

@@ -216,25 +216,25 @@
                                     <ColumnDefinition Width="Auto" />

                                 </Grid.ColumnDefinitions>

 

-                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:ResourcesUI.Options_DefaultPath}" Grid.Column="0" Grid.Row="0" />

+                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.Options_DefaultPath}" Grid.Column="0" Grid.Row="0" />

                                 <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="380" Grid.Column="1" Grid.Row="0" 

                                          ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" />

                                 <Button Content="Browse" Margin="5,0,0,0" Grid.Column="2" Grid.Row="0" 

                                         cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" />

 

-                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:ResourcesUI.Options_Format}"  Grid.Column="0" Grid.Row="2" Margin="0,5,0,0" />

+                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.Options_Format}"  Grid.Column="0" Grid.Row="2" Margin="0,5,0,0" />

                                 <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat, UpdateSourceTrigger=PropertyChanged}" Width="380"  Grid.Column="1" Grid.Row="2"  Margin="0,0,0,0"

                                          ToolTip="{x:Static Properties:Resources.Options_AdditionalFormatOptions}"  />

                             </Grid>

 

                             <StackPanel Orientation="Vertical" Margin="0,15,0,0">

-                                <CheckBox Content="{x:Static Properties:ResourcesUI.Options_TitleCase}" IsChecked="{Binding ChangeToTitleCase}" />

-                                <CheckBox Content="{x:Static Properties:ResourcesUI.Options_ReplaceUnderscores}" IsChecked="{Binding RemoveUnderscores}"/>

-                                <CheckBox Content="{x:Static Properties:ResourcesUI.Options_RemovePunctuation}" ToolTip="Dash (-), Period (.) and Comma (,) " IsChecked="{Binding RemovePunctuation}"  />

+                                <CheckBox Content="{x:Static Properties:Resources.Options_TitleCase}" IsChecked="{Binding ChangeToTitleCase}" />

+                                <CheckBox Content="{x:Static Properties:Resources.Options_ReplaceUnderscores}" IsChecked="{Binding RemoveUnderscores}"/>

+                                <CheckBox Content="{x:Static Properties:Resources.Options_RemovePunctuation}" ToolTip="Dash (-), Period (.) and Comma (,) " IsChecked="{Binding RemovePunctuation}"  />

                             </StackPanel>

 

                             <StackPanel Orientation="Horizontal" Margin="0,15,0,0">

-                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:ResourcesUI.Options_MP4FileExtension}" />

+                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.Options_MP4FileExtension}" />

                                 <ComboBox Name="mp4FileExtension" Width="120" ItemsSource="{Binding Mp4ExtensionOptions}" SelectedIndex="{Binding SelectedMp4Extension}" HorizontalAlignment="Left" />

                             </StackPanel>

                         </StackPanel>

@@ -244,29 +244,29 @@
                 <StackPanel Name="Hardware" Orientation="Vertical" Margin="10,5,0,0"

                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Video}}">

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Video}" FontSize="20" FontFamily="Segoe UI Light" />

+                    <TextBlock Text="{x:Static Properties:Resources.Options_Video}" FontSize="20" FontFamily="Segoe UI Light" />

 

                     <StackPanel Orientation="Vertical" Margin="0,0,0,20">

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Encoding}" FontSize="14" Margin="0,10,0,10" />

+                        <TextBlock Text="{x:Static Properties:Resources.Options_Encoding}" FontSize="14" Margin="0,10,0,10" />

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.OptionsView_EnableQuicksyncEncoding}" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding EnableQuickSyncEncoding}" />

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.OptionsView_EnableVceEncoding}" IsEnabled="{Binding IsVceAvailable}" IsChecked="{Binding EnableVceEncoder}" />

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.OptionsView_EnableNvencEncoding}" IsEnabled="{Binding IsNvencAvailable}" IsChecked="{Binding EnableNvencEncoder}" />

+                            <CheckBox Content="{x:Static Properties:Resources.OptionsView_EnableQuicksyncEncoding}" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding EnableQuickSyncEncoding}" />

+                            <CheckBox Content="{x:Static Properties:Resources.OptionsView_EnableVceEncoding}" IsEnabled="{Binding IsVceAvailable}" IsChecked="{Binding EnableVceEncoder}" />

+                            <CheckBox Content="{x:Static Properties:Resources.OptionsView_EnableNvencEncoding}" IsEnabled="{Binding IsNvencAvailable}" IsChecked="{Binding EnableNvencEncoder}" />

                         </StackPanel>

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Decoding}" FontSize="14" Margin="0,10,0,10" />

+                        <TextBlock Text="{x:Static Properties:Resources.Options_Decoding}" FontSize="14" Margin="0,10,0,10" />

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_QsvDecode}" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding EnableQuickSyncDecoding}" />

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_QsvDecodeForNonFullPath}" Visibility="{Binding IsUseQsvDecAvailable, Converter={StaticResource boolToVisConverter}}" IsChecked="{Binding UseQSVDecodeForNonQSVEnc}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_QsvDecode}" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding EnableQuickSyncDecoding}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_QsvDecodeForNonFullPath}" Visibility="{Binding IsUseQsvDecAvailable, Converter={StaticResource boolToVisConverter}}" IsChecked="{Binding UseQSVDecodeForNonQSVEnc}" />

                             <TextBlock Text="{x:Static Properties:Resources.Video_QuickSyncNotAvailable}" Margin="17,2,0,0" TextWrapping="Wrap"

                                         Visibility="{Binding IsQuickSyncAvailable, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

                         </StackPanel>

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Scaling}" FontSize="14" Margin="0,20,0,10" Visibility="Collapsed" />

+                        <TextBlock Text="{x:Static Properties:Resources.Options_Scaling}" FontSize="14" Margin="0,20,0,10" Visibility="Collapsed" />

 

                         <StackPanel Orientation="Horizontal" Margin="20,0,0,0" Visibility="Collapsed">

-                            <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Scaler}" Margin="0,0,5,0" VerticalAlignment="Center" />

+                            <TextBlock Text="{x:Static Properties:Resources.Options_Scaler}" Margin="0,0,5,0" VerticalAlignment="Center" />

                             <ComboBox  ItemsSource="{Binding ScalingOptions, Converter={StaticResource enumComboConverter}}" 

                                        SelectedItem="{Binding SelectedScalingMode, Converter={StaticResource enumComboConverter}}" 

                                        Width="120" VerticalAlignment="Center" />

@@ -281,77 +281,77 @@
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Advanced}}">

 

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Advanced}" FontSize="20" FontFamily="Segoe UI Light"  />

+                    <TextBlock Text="{x:Static Properties:Resources.Options_Advanced}" FontSize="20" FontFamily="Segoe UI Light"  />

 

                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_AdvancedOptions}" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="{x:Static Properties:Resources.Options_AdvancedOptions}" FontSize="14" Margin="0,0,0,10"/>

 

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_PreventSleep}" IsChecked="{Binding PreventSleep}" />

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_PauseQueueOnLowDiskSpace}" 

+                            <CheckBox Content="{x:Static Properties:Resources.Options_PreventSleep}" IsChecked="{Binding PreventSleep}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_PauseQueueOnLowDiskSpace}" 

                                       IsChecked="{Binding PauseOnLowDiskspace}" />

                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

-                                <TextBlock Text="{x:Static Properties:ResourcesUI.Options_LowDiskspaceSize}" VerticalAlignment="Center"  Width="250" />

+                                <TextBlock Text="{x:Static Properties:Resources.Options_LowDiskspaceSize}" VerticalAlignment="Center"  Width="250" />

                                 <TextBox x:Name="PauseOnLowDiskspaceLEvel" Text="{Binding PauseOnLowDiskspaceLevel, Converter={StaticResource fileSizeConverter}, UpdateSourceTrigger=PropertyChanged}"  Width="120"/>

                             </StackPanel>

                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">

-                                <TextBlock Text="{x:Static Properties:ResourcesUI.Options_PreviewScanCount}" VerticalAlignment="Center" Width="250" />

+                                <TextBlock Text="{x:Static Properties:Resources.Options_PreviewScanCount}" VerticalAlignment="Center" Width="250" />

                                 <ComboBox Name="numberOfPreviews" ItemsSource="{Binding PreviewPicturesToScan}" SelectedItem="{Binding SelectedPreviewCount}" Width="120" />

                             </StackPanel>

                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

-                                <TextBlock Text="{x:Static Properties:ResourcesUI.Options_MinTitleScanLength}" VerticalAlignment="Center" Width="250" />

+                                <TextBlock Text="{x:Static Properties:Resources.Options_MinTitleScanLength}" VerticalAlignment="Center" Width="250" />

                                 <TextBox x:Name="MinTitleLength" Text="{Binding MinLength}"  Width="120"/>

                                 <!-- Find a control for this-->

                             </StackPanel>

                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

-                                <TextBlock Text="{x:Static Properties:ResourcesUI.Options_PriorityLevel}" Width="250" VerticalAlignment="Center" />

+                                <TextBlock Text="{x:Static Properties:Resources.Options_PriorityLevel}" Width="250" VerticalAlignment="Center" />

                                 <ComboBox Name="processPriorityLevel" ItemsSource="{Binding PriorityLevelOptions}" SelectedItem="{Binding SelectedPriority}" Width="120" />

                             </StackPanel>

                   </StackPanel>

                     </StackPanel>

 

                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_x264}" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="{x:Static Properties:Resources.Options_x264}" FontSize="14" Margin="0,0,0,10"/>

                         <StackPanel Orientation="Horizontal" Margin="20,0,0,0">

-                            <TextBlock Text="{x:Static Properties:ResourcesUI.Options_x264Granularity}" VerticalAlignment="Center" Width="250" />

+                            <TextBlock Text="{x:Static Properties:Resources.Options_x264Granularity}" VerticalAlignment="Center" Width="250" />

                             <ComboBox Name="x264Granularity" ItemsSource="{Binding ConstantQualityGranularity}" SelectedItem="{Binding SelectedGranulairty}" Width="120"/>

                         </StackPanel>

                     </StackPanel>

 

                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_DVD}" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="{x:Static Properties:Resources.Options_DVD}" FontSize="14" Margin="0,0,0,10"/>

 

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_DvdRead}" IsChecked="{Binding DisableLibdvdNav}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_DvdRead}" IsChecked="{Binding DisableLibdvdNav}" />

                         </StackPanel>

 

                     </StackPanel>

 

                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">

 

-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Logging}" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="{x:Static Properties:Resources.Options_Logging}" FontSize="14" Margin="0,0,0,10"/>

 

                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

                             <StackPanel Orientation="Horizontal">

-                                <TextBlock Text="{x:Static Properties:ResourcesUI.Options_LogLevel}" Width="250" VerticalAlignment="Center" />

+                                <TextBlock Text="{x:Static Properties:Resources.Options_LogLevel}" Width="250" VerticalAlignment="Center" />

                                 <ComboBox Name="logVerbosityLevel" ItemsSource="{Binding LogVerbosityOptions, Converter={StaticResource LogLevelConverter}}" SelectedItem="{Binding SelectedVerbosity, Converter={StaticResource LogLevelConverter}}" Width="120" />

                             </StackPanel>

 

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_CopyLogToEncDir}" Margin="0,5,0,0" IsChecked="{Binding CopyLogToEncodeDirectory}" />

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_CopyLogToDir}" Margin="0,5,0,0" IsChecked="{Binding CopyLogToSepcficedLocation}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_CopyLogToEncDir}" Margin="0,5,0,0" IsChecked="{Binding CopyLogToEncodeDirectory}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_CopyLogToDir}" Margin="0,5,0,0" IsChecked="{Binding CopyLogToSepcficedLocation}" />

                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">

-                                <TextBlock Text="{x:Static Properties:ResourcesUI.Options_LogPath}" VerticalAlignment="Center" />

+                                <TextBlock Text="{x:Static Properties:Resources.Options_LogPath}" VerticalAlignment="Center" />

                                 <TextBox Width="380" Text="{Binding LogDirectory}" />

                                 <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseLogPath]" />

                             </StackPanel>

                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">

-                                <Button Content="{x:Static Properties:ResourcesUI.Options_ViewLogDirectory}" cal:Message.Attach="[Event Click] = [Action ViewLogDirectory]" Margin="0,0,5,0" />

-                                <Button Content="{x:Static Properties:ResourcesUI.Options_ClearLogs}" cal:Message.Attach="[Event Click] = [Action ClearLogHistory]" />

+                                <Button Content="{x:Static Properties:Resources.Options_ViewLogDirectory}" cal:Message.Attach="[Event Click] = [Action ViewLogDirectory]" Margin="0,0,5,0" />

+                                <Button Content="{x:Static Properties:Resources.Options_ClearLogs}" cal:Message.Attach="[Event Click] = [Action ClearLogHistory]" />

                             </StackPanel>

 

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_30DayLogClear}" Margin="0,10,0,0" IsChecked="{Binding ClearOldOlgs}" />

+                            <CheckBox Content="{x:Static Properties:Resources.Options_30DayLogClear}" Margin="0,10,0,0" IsChecked="{Binding ClearOldOlgs}" />

                         </StackPanel>

 

                     </StackPanel>

@@ -362,9 +362,9 @@
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Updates}}">

 

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Updates}" FontSize="20" FontFamily="Segoe UI Light" />

+                    <TextBlock Text="{x:Static Properties:Resources.Options_Updates}" FontSize="20" FontFamily="Segoe UI Light" />

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.Options_CurVersion}" FontSize="14" Margin="0,10,0,10"/>

+                    <TextBlock Text="{x:Static Properties:Resources.Options_CurVersion}" FontSize="14" Margin="0,10,0,10"/>

 

                     <Grid Margin="20,10,0,20">

                         <Grid.ColumnDefinitions>

@@ -373,15 +373,15 @@
                         </Grid.ColumnDefinitions>

 

                         <!-- Version -->

-                        <TextBlock Grid.Column="0" Margin="0,0,5,0" Text="{x:Static Properties:ResourcesUI.Options_Version}" />

+                        <TextBlock Grid.Column="0" Margin="0,0,5,0" Text="{x:Static Properties:Resources.Options_Version}" />

                         <TextBlock Grid.Column="1" Margin="0,0,0,1" VerticalAlignment="Bottom" Text="{Binding Version}" />

                     </Grid>

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Updates}" FontSize="14" Margin="0,10,0,10"/>

+                    <TextBlock Text="{x:Static Properties:Resources.Options_Updates}" FontSize="14" Margin="0,10,0,10"/>

 

                     <StackPanel Margin="20,0,0,0" Orientation="Horizontal">

-                        <Button Content="{x:Static Properties:ResourcesUI.Options_CheckForUpdates}" MaxWidth="130" Margin="0,0,5,0" cal:Message.Attach="[Event Click] = [Action PerformUpdateCheck]" />

-                        <Button Content="{x:Static Properties:ResourcesUI.Options_DownloadUpdates}" Width="120" cal:Message.Attach="[Event Click] = [Action DownloadUpdate]" Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />

+                        <Button Content="{x:Static Properties:Resources.Options_CheckForUpdates}" MaxWidth="130" Margin="0,0,5,0" cal:Message.Attach="[Event Click] = [Action PerformUpdateCheck]" />

+                        <Button Content="{x:Static Properties:Resources.Options_DownloadUpdates}" Width="120" cal:Message.Attach="[Event Click] = [Action DownloadUpdate]" Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />

                     </StackPanel>

 

                     <StackPanel Margin="20,10,0,0" Orientation="Horizontal">

@@ -397,7 +397,7 @@
                 <StackPanel Name="About" Orientation="Vertical" Margin="10,5,0,0"

                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.About}}">

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.Options_About}" FontSize="20" FontFamily="Segoe UI Light"  />

+                    <TextBlock Text="{x:Static Properties:Resources.Options_About}" FontSize="20" FontFamily="Segoe UI Light"  />

 

                     <ContentControl x:Name="AboutViewModel" />

 

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>

diff --git a/win/CS/HandBrakeWPF/Views/PopupWindowView.xaml b/win/CS/HandBrakeWPF/Views/PopupWindowView.xaml
index 9ca6236c8..830a283d4 100644
--- a/win/CS/HandBrakeWPF/Views/PopupWindowView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PopupWindowView.xaml
@@ -49,14 +49,14 @@
                 <Button Grid.Column="1"
                     Margin="0,5,10,10"
                     cal:Message.Attach="[Event Click] = [Action Cancel]"
-                    Content="{x:Static properties:ResourcesUI.Generic_Cancel}"
+                    Content="{x:Static properties:Resources.Generic_Cancel}"
                     IsCancel="True"
                     Visibility="Collapsed"
                     Padding="8,2" />
                 <Button Grid.Column="2"
                     Margin="0,5,10,10"
                     cal:Message.Attach="[Event Click] = [Action Save]"
-                    Content="{x:Static properties:ResourcesUI.Generic_Save}"
+                    Content="{x:Static properties:Resources.Generic_Save}"
                     IsDefault="True"
                     Padding="8,2" />
             </Grid>
diff --git a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
index c304f36db..80191a3a7 100644
--- a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
+++ b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
@@ -64,14 +64,14 @@
 
             <ListBox.ContextMenu>
                 <ContextMenu cal:Action.TargetWithoutContext="{Binding Path=PlacementTarget.Tag, RelativeSource={RelativeSource Self}}">
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action StartQueue]" Header="{x:Static Properties:ResourcesUI.QueueView_Start}" />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action PauseQueue]" Header="{x:Static Properties:ResourcesUI.QueueView_Pause}" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action StartQueue]" Header="{x:Static Properties:Resources.QueueView_Start}" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action PauseQueue]" Header="{x:Static Properties:Resources.QueueView_Pause}" />
                     <Separator />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearCompleted}" />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearAll}" />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearSelected}" />                 
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:Resources.QueueView_ClearAll}" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" />                 
                     <Separator />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:Resources.QueueView_Export}" />
                 </ContextMenu>
             </ListBox.ContextMenu>
 
@@ -103,27 +103,27 @@
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Source}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
                                 <TextBlock Text="{Binding Task.Source}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
                                 <TextBlock Text="{Binding Task.Destination}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
                                 <TextBlock Text="{Binding Task, Converter={StaticResource pictureSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1"  />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Video}" Grid.Row="3" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Video}" Grid.Row="3" Grid.Column="0" />
                                 <TextBlock Text="{Binding Task, Converter={StaticResource videoOptionsTooltipConverter}}" Grid.Row="3" Grid.Column="1" TextWrapping="Wrap"  />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Audio}"  Grid.Row="4" Grid.Column="0"/>
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Audio}"  Grid.Row="4" Grid.Column="0"/>
                                 <TextBlock Text="{Binding Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}"
                                            Grid.Row="4" Grid.Column="1"/>
 
-                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:ResourcesUI.QueueView_Subtitles}" Grid.Row="5" Grid.Column="0"  />
+                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:Resources.QueueView_Subtitles}" Grid.Row="5" Grid.Column="0"  />
                                 <TextBlock Text="{Binding Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}"
                                            Grid.Row="5" Grid.Column="1" />
 
-                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0"  Text="{x:Static Properties:ResourcesUI.QueueView_Advanced}" />
+                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0"  Text="{x:Static Properties:Resources.QueueView_Advanced}" />
                                 <TextBlock Text="{Binding Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="6" Grid.Column="1" TextWrapping="Wrap"  />
                             </Grid>
 
@@ -187,12 +187,12 @@
 
                             <!--  TODO Support Drive Label Name  -->
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Source}" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" />
                                 <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}" />
                             </StackPanel>
 
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Destination}" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" />
                                 <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" />
                             </StackPanel>
                         </StackPanel>
diff --git a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
index 4d001ae9a..31a915fc1 100644
--- a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
+++ b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
@@ -51,16 +51,16 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <TextBlock Text="{x:Static Properties:ResourcesUI.MainView_ShowQueue}" FontSize="28" VerticalAlignment="Center" FontFamily="Segoe UI Light" Margin="10,0,0,0"  />
+            <TextBlock Text="{x:Static Properties:Resources.MainView_ShowQueue}" FontSize="28" VerticalAlignment="Center" FontFamily="Segoe UI Light" Margin="10,0,0,0"  />
 
             <Menu HorizontalAlignment="Right" VerticalAlignment="Center" Background="Transparent" Grid.Column="2" 
-                  AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_WhenDone}">
+                  AutomationProperties.Name="{x:Static Properties:Resources.QueueView_WhenDone}">
                 <MenuItem>
                     <MenuItem.Header>
                         <StackPanel Height="32" Orientation="Horizontal">
                             <TextBlock VerticalAlignment="Center"
                                            FontWeight="Bold"
-                                           Text="{x:Static Properties:ResourcesUI.QueueView_WhenDone}" />
+                                           Text="{x:Static Properties:Resources.QueueView_WhenDone}" />
                             <Label Margin="8,0,0,0"
                                        VerticalAlignment="Center"
                                        Content="{Binding WhenDoneAction}" />
@@ -73,25 +73,25 @@
 
                     <MenuItem x:Name="doNothing"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(doNothing.Header)]"
-                                  Header="{x:Static Properties:ResourcesUI.QueueView_DoNothing}" />
+                                  Header="{x:Static Properties:Resources.QueueView_DoNothing}" />
                     <MenuItem x:Name="shutdown"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(shutdown.Header)]"
-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Shutdown}" />
+                                  Header="{x:Static Properties:Resources.QueueView_Shutdown}" />
                     <MenuItem x:Name="suspend"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(suspend.Header)]"
-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Suspend}" />
+                                  Header="{x:Static Properties:Resources.QueueView_Suspend}" />
                     <MenuItem x:Name="hibernate"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(hibernate.Header)]"
-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Hibernate}"/>
+                                  Header="{x:Static Properties:Resources.QueueView_Hibernate}"/>
                     <MenuItem x:Name="lock"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(lock.Header)]"
-                                  Header="{x:Static Properties:ResourcesUI.QueueView_LockSystem}" />
+                                  Header="{x:Static Properties:Resources.QueueView_LockSystem}" />
                     <MenuItem x:Name="logoff"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(logoff.Header)]"
-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Logoff}"/>
+                                  Header="{x:Static Properties:Resources.QueueView_Logoff}"/>
                     <MenuItem x:Name="quit"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(quit.Header)]"
-                                  Header="{x:Static Properties:ResourcesUI.QueueView_QuitHandBrake}"/>
+                                  Header="{x:Static Properties:Resources.QueueView_QuitHandBrake}"/>
                 </MenuItem>
             </Menu>
         </Grid>
@@ -129,21 +129,21 @@
 
                 <ListBox.ContextMenu>
                     <ContextMenu cal:Action.TargetWithoutContext="{Binding Path=PlacementTarget.Tag, RelativeSource={RelativeSource Self}}" Opened="ContextMenu_OnOpened">
-                        <MenuItem cal:Message.Attach="[Event Click] = [Action StartQueue]" Header="{x:Static Properties:ResourcesUI.QueueView_Start}" />
-                        <MenuItem cal:Message.Attach="[Event Click] = [Action PauseQueue]" Header="{x:Static Properties:ResourcesUI.QueueView_Pause}" />
+                        <MenuItem cal:Message.Attach="[Event Click] = [Action StartQueue]" Header="{x:Static Properties:Resources.QueueView_Start}" />
+                        <MenuItem cal:Message.Attach="[Event Click] = [Action PauseQueue]" Header="{x:Static Properties:Resources.QueueView_Pause}" />
                         <Separator />
-                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetFailed]" Header="{x:Static Properties:ResourcesUI.QueueView_ResetFailed}" />
-                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetSelectedJobs]" Header="{x:Static Properties:ResourcesUI.QueueView_ResetSelectedJobs}" />
-                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetAllJobs]" Header="{x:Static Properties:ResourcesUI.QueueView_ResetAllJobs}" />
+                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetFailed]" Header="{x:Static Properties:Resources.QueueView_ResetFailed}" />
+                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ResetSelectedJobs}" />
+                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetAllJobs]" Header="{x:Static Properties:Resources.QueueView_ResetAllJobs}" />
                         <Separator />
-                        <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearCompleted}" />
-                        <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearAll}" />
-                        <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearSelected}" />
+                        <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" />
+                        <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:Resources.QueueView_ClearAll}" />
+                        <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" />
                         <Separator />
-                        <MenuItem Header="{x:Static Properties:ResourcesUI.QueueView_OpenSourceDir}" x:Name="openSourceDir" Click="OpenSourceDir_OnClick" />
-                        <MenuItem Header="{x:Static Properties:ResourcesUI.QueueView_OpenDestDir}" x:Name="openDestDir" Click="OpenDestDir_OnClick" />
+                        <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenSourceDir}" x:Name="openSourceDir" Click="OpenSourceDir_OnClick" />
+                        <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenDestDir}" x:Name="openDestDir" Click="OpenDestDir_OnClick" />
                         <Separator />
-                        <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" />
+                        <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:Resources.QueueView_Export}" />
                     </ContextMenu>
                 </ListBox.ContextMenu>
 
@@ -231,9 +231,9 @@
                                 </StackPanel>
 
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Source}" Grid.Row="1" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" Grid.Row="1" />
                                 <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}"  Margin="2,0,0,0" Grid.Row="1" Grid.Column="1"/>
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Destination}" Grid.Row="2" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" Grid.Row="2" />
                                 <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" Margin="2,0,0,0" TextTrimming="CharacterEllipsis" Grid.Row="2" Grid.Column="1" />
 
                                 <ProgressBar Minimum="0" Height="4" Maximum="100" Name="pbStatus" Margin="0,2,5,0" Grid.Row="3" Grid.ColumnSpan="2"
@@ -246,7 +246,7 @@
             </ListBox>
 
             <TabControl x:Name="summaryTabControl"  Grid.Column="1"  Margin="5,0,10,10" >
-                <TabItem Header="{x:Static Properties:ResourcesUI.QueueView_Summary}" >
+                <TabItem Header="{x:Static Properties:Resources.QueueView_Summary}" >
                     <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="5,5,0,5">
 
                         <StackPanel Orientation="Vertical"  Margin="5,5,0,5">
@@ -259,13 +259,13 @@
                                     </Style>
                                 </StackPanel.Resources>
 
-                                <Button AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Retry}"  ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
+                                <Button AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Retry}"  ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
                                     <Button.Content>
                                         <StackPanel Orientation="Horizontal">
                                             <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0"
                                                Source="../Images/Refresh.ico">
                                             </Image>
-                                            <TextBlock Text="{x:Static Properties:ResourcesUI.QueueView_Retry}" />
+                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Retry}" />
                                         </StackPanel>
 
                                     </Button.Content>
@@ -278,13 +278,13 @@
                                     </i:Interaction.Triggers>
                                 </Button>
 
-                                <Button Margin="10,0,0,0" AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Edit}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_SendJobBack}">
+                                <Button Margin="10,0,0,0" AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Edit}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_SendJobBack}">
                                     <Button.Content>
                                         <StackPanel Orientation="Horizontal">
                                             <Image Width="20" Margin="0,0,5,0" Height="20" VerticalAlignment="Center"
                                                Source="../Images/options24.png">
                                             </Image>
-                                            <TextBlock Text="{x:Static Properties:ResourcesUI.QueueView_Edit}" />
+                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Edit}" />
                                         </StackPanel>
                                     </Button.Content>
                                     <i:Interaction.Triggers>
@@ -296,13 +296,13 @@
                                     </i:Interaction.Triggers>
                                 </Button>
 
-                                <Button Margin="10,0,0,0" AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Delete}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}">
+                                <Button Margin="10,0,0,0" AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Delete}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}">
                                     <Button.Content>
                                         <StackPanel Orientation="Horizontal">
                                             <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0" 
                                                Source="../Images/delete.png">
                                             </Image>
-                                            <TextBlock Text="{x:Static Properties:ResourcesUI.QueueView_Delete}" />
+                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Delete}" />
                                         </StackPanel>
                                     </Button.Content>
                                     <i:Interaction.Triggers>
@@ -337,27 +337,27 @@
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Source}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
                                 <TextBlock Text="{Binding SelectedTask.Task.Source}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
                                 <TextBlock Text="{Binding SelectedTask.Task.Destination}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
                                 <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource pictureSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1"  />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Video}" Grid.Row="3" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Video}" Grid.Row="3" Grid.Column="0" />
                                 <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource videoOptionsTooltipConverter}}" Grid.Row="3" Grid.Column="1" TextWrapping="Wrap"  />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Audio}"  Grid.Row="4" Grid.Column="0"/>
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Audio}"  Grid.Row="4" Grid.Column="0"/>
                                 <TextBlock Text="{Binding SelectedTask.Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}"
                                            Grid.Row="4" Grid.Column="1"/>
 
-                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:ResourcesUI.QueueView_Subtitles}" Grid.Row="5" Grid.Column="0"  />
+                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:Resources.QueueView_Subtitles}" Grid.Row="5" Grid.Column="0"  />
                                 <TextBlock Text="{Binding SelectedTask.Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}"
                                            Grid.Row="5" Grid.Column="1" />
 
-                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0"  Text="{x:Static Properties:ResourcesUI.QueueView_Advanced}" />
+                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0"  Text="{x:Static Properties:Resources.QueueView_Advanced}" />
                                 <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="6" Grid.Column="1" TextWrapping="Wrap"  />
                             </Grid>
 
@@ -365,10 +365,10 @@
                     </ScrollViewer>
                 </TabItem>
 
-                <TabItem Header="{x:Static Properties:ResourcesUI.QueueView_Statistics}" >
+                <TabItem Header="{x:Static Properties:Resources.QueueView_Statistics}" >
                     <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="10,0,0,5">
                         <StackPanel>
-                            <TextBlock Text="{x:Static Properties:ResourcesUI.QueueView_StatsNotAvailableYet}" Margin="0,10,0,0" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+                            <TextBlock Text="{x:Static Properties:Resources.QueueView_StatsNotAvailableYet}" Margin="0,10,0,0" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
 
                             <Grid Style="{StaticResource LongToolTipHolder}" Margin="0,5,0,0" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}}">
                                 <Grid.Resources>
@@ -392,19 +392,19 @@
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_StartTime}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_StartTime}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
                                 <TextBlock Text="{Binding SelectedTask.Statistics.StartTime}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_EndTime}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_EndTime}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
                                 <TextBlock Text="{Binding SelectedTask.Statistics.EndTime}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_PausedDuration}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PausedDuration}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
                                 <TextBlock Text="{Binding SelectedTask.Statistics.PausedDuration,StringFormat=hh\\:mm\\:ss}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1" />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Duration}" VerticalAlignment="Top" Grid.Row="3" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Duration}" VerticalAlignment="Top" Grid.Row="3" Grid.Column="0" />
                                 <TextBlock Text="{Binding SelectedTask.Statistics.Duration,StringFormat=hh\\:mm\\:ss}" TextWrapping="Wrap" Grid.Row="3" Grid.Column="1" />
 
-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_FileSize}" VerticalAlignment="Top" Grid.Row="4" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_FileSize}" VerticalAlignment="Top" Grid.Row="4" Grid.Column="0" />
                                 <StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="1" >
                                     <TextBlock Text="{Binding SelectedTask.Statistics.FinalFileSizeInMegaBytes}" TextWrapping="Wrap" />
                                     <TextBlock Text=" MB" />
@@ -416,16 +416,16 @@
                     </ScrollViewer>
                 </TabItem>
 
-                <TabItem Header="{x:Static Properties:ResourcesUI.MainView_ActivityLog}">
+                <TabItem Header="{x:Static Properties:Resources.MainView_ActivityLog}">
                     <TextBox ScrollViewer.VerticalScrollBarVisibility="Visible" Text="{Binding ActivityLog, Mode=OneWay}" TextWrapping="Wrap" x:Name="logText">
                         <TextBox.ContextMenu>
                             <ContextMenu>
-                                <MenuItem Header="{x:Static Properties:ResourcesUI.LogView_CopyClipboard}" cal:Message.Attach="[Event Click] = [Action CopyLog]" >
+                                <MenuItem Header="{x:Static Properties:Resources.LogView_CopyClipboard}" cal:Message.Attach="[Event Click] = [Action CopyLog]" >
                                     <MenuItem.Icon>
                                         <Image Width="16" Source="../Images/copy.png" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="{x:Static Properties:ResourcesUI.LogView_OpenLogDir}" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">
+                                <MenuItem Header="{x:Static Properties:Resources.LogView_OpenLogDir}" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">
                                     <MenuItem.Icon>
                                         <Image Width="16" Source="../Images/folder.png" />
                                     </MenuItem.Icon>
diff --git a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
index d6446e1db..88404166e 100644
--- a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
@@ -36,11 +36,11 @@
         </Grid.RowDefinitions>

 

         <!--  Header  -->

-        <TextBlock Text="{x:Static Properties:ResourcesUI.QueueSelectionView_Title}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />

+        <TextBlock Text="{x:Static Properties:Resources.QueueSelectionView_Title}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />

 

         <!-- Text -->

         <StackPanel Orientation="Vertical" Grid.Row="1" Margin="10,0,10,0">

-            <TextBlock Text="{x:Static Properties:ResourcesUI.QueueSelectionView_ChooseTitles}" />

+            <TextBlock Text="{x:Static Properties:Resources.QueueSelectionView_ChooseTitles}" />

         </StackPanel>

 

         <!-- Selection -->

@@ -122,13 +122,13 @@
             <Button Grid.Column="1"

                     Margin="0,5,10,10"

                     cal:Message.Attach="[Event Click] = [Action Cancel]"

-                    Content="{x:Static Properties:ResourcesUI.Generic_Cancel}"

+                    Content="{x:Static Properties:Resources.Generic_Cancel}"

                     IsCancel="True"

                     Padding="8,2" />

             <Button Grid.Column="2"

                     Margin="0,5,10,10"

                     cal:Message.Attach="[Event Click] = [Action Add]"

-                    Content="{x:Static Properties:ResourcesUI.Generic_Add}"

+                    Content="{x:Static Properties:Resources.Generic_Add}"

                     IsDefault="True"

                     Padding="8,2" />

         </Grid>

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 823d4b6d8..34f959cf8 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -86,7 +86,7 @@
                                Source="Images/Play.png" />

                             <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

-                               Content="{x:Static Properties:ResourcesUI.QueueView_Start}" />

+                               Content="{x:Static Properties:Resources.QueueView_Start}" />

                         </StackPanel>

                     </Button>

 

@@ -101,19 +101,19 @@
                                Source="Images/Pause.png" />

                             <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

-                               Content="{x:Static Properties:ResourcesUI.QueueView_Pause}" />

+                               Content="{x:Static Properties:Resources.QueueView_Pause}" />

                         </StackPanel>

                     </Button>

 

                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" HorizontalAlignment="Right">

                         <Menu HorizontalAlignment="Right" VerticalAlignment="Center" Background="Transparent"

-                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_WhenDone}">

+                              AutomationProperties.Name="{x:Static Properties:Resources.QueueView_WhenDone}">

                             <MenuItem>

                                 <MenuItem.Header>

                                     <StackPanel Height="32" Orientation="Horizontal">

                                         <TextBlock VerticalAlignment="Center"

                                            FontWeight="Bold"

-                                           Text="{x:Static Properties:ResourcesUI.QueueView_WhenDone}" />

+                                           Text="{x:Static Properties:Resources.QueueView_WhenDone}" />

                                         <Label Margin="8,0,0,0"

                                        VerticalAlignment="Center"

                                        Content="{Binding WhenDoneAction}" />

@@ -126,25 +126,25 @@
 

                                 <MenuItem x:Name="doNothing"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(doNothing.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_DoNothing}" />

+                                  Header="{x:Static Properties:Resources.QueueView_DoNothing}" />

                                 <MenuItem x:Name="shutdown"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(shutdown.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Shutdown}" />

+                                  Header="{x:Static Properties:Resources.QueueView_Shutdown}" />

                                 <MenuItem x:Name="suspend"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(suspend.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Suspend}" />

+                                  Header="{x:Static Properties:Resources.QueueView_Suspend}" />

                                 <MenuItem x:Name="hibernate"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(hibernate.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Hibernate}"/>

+                                  Header="{x:Static Properties:Resources.QueueView_Hibernate}"/>

                                 <MenuItem x:Name="lock"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(lock.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_LockSystem}" />

+                                  Header="{x:Static Properties:Resources.QueueView_LockSystem}" />

                                 <MenuItem x:Name="logoff"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(logoff.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_Logoff}"/>

+                                  Header="{x:Static Properties:Resources.QueueView_Logoff}"/>

                                 <MenuItem x:Name="quit"

                                   cal:Message.Attach="[Event Click] = [Action WhenDone(quit.Header)]"

-                                  Header="{x:Static Properties:ResourcesUI.QueueView_QuitHandBrake}"/>

+                                  Header="{x:Static Properties:Resources.QueueView_QuitHandBrake}"/>

                             </MenuItem>

                         </Menu>

                     </StackPanel>

@@ -179,21 +179,21 @@
 

                 <ListBox.ContextMenu>

                     <ContextMenu cal:Action.TargetWithoutContext="{Binding Path=PlacementTarget.Tag, RelativeSource={RelativeSource Self}}" Opened="ContextMenu_OnOpened">

-                        <MenuItem cal:Message.Attach="[Event Click] = [Action StartQueue]" Header="{x:Static Properties:ResourcesUI.QueueView_Start}" />

-                        <MenuItem cal:Message.Attach="[Event Click] = [Action PauseQueue]" Header="{x:Static Properties:ResourcesUI.QueueView_Pause}" />

+                        <MenuItem cal:Message.Attach="[Event Click] = [Action StartQueue]" Header="{x:Static Properties:Resources.QueueView_Start}" />

+                        <MenuItem cal:Message.Attach="[Event Click] = [Action PauseQueue]" Header="{x:Static Properties:Resources.QueueView_Pause}" />

                         <Separator />

-                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetFailed]" Header="{x:Static Properties:ResourcesUI.QueueView_ResetFailed}" />

-                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetSelectedJobs]" Header="{x:Static Properties:ResourcesUI.QueueView_ResetSelectedJobs}" />

-                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetAllJobs]" Header="{x:Static Properties:ResourcesUI.QueueView_ResetAllJobs}" />

+                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetFailed]" Header="{x:Static Properties:Resources.QueueView_ResetFailed}" />

+                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ResetSelectedJobs}" />

+                        <MenuItem cal:Message.Attach="[Event Click] = [Action ResetAllJobs]" Header="{x:Static Properties:Resources.QueueView_ResetAllJobs}" />

                         <Separator />

-                        <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearCompleted}" />

-                        <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearAll}" />

-                        <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearSelected}" />

+                        <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" />

+                        <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:Resources.QueueView_ClearAll}" />

+                        <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" />

                         <Separator />

-                        <MenuItem Header="{x:Static Properties:ResourcesUI.QueueView_OpenSourceDir}" x:Name="openSourceDir" Click="OpenSourceDir_OnClick" />

-                        <MenuItem Header="{x:Static Properties:ResourcesUI.QueueView_OpenDestDir}" x:Name="openDestDir" Click="OpenDestDir_OnClick" />

+                        <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenSourceDir}" x:Name="openSourceDir" Click="OpenSourceDir_OnClick" />

+                        <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenDestDir}" x:Name="openDestDir" Click="OpenDestDir_OnClick" />

                         <Separator />

-                        <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" />

+                        <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:Resources.QueueView_Export}" />

                     </ContextMenu>

                 </ListBox.ContextMenu>

 

@@ -225,27 +225,27 @@
                                         <ColumnDefinition Width="*" />

                                     </Grid.ColumnDefinitions>

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Source}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />

                                     <TextBlock Text="{Binding Task.Source}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />

                                     <TextBlock Text="{Binding Task.Destination}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />

                                     <TextBlock Text="{Binding Task, Converter={StaticResource pictureSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1"  />

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Video}" Grid.Row="3" Grid.Column="0" />

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Video}" Grid.Row="3" Grid.Column="0" />

                                     <TextBlock Text="{Binding Task, Converter={StaticResource videoOptionsTooltipConverter}}" Grid.Row="3" Grid.Column="1" TextWrapping="Wrap"  />

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Audio}"  Grid.Row="4" Grid.Column="0"/>

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Audio}"  Grid.Row="4" Grid.Column="0"/>

                                     <TextBlock Text="{Binding Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}"

                                            Grid.Row="4" Grid.Column="1"/>

 

-                                    <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:ResourcesUI.QueueView_Subtitles}" Grid.Row="5" Grid.Column="0"  />

+                                    <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:Resources.QueueView_Subtitles}" Grid.Row="5" Grid.Column="0"  />

                                     <TextBlock Text="{Binding Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}"

                                            Grid.Row="5" Grid.Column="1" />

 

-                                    <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0"  Text="{x:Static Properties:ResourcesUI.QueueView_Advanced}" />

+                                    <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0"  Text="{x:Static Properties:Resources.QueueView_Advanced}" />

                                     <TextBlock Text="{Binding Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="6" Grid.Column="1" TextWrapping="Wrap"  />

                                 </Grid>

 

@@ -332,9 +332,9 @@
                                 </StackPanel>

 

 

-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Source}" Grid.Row="1" />

+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" Grid.Row="1" />

                                 <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}"  Margin="2,0,0,0" Grid.Row="1" Grid.Column="1"/>

-                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Destination}" Grid.Row="2" />

+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" Grid.Row="2" />

                                 <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" Margin="2,0,0,0" TextTrimming="CharacterEllipsis" Grid.Row="2" Grid.Column="1" />

 

                                 <ProgressBar Minimum="0" Height="4" Maximum="100" Name="pbStatus" Margin="0,2,5,0" Grid.Row="3" Grid.ColumnSpan="2"

@@ -358,7 +358,7 @@
                                 </Grid.ColumnDefinitions>

 

                                 <Button Visibility="{Binding Status, Converter={StaticResource queueStatusVisConverter}}"

-                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Retry}"  ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}"

+                                        AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Retry}"  ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}"

                                     Grid.Row="0" Grid.Column="0" Margin="0,5,0,0">

                                     <Button.Template>

                                         <ControlTemplate>

@@ -378,7 +378,7 @@
                                 </Button>

 

                                 <Button Grid.Row="0" Grid.Column="1" Margin="10,5,0,0"

-                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Edit}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_SendJobBack}" >

+                                        AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Edit}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_SendJobBack}" >

                                     <Button.Template>

                                         <ControlTemplate>

                                             <Image Width="20" 

@@ -398,7 +398,7 @@
                                 </Button>

 

                                 <Button Grid.Row="0" Grid.Column="2" Margin="10,5,0,0"

-                                        AutomationProperties.Name="{x:Static Properties:ResourcesUI.QueueView_Delete}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}">

+                                        AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Delete}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}">

                                     <Button.Template>

                                         <ControlTemplate>

                                             <Image Width="20" 

diff --git a/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
index d17798a4b..48323b259 100644
--- a/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
+++ b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
@@ -31,7 +31,7 @@
                     <RowDefinition Height="Auto" />

                     <RowDefinition Height="Auto" />

                 </Grid.RowDefinitions>

-                <Slider Maximum="{Binding TotalPreviews}" Minimum="0" AutomationProperties.Name="{x:Static Properties:ResourcesUI.StaticPreviewView_SelectPreviewImage}"

+                <Slider Maximum="{Binding TotalPreviews}" Minimum="0" AutomationProperties.Name="{x:Static Properties:Resources.StaticPreviewView_SelectPreviewImage}"

                 Value="{Binding SelectedPreviewImage}"

                 VerticalAlignment="Center"

                 HorizontalAlignment="Stretch"

@@ -40,13 +40,13 @@
                 />

 

                 <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Left">

-                    <Button Content="{x:Static Properties:ResourcesUI.StaticPreviewView_LivePreview}" Padding="8,2" cal:Message.Attach="[Event Click] = [Action Play]" />

-                    <TextBlock Margin="10,0,5,0" VerticalAlignment="Center" Foreground="White" Text="{x:Static Properties:ResourcesUI.StaticPreviewView_Duration}" />

+                    <Button Content="{x:Static Properties:Resources.StaticPreviewView_LivePreview}" Padding="8,2" cal:Message.Attach="[Event Click] = [Action Play]" />

+                    <TextBlock Margin="10,0,5,0" VerticalAlignment="Center" Foreground="White" Text="{x:Static Properties:Resources.StaticPreviewView_Duration}" />

                     <ComboBox Width="60"

                       ItemsSource="{Binding AvailableDurations}"

                       SelectedItem="{Binding Duration}" />

 

-                    <CheckBox VerticalAlignment="Center" Content="{x:Static Properties:ResourcesUI.StaticPreviewView_UseSystemDefault}" Foreground="White" Margin="10,0,0,0" IsChecked="{Binding UseSystemDefaultPlayer}" />

+                    <CheckBox VerticalAlignment="Center" Content="{x:Static Properties:Resources.StaticPreviewView_UseSystemDefault}" Foreground="White" Margin="10,0,0,0" IsChecked="{Binding UseSystemDefaultPlayer}" />

                 </StackPanel>

 

                 <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,5,0,0">

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml
index 87ce1e7cd..10d85149c 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml
@@ -57,11 +57,11 @@
                 </Grid.ColumnDefinitions>
 
                 <!-- Subtitles -->
-                <TextBlock Text="{x:Static Properties:ResourcesUI.SubtitlesView_TrackSelectionBehaviour}"  Grid.Column="2" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                <TextBlock Text="{x:Static Properties:Resources.SubtitlesView_TrackSelectionBehaviour}"  Grid.Column="2" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
                 <ComboBox Name="autoSubtitleMode"  Grid.Column="3" Grid.Row="0" HorizontalAlignment="Left"
                           ItemsSource="{Binding SubtitleBehaviourModeList, Converter={StaticResource subtitleBehaviourConverter}}" 
                           SelectedItem="{Binding SubtitleBehaviours.SelectedBehaviour, Converter={StaticResource subtitleBehaviourConverter}}" Width="210" Margin="0,0,5,0" />
-                <TextBlock Text="{x:Static Properties:ResourcesUI.SubtitlesView_BurnInBehaviour}"  Grid.Column="2" Grid.Row="1" Margin="0,5,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                <TextBlock Text="{x:Static Properties:Resources.SubtitlesView_BurnInBehaviour}"  Grid.Column="2" Grid.Row="1" Margin="0,5,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
                 <ComboBox Name="burninBehaviour"  Grid.Column="3" Grid.Row="1" HorizontalAlignment="Left"
                           ItemsSource="{Binding SubtitleBurnInBehaviourModeList, Converter={StaticResource subtitleBurnInBehaviourConverter}}" 
                           SelectedItem="{Binding SubtitleBehaviours.SelectedBurnInBehaviour, Converter={StaticResource subtitleBurnInBehaviourConverter}}" Width="210" Margin="0,5,5,0">
@@ -69,13 +69,13 @@
                         <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Subtitles_BurnInBehaviourModes}" />
                     </ComboBox.ToolTip>
                 </ComboBox>
-                <CheckBox Content="{x:Static Properties:ResourcesUI.SubtitlesView_AddCC}"  Grid.Column="3" Grid.Row="2" Margin="0,5,0,0" 
+                <CheckBox Content="{x:Static Properties:Resources.SubtitlesView_AddCC}"  Grid.Column="3" Grid.Row="2" Margin="0,5,0,0" 
                                   HorizontalAlignment="Left" IsChecked="{Binding SubtitleBehaviours.AddClosedCaptions}"/>
-                <CheckBox Content="{x:Static Properties:ResourcesUI.SubtitlesView_AddForeignAudioSearch}"  Grid.Column="3" Grid.Row="3" Margin="0,5,0,0" 
+                <CheckBox Content="{x:Static Properties:Resources.SubtitlesView_AddForeignAudioSearch}"  Grid.Column="3" Grid.Row="3" Margin="0,5,0,0" 
                                   HorizontalAlignment="Left" IsChecked="{Binding SubtitleBehaviours.AddForeignAudioScanTrack}"/>
             </Grid>
 
-            <TextBlock Text="{x:Static Properties:ResourcesUI.Shared_ChooseLanguages}" Margin="5,15,0,0"/>
+            <TextBlock Text="{x:Static Properties:Resources.Shared_ChooseLanguages}" Margin="5,15,0,0"/>
 
             <Grid Margin="20,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -91,7 +91,7 @@
                         </Grid.ColumnDefinitions>
 
                         <StackPanel Orientation="Vertical" Grid.Column="0">
-                            <TextBlock Text="{x:Static Properties:ResourcesUI.Shared_AvailableLanguages}" Margin="0,0,0,5"/>
+                            <TextBlock Text="{x:Static Properties:Resources.Shared_AvailableLanguages}" Margin="0,0,0,5"/>
                             <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" 
                                      helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 
                                              SelectionMode="Extended" Width="140" Height="120" />
@@ -99,14 +99,14 @@
 
                         <DockPanel Grid.Column="1" Margin="10,0,10,0">
                             <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                                <Button Content="{x:Static Properties:ResourcesUI.Generic_MoveRight}"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
-                                <Button Content="{x:Static Properties:ResourcesUI.Generic_MoveLeft}"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />
-                                <Button Content="{x:Static Properties:ResourcesUI.Generic_Clear}" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
+                                <Button Content="{x:Static Properties:Resources.Generic_MoveRight}"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
+                                <Button Content="{x:Static Properties:Resources.Generic_MoveLeft}"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />
+                                <Button Content="{x:Static Properties:Resources.Generic_Clear}" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
                             </StackPanel>
                         </DockPanel>
 
                         <StackPanel Orientation="Vertical" Grid.Column="2">
-                            <TextBlock Text="{x:Static Properties:ResourcesUI.Shared_ChosenLangages}"  Margin="0,0,0,5"/>
+                            <TextBlock Text="{x:Static Properties:Resources.Shared_ChosenLangages}"  Margin="0,0,0,5"/>
                             <ListBox Name="selectedLangauges" ItemsSource="{Binding SubtitleBehaviours.SelectedLangauges}" 
                                      helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" 
                                              SelectionMode="Extended" Width="140" Height="120"
diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 3898682a5..332efb1c7 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -64,7 +64,7 @@
                     <StackPanel Orientation="Horizontal">

                         <TextBlock Margin="0,0,5,0" Padding="0"

                                    VerticalAlignment="Center"

-                                   Text="{x:Static Properties:ResourcesUI.Shared_AddTrack}" />

+                                   Text="{x:Static Properties:Resources.Shared_AddTrack}" />

 

                         <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"

                               Data="M 0 0 L 4 4 L 8 0 Z"

@@ -74,7 +74,7 @@
 

                 <Button.ContextMenu>

                     <ContextMenu x:Name="MainContextMenu" PlacementRectangle="{Binding RelativeSource={RelativeSource Self}}">

-                        <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />

+                        <MenuItem Header="{x:Static Properties:Resources.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />

                         <MenuItem Header="Add All Remaining Tracks" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />

                         <MenuItem Header="Add All Remaining Closed Captions" cal:Message.Attach="[Event Click] = [Action AddAllClosedCaptions]" />

                         <MenuItem Header="Add All Remaining Selected Languages" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />

@@ -84,12 +84,12 @@
 

             <Button MinWidth="75" Grid.Column="1"

                     cal:Message.Attach="[Event Click] = [Action Import]"

-                    Content="{x:Static Properties:ResourcesUI.SubtitlesView_ImportSRT}"

+                    Content="{x:Static Properties:Resources.SubtitlesView_ImportSRT}"

                     Margin="0,0,10,0"/>

             <Button MinWidth="65" Grid.Column="2"

                     Margin="0,0,10,0"

                     cal:Message.Attach="[Event Click] = [Action Clear]"

-                    Content="{x:Static Properties:ResourcesUI.Generic_Clear}" />

+                    Content="{x:Static Properties:Resources.Generic_Clear}" />

 

             <Button MinWidth="65" Grid.Column="4"

                     Margin="0,0,10,0"

@@ -98,7 +98,7 @@
 

             <Button MinWidth="65" Grid.Column="5"

                     cal:Message.Attach="[Event Click] = [Action ReloadDefaults]"

-                    Content="{x:Static Properties:ResourcesUI.Shared_ReloadDefaults}" />

+                    Content="{x:Static Properties:Resources.Shared_ReloadDefaults}" />

         </Grid>

 

 

@@ -120,14 +120,14 @@
 

             <ListBox.ContextMenu>

                 <ContextMenu>

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddAllRemaining}" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.SubtitleView_AddAllCC}" cal:Message.Attach="[Event Click] = [Action AddAllClosedCaptions]" />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddAllForSelected}" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />    

+                    <MenuItem Header="{x:Static Properties:Resources.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />

+                    <MenuItem Header="{x:Static Properties:Resources.Shared_AddAllRemaining}" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />

+                    <MenuItem Header="{x:Static Properties:Resources.SubtitleView_AddAllCC}" cal:Message.Attach="[Event Click] = [Action AddAllClosedCaptions]" />

+                    <MenuItem Header="{x:Static Properties:Resources.Shared_AddAllForSelected}" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />    

                     <Separator />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Clear}" cal:Message.Attach="[Event Click] = [Action Clear]" />

+                    <MenuItem Header="{x:Static Properties:Resources.Generic_Clear}" cal:Message.Attach="[Event Click] = [Action Clear]" />

                     <Separator />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_ConfigureDefaultBehaviours}" cal:Message.Attach="[Event Click] = [Action ShowSubtitleDefaultsPanel]" />

+                    <MenuItem Header="{x:Static Properties:Resources.Shared_ConfigureDefaultBehaviours}" cal:Message.Attach="[Event Click] = [Action ShowSubtitleDefaultsPanel]" />

                 </ContextMenu>

             </ListBox.ContextMenu>

 

diff --git a/win/CS/HandBrakeWPF/Views/SummaryView.xaml b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
index 022c82d1a..43c407654 100644
--- a/win/CS/HandBrakeWPF/Views/SummaryView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
@@ -55,24 +55,24 @@
             </Grid.Resources>
 
 
-            <TextBlock Text="{x:Static Properties:ResourcesUI.MainView_Format}" FontWeight="Bold" Grid.Row="0" VerticalAlignment="Center" />
+            <TextBlock Text="{x:Static Properties:Resources.MainView_Format}" FontWeight="Bold" Grid.Row="0" VerticalAlignment="Center" />
             <ComboBox Name="Container" Width="100" HorizontalAlignment="Left"  Grid.Row="0" Grid.Column="1"
                               ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Mux}" VerticalAlignment="Center"
                               ItemsSource="{Binding OutputFormats, Converter={StaticResource enumComboConverter}}"
                               SelectedItem="{Binding SelectedOutputFormat, Converter={StaticResource enumComboConverter}}" 
-                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_Format}" />
+                              AutomationProperties.Name="{x:Static Properties:Resources.MainView_Format}" />
             <CheckBox Name="WebOptimized" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"
-                              Content="{x:Static Properties:ResourcesUI.MainView_WebOptimized}"
+                              Content="{x:Static Properties:Resources.MainView_WebOptimized}"
                               IsChecked="{Binding Path=OptimizeMP4}"
                               ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Optimise}"
                               Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
             <CheckBox Name="AlignAVStart" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"
-                              Content="{x:Static Properties:ResourcesUI.MainView_AlignAVStart}"
+                              Content="{x:Static Properties:Resources.MainView_AlignAVStart}"
                               ToolTip="{x:Static Properties:ResourcesTooltips.MainView_AlignAVStart}"
                               IsChecked="{Binding Path=AlignAVStart}"
                               Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
             <CheckBox Name="iPod5G" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"
-                              Content="{x:Static Properties:ResourcesUI.MainView_iPod5G}"
+                              Content="{x:Static Properties:Resources.MainView_iPod5G}"
                               ToolTip="{x:Static Properties:ResourcesTooltips.MainView_IpodAtom}"
                               IsChecked="{Binding Path=IPod5GSupport}"
                               Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter},  ConverterParameter=true}" />
diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index c5e256fbc..92ab11d65 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -37,12 +37,12 @@
 

             <StackPanel Orientation="Vertical" Grid.Column="0" >

 

-                <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Video}" FontWeight="Bold" Margin="0,0,0,10"/>

+                <TextBlock Text="{x:Static Properties:Resources.VideoView_Video}" FontWeight="Bold" Margin="0,0,0,10"/>

 

                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Codec}" Width="100" />

+                    <TextBlock Text="{x:Static Properties:Resources.VideoView_Codec}" Width="100" />

 

-                    <ComboBox Width="120" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Encoders}" AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_Codec}" >

+                    <ComboBox Width="120" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Encoders}" AutomationProperties.Name="{x:Static Properties:Resources.VideoView_Codec}" >

                         <ComboBox.SelectedItem>

                             <MultiBinding Converter="{StaticResource videoEncoderConverter}">

                                 <Binding Path="SelectedVideoEncoder" />

@@ -60,17 +60,17 @@
                 </StackPanel>

 

                 <StackPanel Orientation="Horizontal">

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Framerate}" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>

+                    <TextBlock Text="{x:Static Properties:Resources.VideoView_Framerate}" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>

                     <StackPanel Orientation="Vertical">

                         <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Framerate}"

-                                  AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_Framerate}" />

+                                  AutomationProperties.Name="{x:Static Properties:Resources.VideoView_Framerate}" />

 

                         <StackPanel Orientation="Vertical" >

-                            <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantFramerate}" IsChecked="{Binding IsConstantFramerate}" Margin="0,5,0,0"

+                            <RadioButton Content="{x:Static Properties:Resources.VideoView_ConstantFramerate}" IsChecked="{Binding IsConstantFramerate}" Margin="0,5,0,0"

                                          ToolTip="{x:Static Properties:ResourcesTooltips.Video_ConstantFramerate}" />

-                            <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_VariableFramerate}" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" 

+                            <RadioButton Content="{x:Static Properties:Resources.VideoView_VariableFramerate}" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" 

                                      Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_VariableFramerate}"  />

-                            <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_PeakFramerate}" IsChecked="{Binding IsPeakFramerate}" Margin="0,5,0,0"

+                            <RadioButton Content="{x:Static Properties:Resources.VideoView_PeakFramerate}" IsChecked="{Binding IsPeakFramerate}" Margin="0,5,0,0"

                                      Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_PeakFramerate}"  />

                         </StackPanel>

                     </StackPanel>

@@ -81,7 +81,7 @@
                 <TextBlock Text="Quality" FontWeight="Bold" Margin="0,0,0,10"/>

 

                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >

-                    <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantQuality}" IsChecked="{Binding IsConstantQuantity}"  Margin="0,0,10,0"

+                    <RadioButton Content="{x:Static Properties:Resources.VideoView_ConstantQuality}" IsChecked="{Binding IsConstantQuantity}"  Margin="0,0,10,0"

                                  ToolTip="{x:Static Properties:ResourcesTooltips.Video_Quality}" />

                     <TextBlock Text="{Binding DisplayRF}" MinWidth="30" />

                     <TextBlock Text="{Binding Rfqp}" FontWeight="Bold" Margin="5,0,0,0" />

@@ -105,16 +105,16 @@
                 </Grid>

 

                 <StackPanel Orientation="Horizontal" Margin="0,0,0,6">

-                    <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_AverageBitrate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_AvgBitrate}" 

+                    <RadioButton Content="{x:Static Properties:Resources.VideoView_AverageBitrate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_AvgBitrate}" 

                                  IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>

                     <TextBox Width="75" Text="{Binding VideoBitrate, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"

-                             ToolTip="{x:Static Properties:ResourcesTooltips.Video_AvgBitrate}" AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_AverageBitrate}"  />

+                             ToolTip="{x:Static Properties:ResourcesTooltips.Video_AvgBitrate}" AutomationProperties.Name="{x:Static Properties:Resources.VideoView_AverageBitrate}"  />

                 </StackPanel>

 

                 <StackPanel Orientation="Horizontal" Margin="30,0,0,0" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">

-                    <CheckBox Content="{x:Static Properties:ResourcesUI.VideoView_2Pass}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"

+                    <CheckBox Content="{x:Static Properties:Resources.VideoView_2Pass}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"

                               IsChecked="{Binding TwoPass}" Margin="0,0,10,0" ToolTip="{x:Static Properties:ResourcesTooltips.Video_TwoPass}"  />

-                    <CheckBox Content="{x:Static Properties:ResourcesUI.VideoView_TurboFirstPass}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"

+                    <CheckBox Content="{x:Static Properties:Resources.VideoView_TurboFirstPass}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"

                               IsChecked="{Binding TurboFirstPass}" Visibility="{Binding DisplayTurboFirstPass, Converter={StaticResource boolToVisConverter}}"

                               ToolTip="{x:Static Properties:ResourcesTooltips.Video_TurboFirstPass}" />

                 </StackPanel>

@@ -129,9 +129,9 @@
                     <RowDefinition Height="*" />

                 </Grid.RowDefinitions>

 

-                <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_OptimiseVideo}" Margin="0,0,0,0" Grid.Row="0"  Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />

+                <TextBlock Text="{x:Static Properties:Resources.VideoView_OptimiseVideo}" Margin="0,0,0,0" Grid.Row="0"  Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />

 

-                <CheckBox Content="{x:Static Properties:ResourcesUI.VideoView_UseAdvancedTab}" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" Margin="0,5,0,0"

+                <CheckBox Content="{x:Static Properties:Resources.VideoView_UseAdvancedTab}" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" Margin="0,5,0,0"

                           Visibility="{Binding IsAdvancedTabOptionEnabled, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"

                           ToolTip="{x:Static Properties:ResourcesTooltips.Video_AdvancedOptions}" />

 

@@ -153,7 +153,7 @@
                     </Grid.ColumnDefinitions>

 

                     <!-- Row 1 -->

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderPreset}" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}" />

+                    <TextBlock Text="{x:Static Properties:Resources.VideoView_EncoderPreset}" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}" />

                     <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}">

                         <Slider Minimum="0" Maximum="{Binding VideoPresetMaxValue}" Width="150" Value="{Binding VideoPresetValue, Mode=Default, UpdateSourceTrigger=PropertyChanged}" 

                             IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Presets}" 

@@ -161,33 +161,33 @@
                         <TextBlock Text="{Binding VideoPreset.DisplayName}" Margin="5,0,0,0" />

                     </StackPanel>

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncodeTune}" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,5,0,0"

+                    <TextBlock Text="{x:Static Properties:Resources.VideoView_EncodeTune}" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,5,0,0"

                                Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>

-                    <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" Height="22" AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_EncodeTune}"

+                    <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" Height="22" AutomationProperties.Name="{x:Static Properties:Resources.VideoView_EncodeTune}"

                               ItemsSource="{Binding VideoTunes}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoTune}"

                               ToolTip="{x:Static Properties:ResourcesTooltips.Video_EncoderTune}"  Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"

                               Style="{StaticResource LongToolTipHolder}" />

-                    <CheckBox IsChecked="{Binding FastDecode}" Content="{x:Static Properties:ResourcesUI.VideoView_FastDecode}" Grid.Row="2" Grid.Column="2" Margin="10,5,10,0" VerticalAlignment="Center" VerticalContentAlignment="Center"

+                    <CheckBox IsChecked="{Binding FastDecode}" Content="{x:Static Properties:Resources.VideoView_FastDecode}" Grid.Row="2" Grid.Column="2" Margin="10,5,10,0" VerticalAlignment="Center" VerticalContentAlignment="Center"

                               ToolTip="{x:Static Properties:ResourcesTooltips.Video_FastDecode}"  Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>

 

           

                     <!-- Row 2-->

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderProfile}" Grid.Row="3" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"/>

+                    <TextBlock Text="{x:Static Properties:Resources.VideoView_EncoderProfile}" Grid.Row="3" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"/>

                     <ComboBox Width="100" Grid.Row="3" Grid.Column="1" Margin="5,5,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"

                           ItemsSource="{Binding VideoProfiles}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoProfile}"

                           Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Profile}"

-                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_EncoderProfile}" />

+                              AutomationProperties.Name="{x:Static Properties:Resources.VideoView_EncoderProfile}" />

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderLevel}" Grid.Row="3" Grid.Column="2" Margin="10,5,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}" />

+                    <TextBlock Text="{x:Static Properties:Resources.VideoView_EncoderLevel}" Grid.Row="3" Grid.Column="2" Margin="10,5,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}" />

                     <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,5,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}"

                           ItemsSource="{Binding VideoLevels}"  DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoLevel}"

                           Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Level}"

-                              AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_EncoderLevel}" />

+                              AutomationProperties.Name="{x:Static Properties:Resources.VideoView_EncoderLevel}" />

 

                     <!-- Row 3 -->

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_ExtraOptions}" Grid.Row="4" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />

+                    <TextBlock Text="{x:Static Properties:Resources.VideoView_ExtraOptions}" Grid.Row="4" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />

                     <TextBox Text="{Binding ExtraArguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" TextWrapping="WrapWithOverflow"

-                             AutomationProperties.Name="{x:Static Properties:ResourcesUI.VideoView_ExtraOptions}" 

+                             AutomationProperties.Name="{x:Static Properties:Resources.VideoView_ExtraOptions}" 

                              MaxLines="4" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="4" Margin="5,5,5,2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Stretch"

                              ToolTip="{Binding FullOptionsTooltip}" Style="{StaticResource LongToolTipHolder}" >

                         <TextBox.ContextMenu>