From ffb84dc9de2d85776c172f48afebd1c773b322e6 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Thu, 4 Jun 2015 20:54:14 +0000
Subject: WinGui: Starting to move UI text string to resources. This will allow
 us to start looking at localisations on the windows gui.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7276 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 win/CS/HandBrakeWPF/HandBrakeWPF.csproj            |  10 +
 .../HandBrakeWPF/Properties/Resources.Designer.cs  |  27 ++
 win/CS/HandBrakeWPF/Properties/Resources.resx      |   9 +
 win/CS/HandBrakeWPF/Properties/ResourcesUI.resx    | 300 +++++++++++++++++++++
 win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs    |   7 +-
 win/CS/HandBrakeWPF/Views/AboutView.xaml           |   4 +-
 win/CS/HandBrakeWPF/Views/AddPresetView.xaml       |  20 +-
 win/CS/HandBrakeWPF/Views/ChaptersView.xaml        |  21 +-
 win/CS/HandBrakeWPF/Views/LogView.xaml             |   9 +-
 win/CS/HandBrakeWPF/Views/MainView.xaml            |  65 ++---
 10 files changed, 410 insertions(+), 62 deletions(-)
 create mode 100644 win/CS/HandBrakeWPF/Properties/ResourcesUI.resx

(limited to 'win/CS/HandBrakeWPF')

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 14fe06b41..10bddbeb6 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\ResourcesUI.Designer.cs">
+      <DependentUpon>ResourcesUI.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="Services\Presets\Factories\JsonPresetFactory.cs" />
     <Compile Include="Services\Queue\Interfaces\IQueueProcessor.cs" />
     <Compile Include="Services\Presets\Factories\PlistPresetFactory.cs" />
@@ -354,6 +359,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="Properties\ResourcesUI.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>ResourcesUI.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index f248ee1e2..1cfcd6914 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -780,6 +780,33 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to You can not delete the default preset. Please set another preset as default first..
+        /// </summary>
+        public static string MainViewModel_CanNotDeleteDefaultPreset {
+            get {
+                return ResourceManager.GetString("MainViewModel_CanNotDeleteDefaultPreset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0:00.00}%   FPS: {1:000.0}   Avg FPS: {2:000.0}   Time Remaining: {3}   Elapsed: {4:hh\:mm\:ss}.
+        /// </summary>
+        public static string MainViewModel_EncodeStatusChanged_StatusLabel {
+            get {
+                return ResourceManager.GetString("MainViewModel_EncodeStatusChanged_StatusLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Are you sure you want to delete the preset: .
+        /// </summary>
+        public static string MainViewModel_PresetRemove_AreYouSure {
+            get {
+                return ResourceManager.GetString("MainViewModel_PresetRemove_AreYouSure", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Notice.
         /// </summary>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index c51a184dd..175695ae1 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -578,4 +578,13 @@ The Activity log may have further information.</value>
   <data name="Main_StartQueue" xml:space="preserve">
     <value>Start Queue</value>
   </data>
+  <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
+    <value>You can not delete the default preset. Please set another preset as default first.</value>
+  </data>
+  <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
+    <value>Are you sure you want to delete the preset: </value>
+  </data>
+  <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+    <value>{0:00.00}%   FPS: {1:000.0}   Avg FPS: {2:000.0}   Time Remaining: {3}   Elapsed: {4:hh\:mm\:ss}</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
new file mode 100644
index 000000000..b780ecbb5
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -0,0 +1,300 @@
+<?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="MainView_ActivityLog" xml:space="preserve">
+    <value>Activity Log</value>
+  </data>
+  <data name="Generic_Add" xml:space="preserve">
+    <value>Add</value>
+  </data>
+  <data name="MainView_AddToQueue" xml:space="preserve">
+    <value>Add to Queue</value>
+  </data>
+  <data name="MainView_AdvancedTab" xml:space="preserve">
+    <value>Advanced</value>
+  </data>
+  <data name="MainView_Angle" xml:space="preserve">
+    <value>Angle</value>
+  </data>
+  <data name="MainView_AudioTab" xml:space="preserve">
+    <value>Audio</value>
+  </data>
+  <data name="MainView_Browser" xml:space="preserve">
+    <value>Browse</value>
+  </data>
+  <data name="MainView_ChaptersTab" xml:space="preserve">
+    <value>Chapters</value>
+  </data>
+  <data name="MainView_Container" xml:space="preserve">
+    <value>Container</value>
+  </data>
+  <data name="MainView_Destination" xml:space="preserve">
+    <value>Destination</value>
+  </data>
+  <data name="MainView_Duration" xml:space="preserve">
+    <value>Duration</value>
+  </data>
+  <data name="MainView_File" xml:space="preserve">
+    <value>File</value>
+  </data>
+  <data name="MainView_FiltersTab" xml:space="preserve">
+    <value>Filters</value>
+  </data>
+  <data name="MainView_Help" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="MainView_iPod5G" xml:space="preserve">
+    <value>iPod 5G Support</value>
+  </data>
+  <data name="MainView_Options" xml:space="preserve">
+    <value>Options</value>
+  </data>
+  <data name="MainView_OutputSettings" xml:space="preserve">
+    <value>Output Settings</value>
+  </data>
+  <data name="MainView_Pause" xml:space="preserve">
+    <value>Pause</value>
+  </data>
+  <data name="MainView_PictureTab" xml:space="preserve">
+    <value>Picture</value>
+  </data>
+  <data name="MainView_Presets" xml:space="preserve">
+    <value>Presets</value>
+  </data>
+  <data name="MainView_Preview" xml:space="preserve">
+    <value>Preview</value>
+  </data>
+  <data name="MainView_Remove" xml:space="preserve">
+    <value>Remove</value>
+  </data>
+  <data name="MainView_ShowQueue" xml:space="preserve">
+    <value>Show Queue</value>
+  </data>
+  <data name="MainView_Source" xml:space="preserve">
+    <value>Source</value>
+  </data>
+  <data name="MainView_StartEncode" xml:space="preserve">
+    <value>Start Encode</value>
+  </data>
+  <data name="MainView_StartQueue" xml:space="preserve">
+    <value>Start Queue</value>
+  </data>
+  <data name="MainView_Stop" xml:space="preserve">
+    <value>Stop</value>
+  </data>
+  <data name="MainView_SubtitlesTab" xml:space="preserve">
+    <value>Subtitles</value>
+  </data>
+  <data name="MainView_through" xml:space="preserve">
+    <value>through</value>
+  </data>
+  <data name="MainView_Title" xml:space="preserve">
+    <value>Title</value>
+  </data>
+  <data name="MainView_Tools" xml:space="preserve">
+    <value>Tools</value>
+  </data>
+  <data name="MainView_VideoTab" xml:space="preserve">
+    <value>Video</value>
+  </data>
+  <data name="MainView_WebOptimized" xml:space="preserve">
+    <value>Web Optimized</value>
+  </data>
+  <data name="AboutView_License" xml:space="preserve">
+    <value>License: </value>
+  </data>
+  <data name="AboutView_Version" xml:space="preserve">
+    <value>Version: </value>
+  </data>
+  <data name="AddPresetView_AddPreset" xml:space="preserve">
+    <value>Add Preset</value>
+  </data>
+  <data name="AddPresetView_Description" xml:space="preserve">
+    <value>Description:</value>
+  </data>
+  <data name="AddPresetView_Name" xml:space="preserve">
+    <value>Name:</value>
+  </data>
+  <data name="AddPresetView_SavePictureSize" xml:space="preserve">
+    <value>Save Picture Size:</value>
+  </data>
+  <data name="AddPresetView_SaveVideoFilters" xml:space="preserve">
+    <value>Save Video Filter Settings</value>
+  </data>
+  <data name="Generic_Cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="ChaptersView_ChapterMarkers" xml:space="preserve">
+    <value>Chapter Markers</value>
+  </data>
+  <data name="ChaptersView_ChapterName" xml:space="preserve">
+    <value>Chapter Name</value>
+  </data>
+  <data name="ChaptersView_ChapterNumber" xml:space="preserve">
+    <value>Chapter Number</value>
+  </data>
+  <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">
+    <value>Create chapter markers</value>
+  </data>
+  <data name="ChaptersView_Duration" xml:space="preserve">
+    <value>Duration</value>
+  </data>
+  <data name="ChaptersView_Export" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="ChaptersView_Import" xml:space="preserve">
+    <value>Import</value>
+  </data>
+  <data name="ChapterView_ExportNames" xml:space="preserve">
+    <value>Export Names</value>
+  </data>
+  <data name="ChapterView_ImportNames" xml:space="preserve">
+    <value>Import Names</value>
+  </data>
+  <data name="ChapterView_ResetChapterNames" xml:space="preserve">
+    <value>Reset Chapter Names</value>
+  </data>
+  <data name="Generic_Export" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Generic_Import" xml:space="preserve">
+    <value>Import</value>
+  </data>
+  <data name="LogView_CopyClipboard" xml:space="preserve">
+    <value>Copy to clipboard</value>
+  </data>
+  <data name="LogView_EncodeLog" xml:space="preserve">
+    <value>Encode Log</value>
+  </data>
+  <data name="LogView_OpenLogDir" xml:space="preserve">
+    <value>Open Log Directory</value>
+  </data>
+  <data name="LogView_ScanLog" xml:space="preserve">
+    <value>ScanLog</value>
+  </data>
+  <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
+    <value>Reset Built-in Presets</value>
+  </data>
+  <data name="MainView_SetDefault" xml:space="preserve">
+    <value>Set Default</value>
+  </data>
+  <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
+    <value>Update Selected Preset</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 327468411..f995b4d2e 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -21,7 +21,6 @@ namespace HandBrakeWPF.ViewModels
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Services.Encode.EventArgs;
     using HandBrake.ApplicationServices.Services.Encode.Interfaces;
     using HandBrake.ApplicationServices.Services.Encode.Model;
@@ -1765,7 +1764,7 @@ namespace HandBrakeWPF.ViewModels
                 if (this.selectedPreset.IsDefault)
                 {
                     this.errorService.ShowMessageBox(
-                      "You can not delete the default preset. Please set another preset as default first.",
+                      Resources.MainViewModel_CanNotDeleteDefaultPreset,
                       Resources.Warning,
                       MessageBoxButton.OK,
                       MessageBoxImage.Information);
@@ -1775,7 +1774,7 @@ namespace HandBrakeWPF.ViewModels
 
                 MessageBoxResult result =
                 this.errorService.ShowMessageBox(
-                   "Are you sure you want to delete the preset: " + this.selectedPreset.Name + " ?",
+                   Resources.MainViewModel_PresetRemove_AreYouSure + this.selectedPreset.Name + " ?",
                    Resources.Question,
                    MessageBoxButton.YesNo,
                    MessageBoxImage.Question);
@@ -2252,7 +2251,7 @@ namespace HandBrakeWPF.ViewModels
                     if (this.queueProcessor.EncodeService.IsEncoding)
                     {
                         this.ProgramStatusLabel =
-                            string.Format("{0:00.00}%   FPS: {1:000.0}   Avg FPS: {2:000.0}   Time Remaining: {3}   Elapsed: {4:hh\\:mm\\:ss}" + Resources.Main_JobsPending_addon,
+                            string.Format(Resources.MainViewModel_EncodeStatusChanged_StatusLabel + Resources.Main_JobsPending_addon,
                                 e.PercentComplete,
                                 e.CurrentFrameRate,
                                 e.AverageFrameRate,
diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index ac625ef5d..01fc3f2d0 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -34,11 +34,11 @@
                 <StackPanel Grid.Row="0"
                             Margin="5,10,0,0"
                             Orientation="Horizontal">
-                    <TextBlock Margin="0,0,5,0" FontSize="16" FontFamily="Segoe UI Light" Text="Version: " />
+                    <TextBlock Margin="0,0,5,0" FontSize="16" FontFamily="Segoe UI Light" Text="{x:Static Properties:ResourcesUI.MainView_AudioTab}" />
                     <TextBlock Margin="0,0,0,1" FontSize="16" FontFamily="Segoe UI Light" VerticalAlignment="Bottom" Text="{Binding Version}" />
                 </StackPanel>
 
-                <TextBlock Grid.Row="1" Margin="5,10,0,5" Text="License: " />
+                <TextBlock Grid.Row="1" Margin="5,10,0,5" Text="{x:Static Properties:ResourcesUI.AboutView_License}" />
 
                 <TextBox Text="{x:Static Properties:Resources.About_GPL}" Grid.Row="2" Margin="10,0,10,10" HorizontalAlignment="Stretch"
                          VerticalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" />
diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
index 9940282c7..eb9d67b26 100644
--- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
@@ -33,8 +33,8 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <TextBlock Text="Add Preset" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />
-        
+        <TextBlock Text="{x:Static Properties:ResourcesUI.AddPresetView_AddPreset}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />
+
         <!--  Header  -->
         <Grid Grid.Row="1" Margin="10,0,10,0">
             <Grid.ColumnDefinitions>
@@ -56,7 +56,7 @@
             <!--  Name  -->
             <TextBlock Grid.Row="0"
                        Grid.Column="0"
-                       Text="Name:" />
+                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Name}" />
             <TextBox Grid.Row="0"
                      Grid.Column="1"
                      Width="150"
@@ -64,12 +64,12 @@
                      Text="{Binding Preset.Name}" />
 
             <!--  Settings  -->
-            <TextBlock Grid.Row="2" Margin="0,10,0,0"
+            <TextBlock Grid.Row="2" Margin="0,10,10,0"
                        Grid.Column="0"
                        Style="{StaticResource LongToolTipHolder}"
                        VerticalAlignment="Center"
                        ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"
-                       Text="Save Picture Size:" />
+                       Text="{x:Static Properties:ResourcesUI.AddPresetView_SavePictureSize}" />
             <ComboBox Grid.Row="2" Margin="0,10,0,0"
                       Grid.Column="1"
                       Width="125"
@@ -99,13 +99,13 @@
             <CheckBox Grid.Row="4"
                       Grid.Column="0" Grid.ColumnSpan="2"
                       Margin="0,10,0,0"
-                      Content="Save Video Filter Settings"
+                      Content="{x:Static Properties:ResourcesUI.AddPresetView_SaveVideoFilters}"
                       IsChecked="{Binding Preset.UsePictureFilters}" />
 
             <!--  Description  -->
             <TextBlock Grid.Row="5"
                        Grid.Column="0" Margin="0,10,0,0"
-                       Text="Description:" />
+                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Description}" />
             <TextBox Grid.Row="5"
                      Grid.Column="1" Margin="0,10,0,0"
                      HorizontalAlignment="Stretch"
@@ -115,7 +115,7 @@
         <!--  Controls  -->
         <Grid Grid.Row="3"
               Margin="0,20,0,0">
-            
+
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
@@ -125,13 +125,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/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
index 583e2c41d..6dfe53410 100644
--- a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
              d:DesignHeight="170"
              d:DesignWidth="616"
              mc:Ignorable="d" >
@@ -13,7 +14,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <TextBlock Text="Chapter Markers" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
+        <TextBlock Text="{x:Static Properties:ResourcesUI.ChaptersView_ChapterMarkers}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
 
         <Grid Grid.Row="1" Margin="10,5,10,0">
             <Grid.ColumnDefinitions>
@@ -22,9 +23,9 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <CheckBox Content="Create chapter markers" IsChecked="{Binding IncludeChapterMarkers}" Grid.Column="0" VerticalAlignment="Center" />
-            <Button Content="Import" Name="import" Grid.Column="2" Width="75" Margin="0,0,10,0" cal:Message.Attach="[Event Click] = [Action Import]" />
-            <Button Content="Export" Name="export" Grid.Column="3" Width="75" cal:Message.Attach="[Event Click] = [Action Export]" />
+            <CheckBox Content="{x:Static Properties:ResourcesUI.ChaptersView_CreateChapterMarkers}" IsChecked="{Binding IncludeChapterMarkers}" Grid.Column="0" VerticalAlignment="Center" />
+            <Button Content="{x:Static Properties:ResourcesUI.ChaptersView_Import}" Name="import" Grid.Column="2" Width="75" Margin="0,0,10,0" cal:Message.Attach="[Event Click] = [Action Import]" />
+            <Button Content="{x:Static Properties:ResourcesUI.ChaptersView_Export}" Name="export" Grid.Column="3" Width="75" cal:Message.Attach="[Event Click] = [Action Export]" />
         </Grid>
 
         <DataGrid Grid.Row="2" Margin="10" ItemsSource="{Binding Task.ChapterNames}" 
@@ -38,16 +39,16 @@
             </DataGrid.CellStyle>
             <DataGrid.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="Import Names" cal:Message.Attach="[Event Click] = [Action Import]" />
-                    <MenuItem Header="Export Names" cal:Message.Attach="[Event Click] = [Action Export]" />
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.ChapterView_ImportNames}" cal:Message.Attach="[Event Click] = [Action Import]" />
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.ChapterView_ExportNames}" cal:Message.Attach="[Event Click] = [Action Export]" />
                     <Separator />
-                    <MenuItem Header="Reset Chapter Names" cal:Message.Attach="[Event Click] = [Action Reset]" />
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.ChapterView_ResetChapterNames}" cal:Message.Attach="[Event Click] = [Action Reset]" />
                 </ContextMenu>
             </DataGrid.ContextMenu>
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Chapter Number" Width="120" Binding="{Binding ChapterNumber}" IsReadOnly="True" />
-                <DataGridTextColumn Header="Duration" Width="100" Binding="{Binding Duration}" IsReadOnly="True" />
-                <DataGridTextColumn Header="Chapter Name"  Width="*" Binding="{Binding ChapterName}" IsReadOnly="False" />
+                <DataGridTextColumn Header="{x:Static Properties:ResourcesUI.ChaptersView_ChapterNumber}" Width="120" Binding="{Binding ChapterNumber}" IsReadOnly="True" />
+                <DataGridTextColumn Header="{x:Static Properties:ResourcesUI.ChaptersView_Duration}" Width="100" Binding="{Binding Duration}" IsReadOnly="True" />
+                <DataGridTextColumn Header="{x:Static Properties:ResourcesUI.ChaptersView_ChapterName}"  Width="*" Binding="{Binding ChapterName}" IsReadOnly="False" />
             </DataGrid.Columns>
         </DataGrid>
 
diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml
index 163133f94..64ca9da2d 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml
+++ b/win/CS/HandBrakeWPF/Views/LogView.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="525"
         Height="600"
@@ -25,13 +26,13 @@
                 <Button cal:Message.Attach="[Event Click] = [Action CopyLog]" Margin="10,0,0,0">
                     <StackPanel Orientation="Horizontal">
                         <Image Width="16" Source="Images/copy.png" />
-                        <TextBlock Margin="2,0,0,0" Text="Copy to clipboard" />
+                        <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:ResourcesUI.LogView_CopyClipboard}" />
                     </StackPanel>
                 </Button>
                 <Button Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">
                     <StackPanel Orientation="Horizontal">
                         <Image Width="16" Source="Images/folder.png" />
-                        <TextBlock Margin="2,0,0,0" Text="Open Log Directory" />
+                        <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:ResourcesUI.LogView_OpenLogDir}" />
                     </StackPanel>
                 </Button>
 
@@ -41,7 +42,7 @@
             <TabControl Grid.Row="2" SelectedIndex="{Binding SelectedTab}" Margin="0,3,0,0">
                 <TabItem>
                     <TabItem.Header>
-                        <TextBlock Text="Encode Log" Padding="4">
+                        <TextBlock Text="{x:Static Properties:ResourcesUI.LogView_EncodeLog}" Padding="4">
                             <TextBlock.Style>
                                 <Style TargetType="TextBlock">
                                     <Style.Triggers>
@@ -64,7 +65,7 @@
 
                 <TabItem>
                     <TabItem.Header>
-                        <TextBlock Text="Scan Log" Padding="4">
+                        <TextBlock Text="{x:Static Properties:ResourcesUI.LogView_ScanLog}" Padding="4">
                             <TextBlock.Style>
                                 <Style TargetType="TextBlock">
                                     <Style.Triggers>
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 80ff24c61..13c1ccd8b 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -6,6 +6,7 @@
              xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:commands="clr-namespace:HandBrakeWPF.Commands"
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
              AllowDrop="True"
         FontSize="11"
         Micro:Message.Attach="[Event Loaded] = [Action Load]"
@@ -155,7 +156,7 @@
                                />
                         <Label Margin="8,0,0,0"
                                VerticalAlignment="Center"
-                               Content="Source"
+                               Content="{x:Static Properties:ResourcesUI.MainView_Source}"
                                />
                     </StackPanel>
                 </Button>
@@ -175,7 +176,7 @@
                                />
                         <Label Margin="8,0,0,0"
                                VerticalAlignment="Center"
-                               Content="{Binding StartLabel, FallbackValue='Start'}"
+                               Content="{Binding StartLabel, FallbackValue='{x:Static Properties:ResourcesUI.MainView_StartEncode}'}"
                                />
                     </StackPanel>
                 </Button>
@@ -194,7 +195,7 @@
                                />
                         <Label Margin="8,0,0,0"
                                VerticalAlignment="Center"
-                               Content="Stop"
+                               Content="{x:Static Properties:ResourcesUI.MainView_Stop}"
                                />
                     </StackPanel>
                 </Button>
@@ -213,7 +214,7 @@
                                />
                         <Label Margin="8,0,0,0"
                                VerticalAlignment="Center"
-                               Content="Pause"
+                               Content="{x:Static Properties:ResourcesUI.MainView_Pause}"
                                />
                     </StackPanel>
                 </Button>
@@ -238,7 +239,7 @@
                                                />
                                         <Label Margin="8,0,0,0"
                                                VerticalAlignment="Center"
-                                               Content="Add to Queue"
+                                               Content="{x:Static Properties:ResourcesUI.MainView_AddToQueue}"
                                                />
                                     </StackPanel>
                                     <Button.Style>
@@ -285,7 +286,7 @@
                                />
                         <Label Margin="8,0,0,0"
                                VerticalAlignment="Center"
-                               Content="{Binding QueueLabel, FallbackValue='Show Queue'}"
+                               Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:ResourcesUI.MainView_ShowQueue}'}"
                                />
                     </StackPanel>
                 </Button>
@@ -341,18 +342,18 @@
                             VerticalAlignment="Stretch"
                             >
                     <StackPanel Orientation="Horizontal">
-                        <Label Content="Source" FontWeight="Bold" />
+                        <Label Content="{x:Static Properties:ResourcesUI.MainView_Source}" FontWeight="Bold" />
                         <Label Content="{Binding Path=SourceLabel}" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <Label Margin="8,0,0,0" Content="Title" />
+                        <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Title}" />
                         <ComboBox Name="Titles"
                                   MinWidth="100"
                                   Margin="8,0,0,0"
                                   ItemsSource="{Binding ScannedSource.Titles}"
                                   SelectedItem="{Binding Path=SelectedTitle}"
                                   />
-                        <Label Margin="8,0,0,0" Content="Angle" />
+                        <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Angle}" />
 
                         <ComboBox Name="Angles"
                                   MinWidth="60"
@@ -382,7 +383,7 @@
                                                        ConverterParameter=false}"
                                                 />
 
-                        <Label Margin="4,0,0,0" Content="through" />
+                        <Label Margin="4,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_through}" />
                         <ComboBox Name="EndPoint"
                                   MinWidth="60"
                                   Margin="4,0,0,0"
@@ -399,7 +400,7 @@
                                                        ConverterParameter=false}"
                                                 />
 
-                        <Label Margin="4,0,0,0" Content="Duration" />
+                        <Label Margin="4,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Duration}" />
                         <Label Margin="4,0,0,0" Content="{Binding Duration}" />
 
                     </StackPanel>
@@ -412,14 +413,14 @@
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         >
-                <Label Content="Destination" FontWeight="Bold" />
+                <Label Content="{x:Static Properties:ResourcesUI.MainView_Destination}" FontWeight="Bold" />
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <Label Margin="8,0,0,0" Content="File" />
+                    <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_File}" />
                     <TextBox Name="Destination"
                              Grid.Column="1"
                              Margin="8,0,0,0"
@@ -447,9 +448,9 @@
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         >
-                <Label Content="Output Settings" FontWeight="Bold" />
+                <Label Content="{x:Static Properties:ResourcesUI.MainView_OutputSettings}" FontWeight="Bold" />
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="8,0,0,0" Content="Container" />
+                    <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Container}" />
                     <ComboBox Name="Container"
                               MinWidth="100"
                               Margin="8,0,0,0"
@@ -459,7 +460,7 @@
                     <CheckBox Name="WebOptimized"
                               Margin="8,0,0,0"
                               VerticalAlignment="Center"
-                              Content="Web Optimized"
+                              Content="{x:Static Properties:ResourcesUI.MainView_WebOptimized}"
                               IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"
                               Visibility="{Binding IsMkv,
                                                    Converter={StaticResource boolToVisConverter},
@@ -468,7 +469,7 @@
                     <CheckBox Name="iPod5G"
                               Margin="8,0,0,0"
                               VerticalAlignment="Center"
-                              Content="iPod 5G Support"
+                              Content="{x:Static Properties:ResourcesUI.MainView_iPod5G}"
                               IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"
                               Visibility="{Binding IsMkv,
                                                    Converter={StaticResource boolToVisConverter},
@@ -485,25 +486,25 @@
                         VerticalAlignment="Stretch"
                         MinHeight="350" MinWidth="720"
                         >
-                <TabItem Name="pictureTab" Header="Picture">
+                <TabItem Name="pictureTab" Header="{x:Static Properties:ResourcesUI.MainView_PictureTab}">
                     <ContentControl x:Name="PictureSettingsViewModel" />
                 </TabItem>
-                <TabItem Name="filtersTab" Header="Filters">
+                <TabItem Name="filtersTab" Header="{x:Static Properties:ResourcesUI.MainView_FiltersTab}">
                     <ContentControl x:Name="FiltersViewModel" />
                 </TabItem>
-                <TabItem Name="videoTab" Header="Video">
+                <TabItem Name="videoTab" Header="{x:Static Properties:ResourcesUI.MainView_VideoTab}">
                     <ContentControl x:Name="VideoViewModel" />
                 </TabItem>
-                <TabItem Name="audioTab" Header="Audio">
+                <TabItem Name="audioTab" Header="{x:Static Properties:ResourcesUI.MainView_AudioTab}">
                     <ContentControl x:Name="AudioViewModel" />
                 </TabItem>
-                <TabItem Name="subtitlesTab" Header="Subtitles">
+                <TabItem Name="subtitlesTab" Header="{x:Static Properties:ResourcesUI.MainView_SubtitlesTab}">
                     <ContentControl x:Name="SubtitleViewModel" />
                 </TabItem>
-                <TabItem Name="chaptersTab" Header="Chapters">
+                <TabItem Name="chaptersTab" Header="{x:Static Properties:ResourcesUI.MainView_ChaptersTab}">
                     <ContentControl x:Name="ChaptersViewModel" />
                 </TabItem>
-                <TabItem Name="advancedTab" Header="Advanced" Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}}">
+                <TabItem Name="advancedTab" Header="{x:Static Properties:ResourcesUI.MainView_AdvancedTab}" Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}}">
                     <ContentControl x:Name="AdvancedViewModel" />
                 </TabItem>
             </TabControl>
@@ -590,7 +591,7 @@
                                     <TextBlock Margin="2,0,0,0"
                                                VerticalAlignment="Center"
                                                Style="{StaticResource textBlockOrangeStyle}"
-                                               Text="Add"
+                                               Text="{x:Static Properties:ResourcesUI.Generic_Add}"
                                                />
                                 </StackPanel>
                             </Button.Content>
@@ -606,7 +607,7 @@
                                     <TextBlock Margin="2,0,0,0"
                                                VerticalAlignment="Center"
                                                Style="{StaticResource textBlockOrangeStyle}"
-                                               Text="Remove"
+                                               Text="{x:Static Properties:ResourcesUI.MainView_Remove}"
                                                />
                                 </StackPanel>
                             </Button.Content>
@@ -623,18 +624,18 @@
                                         <TextBlock Margin="2,0,0,0"
                                                    VerticalAlignment="Center"
                                                    Style="{StaticResource textBlockOrangeStyle}"
-                                                   Text="Options"
+                                                   Text="{x:Static Properties:ResourcesUI.MainView_Options}"
                                                    />
                                     </StackPanel>
                                 </MenuItem.Header>
-                                <MenuItem Header="Set Default" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />
                                 <Separator />
-                                <MenuItem Header="Update Selected Preset" Micro:Message.Attach="[Event Click] = [Action PresetUpdate]" />
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" Micro:Message.Attach="[Event Click] = [Action PresetUpdate]" />
                                 <Separator />
-                                <MenuItem Header="Import" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />
-                                <MenuItem Header="Export" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Import}" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Export}" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />
                                 <Separator />
-                                <MenuItem Header="Reset Built-in Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />
                             </MenuItem>
                         </Menu>
                     </ToolBar>
-- 
cgit v1.2.3