15 files changed, 650 insertions, 323 deletions
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 10bddbeb6..6304e107d 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -159,6 +159,11 @@
     <Compile Include="Model\Subtitles\SubtitleBurnInBehaviourModes.cs" />
     <Compile Include="Model\Subtitles\SubtitleBehaviourModes.cs" />
     <Compile Include="Model\Subtitles\SubtitleBehaviours.cs" />
+    <Compile Include="Properties\ResourcesTooltips.Designer.cs">
+      <DependentUpon>ResourcesTooltips.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="Properties\ResourcesUI.Designer.cs">
       <DependentUpon>ResourcesUI.resx</DependentUpon>
       <AutoGen>True</AutoGen>
@@ -359,6 +364,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="Properties\ResourcesTooltips.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>ResourcesTooltips.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\ResourcesUI.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>ResourcesUI.Designer.cs</LastGenOutput>
diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
new file mode 100644
index 000000000..a97cb693e
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="QueueView_DeleteJob" xml:space="preserve">
+    <value>Delete the job from the queue.</value>
+  </data>
+  <data name="QueueView_ResetJobStatus" xml:space="preserve">
+    <value>Reset job status to Waiting.</value>
+  </data>
+  <data name="QueueView_SendJobBack" xml:space="preserve">
+    <value>Send the job back to the main window for editing.</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index b780ecbb5..11b8d5ea5 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -297,4 +297,355 @@
   <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
     <value>Update Selected Preset</value>
   </data>
+  <data name="Shared_AddAllForSelected" xml:space="preserve">
+    <value>Add All Remaining Selected Languages</value>
+  </data>
+  <data name="Shared_AddAllRemaining" xml:space="preserve">
+    <value>Add All Remaining Tracks</value>
+  </data>
+  <data name="Shared_AddNewTrack" xml:space="preserve">
+    <value>Add New Track</value>
+  </data>
+  <data name="Shared_AddTrack" xml:space="preserve">
+    <value>Add Track</value>
+  </data>
+  <data name="AudioView_AllowPassThruOf" xml:space="preserve">
+    <value>Allow passthru of:</value>
+  </data>
+  <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
+    <value>'Auto Passthru' Behaviour:</value>
+  </data>
+  <data name="Shared_AvailableLanguages" xml:space="preserve">
+    <value>Available Languages:</value>
+  </data>
+  <data name="AudioView_Bitrate" xml:space="preserve">
+    <value>Bitrate</value>
+  </data>
+  <data name="Shared_ChooseLanguages" xml:space="preserve">
+    <value>Choose Languages:</value>
+  </data>
+  <data name="Shared_ChosenLangages" xml:space="preserve">
+    <value>Chosen Languages:</value>
+  </data>
+  <data name="AudioView_Codec" xml:space="preserve">
+    <value>Codec</value>
+  </data>
+  <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
+    <value>Configure Default Behaviours</value>
+  </data>
+  <data name="AudioView_DRC" xml:space="preserve">
+    <value>DRC</value>
+  </data>
+  <data name="AudioView_Gain" xml:space="preserve">
+    <value>Gain</value>
+  </data>
+  <data name="AudioView_Hide" xml:space="preserve">
+    <value>Hide</value>
+  </data>
+  <data name="AudioView_Mixdown" xml:space="preserve">
+    <value>Mixdown</value>
+  </data>
+  <data name="Generic_MoveLeft" xml:space="preserve">
+    <value>Move Left</value>
+  </data>
+  <data name="Generic_MoveRight" xml:space="preserve">
+    <value>Move Right</value>
+  </data>
+  <data name="AudioView_OtherwiseFallbackEncoder" xml:space="preserve">
+    <value>Otherwise use fallback encoder:</value>
+  </data>
+  <data name="AudioView_ReloadDefaults" xml:space="preserve">
+    <value>Reload Defaults</value>
+  </data>
+  <data name="AudioView_Samplerate" xml:space="preserve">
+    <value>Samplerate</value>
+  </data>
+  <data name="AudioView_Show" xml:space="preserve">
+    <value>Show</value>
+  </data>
+  <data name="AudioView_TrackName" xml:space="preserve">
+    <value>Track Name:</value>
+  </data>
+  <data name="AudioView_TrackSelectionBehaviour" xml:space="preserve">
+    <value>Track Selection Behaviour:</value>
+  </data>
+  <data name="AudioView_TrackSettingDefaultBehaviour" xml:space="preserve">
+    <value>Track Setting Default Behaviour:</value>
+  </data>
+  <data name="AudioView_WhenAutoPassthru" xml:space="preserve">
+    <value>When 'Auto Passthru' is selected as the audio codec.</value>
+  </data>
+  <data name="CountdownAlterView_CancelAction" xml:space="preserve">
+    <value>Cancel Action</value>
+  </data>
+  <data name="CountdownAlterView_Proceed" xml:space="preserve">
+    <value>Proceed</value>
+  </data>
+  <data name="CountdownAlterView_WhenDoneAction" xml:space="preserve">
+    <value>When Done Action</value>
+  </data>
+  <data name="ErrorView_ErrorDetails" xml:space="preserve">
+    <value>Error Details:</value>
+  </data>
+  <data name="FiltersView_Custom" xml:space="preserve">
+    <value>Custom:</value>
+  </data>
+  <data name="FiltersView_Deblock" xml:space="preserve">
+    <value>Deblock</value>
+  </data>
+  <data name="FiltersView_Decomb" xml:space="preserve">
+    <value>Decomb</value>
+  </data>
+  <data name="FiltersView_Deinterlace" xml:space="preserve">
+    <value>Deinterlace</value>
+  </data>
+  <data name="FiltersView_Denoise" xml:space="preserve">
+    <value>Denoise:</value>
+  </data>
+  <data name="FiltersView_Detelecine" xml:space="preserve">
+    <value>Detelecine:</value>
+  </data>
+  <data name="FiltersView_Filters" xml:space="preserve">
+    <value>Filters</value>
+  </data>
+  <data name="FiltersView_Grayscale" xml:space="preserve">
+    <value>Grayscale</value>
+  </data>
+  <data name="FiltersView_Preset" xml:space="preserve">
+    <value>Preset:</value>
+  </data>
+  <data name="FiltersView_Tune" xml:space="preserve">
+    <value>Tune:</value>
+  </data>
+  <data name="Generic_Clear" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+  <data name="Generic_Close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="Generic_CopyToClipboard" xml:space="preserve">
+    <value>Copy to Clipboard</value>
+  </data>
+  <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+    <value>Anamorphic:</value>
+  </data>
+  <data name="PictureSettingsView_Automatic" xml:space="preserve">
+    <value>Automatic</value>
+  </data>
+  <data name="PictureSettingsView_Bottom" xml:space="preserve">
+    <value>Bottom</value>
+  </data>
+  <data name="PictureSettingsView_Cropping" xml:space="preserve">
+    <value>Cropping</value>
+  </data>
+  <data name="PictureSettingsView_Custom" xml:space="preserve">
+    <value>Custom</value>
+  </data>
+  <data name="PictureSettingsView_DisplayWitdh" xml:space="preserve">
+    <value>Display Width:</value>
+  </data>
+  <data name="PictureSettingsView_Height" xml:space="preserve">
+    <value>Height:</value>
+  </data>
+  <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+    <value>Keep Aspect Ratio</value>
+  </data>
+  <data name="PictureSettingsView_Left" xml:space="preserve">
+    <value>Left</value>
+  </data>
+  <data name="PictureSettingsView_Modulus" xml:space="preserve">
+    <value>Modulus:</value>
+  </data>
+  <data name="PictureSettingsView_Output" xml:space="preserve">
+    <value>Output</value>
+  </data>
+  <data name="PictureSettingsView_ParH" xml:space="preserve">
+    <value>PAR Height:</value>
+  </data>
+  <data name="PictureSettingsView_ParW" xml:space="preserve">
+    <value>PAR Width:</value>
+  </data>
+  <data name="PictureSettingsView_Right" xml:space="preserve">
+    <value>Right</value>
+  </data>
+  <data name="PictureSettingsView_Size" xml:space="preserve">
+    <value>Size</value>
+  </data>
+  <data name="PictureSettingsView_Source" xml:space="preserve">
+    <value>Source:</value>
+  </data>
+  <data name="PictureSettingsView_Top" xml:space="preserve">
+    <value>Top</value>
+  </data>
+  <data name="PictureSettingsView_Width" xml:space="preserve">
+    <value>Width:</value>
+  </data>
+  <data name="QueueSelectionView_ChooseTitles" xml:space="preserve">
+    <value>Choose titles:</value>
+  </data>
+  <data name="QueueSelectionView_Title" xml:space="preserve">
+    <value>Add to Queue</value>
+  </data>
+  <data name="QueueView_Advanced" xml:space="preserve">
+    <value>Advanced:</value>
+  </data>
+  <data name="QueueView_Audio" xml:space="preserve">
+    <value>Audio:</value>
+  </data>
+  <data name="QueueView_ClearAll" xml:space="preserve">
+    <value>Clear All</value>
+  </data>
+  <data name="QueueView_ClearCompleted" xml:space="preserve">
+    <value>Clear Completed</value>
+  </data>
+  <data name="QueueView_ClearQueue" xml:space="preserve">
+    <value>Clear Queue</value>
+  </data>
+  <data name="QueueView_ClearSelected" xml:space="preserve">
+    <value>Clear Selected</value>
+  </data>
+  <data name="QueueView_Destination" xml:space="preserve">
+    <value>Destination: </value>
+  </data>
+  <data name="QueueView_DoNothing" xml:space="preserve">
+    <value>Do nothing</value>
+  </data>
+  <data name="QueueView_Export" xml:space="preserve">
+    <value>Export Queue</value>
+  </data>
+  <data name="QueueView_Hibernate" xml:space="preserve">
+    <value>Hibernate</value>
+  </data>
+  <data name="QueueView_Import" xml:space="preserve">
+    <value>Import Queue</value>
+  </data>
+  <data name="QueueView_LockSystem" xml:space="preserve">
+    <value>Lock System</value>
+  </data>
+  <data name="QueueView_Logoff" xml:space="preserve">
+    <value>Log off</value>
+  </data>
+  <data name="QueueView_Options" xml:space="preserve">
+    <value>Options</value>
+  </data>
+  <data name="QueueView_Pause" xml:space="preserve">
+    <value>Pause</value>
+  </data>
+  <data name="QueueView_PictureSettings" xml:space="preserve">
+    <value>Picture Settings:</value>
+  </data>
+  <data name="QueueView_QuitHandBrake" xml:space="preserve">
+    <value>Quit HandBrake</value>
+  </data>
+  <data name="QueueView_Shutdown" xml:space="preserve">
+    <value>Shutdown</value>
+  </data>
+  <data name="QueueView_Source" xml:space="preserve">
+    <value>Source: </value>
+  </data>
+  <data name="QueueView_Start" xml:space="preserve">
+    <value>Start</value>
+  </data>
+  <data name="QueueView_Subtitles" xml:space="preserve">
+    <value>Subtitles:</value>
+  </data>
+  <data name="QueueView_Suspend" xml:space="preserve">
+    <value>Suspend</value>
+  </data>
+  <data name="QueueView_Video" xml:space="preserve">
+    <value>Video:</value>
+  </data>
+  <data name="QueueView_WhenDone" xml:space="preserve">
+    <value>When Done::</value>
+  </data>
+  <data name="StaticPreviewView_Duration" xml:space="preserve">
+    <value>Duration:</value>
+  </data>
+  <data name="StaticPreviewView_LivePreview" xml:space="preserve">
+    <value>Live Preview</value>
+  </data>
+  <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
+    <value>Use system default player</value>
+  </data>
+  <data name="SubtitlesView_AddCC" xml:space="preserve">
+    <value>Add Closed Captions when available</value>
+  </data>
+  <data name="SubtitlesView_AddForeignAudioSearch" xml:space="preserve">
+    <value>Add 'Foreign Audio Scan'</value>
+  </data>
+  <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
+    <value>Burn-In Behaviour:</value>
+  </data>
+  <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
+    <value>Track Selection Behaviour:</value>
+  </data>
+  <data name="Shared_ReloadDefaults" xml:space="preserve">
+    <value>Reload Defaults</value>
+  </data>
+  <data name="SubtitlesView_ImportSRT" xml:space="preserve">
+    <value>Import SRT</value>
+  </data>
+  <data name="SubtitleView_AddAllCC" xml:space="preserve">
+    <value>Add All Remaining Closed Captions</value>
+  </data>
+  <data name="VideoView_2Pass" xml:space="preserve">
+    <value>2-Pass Encoding</value>
+  </data>
+  <data name="VideoView_AverageBitrate" xml:space="preserve">
+    <value>Avg Bitrate (kbps):</value>
+  </data>
+  <data name="VideoView_Codec" xml:space="preserve">
+    <value>Video Codec:</value>
+  </data>
+  <data name="VideoView_ConstantFramerate" xml:space="preserve">
+    <value>Constant Framerate</value>
+  </data>
+  <data name="VideoView_ConstantQuality" xml:space="preserve">
+    <value>Constant Quality:</value>
+  </data>
+  <data name="VideoView_EncoderLevel" xml:space="preserve">
+    <value>Encoder Level</value>
+  </data>
+  <data name="VideoView_EncoderPreset" xml:space="preserve">
+    <value>Encoder Preset:</value>
+  </data>
+  <data name="VideoView_EncoderProfile" xml:space="preserve">
+    <value>Encoder Profile:</value>
+  </data>
+  <data name="VideoView_EncodeTune" xml:space="preserve">
+    <value>Encoder Tune:</value>
+  </data>
+  <data name="VideoView_ExtraOptions" xml:space="preserve">
+    <value>Extra Options:</value>
+  </data>
+  <data name="VideoView_FastDecode" xml:space="preserve">
+    <value>Fast Decode</value>
+  </data>
+  <data name="VideoView_Framerate" xml:space="preserve">
+    <value>Framerate (FPS):</value>
+  </data>
+  <data name="VideoView_OptimiseVideo" xml:space="preserve">
+    <value>Optimise Video:</value>
+  </data>
+  <data name="VideoView_PeakFramerate" xml:space="preserve">
+    <value>Peak Framerate</value>
+  </data>
+  <data name="VideoView_Quality" xml:space="preserve">
+    <value>Quality</value>
+  </data>
+  <data name="VideoView_SameAsSource" xml:space="preserve">
+    <value>Same as source</value>
+  </data>
+  <data name="VideoView_TurboFirstPass" xml:space="preserve">
+    <value>Turbo first pass</value>
+  </data>
+  <data name="VideoView_UseAdvancedTab" xml:space="preserve">
+    <value>Use Advanced Tab instead</value>
+  </data>
+  <data name="VideoView_VariableFramerate" xml:space="preserve">
+    <value>Variable Framerate</value>
+  </data>
+  <data name="VideoView_Video" xml:space="preserve">
+    <value>Video</value>
+  </data>
 </root>
 \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index 01fc3f2d0..0b0358251 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -34,7 +34,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.MainView_AudioTab}" />
+                    <TextBlock Margin="0,0,5,0" FontSize="16" FontFamily="Segoe UI Light" Text="{x:Static Properties:ResourcesUI.AboutView_Version}" />
                     <TextBlock Margin="0,0,0,1" FontSize="16" FontFamily="Segoe UI Light" VerticalAlignment="Bottom" Text="{Binding Version}" />
                 </StackPanel>
 
diff --git a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
deleted file mode 100644
index 876485d26..000000000
--- a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
+++ /dev/null
@@ -1,163 +0,0 @@
-<UserControl x:Class="HandBrakeWPF.Views.AudioDefaultsView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"
-             xmlns:cal="http://www.caliburnproject.org"
-             xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"
-             d:DesignHeight="400"
-             d:DesignWidth="720"
-             Width="600"
-             Height="360"
-             mc:Ignorable="d"
-             Background="{Binding Path=Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
-             BorderThickness="1" BorderBrush="DarkGray"
-             x:Name="audioTab">
-
-    <UserControl.Resources>
-        <Conveters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
-        <Audio:AudioEncoderConverter x:Key="audioEncoderConverter" />
-        <Audio:AudioBehaviourConverter x:Key="audioBehaviourConverter" />
-    </UserControl.Resources>
-
-    <Grid >
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-
-
-        <!-- Row 0 -->
-        <TextBlock Grid.Row="0"
-                   Margin="10,5,0,0"
-                   FontWeight="Bold"
-                   VerticalAlignment="Top"
-                   Text="AudioDefaults" />
-
-        <!-- Row 2 -->
-        <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="10,0,10,0"
-              Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
-
-            <Grid Margin="5,0,0,0" >
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <!-- Audio -->
-                <TextBlock Text="Track Selection Behaviour:" Grid.Column="0" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left"  VerticalAlignment="Center" />
-                <ComboBox Name="autoAudioMode" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left"
-                          ItemsSource="{Binding AudioBehaviourModeList, Converter={StaticResource audioBehaviourConverter}}" 
-                          SelectedItem="{Binding AudioBehaviours.SelectedBehaviour, Converter={StaticResource audioBehaviourConverter}}" Width="210" Margin="0,0,5,0" />
-            </Grid>
-
-            <TextBlock Text="Choose Languages:" Margin="5,10,0,0" />
-
-            <Grid Margin="20,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <StackPanel Orientation="Horizontal">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <StackPanel Orientation="Vertical" Grid.Column="0">
-                            <TextBlock Text="Available Languages:" Margin="0,0,0,5"/>
-                            <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" 
-                                     helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 
-                                             SelectionMode="Extended" Width="140" Height="120" />
-                        </StackPanel>
-
-                        <DockPanel Grid.Column="1" Margin="10,0,10,0">
-                            <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                                <Button Content="Move Right"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
-                                <Button Content="Move Left"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />
-                                <Button Content="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="Chosen Languages:"  Margin="0,0,0,5"/>
-                            <ListBox Name="selectedLangauges" ItemsSource="{Binding AudioBehaviours.SelectedLangauges}" 
-                                     helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" 
-                                             SelectionMode="Extended" Width="140" Height="120"
-                                             dd:DragDrop.DropHandler="{Binding}"
-                                             dd:DragDrop.IsDragSource="True"
-                                             dd:DragDrop.IsDropTarget="True"/>
-                        </StackPanel>
-                    </Grid>
-                </StackPanel>
-            </Grid>
-
-            <TextBlock Text="'Auto Passthru' Behaviour:" FontWeight="Bold" Margin="0,10,0,5" />
-            <StackPanel Margin="10,5,0,0"
-                        Orientation="Vertical">
-                <TextBlock Margin="5,0,5,0" Text="When 'Auto Passthru' is selected as the audio codec." VerticalAlignment="Center" />
-                <TextBlock Margin="5,0,5,0" Text="Allow passthru of:" VerticalAlignment="Center" />
-            </StackPanel>
-            <StackPanel Margin="15,5,0,0"
-                        Orientation="Horizontal">
-                <CheckBox Margin="0,0,5,0"
-                          Content="MP3" VerticalAlignment="Center"    
-                          IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowMP3Pass}" />
-                <CheckBox Margin="0,0,5,0"
-                          Content="AAC" VerticalAlignment="Center"
-                          IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAACPass}" />
-                <CheckBox Margin="0,0,5,0"
-                          Content="AC3" VerticalAlignment="Center"
-                          IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAC3Pass}" />
-                <CheckBox Margin="0,0,5,0"
-                          Content="DTS" VerticalAlignment="Center"
-                          IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSPass}" />
-                <CheckBox Margin="0,0,5,0"
-                          Content="DTSHD" VerticalAlignment="Center"
-                          IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSHDPass}" />
-                
-                <TextBlock Margin="15,0,5,0" Text="Otherwise use fallback encoder:" />
-
-                <ComboBox VerticalAlignment="Center" Width="120" Height="22" Margin="10,0,5,0">
-                    <ComboBox.SelectedItem>
-                        <MultiBinding Converter="{StaticResource audioEncoderConverter}">
-                            <Binding Path="Task.AllowedPassthruOptions.AudioEncoderFallback" />
-                        </MultiBinding>
-                    </ComboBox.SelectedItem>
-                    <ComboBox.ItemsSource>
-                        <MultiBinding Converter="{StaticResource audioEncoderConverter}" ConverterParameter="True">
-                            <Binding Path="DataContext.AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
-                            <Binding Path="DataContext.Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
-                        </MultiBinding>
-                    </ComboBox.ItemsSource>
-                </ComboBox>
-
-            </StackPanel>
-
-        </StackPanel>
-
-        <Button Content="Done" cal:Message.Attach="[Event Click] = [Action Close]" Grid.Row="3" HorizontalAlignment="Center" 
-                Margin="0,5,0,5" Padding="8,2" />
-    </Grid>
-</UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 1901069a8..af270a557 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -11,6 +11,7 @@
              xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"
              xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
              xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
              d:DesignHeight="800"
              d:DesignWidth="750"
              mc:Ignorable="d"
@@ -70,19 +71,19 @@
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                
-                <splitButton:SplitMenuButton Content="Add Track" cal:Message.Attach="[Event Click] = [Action Add]"  FontWeight="Bold" Margin="0,0,10,0" Grid.Column="0">
+
+                <splitButton:SplitMenuButton Content="{x:Static Properties:ResourcesUI.Shared_AddTrack}" cal:Message.Attach="[Event Click] = [Action Add]"  FontWeight="Bold" Margin="0,0,10,0" Grid.Column="0">
                     <splitButton:SplitMenuButton.ItemSource>
-                        <MenuItem Header="Add New Track" 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 Selected Languages" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />
+                        <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]" />
                     </splitButton:SplitMenuButton.ItemSource>
                 </splitButton:SplitMenuButton>
 
                 <Button MinWidth="65" Grid.Column="1"
                     Margin="0,0,10,0"
                     cal:Message.Attach="[Event Click] = [Action Clear]"
-                    Content="Clear" />
+                    Content="{x:Static Properties:ResourcesUI.Generic_Clear}" />
 
                 <Button MinWidth="65" Grid.Column="3"
                     Margin="0,0,10,0"
@@ -91,7 +92,7 @@
 
                 <Button MinWidth="65" Grid.Column="4"
                     cal:Message.Attach="[Event Click] = [Action ReloadDefaults]"
-                    Content="Reload Defaults" />
+                    Content="{x:Static Properties:ResourcesUI.AudioView_ReloadDefaults}" />
 
 
             </Grid>
@@ -99,7 +100,7 @@
 
         <!-- Row 2 -->
 
-        <ListBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Stretch" Grid.RowSpan="1"
+        <ListBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Stretch" 
                  Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"
                  Margin="10,10,10,10"
                  dd:DragDrop.DropHandler="{Binding}"
@@ -117,13 +118,13 @@
 
             <ListBox.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="Add New Track" 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 Selected Languages" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />
+                    <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]" />
                     <Separator />
-                    <MenuItem Header="Clear All" cal:Message.Attach="[Event Click] = [Action Clear]" />
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Clear}" cal:Message.Attach="[Event Click] = [Action Clear]" />
                     <Separator />
-                    <MenuItem Header="Configure Default Behaviours" cal:Message.Attach="[Event Click] = [Action SetDefaultBehaviour]" />
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_ConfigureDefaultBehaviours}" cal:Message.Attach="[Event Click] = [Action SetDefaultBehaviour]" />
                 </ContextMenu>
             </ListBox.ContextMenu>
 
@@ -173,7 +174,7 @@
                                       ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
                                       SelectedItem="{Binding ScannedTrack}" />
 
-                            <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="Codec" />
+                            <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Codec}" />
                             <ComboBox Grid.Column="3" Width="100" Height="22" Margin="5,0,5,0">
                                 <ComboBox.SelectedItem>
                                     <MultiBinding Converter="{StaticResource audioEncoderConverter}">
@@ -188,7 +189,7 @@
                                 </ComboBox.ItemsSource>
                             </ComboBox>
 
-                            <TextBlock Grid.Column="4" VerticalAlignment="Center" FontWeight="Bold" Text="Bitrate"
+                            <TextBlock Grid.Column="4" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.AudioView_Bitrate}"
                                        Visibility="{Binding CannotSetBitrate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
                             <ComboBox Grid.Column="5" Width="55" Height="22" Margin="5,0,5,0" ItemsSource="{Binding TrackReference, Converter={StaticResource audioBitrateConverter}}"
                                       SelectedItem="{Binding Bitrate}"
@@ -196,7 +197,7 @@
 
 
                             <!--  Row 2  -->
-                            <TextBlock Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="Mixdown"
+                            <TextBlock Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.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 DataContext.AudioMixdowns, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
@@ -241,28 +242,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="Samplerate"
+                                <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.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="DRC"
+                                <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.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="Gain"
+                                <TextBlock  VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.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="Track Name:" VerticalAlignment="Center" FontWeight="Bold" Margin="5,0,5,0" />
+                                <TextBlock Text="{x:Static Properties:ResourcesUI.AudioView_TrackName}" VerticalAlignment="Center" FontWeight="Bold" Margin="5,0,5,0" />
                                 <TextBox Text="{Binding TrackName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="138" Height="22" />
 
                             </StackPanel>
@@ -292,19 +293,19 @@
                 </Grid.ColumnDefinitions>
 
                 <!-- Audio -->
-                <TextBlock Text="Track Selection Behaviour:" Grid.Column="0" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left"  VerticalAlignment="Center" />
+                <TextBlock Text="{x:Static Properties:ResourcesUI.AudioView_TrackSelectionBehaviour}" Grid.Column="0" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left"  VerticalAlignment="Center" />
                 <ComboBox Name="autoAudioMode" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left"
                           ItemsSource="{Binding AudioBehaviourModeList, Converter={StaticResource audioBehaviourConverter}}" 
                           SelectedItem="{Binding AudioBehaviours.SelectedBehaviour, Converter={StaticResource audioBehaviourConverter}}" Width="210" Margin="0,0,5,0" />
-                
-                
-                <TextBlock Text="Track Setting Default Behaviour:" Grid.Column="0" Grid.Row="1" Margin="0,5,5,0" HorizontalAlignment="Left"  VerticalAlignment="Center" />
+
+
+                <TextBlock Text="{x:Static Properties:ResourcesUI.AudioView_TrackSettingDefaultBehaviour}" Grid.Column="0" Grid.Row="1" Margin="0,5,5,0" HorizontalAlignment="Left"  VerticalAlignment="Center" />
                 <ComboBox Name="audioTrackBeahaviorMode" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left"
                           ItemsSource="{Binding AudioTrackDefaultBehaviourModeList, Converter={StaticResource audioTrackDefaultBehaviourConverter}}" 
                           SelectedItem="{Binding AudioBehaviours.SelectedTrackDefaultBehaviour, Converter={StaticResource audioTrackDefaultBehaviourConverter}}" Width="210" Margin="0,5,5,0" />
             </Grid>
 
-            <TextBlock Text="Choose Languages:" Margin="5,10,0,0" />
+            <TextBlock Text="{x:Static Properties:ResourcesUI.Shared_ChooseLanguages}" Margin="5,10,0,0" />
 
             <Grid Margin="20,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -320,7 +321,7 @@
                         </Grid.ColumnDefinitions>
 
                         <StackPanel Orientation="Vertical" Grid.Column="0">
-                            <TextBlock Text="Available Languages:" Margin="0,0,0,5"/>
+                            <TextBlock Text="{x:Static Properties:ResourcesUI.Shared_AvailableLanguages}" Margin="0,0,0,5"/>
                             <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" 
                                      helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 
                                              SelectionMode="Extended" Width="140" Height="120" />
@@ -328,14 +329,14 @@
 
                         <DockPanel Grid.Column="1" Margin="10,0,10,0">
                             <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                                <Button Content="Move Right"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
-                                <Button Content="Move Left"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />
-                                <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
+                                <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"/>
                             </StackPanel>
                         </DockPanel>
 
                         <StackPanel Orientation="Vertical" Grid.Column="2">
-                            <TextBlock Text="Chosen Languages:"  Margin="0,0,0,5"/>
+                            <TextBlock Text="{x:Static Properties:ResourcesUI.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"
@@ -347,11 +348,11 @@
                 </StackPanel>
             </Grid>
 
-            <TextBlock Text="'Auto Passthru' Behaviour:" FontWeight="Bold" Margin="0,10,0,5" />
+            <TextBlock Text="{x:Static Properties:ResourcesUI.AudioView_AutoPassthruBehaviour}" FontWeight="Bold" Margin="0,10,0,5" />
             <StackPanel Margin="10,5,0,0"
                         Orientation="Vertical">
-                <TextBlock Margin="5,0,5,0" Text="When 'Auto Passthru' is selected as the audio codec." VerticalAlignment="Center" />
-                <TextBlock Margin="5,0,5,0" Text="Allow passthru of:" VerticalAlignment="Center" />
+                <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" />
             </StackPanel>
             <StackPanel Margin="15,5,0,0"
                         Orientation="Horizontal">
@@ -379,8 +380,8 @@
                 <CheckBox Margin="0,0,5,0"
                           Content="FLAC" VerticalAlignment="Center"
                           IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowFlacPass}" />
-  
-                <TextBlock Margin="15,0,5,0" Text="Otherwise use fallback encoder:" />
+
+                <TextBlock Margin="15,0,5,0" Text="{x:Static Properties:ResourcesUI.AudioView_OtherwiseFallbackEncoder}" />
 
                 <ComboBox VerticalAlignment="Center" Width="105" Height="22" Margin="10,0,5,0">
                     <ComboBox.SelectedItem>
diff --git a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
index b063f85ba..069af0bc2 100644
--- a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
+++ b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
@@ -2,6 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:cal="http://www.caliburnproject.org"
+        xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
         Title="When Done Action" MinHeight="130" MinWidth="400" WindowStartupLocation="CenterScreen" WindowStyle="None"
         ShowActivated="True" ShowInTaskbar="True" SizeToContent="WidthAndHeight">
     <Grid>
@@ -11,15 +12,15 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <TextBlock Text="When Done Action" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />
+        <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="{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="Proceed"  HorizontalAlignment="Right"
+            <Button Content="{x:Static Properties:ResourcesUI.CountdownAlterView_Proceed}"  HorizontalAlignment="Right"
                 cal:Message.Attach="[Event Click] = [Action Proceed]" Padding="8,2" Margin="0,10,10,5"/>
 
-            <Button Content="Cancel Action"  HorizontalAlignment="Right" Margin="0,10,10,5"
+            <Button Content="{x:Static Properties:ResourcesUI.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 8053205fe..ba103dedb 100644
--- a/win/CS/HandBrakeWPF/Views/ErrorView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
@@ -2,6 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:cal="http://www.caliburnproject.org"
+        xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
         Title="{Binding Title}"
         Width="680"
         Height="380"
@@ -44,7 +45,7 @@
                            Margin="0,0,0,2"
                            VerticalAlignment="Bottom"
                            FontWeight="Bold"
-                           Text="Error Details:" />
+                           Text="{x:Static Properties:ResourcesUI.ErrorView_ErrorDetails}" />
             </Grid>
         </StackPanel>
 
@@ -81,14 +82,14 @@
                            Height="16"
                            Margin="0,0,5,0"
                            Source="Images/copy.png" />
-                    <TextBlock Grid.Column="1" Text="Copy to Clipboard" />
+                    <TextBlock Grid.Column="1" Text="{x:Static Properties:ResourcesUI.Generic_CopyToClipboard}" />
                 </Grid>
             </Button>
 
             <Button Grid.Column="2"
                     Margin="0,5,10,5"
                     cal:Message.Attach="[Event Click] = [Action Close]"
-                    Content="Close"
+                    Content="{x:Static Properties:ResourcesUI.Generic_Close}"
                     Padding="8,2" />
         </Grid>
     </Grid>
diff --git a/win/CS/HandBrakeWPF/Views/FiltersView.xaml b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
index b3aeecd95..d8304c1c6 100644
--- a/win/CS/HandBrakeWPF/Views/FiltersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
              xmlns:filters="clr-namespace:HandBrakeWPF.Converters.Filters"
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
              mc:Ignorable="d" >
     <UserControl.Resources>
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
@@ -25,7 +26,7 @@
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
-        <TextBlock Text="Filters" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
+        <TextBlock Text="{x:Static Properties:ResourcesUI.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>
@@ -44,7 +45,7 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
 
-                <TextBlock Text="Detelecine:" Grid.Row="0" Grid.Column="0" Margin="0,0,0,10" />
+                <TextBlock Text="{x:Static Properties:ResourcesUI.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"
                           HorizontalAlignment="Left"/>
@@ -54,8 +55,8 @@
                 <TextBlock Text="{Binding DeinterlaceControlText}" Grid.Row="1" Grid.Column="0" Margin="0,0,0,10" VerticalAlignment="Top"/>
                 <StackPanel Grid.Row="1" Grid.Column="1" >
                     <StackPanel Orientation="Horizontal">
-                        <RadioButton GroupName="Interlace" Content="Deinterlace" IsChecked="{Binding IsDeinterlaceMode}" />
-                        <RadioButton GroupName="Interlace" Content="Decomb" Margin="10,0,0,0" IsChecked="{Binding IsDeinterlaceMode, Converter={StaticResource inverseBooleanConverter}}" />
+                        <RadioButton GroupName="Interlace" Content="{x:Static Properties:ResourcesUI.FiltersView_Deinterlace}" IsChecked="{Binding IsDeinterlaceMode}" />
+                        <RadioButton GroupName="Interlace" Content="{x:Static Properties:ResourcesUI.FiltersView_Decomb}" Margin="10,0,0,0" IsChecked="{Binding IsDeinterlaceMode, Converter={StaticResource inverseBooleanConverter}}" />
                     </StackPanel>
 
                     <ComboBox Width="120" ItemsSource="{Binding DecombOptions, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left"
@@ -73,14 +74,14 @@
                 <TextBox Width="120" Grid.Row="1" Grid.Column="2" Text="{Binding CustomDeinterlace, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" HorizontalAlignment="Left"
                          Visibility="{Binding ShowDeinterlaceCustom, Converter={StaticResource boolToVisConverter}}" />
 
-                <TextBlock Text="Denoise:" Grid.Row="3" Grid.Column="0" Margin="0,0,0,10"/>
+                <TextBlock Text="{x:Static Properties:ResourcesUI.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" />
 
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="3" Grid.Column="2" Margin="0,0,0,10" 
                             Visibility="{Binding ShowDenoiseOptions, Converter={StaticResource boolToVisConverter}}">
-                    <TextBlock Text="Preset: " Margin="5,0,5,0" />
+                    <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Preset}" Margin="5,0,5,0" />
                     <ComboBox SelectedItem="{Binding SelectedDenoisePreset}" 
                               MinWidth="100"  HorizontalAlignment="Center" VerticalAlignment="Center">
                         <ComboBox.ItemsSource>
@@ -92,24 +93,24 @@
                     </ComboBox>
 
                     <StackPanel Orientation="Horizontal" Visibility="{Binding ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}">
-                        <TextBlock Text="Tune: " Margin="5,0,5,0" />
+                        <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Tune}" Margin="5,0,5,0" />
                         <ComboBox ItemsSource="{Binding DenoiseTunes}" SelectedItem="{Binding SelectedDenoiseTune}" MinWidth="100"
                           Visibility="{Binding ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}" VerticalAlignment="Center" />
                     </StackPanel>
 
                     <StackPanel Orientation="Horizontal" Visibility="{Binding ShowDenoiseCustom, Converter={StaticResource boolToVisConverter}}">
-                        <TextBlock Text="Custom: " Margin="5,0,5,0" />
+                        <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Custom}" Margin="5,0,5,0" />
                         <TextBox Width="120" Margin="0" Text="{Binding CustomDenoise, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" />
                     </StackPanel>
 
                 </StackPanel>
 
-                <TextBlock Text="Deblock:" Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"/>
+                <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Deblock}" Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"/>
                 <Slider Width="120" Value="{Binding DeblockValue}" TickPlacement="BottomRight" Minimum="4" Maximum="15" Grid.Row="4" Grid.Column="1" Margin="0,0,0,10"
                         HorizontalAlignment="Left" />
                 <TextBlock Text="{Binding DeblockText}" Grid.Row="4" Grid.Column="2" Margin="0,0,0,10"/>
 
-                <CheckBox Content="Grayscale" IsChecked="{Binding Grayscale}" Grid.Row="5" Grid.Column="1" Margin="0,0,0,10"/>
+                <CheckBox Content="{x:Static Properties:ResourcesUI.FiltersView_Grayscale}" IsChecked="{Binding Grayscale}" Grid.Row="5" Grid.Column="1" Margin="0,0,0,10"/>
             </Grid>
 
         </StackPanel>
diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 9285cba82..62eeabb10 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
              xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
-             xmlns:cal="http://www.caliburnproject.org">
+             xmlns:cal="http://www.caliburnproject.org"
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties">
 
     <UserControl.Resources>
         <Converters:BooleanConverter x:Key="boolConverter" />
@@ -15,12 +16,6 @@
     </UserControl.Resources>
 
     <Border Background="Transparent">
-        <Border.ContextMenu>
-            <ContextMenu>
-                <MenuItem Header="Show Still Preview (Experimental)" cal:Message.Attach="[Event Click] = [Action PreviewImage]" Visibility="Visible" />
-            </ContextMenu>
-        </Border.ContextMenu  >
-
         <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
 
             <Grid.ColumnDefinitions>
@@ -36,25 +31,25 @@
 
             <!-- Size Panel-->
             <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Grid.Column="0" Grid.Row="0" Grid.RowSpan="1" >
-                <Label Content="Size" FontWeight="Bold" />
+                <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Size}" FontWeight="Bold" />
 
                 <!-- Row 1-->
                 <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
-                    <Label Content="Source:" />
+                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Source}" />
                     <Label Content="{Binding SourceInfo}" Name="sourceResolution"/>
                 </StackPanel>
 
                 <!-- Row 2-->
                 <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
-                    <Label Content="Width:" />
+                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Width}" />
                     <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" UpdateBindingOnTextChange="True" IsEnabled="{Binding WidthControlEnabled}" 
                                         Modulus="{Binding SelectedModulus, Mode=OneWay}"
                                              Minimum="0" Width="60"  />
-                    <Label Content="Height:" />
+                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Height}" />
                     <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" UpdateBindingOnTextChange="True" 
                                         Modulus="{Binding SelectedModulus, Mode=OneWay}" 
                                              Minimum="0" Width="60"  />
-                    <CheckBox Content="Keep Aspect Ratio" IsChecked="{Binding MaintainAspectRatio}"
+                    <CheckBox Content="{x:Static Properties:ResourcesUI.PictureSettingsView_KeepAR}" IsChecked="{Binding MaintainAspectRatio}"
                           Visibility="{Binding ShowKeepAR, Converter={StaticResource boolToVisHiddenConverter}}" 
                           VerticalAlignment="Center" Margin="5,0,0,0" />
                 </StackPanel>
@@ -71,8 +66,8 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="Anamorphic:" Grid.Row="0" Grid.Column="0" />
-                    <Label Content="Modulus:" Grid.Row="1" Grid.Column="0" 
+                    <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" 
                        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" />
@@ -94,9 +89,9 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="Display Width:" Grid.Row="0" Grid.Column="0" />
-                    <Label Content="PAR Width:" Grid.Row="1" Grid.Column="0" />
-                    <Label Content="PAR Height:" Grid.Row="2" Grid.Column="0" />
+                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_DisplayWitdh}" Grid.Row="0" Grid.Column="0" />
+                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_ParW}" Grid.Row="1" Grid.Column="0" />
+                    <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_ParH}" Grid.Row="2" 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" />
@@ -110,9 +105,9 @@
 
             <!-- 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="Cropping" FontWeight="Bold" />
-                <RadioButton Content="Automatic" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"/>
-                <RadioButton Content="Custom" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0" />
+                <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"/>
+                <RadioButton Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Custom}" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0" />
 
                 <Grid Margin="0,10,0,0">
                     <Grid.RowDefinitions>
@@ -131,10 +126,10 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="Top" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
-                    <Label Content="Bottom" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />
-                    <Label Content="Left" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
-                    <Label Content="Right" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
+                    <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" />
 
                     <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" />
@@ -154,7 +149,7 @@
 
             <!-- Preview Panel -->
             <StackPanel Name="PreviewPanel" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1"  Grid.Column="0">
-                <Label Content="Output" FontWeight="Bold" />
+                <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Output}" FontWeight="Bold" />
 
                 <Grid Margin="5,0,0,0">
                     <Grid.RowDefinitions>
diff --git a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
index 2712d0264..6e2fd834b 100644
--- a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
@@ -35,11 +35,11 @@
         </Grid.RowDefinitions>
 
         <!--  Header  -->
-        <TextBlock Text="Add to Queue" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />
+        <TextBlock Text="{x:Static Properties:ResourcesUI.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="Choose titles: " />
+            <TextBlock Text="{x:Static Properties:ResourcesUI.QueueSelectionView_ChooseTitles}" />
         </StackPanel>
 
         <!-- Selection -->
@@ -116,13 +116,13 @@
             <Button Grid.Column="1"
                     Margin="0,5,10,10"
                     cal:Message.Attach="[Event Click] = [Action Cancel]"
-                    Content="Cancel"
+                    Content="{x:Static Properties:ResourcesUI.Generic_Cancel}"
                     IsCancel="True"
                     Padding="8,2" />
             <Button Grid.Column="2"
                     Margin="0,5,10,10"
                     cal:Message.Attach="[Event Click] = [Action Add]"
-                    Content="Add"
+                    Content="{x:Static Properties:ResourcesUI.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 b5efe838c..9a7460015 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -13,6 +13,7 @@
         xmlns:video="clr-namespace:HandBrakeWPF.Converters.Video"
         xmlns:commands="clr-namespace:HandBrakeWPF.Commands"
         xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"
+        xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
         Title="{Binding Title}"
         Width="700"
         Height="500"
@@ -76,7 +77,7 @@
                                Source="Images/Play.png" />
                         <Label Margin="8,0,0,0"
                                VerticalAlignment="Center"
-                               Content="Start" />
+                               Content="{x:Static Properties:ResourcesUI.QueueView_Start}" />
                     </StackPanel>
                 </Button>
 
@@ -91,7 +92,7 @@
                                Source="Images/Pause.png" />
                         <Label Margin="8,0,0,0"
                                VerticalAlignment="Center"
-                               Content="Pause" />
+                               Content="{x:Static Properties:ResourcesUI.QueueView_Pause}" />
                     </StackPanel>
                 </Button>
 
@@ -102,7 +103,7 @@
                                 <StackPanel Height="32" Orientation="Horizontal">
                                     <TextBlock VerticalAlignment="Center"
                                            FontWeight="Bold"
-                                           Text="When Done: " />
+                                           Text="{x:Static Properties:ResourcesUI.QueueView_WhenDone}" />
                                     <Label Margin="8,0,0,0"
                                        VerticalAlignment="Center"
                                        Content="{Binding WhenDoneAction}" />
@@ -115,37 +116,37 @@
 
                             <MenuItem x:Name="doNothing"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(doNothing.Header)]"
-                                  Header="Do nothing"
+                                  Header="{x:Static Properties:ResourcesUI.QueueView_DoNothing}"
                                   IsCheckable="True"
                                   AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
                             <MenuItem x:Name="shutdown"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(shutdown.Header)]"
-                                  Header="Shutdown"
+                                  Header="{x:Static Properties:ResourcesUI.QueueView_Shutdown}"
                                   IsCheckable="True"
                                   AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
                             <MenuItem x:Name="suspend"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(suspend.Header)]"
-                                  Header="Suspend"
+                                  Header="{x:Static Properties:ResourcesUI.QueueView_Suspend}"
                                   IsCheckable="True"
                                   AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
                             <MenuItem x:Name="hibernate"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(hibernate.Header)]"
-                                  Header="Hibernate"
+                                  Header="{x:Static Properties:ResourcesUI.QueueView_Hibernate}"
                                   IsCheckable="True"
                                   AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
                             <MenuItem x:Name="lock"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(lock.Header)]"
-                                  Header="Lock System"
+                                  Header="{x:Static Properties:ResourcesUI.QueueView_LockSystem}"
                                   IsCheckable="True"
                                   AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
                             <MenuItem x:Name="logoff"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(logoff.Header)]"
-                                  Header="Log off"
+                                  Header="{x:Static Properties:ResourcesUI.QueueView_Logoff}"
                                   IsCheckable="True"
                                   AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
                             <MenuItem x:Name="quit"
                                   cal:Message.Attach="[Event Click] = [Action WhenDone(quit.Header)]"
-                                  Header="Quit HandBrake"
+                                  Header="{x:Static Properties:ResourcesUI.QueueView_QuitHandBrake}"
                                   IsCheckable="True"
                                   AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
                         </MenuItem>
@@ -157,7 +158,7 @@
                                 <StackPanel Height="32" Orientation="Horizontal">
                                     <Image Source="Images\Advanced.png" Width="20" Height="20" VerticalAlignment="Center" />
                                     <TextBlock VerticalAlignment="Center"
-                                           Text="Options " Margin="5,0,0,0" />
+                                           Text="{x:Static Properties:ResourcesUI.QueueView_Options}" Margin="5,0,0,0" />
                                     <Path Height="5"
                                       Margin="2,2,2,0"
                                       Data="M 0 0 L 4 4 L 8 0 Z"
@@ -165,11 +166,11 @@
                                 </StackPanel>
                             </MenuItem.Header>
 
-                            <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="Clear Completed" />
-                            <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear Queue" />
+                            <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_ClearQueue}" />
                             <Separator />
-                            <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="Import Queue" />
-                            <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="Export Queue" />
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="{x:Static Properties:ResourcesUI.QueueView_Import}" />
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" />
 
                         </MenuItem>
                     </Menu>
@@ -205,12 +206,12 @@
 
             <ListBox.ContextMenu>
                 <ContextMenu>
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="Clear Completed" />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear All" />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="Clear Selected" />                 
+                    <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}" />                 
                     <Separator />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="Import Queue" />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="Export Queue" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="{x:Static Properties:ResourcesUI.QueueView_Import}" />
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" />
                 </ContextMenu>
             </ListBox.ContextMenu>
 
@@ -242,27 +243,27 @@
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
 
-                                <TextBlock FontWeight="Bold" Text="Source:" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.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="Destination:" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.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="Picture Settings:" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
                                 <TextBlock Text="{Binding Task.PictureSettingsDesc}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1"  />
-                                
-                                <TextBlock FontWeight="Bold" Text="Video:" Grid.Row="3" Grid.Column="0" />
+
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.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="Audio: "  Grid.Row="4" Grid.Column="0"/>
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.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="Subtitles: " Grid.Row="5" Grid.Column="0"  />
+                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:ResourcesUI.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="Advanced: " />
+                                <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0"  Text="{x:Static Properties:ResourcesUI.QueueView_Advanced}" />
                                 <TextBlock Text="{Binding Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="6" Grid.Column="1" TextWrapping="Wrap"  />
                             </Grid>
 
@@ -326,12 +327,12 @@
 
                             <!--  TODO Support Drive Label Name  -->
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock FontWeight="Bold" Text="Source: " />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Source}" />
                                 <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}" />
                             </StackPanel>
 
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock FontWeight="Bold" Text="Destination: " />
+                                <TextBlock FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_Destination}" />
                                 <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" />
                             </StackPanel>
                         </StackPanel>
@@ -358,7 +359,7 @@
                                         <Image Width="20"  
                                                Height="20" VerticalAlignment="Center"
                                                Source="Images/Refresh.ico"
-                                               ToolTip="Reset job status to Waiting.">
+                                               ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
                                         </Image>
                                     </ControlTemplate>
                                 </Button.Template>
@@ -377,7 +378,7 @@
                                         <Image Width="20" 
                                                Height="20" VerticalAlignment="Center"
                                                Source="Images/Options24.png"
-                                               ToolTip="Send the job back to the main window for editing.">
+                                               ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_SendJobBack}">
                                         </Image>
                                     </ControlTemplate>
                                 </Button.Template>
@@ -396,7 +397,7 @@
                                         <Image Width="20" 
                                                Height="20" VerticalAlignment="Center" 
                                                Source="Images/delete.png"
-                                               ToolTip="Delete the job from the queue.">
+                                               ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}">
                                         </Image>
                                     </ControlTemplate>
                                 </Button.Template>
diff --git a/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
index 64783a087..517ae13f9 100644
--- a/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
+++ b/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:cal="http://www.caliburnproject.org"
              xmlns:converters="clr-namespace:HandBrakeWPF.Converters"
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
              mc:Ignorable="d" SizeToContent="WidthAndHeight"
              TextOptions.TextFormattingMode="Display"
              WindowStartupLocation="CenterScreen"
@@ -31,7 +32,6 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions></Grid.ColumnDefinitions>
                 <Slider Maximum="{Binding TotalPreviews}" Minimum="0" 
                 Value="{Binding SelectedPreviewImage}"
                 VerticalAlignment="Center"
@@ -41,13 +41,13 @@
                 />
 
                 <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Left">
-                    <Button Content="Live Preview" Padding="8,2" cal:Message.Attach="[Event Click] = [Action Play]" />
-                    <TextBlock Margin="10,0,5,0" VerticalAlignment="Center" Foreground="White" Text="Duration:" />
+                    <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}" />
                     <ComboBox Width="60"
                       ItemsSource="{Binding AvailableDurations}"
                       SelectedItem="{Binding Duration}" />
 
-                    <CheckBox VerticalAlignment="Center" Content="Use system default player" Foreground="White" Margin="10,0,0,0" IsChecked="{Binding UseSystemDefaultPlayer}" />
+                    <CheckBox VerticalAlignment="Center" Content="{x:Static Properties:ResourcesUI.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/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 1ef7f70c6..cc574227b 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -68,10 +68,10 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            
-            <splitButton:SplitMenuButton Content="Add Track" cal:Message.Attach="[Event Click] = [Action Add]"  FontWeight="Bold" Margin="0,0,10,0" Grid.Column="0">
+
+            <splitButton:SplitMenuButton Content="{x:Static Properties:ResourcesUI.Shared_AddTrack}" cal:Message.Attach="[Event Click] = [Action Add]"  FontWeight="Bold" Margin="0,0,10,0" Grid.Column="0">
                 <splitButton:SplitMenuButton.ItemSource>
-                    <MenuItem Header="Add New Track" cal:Message.Attach="[Event Click] = [Action Add]" />
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.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]" />
@@ -80,12 +80,12 @@
 
             <Button MinWidth="75" Grid.Column="1"
                     cal:Message.Attach="[Event Click] = [Action Import]"
-                    Content="Import SRT"
+                    Content="{x:Static Properties:ResourcesUI.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="Clear" />
+                    Content="{x:Static Properties:ResourcesUI.Generic_Clear}" />
 
             <Button MinWidth="65" Grid.Column="4"
                     Margin="0,0,10,0"
@@ -94,7 +94,7 @@
 
             <Button MinWidth="65" Grid.Column="5"
                     cal:Message.Attach="[Event Click] = [Action ReloadDefaults]"
-                    Content="Reload Defaults" />
+                    Content="{x:Static Properties:ResourcesUI.Shared_ReloadDefaults}" />
         </Grid>
 
 
@@ -117,14 +117,14 @@
 
             <ListBox.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="Add New Track" 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]" />    
+                    <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]" />    
                     <Separator />
-                    <MenuItem Header="Clear All" cal:Message.Attach="[Event Click] = [Action Clear]" />
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Clear}" cal:Message.Attach="[Event Click] = [Action Clear]" />
                     <Separator />
-                    <MenuItem Header="Configure Default Behaviours" cal:Message.Attach="[Event Click] = [Action SetDefaultBehaviour]" />
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_ConfigureDefaultBehaviours}" cal:Message.Attach="[Event Click] = [Action SetDefaultBehaviour]" />
                 </ContextMenu>
             </ListBox.ContextMenu>
 
@@ -304,25 +304,25 @@
                 </Grid.ColumnDefinitions>
 
                 <!-- Subtitles -->
-                <TextBlock Text="Track Selection Behaviour:"  Grid.Column="2" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                <TextBlock Text="{x:Static Properties:ResourcesUI.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="Burn-In Behaviour:"  Grid.Column="2" Grid.Row="1" Margin="0,5,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                <TextBlock Text="{x:Static Properties:ResourcesUI.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">
                     <ComboBox.ToolTip>
                         <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Subtitles_BurnInBehaviourModes}" />
                     </ComboBox.ToolTip>
-                </ComboBox> 
-                <CheckBox Content="Add Closed Captions when available"  Grid.Column="3" Grid.Row="2" Margin="0,5,0,0" 
+                </ComboBox>
+                <CheckBox Content="{x:Static Properties:ResourcesUI.SubtitlesView_AddCC}"  Grid.Column="3" Grid.Row="2" Margin="0,5,0,0" 
                                   HorizontalAlignment="Left" IsChecked="{Binding SubtitleBehaviours.AddClosedCaptions}"/>
-                <CheckBox Content="Add 'Foreign Audio Scan'"  Grid.Column="3" Grid.Row="3" Margin="0,5,0,0" 
+                <CheckBox Content="{x:Static Properties:ResourcesUI.SubtitlesView_AddForeignAudioSearch}"  Grid.Column="3" Grid.Row="3" Margin="0,5,0,0" 
                                   HorizontalAlignment="Left" IsChecked="{Binding SubtitleBehaviours.AddForeignAudioScanTrack}"/>
             </Grid>
 
-            <TextBlock Text="Choose Languages:" Margin="5,15,0,0"/>
+            <TextBlock Text="{x:Static Properties:ResourcesUI.Shared_ChooseLanguages}" Margin="5,15,0,0"/>
 
             <Grid Margin="20,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -338,7 +338,7 @@
                         </Grid.ColumnDefinitions>
 
                         <StackPanel Orientation="Vertical" Grid.Column="0">
-                            <TextBlock Text="Available Languages:" Margin="0,0,0,5"/>
+                            <TextBlock Text="{x:Static Properties:ResourcesUI.Shared_AvailableLanguages}" Margin="0,0,0,5"/>
                             <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" 
                                      helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 
                                              SelectionMode="Extended" Width="140" Height="120" />
@@ -346,14 +346,14 @@
 
                         <DockPanel Grid.Column="1" Margin="10,0,10,0">
                             <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                                <Button Content="Move Right"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
-                                <Button Content="Move Left"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />
-                                <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
+                                <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"/>
                             </StackPanel>
                         </DockPanel>
 
                         <StackPanel Orientation="Vertical" Grid.Column="2">
-                            <TextBlock Text="Chosen Languages:"  Margin="0,0,0,5"/>
+                            <TextBlock Text="{x:Static Properties:ResourcesUI.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/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index db7f0e619..878d8a17e 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -37,10 +37,10 @@
 
             <StackPanel Orientation="Vertical" Grid.Column="0" >
 
-                <TextBlock Text="Video" FontWeight="Bold" Margin="0,0,0,10"/>
+                <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Video}" FontWeight="Bold" Margin="0,0,0,10"/>
 
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
-                    <TextBlock Text="Video Codec:" Width="100" />
+                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Codec}" Width="100" />
 
                     <ComboBox Width="120">
                         <ComboBox.SelectedItem>
@@ -59,18 +59,18 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal">
-                    <TextBlock Text="Framerate (FPS):" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>
+                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Framerate}" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>
                     <StackPanel Orientation="Vertical">
                         <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}"  
                                   Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
-                        <TextBlock Text="Same as source"  VerticalAlignment="Center" Margin="0,5,0,0"
+                        <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_SameAsSource}"  VerticalAlignment="Center" Margin="0,5,0,0"
                                    Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
 
                         <StackPanel Orientation="Vertical" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">
-                            <RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" Margin="0,5,0,0" />
-                            <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" 
+                            <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantFramerate}" IsChecked="{Binding IsConstantFramerate}" Margin="0,5,0,0" />
+                            <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_VariableFramerate}" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" 
                                      Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
-                            <RadioButton Content="Peak Framerate" IsChecked="{Binding IsPeakFramerate}" Margin="0,5,0,0"
+                            <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_PeakFramerate}" IsChecked="{Binding IsPeakFramerate}" Margin="0,5,0,0"
                                      Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
                         </StackPanel>
                     </StackPanel>
@@ -82,7 +82,7 @@
                 <TextBlock Text="Quality" FontWeight="Bold" Margin="0,0,0,10"/>
 
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
-                    <RadioButton Content="Constant Quality:" IsChecked="{Binding IsConstantQuantity}"  Margin="0,0,10,0" />
+                    <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantQuality}" IsChecked="{Binding IsConstantQuantity}"  Margin="0,0,10,0" />
                     <TextBlock Text="{Binding DisplayRF}" MinWidth="30" />
                     <TextBlock Text="{Binding Rfqp}" FontWeight="Bold" Margin="5,0,0,0" />
 
@@ -105,14 +105,14 @@
                 </Grid>
 
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,6">
-                    <RadioButton Content="Avg Bitrate (kbps):" IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>
+                    <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_AverageBitrate}" IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>
                     <TextBox Width="75" Text="{Binding Task.VideoBitrate, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="30,0,0,0" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">
-                    <CheckBox Content="2-Pass Encoding" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"
+                    <CheckBox Content="{x:Static Properties:ResourcesUI.VideoView_2Pass}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"
                               IsChecked="{Binding TwoPass}" Margin="0,0,10,0" />
-                    <CheckBox Content="Turbo first pass" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"
+                    <CheckBox Content="{x:Static Properties:ResourcesUI.VideoView_TurboFirstPass}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"
                               IsChecked="{Binding TurboFirstPass}" Visibility="{Binding DisplayTurboFirstPass, Converter={StaticResource boolToVisConverter}}" />
                 </StackPanel>
 
@@ -126,9 +126,9 @@
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
 
-                <TextBlock Text="Optimise Video:" Margin="0,0,0,0" Grid.Row="0"  Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />
+                <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_OptimiseVideo}" Margin="0,0,0,0" Grid.Row="0"  Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />
 
-                <CheckBox Content="Use Advanced Tab instead" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" Margin="0,5,0,0"
+                <CheckBox Content="{x:Static Properties:ResourcesUI.VideoView_UseAdvancedTab}" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" Margin="0,5,0,0"
                           Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
 
                 <Grid Grid.Row="2" Margin="0,8,0,0" IsEnabled="{Binding UseAdvancedTab, Converter={StaticResource inverseConverter}}">
@@ -151,7 +151,7 @@
 
 
                     <!-- Row 1 -->
-                    <TextBlock Text="Encoder Preset:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}" />
+                    <TextBlock Text="{x:Static Properties:ResourcesUI.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:Resources.Video_EncoderPreset}" 
@@ -159,29 +159,29 @@
                         <TextBlock Text="{Binding VideoPreset.DisplayName}" Margin="5,0,0,0" />
                     </StackPanel>
 
-                    <TextBlock Text="Encoder Tune:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,10,0,0"
+                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncodeTune}" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,10,0,0"
                                Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>
                     <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,10,5,0" Height="22"
                               ItemsSource="{Binding VideoTunes}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoTune}"
                               ToolTip="{x:Static Properties:Resources.Video_EncoderTune}" Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"
                               Style="{StaticResource LongToolTipHolder}" />
-                    <CheckBox IsChecked="{Binding FastDecode}" Content="Fast Decode" Grid.Row="2" Grid.Column="2" Margin="10,10,10,0" VerticalAlignment="Center"
+                    <CheckBox IsChecked="{Binding FastDecode}" Content="{x:Static Properties:ResourcesUI.VideoView_FastDecode}" Grid.Row="2" Grid.Column="2" Margin="10,10,10,0" VerticalAlignment="Center"
                               ToolTip="{x:Static Properties:Resources.Video_x264FastDecode}" Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>
 
           
                     <!-- Row 2-->
-                    <TextBlock Text="Encoder Profile:" Grid.Row="3" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}"/>
+                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderProfile}" Grid.Row="3" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}"/>
                     <ComboBox Width="100" Grid.Row="3" Grid.Column="1" Margin="5,10,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}"
                           ItemsSource="{Binding VideoProfiles}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoProfile}"
                           Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:Resources.Video_EncoderProfile}" />
 
-                    <TextBlock Text="Encoder Level:" Grid.Row="3" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}" />
+                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderLevel}" Grid.Row="3" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}" />
                     <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,10,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:Resources.Video_EncoderLevel}"/>
 
                     <!-- Row 3 -->
-                    <TextBlock Text="Extra Options:" Grid.Row="4" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                    <TextBlock Text="{x:Static Properties:ResourcesUI.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}" MinWidth="200"
                              Height="30" MaxLines="2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Margin="5,10,0,0" VerticalAlignment="Center"
                              ToolTip="{Binding FullOptionsTooltip}" Style="{StaticResource LongToolTipHolder}" >