WinGui: Starting to move UI text string to resources. This will allow us to start...
authorsr55 <sr55.hb@outlook.com>
Thu, 4 Jun 2015 20:54:14 +0000 (20:54 +0000)
committersr55 <sr55.hb@outlook.com>
Thu, 4 Jun 2015 20:54:14 +0000 (20:54 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7276 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
win/CS/HandBrakeWPF/Properties/Resources.resx
win/CS/HandBrakeWPF/Properties/ResourcesUI.resx [new file with mode: 0644]
win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
win/CS/HandBrakeWPF/Views/AboutView.xaml
win/CS/HandBrakeWPF/Views/AddPresetView.xaml
win/CS/HandBrakeWPF/Views/ChaptersView.xaml
win/CS/HandBrakeWPF/Views/LogView.xaml
win/CS/HandBrakeWPF/Views/MainView.xaml

index 14fe06b41fc290c21e86367916e25b50d84da01c..10bddbeb62fcda656d2294162e77760ffc162779 100644 (file)
     <Compile Include="Model\Subtitles\SubtitleBurnInBehaviourModes.cs" />\r
     <Compile Include="Model\Subtitles\SubtitleBehaviourModes.cs" />\r
     <Compile Include="Model\Subtitles\SubtitleBehaviours.cs" />\r
+    <Compile Include="Properties\ResourcesUI.Designer.cs">\r
+      <DependentUpon>ResourcesUI.resx</DependentUpon>\r
+      <AutoGen>True</AutoGen>\r
+      <DesignTime>True</DesignTime>\r
+    </Compile>\r
     <Compile Include="Services\Presets\Factories\JsonPresetFactory.cs" />\r
     <Compile Include="Services\Queue\Interfaces\IQueueProcessor.cs" />\r
     <Compile Include="Services\Presets\Factories\PlistPresetFactory.cs" />\r
       <DesignTime>True</DesignTime>\r
       <DependentUpon>Resources.resx</DependentUpon>\r
     </Compile>\r
+    <EmbeddedResource Include="Properties\ResourcesUI.resx">\r
+      <Generator>PublicResXFileCodeGenerator</Generator>\r
+      <LastGenOutput>ResourcesUI.Designer.cs</LastGenOutput>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="Properties\Resources.resx">\r
       <Generator>PublicResXFileCodeGenerator</Generator>\r
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
index f248ee1e2f2d1bee076dec946c274416772c328c..1cfcd6914e17ad07b814546a692ac6bdd74c65f9 100644 (file)
@@ -780,6 +780,33 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to You can not delete the default preset. Please set another preset as default first..\r
+        /// </summary>\r
+        public static string MainViewModel_CanNotDeleteDefaultPreset {\r
+            get {\r
+                return ResourceManager.GetString("MainViewModel_CanNotDeleteDefaultPreset", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   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}.\r
+        /// </summary>\r
+        public static string MainViewModel_EncodeStatusChanged_StatusLabel {\r
+            get {\r
+                return ResourceManager.GetString("MainViewModel_EncodeStatusChanged_StatusLabel", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Are you sure you want to delete the preset: .\r
+        /// </summary>\r
+        public static string MainViewModel_PresetRemove_AreYouSure {\r
+            get {\r
+                return ResourceManager.GetString("MainViewModel_PresetRemove_AreYouSure", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Notice.\r
         /// </summary>\r
index c51a184dd01c46181e7dc8375eb80cd8d8637f0d..175695ae1725eb37f821fceb921616162acf07ad 100644 (file)
@@ -578,4 +578,13 @@ The Activity log may have further information.</value>
   <data name="Main_StartQueue" xml:space="preserve">\r
     <value>Start Queue</value>\r
   </data>\r
+  <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">\r
+    <value>You can not delete the default preset. Please set another preset as default first.</value>\r
+  </data>\r
+  <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">\r
+    <value>Are you sure you want to delete the preset: </value>\r
+  </data>\r
+  <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">\r
+    <value>{0:00.00}%   FPS: {1:000.0}   Avg FPS: {2:000.0}   Time Remaining: {3}   Elapsed: {4:hh\:mm\:ss}</value>\r
+  </data>\r
 </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 (file)
index 0000000..b780ecb
--- /dev/null
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<root>\r
+  <!-- \r
+    Microsoft ResX Schema \r
+    \r
+    Version 2.0\r
+    \r
+    The primary goals of this format is to allow a simple XML format \r
+    that is mostly human readable. The generation and parsing of the \r
+    various data types are done through the TypeConverter classes \r
+    associated with the data types.\r
+    \r
+    Example:\r
+    \r
+    ... ado.net/XML headers & schema ...\r
+    <resheader name="resmimetype">text/microsoft-resx</resheader>\r
+    <resheader name="version">2.0</resheader>\r
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>\r
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>\r
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>\r
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>\r
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">\r
+        <value>[base64 mime encoded serialized .NET Framework object]</value>\r
+    </data>\r
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>\r
+        <comment>This is a comment</comment>\r
+    </data>\r
+                \r
+    There are any number of "resheader" rows that contain simple \r
+    name/value pairs.\r
+    \r
+    Each data row contains a name, and value. The row also contains a \r
+    type or mimetype. Type corresponds to a .NET class that support \r
+    text/value conversion through the TypeConverter architecture. \r
+    Classes that don't support this are serialized and stored with the \r
+    mimetype set.\r
+    \r
+    The mimetype is used for serialized objects, and tells the \r
+    ResXResourceReader how to depersist the object. This is currently not \r
+    extensible. For a given mimetype the value must be set accordingly:\r
+    \r
+    Note - application/x-microsoft.net.object.binary.base64 is the format \r
+    that the ResXResourceWriter will generate, however the reader can \r
+    read any of the formats listed below.\r
+    \r
+    mimetype: application/x-microsoft.net.object.binary.base64\r
+    value   : The object must be serialized with \r
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter\r
+            : and then encoded with base64 encoding.\r
+    \r
+    mimetype: application/x-microsoft.net.object.soap.base64\r
+    value   : The object must be serialized with \r
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter\r
+            : and then encoded with base64 encoding.\r
+\r
+    mimetype: application/x-microsoft.net.object.bytearray.base64\r
+    value   : The object must be serialized into a byte array \r
+            : using a System.ComponentModel.TypeConverter\r
+            : and then encoded with base64 encoding.\r
+    -->\r
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">\r
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />\r
+    <xsd:element name="root" msdata:IsDataSet="true">\r
+      <xsd:complexType>\r
+        <xsd:choice maxOccurs="unbounded">\r
+          <xsd:element name="metadata">\r
+            <xsd:complexType>\r
+              <xsd:sequence>\r
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />\r
+              </xsd:sequence>\r
+              <xsd:attribute name="name" use="required" type="xsd:string" />\r
+              <xsd:attribute name="type" type="xsd:string" />\r
+              <xsd:attribute name="mimetype" type="xsd:string" />\r
+              <xsd:attribute ref="xml:space" />\r
+            </xsd:complexType>\r
+          </xsd:element>\r
+          <xsd:element name="assembly">\r
+            <xsd:complexType>\r
+              <xsd:attribute name="alias" type="xsd:string" />\r
+              <xsd:attribute name="name" type="xsd:string" />\r
+            </xsd:complexType>\r
+          </xsd:element>\r
+          <xsd:element name="data">\r
+            <xsd:complexType>\r
+              <xsd:sequence>\r
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />\r
+              </xsd:sequence>\r
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />\r
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />\r
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />\r
+              <xsd:attribute ref="xml:space" />\r
+            </xsd:complexType>\r
+          </xsd:element>\r
+          <xsd:element name="resheader">\r
+            <xsd:complexType>\r
+              <xsd:sequence>\r
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
+              </xsd:sequence>\r
+              <xsd:attribute name="name" type="xsd:string" use="required" />\r
+            </xsd:complexType>\r
+          </xsd:element>\r
+        </xsd:choice>\r
+      </xsd:complexType>\r
+    </xsd:element>\r
+  </xsd:schema>\r
+  <resheader name="resmimetype">\r
+    <value>text/microsoft-resx</value>\r
+  </resheader>\r
+  <resheader name="version">\r
+    <value>2.0</value>\r
+  </resheader>\r
+  <resheader name="reader">\r
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </resheader>\r
+  <resheader name="writer">\r
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </resheader>\r
+  <data name="MainView_ActivityLog" xml:space="preserve">\r
+    <value>Activity Log</value>\r
+  </data>\r
+  <data name="Generic_Add" xml:space="preserve">\r
+    <value>Add</value>\r
+  </data>\r
+  <data name="MainView_AddToQueue" xml:space="preserve">\r
+    <value>Add to Queue</value>\r
+  </data>\r
+  <data name="MainView_AdvancedTab" xml:space="preserve">\r
+    <value>Advanced</value>\r
+  </data>\r
+  <data name="MainView_Angle" xml:space="preserve">\r
+    <value>Angle</value>\r
+  </data>\r
+  <data name="MainView_AudioTab" xml:space="preserve">\r
+    <value>Audio</value>\r
+  </data>\r
+  <data name="MainView_Browser" xml:space="preserve">\r
+    <value>Browse</value>\r
+  </data>\r
+  <data name="MainView_ChaptersTab" xml:space="preserve">\r
+    <value>Chapters</value>\r
+  </data>\r
+  <data name="MainView_Container" xml:space="preserve">\r
+    <value>Container</value>\r
+  </data>\r
+  <data name="MainView_Destination" xml:space="preserve">\r
+    <value>Destination</value>\r
+  </data>\r
+  <data name="MainView_Duration" xml:space="preserve">\r
+    <value>Duration</value>\r
+  </data>\r
+  <data name="MainView_File" xml:space="preserve">\r
+    <value>File</value>\r
+  </data>\r
+  <data name="MainView_FiltersTab" xml:space="preserve">\r
+    <value>Filters</value>\r
+  </data>\r
+  <data name="MainView_Help" xml:space="preserve">\r
+    <value>Help</value>\r
+  </data>\r
+  <data name="MainView_iPod5G" xml:space="preserve">\r
+    <value>iPod 5G Support</value>\r
+  </data>\r
+  <data name="MainView_Options" xml:space="preserve">\r
+    <value>Options</value>\r
+  </data>\r
+  <data name="MainView_OutputSettings" xml:space="preserve">\r
+    <value>Output Settings</value>\r
+  </data>\r
+  <data name="MainView_Pause" xml:space="preserve">\r
+    <value>Pause</value>\r
+  </data>\r
+  <data name="MainView_PictureTab" xml:space="preserve">\r
+    <value>Picture</value>\r
+  </data>\r
+  <data name="MainView_Presets" xml:space="preserve">\r
+    <value>Presets</value>\r
+  </data>\r
+  <data name="MainView_Preview" xml:space="preserve">\r
+    <value>Preview</value>\r
+  </data>\r
+  <data name="MainView_Remove" xml:space="preserve">\r
+    <value>Remove</value>\r
+  </data>\r
+  <data name="MainView_ShowQueue" xml:space="preserve">\r
+    <value>Show Queue</value>\r
+  </data>\r
+  <data name="MainView_Source" xml:space="preserve">\r
+    <value>Source</value>\r
+  </data>\r
+  <data name="MainView_StartEncode" xml:space="preserve">\r
+    <value>Start Encode</value>\r
+  </data>\r
+  <data name="MainView_StartQueue" xml:space="preserve">\r
+    <value>Start Queue</value>\r
+  </data>\r
+  <data name="MainView_Stop" xml:space="preserve">\r
+    <value>Stop</value>\r
+  </data>\r
+  <data name="MainView_SubtitlesTab" xml:space="preserve">\r
+    <value>Subtitles</value>\r
+  </data>\r
+  <data name="MainView_through" xml:space="preserve">\r
+    <value>through</value>\r
+  </data>\r
+  <data name="MainView_Title" xml:space="preserve">\r
+    <value>Title</value>\r
+  </data>\r
+  <data name="MainView_Tools" xml:space="preserve">\r
+    <value>Tools</value>\r
+  </data>\r
+  <data name="MainView_VideoTab" xml:space="preserve">\r
+    <value>Video</value>\r
+  </data>\r
+  <data name="MainView_WebOptimized" xml:space="preserve">\r
+    <value>Web Optimized</value>\r
+  </data>\r
+  <data name="AboutView_License" xml:space="preserve">\r
+    <value>License: </value>\r
+  </data>\r
+  <data name="AboutView_Version" xml:space="preserve">\r
+    <value>Version: </value>\r
+  </data>\r
+  <data name="AddPresetView_AddPreset" xml:space="preserve">\r
+    <value>Add Preset</value>\r
+  </data>\r
+  <data name="AddPresetView_Description" xml:space="preserve">\r
+    <value>Description:</value>\r
+  </data>\r
+  <data name="AddPresetView_Name" xml:space="preserve">\r
+    <value>Name:</value>\r
+  </data>\r
+  <data name="AddPresetView_SavePictureSize" xml:space="preserve">\r
+    <value>Save Picture Size:</value>\r
+  </data>\r
+  <data name="AddPresetView_SaveVideoFilters" xml:space="preserve">\r
+    <value>Save Video Filter Settings</value>\r
+  </data>\r
+  <data name="Generic_Cancel" xml:space="preserve">\r
+    <value>Cancel</value>\r
+  </data>\r
+  <data name="ChaptersView_ChapterMarkers" xml:space="preserve">\r
+    <value>Chapter Markers</value>\r
+  </data>\r
+  <data name="ChaptersView_ChapterName" xml:space="preserve">\r
+    <value>Chapter Name</value>\r
+  </data>\r
+  <data name="ChaptersView_ChapterNumber" xml:space="preserve">\r
+    <value>Chapter Number</value>\r
+  </data>\r
+  <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">\r
+    <value>Create chapter markers</value>\r
+  </data>\r
+  <data name="ChaptersView_Duration" xml:space="preserve">\r
+    <value>Duration</value>\r
+  </data>\r
+  <data name="ChaptersView_Export" xml:space="preserve">\r
+    <value>Export</value>\r
+  </data>\r
+  <data name="ChaptersView_Import" xml:space="preserve">\r
+    <value>Import</value>\r
+  </data>\r
+  <data name="ChapterView_ExportNames" xml:space="preserve">\r
+    <value>Export Names</value>\r
+  </data>\r
+  <data name="ChapterView_ImportNames" xml:space="preserve">\r
+    <value>Import Names</value>\r
+  </data>\r
+  <data name="ChapterView_ResetChapterNames" xml:space="preserve">\r
+    <value>Reset Chapter Names</value>\r
+  </data>\r
+  <data name="Generic_Export" xml:space="preserve">\r
+    <value>Export</value>\r
+  </data>\r
+  <data name="Generic_Import" xml:space="preserve">\r
+    <value>Import</value>\r
+  </data>\r
+  <data name="LogView_CopyClipboard" xml:space="preserve">\r
+    <value>Copy to clipboard</value>\r
+  </data>\r
+  <data name="LogView_EncodeLog" xml:space="preserve">\r
+    <value>Encode Log</value>\r
+  </data>\r
+  <data name="LogView_OpenLogDir" xml:space="preserve">\r
+    <value>Open Log Directory</value>\r
+  </data>\r
+  <data name="LogView_ScanLog" xml:space="preserve">\r
+    <value>ScanLog</value>\r
+  </data>\r
+  <data name="MainView_ResetBuiltInPresets" xml:space="preserve">\r
+    <value>Reset Built-in Presets</value>\r
+  </data>\r
+  <data name="MainView_SetDefault" xml:space="preserve">\r
+    <value>Set Default</value>\r
+  </data>\r
+  <data name="MainView_UpdateSelectedPreset" xml:space="preserve">\r
+    <value>Update Selected Preset</value>\r
+  </data>\r
+</root>
\ No newline at end of file
index 3274684117f2318eb1a01506fd4fa0cbda995213..f995b4d2ef6d5b928fbea3ef4b0452e1227a3146 100644 (file)
@@ -21,7 +21,6 @@ namespace HandBrakeWPF.ViewModels
 \r
     using Caliburn.Micro;\r
 \r
-    using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Services.Encode.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Encode.Interfaces;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
@@ -1765,7 +1764,7 @@ namespace HandBrakeWPF.ViewModels
                 if (this.selectedPreset.IsDefault)\r
                 {\r
                     this.errorService.ShowMessageBox(\r
-                      "You can not delete the default preset. Please set another preset as default first.",\r
+                      Resources.MainViewModel_CanNotDeleteDefaultPreset,\r
                       Resources.Warning,\r
                       MessageBoxButton.OK,\r
                       MessageBoxImage.Information);\r
@@ -1775,7 +1774,7 @@ namespace HandBrakeWPF.ViewModels
 \r
                 MessageBoxResult result =\r
                 this.errorService.ShowMessageBox(\r
-                   "Are you sure you want to delete the preset: " + this.selectedPreset.Name + " ?",\r
+                   Resources.MainViewModel_PresetRemove_AreYouSure + this.selectedPreset.Name + " ?",\r
                    Resources.Question,\r
                    MessageBoxButton.YesNo,\r
                    MessageBoxImage.Question);\r
@@ -2252,7 +2251,7 @@ namespace HandBrakeWPF.ViewModels
                     if (this.queueProcessor.EncodeService.IsEncoding)\r
                     {\r
                         this.ProgramStatusLabel =\r
-                            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,\r
+                            string.Format(Resources.MainViewModel_EncodeStatusChanged_StatusLabel + Resources.Main_JobsPending_addon,\r
                                 e.PercentComplete,\r
                                 e.CurrentFrameRate,\r
                                 e.AverageFrameRate,\r
index ac625ef5d6d0e23168722d9add1c7ecbeeb31473..01fc3f2d0255350438f2d26b748f6f1d48521352 100644 (file)
                 <StackPanel Grid.Row="0"\r
                             Margin="5,10,0,0"\r
                             Orientation="Horizontal">\r
-                    <TextBlock Margin="0,0,5,0" FontSize="16" FontFamily="Segoe UI Light" Text="Version: " />\r
+                    <TextBlock Margin="0,0,5,0" FontSize="16" FontFamily="Segoe UI Light" Text="{x:Static Properties:ResourcesUI.MainView_AudioTab}" />\r
                     <TextBlock Margin="0,0,0,1" FontSize="16" FontFamily="Segoe UI Light" VerticalAlignment="Bottom" Text="{Binding Version}" />\r
                 </StackPanel>\r
 \r
-                <TextBlock Grid.Row="1" Margin="5,10,0,5" Text="License: " />\r
+                <TextBlock Grid.Row="1" Margin="5,10,0,5" Text="{x:Static Properties:ResourcesUI.AboutView_License}" />\r
 \r
                 <TextBox Text="{x:Static Properties:Resources.About_GPL}" Grid.Row="2" Margin="10,0,10,10" HorizontalAlignment="Stretch"\r
                          VerticalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" />\r
index 9940282c73aeb0bedfc33021f4a1f03da3fbfc24..eb9d67b269bf5dcddb08e7e1e08e498bc385e84e 100644 (file)
@@ -33,8 +33,8 @@
             <RowDefinition Height="Auto" />\r
         </Grid.RowDefinitions>\r
 \r
-        <TextBlock Text="Add Preset" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />\r
-        \r
+        <TextBlock Text="{x:Static Properties:ResourcesUI.AddPresetView_AddPreset}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />\r
+\r
         <!--  Header  -->\r
         <Grid Grid.Row="1" Margin="10,0,10,0">\r
             <Grid.ColumnDefinitions>\r
@@ -56,7 +56,7 @@
             <!--  Name  -->\r
             <TextBlock Grid.Row="0"\r
                        Grid.Column="0"\r
-                       Text="Name:" />\r
+                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Name}" />\r
             <TextBox Grid.Row="0"\r
                      Grid.Column="1"\r
                      Width="150"\r
                      Text="{Binding Preset.Name}" />\r
 \r
             <!--  Settings  -->\r
-            <TextBlock Grid.Row="2" Margin="0,10,0,0"\r
+            <TextBlock Grid.Row="2" Margin="0,10,10,0"\r
                        Grid.Column="0"\r
                        Style="{StaticResource LongToolTipHolder}"\r
                        VerticalAlignment="Center"\r
                        ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"\r
-                       Text="Save Picture Size:" />\r
+                       Text="{x:Static Properties:ResourcesUI.AddPresetView_SavePictureSize}" />\r
             <ComboBox Grid.Row="2" Margin="0,10,0,0"\r
                       Grid.Column="1"\r
                       Width="125"\r
             <CheckBox Grid.Row="4"\r
                       Grid.Column="0" Grid.ColumnSpan="2"\r
                       Margin="0,10,0,0"\r
-                      Content="Save Video Filter Settings"\r
+                      Content="{x:Static Properties:ResourcesUI.AddPresetView_SaveVideoFilters}"\r
                       IsChecked="{Binding Preset.UsePictureFilters}" />\r
 \r
             <!--  Description  -->\r
             <TextBlock Grid.Row="5"\r
                        Grid.Column="0" Margin="0,10,0,0"\r
-                       Text="Description:" />\r
+                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Description}" />\r
             <TextBox Grid.Row="5"\r
                      Grid.Column="1" Margin="0,10,0,0"\r
                      HorizontalAlignment="Stretch"\r
         <!--  Controls  -->\r
         <Grid Grid.Row="3"\r
               Margin="0,20,0,0">\r
-            \r
+\r
             <Grid.ColumnDefinitions>\r
                 <ColumnDefinition Width="*" />\r
                 <ColumnDefinition Width="Auto" />\r
             <Button Grid.Column="1"\r
                     Margin="0,5,10,10"\r
                     cal:Message.Attach="[Event Click] = [Action Cancel]"\r
-                    Content="Cancel"\r
+                    Content="{x:Static Properties:ResourcesUI.Generic_Cancel}"\r
                     IsCancel="True"\r
                     Padding="8,2" />\r
             <Button Grid.Column="2"\r
                     Margin="0,5,10,10"\r
                     cal:Message.Attach="[Event Click] = [Action Add]"\r
-                    Content="Add"\r
+                    Content="{x:Static Properties:ResourcesUI.Generic_Add}"\r
                     IsDefault="True"\r
                     Padding="8,2" />\r
         </Grid>\r
index 583e2c41da295140641ae52765d4707739598ac9..6dfe534104dcf904caa7fa32bd4bf35c82398fb2 100644 (file)
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"\r
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"\r
              d:DesignHeight="170"\r
              d:DesignWidth="616"\r
              mc:Ignorable="d" >\r
@@ -13,7 +14,7 @@
             <RowDefinition Height="*" />\r
         </Grid.RowDefinitions>\r
 \r
-        <TextBlock Text="Chapter Markers" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>\r
+        <TextBlock Text="{x:Static Properties:ResourcesUI.ChaptersView_ChapterMarkers}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>\r
 \r
         <Grid Grid.Row="1" Margin="10,5,10,0">\r
             <Grid.ColumnDefinitions>\r
@@ -22,9 +23,9 @@
                 <ColumnDefinition Width="Auto" />\r
                 <ColumnDefinition Width="Auto" />\r
             </Grid.ColumnDefinitions>\r
-            <CheckBox Content="Create chapter markers" IsChecked="{Binding IncludeChapterMarkers}" Grid.Column="0" VerticalAlignment="Center" />\r
-            <Button Content="Import" Name="import" Grid.Column="2" Width="75" Margin="0,0,10,0" cal:Message.Attach="[Event Click] = [Action Import]" />\r
-            <Button Content="Export" Name="export" Grid.Column="3" Width="75" cal:Message.Attach="[Event Click] = [Action Export]" />\r
+            <CheckBox Content="{x:Static Properties:ResourcesUI.ChaptersView_CreateChapterMarkers}" IsChecked="{Binding IncludeChapterMarkers}" Grid.Column="0" VerticalAlignment="Center" />\r
+            <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]" />\r
+            <Button Content="{x:Static Properties:ResourcesUI.ChaptersView_Export}" Name="export" Grid.Column="3" Width="75" cal:Message.Attach="[Event Click] = [Action Export]" />\r
         </Grid>\r
 \r
         <DataGrid Grid.Row="2" Margin="10" ItemsSource="{Binding Task.ChapterNames}" \r
             </DataGrid.CellStyle>\r
             <DataGrid.ContextMenu>\r
                 <ContextMenu>\r
-                    <MenuItem Header="Import Names" cal:Message.Attach="[Event Click] = [Action Import]" />\r
-                    <MenuItem Header="Export Names" cal:Message.Attach="[Event Click] = [Action Export]" />\r
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.ChapterView_ImportNames}" cal:Message.Attach="[Event Click] = [Action Import]" />\r
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.ChapterView_ExportNames}" cal:Message.Attach="[Event Click] = [Action Export]" />\r
                     <Separator />\r
-                    <MenuItem Header="Reset Chapter Names" cal:Message.Attach="[Event Click] = [Action Reset]" />\r
+                    <MenuItem Header="{x:Static Properties:ResourcesUI.ChapterView_ResetChapterNames}" cal:Message.Attach="[Event Click] = [Action Reset]" />\r
                 </ContextMenu>\r
             </DataGrid.ContextMenu>\r
             <DataGrid.Columns>\r
-                <DataGridTextColumn Header="Chapter Number" Width="120" Binding="{Binding ChapterNumber}" IsReadOnly="True" />\r
-                <DataGridTextColumn Header="Duration" Width="100" Binding="{Binding Duration}" IsReadOnly="True" />\r
-                <DataGridTextColumn Header="Chapter Name"  Width="*" Binding="{Binding ChapterName}" IsReadOnly="False" />\r
+                <DataGridTextColumn Header="{x:Static Properties:ResourcesUI.ChaptersView_ChapterNumber}" Width="120" Binding="{Binding ChapterNumber}" IsReadOnly="True" />\r
+                <DataGridTextColumn Header="{x:Static Properties:ResourcesUI.ChaptersView_Duration}" Width="100" Binding="{Binding Duration}" IsReadOnly="True" />\r
+                <DataGridTextColumn Header="{x:Static Properties:ResourcesUI.ChaptersView_ChapterName}"  Width="*" Binding="{Binding ChapterName}" IsReadOnly="False" />\r
             </DataGrid.Columns>\r
         </DataGrid>\r
 \r
index 163133f94345ec3e07683fa08a33bc4670557bcf..64ca9da2d13607fb49cdd32c5212a4f8f0c617d5 100644 (file)
@@ -2,6 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
         xmlns:cal="http://www.caliburnproject.org"\r
+        xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"\r
         Title="{Binding Title}"\r
         Width="525"\r
         Height="600"\r
                 <Button cal:Message.Attach="[Event Click] = [Action CopyLog]" Margin="10,0,0,0">\r
                     <StackPanel Orientation="Horizontal">\r
                         <Image Width="16" Source="Images/copy.png" />\r
-                        <TextBlock Margin="2,0,0,0" Text="Copy to clipboard" />\r
+                        <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:ResourcesUI.LogView_CopyClipboard}" />\r
                     </StackPanel>\r
                 </Button>\r
                 <Button Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">\r
                     <StackPanel Orientation="Horizontal">\r
                         <Image Width="16" Source="Images/folder.png" />\r
-                        <TextBlock Margin="2,0,0,0" Text="Open Log Directory" />\r
+                        <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:ResourcesUI.LogView_OpenLogDir}" />\r
                     </StackPanel>\r
                 </Button>\r
 \r
@@ -41,7 +42,7 @@
             <TabControl Grid.Row="2" SelectedIndex="{Binding SelectedTab}" Margin="0,3,0,0">\r
                 <TabItem>\r
                     <TabItem.Header>\r
-                        <TextBlock Text="Encode Log" Padding="4">\r
+                        <TextBlock Text="{x:Static Properties:ResourcesUI.LogView_EncodeLog}" Padding="4">\r
                             <TextBlock.Style>\r
                                 <Style TargetType="TextBlock">\r
                                     <Style.Triggers>\r
@@ -64,7 +65,7 @@
 \r
                 <TabItem>\r
                     <TabItem.Header>\r
-                        <TextBlock Text="Scan Log" Padding="4">\r
+                        <TextBlock Text="{x:Static Properties:ResourcesUI.LogView_ScanLog}" Padding="4">\r
                             <TextBlock.Style>\r
                                 <Style TargetType="TextBlock">\r
                                     <Style.Triggers>\r
index 80ff24c61c246e87874c78a14dccb0b09c6b92a2..13c1ccd8b24147af70a3332b93f00047ff52ce49 100644 (file)
@@ -6,6 +6,7 @@
              xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"\r
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"\r
              xmlns:commands="clr-namespace:HandBrakeWPF.Commands"\r
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"\r
              AllowDrop="True"\r
         FontSize="11"\r
         Micro:Message.Attach="[Event Loaded] = [Action Load]"\r
                                />\r
                         <Label Margin="8,0,0,0"\r
                                VerticalAlignment="Center"\r
-                               Content="Source"\r
+                               Content="{x:Static Properties:ResourcesUI.MainView_Source}"\r
                                />\r
                     </StackPanel>\r
                 </Button>\r
                                />\r
                         <Label Margin="8,0,0,0"\r
                                VerticalAlignment="Center"\r
-                               Content="{Binding StartLabel, FallbackValue='Start'}"\r
+                               Content="{Binding StartLabel, FallbackValue='{x:Static Properties:ResourcesUI.MainView_StartEncode}'}"\r
                                />\r
                     </StackPanel>\r
                 </Button>\r
                                />\r
                         <Label Margin="8,0,0,0"\r
                                VerticalAlignment="Center"\r
-                               Content="Stop"\r
+                               Content="{x:Static Properties:ResourcesUI.MainView_Stop}"\r
                                />\r
                     </StackPanel>\r
                 </Button>\r
                                />\r
                         <Label Margin="8,0,0,0"\r
                                VerticalAlignment="Center"\r
-                               Content="Pause"\r
+                               Content="{x:Static Properties:ResourcesUI.MainView_Pause}"\r
                                />\r
                     </StackPanel>\r
                 </Button>\r
                                                />\r
                                         <Label Margin="8,0,0,0"\r
                                                VerticalAlignment="Center"\r
-                                               Content="Add to Queue"\r
+                                               Content="{x:Static Properties:ResourcesUI.MainView_AddToQueue}"\r
                                                />\r
                                     </StackPanel>\r
                                     <Button.Style>\r
                                />\r
                         <Label Margin="8,0,0,0"\r
                                VerticalAlignment="Center"\r
-                               Content="{Binding QueueLabel, FallbackValue='Show Queue'}"\r
+                               Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:ResourcesUI.MainView_ShowQueue}'}"\r
                                />\r
                     </StackPanel>\r
                 </Button>\r
                             VerticalAlignment="Stretch"\r
                             >\r
                     <StackPanel Orientation="Horizontal">\r
-                        <Label Content="Source" FontWeight="Bold" />\r
+                        <Label Content="{x:Static Properties:ResourcesUI.MainView_Source}" FontWeight="Bold" />\r
                         <Label Content="{Binding Path=SourceLabel}" />\r
                     </StackPanel>\r
                     <StackPanel Orientation="Horizontal">\r
-                        <Label Margin="8,0,0,0" Content="Title" />\r
+                        <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Title}" />\r
                         <ComboBox Name="Titles"\r
                                   MinWidth="100"\r
                                   Margin="8,0,0,0"\r
                                   ItemsSource="{Binding ScannedSource.Titles}"\r
                                   SelectedItem="{Binding Path=SelectedTitle}"\r
                                   />\r
-                        <Label Margin="8,0,0,0" Content="Angle" />\r
+                        <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Angle}" />\r
 \r
                         <ComboBox Name="Angles"\r
                                   MinWidth="60"\r
                                                        ConverterParameter=false}"\r
                                                 />\r
 \r
-                        <Label Margin="4,0,0,0" Content="through" />\r
+                        <Label Margin="4,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_through}" />\r
                         <ComboBox Name="EndPoint"\r
                                   MinWidth="60"\r
                                   Margin="4,0,0,0"\r
                                                        ConverterParameter=false}"\r
                                                 />\r
 \r
-                        <Label Margin="4,0,0,0" Content="Duration" />\r
+                        <Label Margin="4,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Duration}" />\r
                         <Label Margin="4,0,0,0" Content="{Binding Duration}" />\r
 \r
                     </StackPanel>\r
                         HorizontalAlignment="Stretch"\r
                         VerticalAlignment="Stretch"\r
                         >\r
-                <Label Content="Destination" FontWeight="Bold" />\r
+                <Label Content="{x:Static Properties:ResourcesUI.MainView_Destination}" FontWeight="Bold" />\r
                 <Grid>\r
                     <Grid.ColumnDefinitions>\r
                         <ColumnDefinition Width="Auto" />\r
                         <ColumnDefinition Width="*" />\r
                         <ColumnDefinition Width="Auto" />\r
                     </Grid.ColumnDefinitions>\r
-                    <Label Margin="8,0,0,0" Content="File" />\r
+                    <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_File}" />\r
                     <TextBox Name="Destination"\r
                              Grid.Column="1"\r
                              Margin="8,0,0,0"\r
                         HorizontalAlignment="Stretch"\r
                         VerticalAlignment="Stretch"\r
                         >\r
-                <Label Content="Output Settings" FontWeight="Bold" />\r
+                <Label Content="{x:Static Properties:ResourcesUI.MainView_OutputSettings}" FontWeight="Bold" />\r
                 <StackPanel Orientation="Horizontal">\r
-                    <Label Margin="8,0,0,0" Content="Container" />\r
+                    <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Container}" />\r
                     <ComboBox Name="Container"\r
                               MinWidth="100"\r
                               Margin="8,0,0,0"\r
                     <CheckBox Name="WebOptimized"\r
                               Margin="8,0,0,0"\r
                               VerticalAlignment="Center"\r
-                              Content="Web Optimized"\r
+                              Content="{x:Static Properties:ResourcesUI.MainView_WebOptimized}"\r
                               IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"\r
                               Visibility="{Binding IsMkv,\r
                                                    Converter={StaticResource boolToVisConverter},\r
                     <CheckBox Name="iPod5G"\r
                               Margin="8,0,0,0"\r
                               VerticalAlignment="Center"\r
-                              Content="iPod 5G Support"\r
+                              Content="{x:Static Properties:ResourcesUI.MainView_iPod5G}"\r
                               IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"\r
                               Visibility="{Binding IsMkv,\r
                                                    Converter={StaticResource boolToVisConverter},\r
                         VerticalAlignment="Stretch"\r
                         MinHeight="350" MinWidth="720"\r
                         >\r
-                <TabItem Name="pictureTab" Header="Picture">\r
+                <TabItem Name="pictureTab" Header="{x:Static Properties:ResourcesUI.MainView_PictureTab}">\r
                     <ContentControl x:Name="PictureSettingsViewModel" />\r
                 </TabItem>\r
-                <TabItem Name="filtersTab" Header="Filters">\r
+                <TabItem Name="filtersTab" Header="{x:Static Properties:ResourcesUI.MainView_FiltersTab}">\r
                     <ContentControl x:Name="FiltersViewModel" />\r
                 </TabItem>\r
-                <TabItem Name="videoTab" Header="Video">\r
+                <TabItem Name="videoTab" Header="{x:Static Properties:ResourcesUI.MainView_VideoTab}">\r
                     <ContentControl x:Name="VideoViewModel" />\r
                 </TabItem>\r
-                <TabItem Name="audioTab" Header="Audio">\r
+                <TabItem Name="audioTab" Header="{x:Static Properties:ResourcesUI.MainView_AudioTab}">\r
                     <ContentControl x:Name="AudioViewModel" />\r
                 </TabItem>\r
-                <TabItem Name="subtitlesTab" Header="Subtitles">\r
+                <TabItem Name="subtitlesTab" Header="{x:Static Properties:ResourcesUI.MainView_SubtitlesTab}">\r
                     <ContentControl x:Name="SubtitleViewModel" />\r
                 </TabItem>\r
-                <TabItem Name="chaptersTab" Header="Chapters">\r
+                <TabItem Name="chaptersTab" Header="{x:Static Properties:ResourcesUI.MainView_ChaptersTab}">\r
                     <ContentControl x:Name="ChaptersViewModel" />\r
                 </TabItem>\r
-                <TabItem Name="advancedTab" Header="Advanced" Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}}">\r
+                <TabItem Name="advancedTab" Header="{x:Static Properties:ResourcesUI.MainView_AdvancedTab}" Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}}">\r
                     <ContentControl x:Name="AdvancedViewModel" />\r
                 </TabItem>\r
             </TabControl>\r
                                     <TextBlock Margin="2,0,0,0"\r
                                                VerticalAlignment="Center"\r
                                                Style="{StaticResource textBlockOrangeStyle}"\r
-                                               Text="Add"\r
+                                               Text="{x:Static Properties:ResourcesUI.Generic_Add}"\r
                                                />\r
                                 </StackPanel>\r
                             </Button.Content>\r
                                     <TextBlock Margin="2,0,0,0"\r
                                                VerticalAlignment="Center"\r
                                                Style="{StaticResource textBlockOrangeStyle}"\r
-                                               Text="Remove"\r
+                                               Text="{x:Static Properties:ResourcesUI.MainView_Remove}"\r
                                                />\r
                                 </StackPanel>\r
                             </Button.Content>\r
                                         <TextBlock Margin="2,0,0,0"\r
                                                    VerticalAlignment="Center"\r
                                                    Style="{StaticResource textBlockOrangeStyle}"\r
-                                                   Text="Options"\r
+                                                   Text="{x:Static Properties:ResourcesUI.MainView_Options}"\r
                                                    />\r
                                     </StackPanel>\r
                                 </MenuItem.Header>\r
-                                <MenuItem Header="Set Default" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />\r
                                 <Separator />\r
-                                <MenuItem Header="Update Selected Preset" Micro:Message.Attach="[Event Click] = [Action PresetUpdate]" />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" Micro:Message.Attach="[Event Click] = [Action PresetUpdate]" />\r
                                 <Separator />\r
-                                <MenuItem Header="Import" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />\r
-                                <MenuItem Header="Export" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Import}" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Export}" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />\r
                                 <Separator />\r
-                                <MenuItem Header="Reset Built-in Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />\r
                             </MenuItem>\r
                         </Menu>\r
                     </ToolBar>\r