diff --git a/.gitignore b/.gitignore
index af969d99..3285e5b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,6 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-x64/
-x86/
 build/
 bld/
 [Bb]in/
diff --git a/Application/FileConverter/App.config b/Application/FileConverter/App.config
index 8e156463..397afee7 100644
--- a/Application/FileConverter/App.config
+++ b/Application/FileConverter/App.config
@@ -3,4 +3,9 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <probing privatePath="Languages"/>
+        </assemblyBinding>
+    </runtime>
 </configuration>
\ No newline at end of file
diff --git a/Application/FileConverter/Application.xaml b/Application/FileConverter/Application.xaml
index 335fe998..c8171392 100644
--- a/Application/FileConverter/Application.xaml
+++ b/Application/FileConverter/Application.xaml
@@ -3,11 +3,18 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:xaml="clr-namespace:Markdown.Xaml;assembly=Markdown.Xaml"
              xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
+             xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
              StartupUri="Windows/MainWindow.xaml" ShutdownMode="OnMainWindowClose">
     <Application.Resources>
         <!-- Converters -->
         <valueConverters:ApplicationVersionToApplicationName x:Key="ApplicationVersionToApplicationName"/>
-        
+        <generic:BoolToVisibility x:Key="BoolToVisibility"/>
+
+        <generic:ValueConverterGroup x:Key="InvBoolToVisibility">
+            <generic:BoolInverterConverter/>
+            <generic:BoolToVisibility/>
+        </generic:ValueConverterGroup>
+
         <!-- Markdown style -->
         <Style TargetType="FlowDocument" x:Key="DocumentStyle">
             <Setter Property="FontFamily" Value="Segoe UI" />
diff --git a/Application/FileConverter/Application.xaml.cs b/Application/FileConverter/Application.xaml.cs
index ff71feeb..04318e5a 100644
--- a/Application/FileConverter/Application.xaml.cs
+++ b/Application/FileConverter/Application.xaml.cs
@@ -31,7 +31,7 @@ public partial class Application : System.Windows.Application
         private static readonly Version Version = new Version()
                                             {
                                                 Major = 1, 
-                                                Minor = 0,
+                                                Minor = 1,
                                                 Patch = 0,
                                             };
 
@@ -42,8 +42,7 @@ public partial class Application : System.Windows.Application
         private bool needToRunConversionThread;
         private bool cancelAutoExit;
         private bool isSessionEnding;
-        private UpgradeVersionDescription upgradeVersionDescription = null;
-
+        
         public Application()
         {
             this.ConvertionJobs = this.conversionJobs.AsReadOnly();
@@ -83,6 +82,12 @@ public bool HideMainWindow
             set;
         }
 
+        public UpgradeVersionDescription UpgradeVersionDescription
+        {
+            get;
+            private set;
+        }
+
         public bool Verbose
         {
             get;
@@ -107,7 +112,7 @@ protected override void OnStartup(StartupEventArgs e)
 
             if (this.needToRunConversionThread)
             {
-                Thread fileConvertionThread = new Thread(this.ConvertFiles);
+                Thread fileConvertionThread = Helpers.InstantiateThread("ConversionQueueThread", this.ConvertFiles);
                 fileConvertionThread.Start();
             }
         }
@@ -118,23 +123,23 @@ protected override void OnExit(ExitEventArgs e)
 
             Debug.Log("Exit application.");
             
-            if (!this.isSessionEnding && this.upgradeVersionDescription != null && this.upgradeVersionDescription.NeedToUpgrade)
+            if (!this.isSessionEnding && this.UpgradeVersionDescription != null && this.UpgradeVersionDescription.NeedToUpgrade)
             {
-                Debug.Log("A new version of file converter has been found: {0}.", this.upgradeVersionDescription.LatestVersion);
+                Debug.Log("A new version of file converter has been found: {0}.", this.UpgradeVersionDescription.LatestVersion);
 
-                if (string.IsNullOrEmpty(this.upgradeVersionDescription.InstallerPath))
+                if (string.IsNullOrEmpty(this.UpgradeVersionDescription.InstallerPath))
                 {
                     Debug.LogError("Invalid installer path.");
                 }
                 else
                 {
                     Debug.Log("Wait for the end of the installer download.");
-                    while (this.upgradeVersionDescription.InstallerDownloadInProgress)
+                    while (this.UpgradeVersionDescription.InstallerDownloadInProgress)
                     {
                         Thread.Sleep(1000);
                     }
 
-                    string installerPath = this.upgradeVersionDescription.InstallerPath;
+                    string installerPath = this.UpgradeVersionDescription.InstallerPath;
                     if (!System.IO.File.Exists(installerPath))
                     {
                         Debug.LogError("Can't find upgrade installer ({0}). Try to restart the application.", installerPath);
@@ -142,7 +147,7 @@ protected override void OnExit(ExitEventArgs e)
                     }
 
                     // Start process.
-                    Debug.Log("Start file converter upgrade from version {0} to {1}.", ApplicationVersion, this.upgradeVersionDescription.LatestVersion);
+                    Debug.Log("Start file converter upgrade from version {0} to {1}.", ApplicationVersion, this.UpgradeVersionDescription.LatestVersion);
 
                     System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo(installerPath)
                         {
@@ -172,10 +177,12 @@ protected override void OnSessionEnding(SessionEndingCancelEventArgs e)
 
         private void Initialize()
         {
-            Diagnostics.Debug.Log("File Converter v" + ApplicationVersion.ToString());
-            this.numberOfConversionThread = System.Math.Max(1, Environment.ProcessorCount / 2);
-            Diagnostics.Debug.Log("The number of processors on this computer is {0}. Set the default number of conversion threads to {0}", this.numberOfConversionThread);
-            
+#if BUILD32
+            Diagnostics.Debug.Log("File Converter v" + ApplicationVersion.ToString() + " (32 bits)");
+#else
+            Diagnostics.Debug.Log("File Converter v" + ApplicationVersion.ToString() + " (64 bits)");
+#endif
+
             // Retrieve arguments.
             Debug.Log("Retrieve arguments...");
             string[] args = Environment.GetCommandLineArgs();
@@ -286,9 +293,21 @@ private void Initialize()
                 return;
             }
 
+            if (this.Settings.MaximumNumberOfSimultaneousConversions <= 0)
+            {
+                this.Settings.MaximumNumberOfSimultaneousConversions = System.Math.Max(1, Environment.ProcessorCount / 2);
+                Diagnostics.Debug.Log("The number of processors on this computer is {0}. Set the default number of conversion threads to {0}", this.Settings.MaximumNumberOfSimultaneousConversions);
+            }
+
+            this.numberOfConversionThread = this.Settings.MaximumNumberOfSimultaneousConversions;
+            Diagnostics.Debug.Log("Maximum number of conversion threads: {0}", this.numberOfConversionThread);
+
             // Check upgrade.
             if (this.Settings.CheckUpgradeAtStartup)
             {
+#if DEBUG
+                Task<UpgradeVersionDescription> task = Upgrade.Helpers.GetLatestVersionDescriptionAsync(this.OnGetLatestVersionDescription);
+#else
                 long fileTime = Registry.GetValue<long>(Registry.Keys.LastUpdateCheckDate);
                 DateTime lastUpdateDateTime = DateTime.FromFileTime(fileTime);
 
@@ -297,6 +316,7 @@ private void Initialize()
                 {
                     Task<UpgradeVersionDescription> task = Upgrade.Helpers.GetLatestVersionDescriptionAsync(this.OnGetLatestVersionDescription);
                 }
+#endif
             }
 
             ConversionPreset conversionPreset = null;
@@ -376,7 +396,7 @@ private void ConvertFiles()
                             Thread thread = jobThreads[threadIndex];
                             if (thread == null || !thread.IsAlive)
                             {
-                                jobThread = new Thread(this.ExecuteConversionJob);
+                                jobThread = Helpers.InstantiateThread("ConversionThread", this.ExecuteConversionJob);
                                 jobThreads[threadIndex] = jobThread;
                                 break;
                             }
@@ -458,15 +478,6 @@ private void ExecuteConversionJob(object parameter)
             {
                 Debug.LogError("Failure during conversion: {0}", exception.ToString());
             }
-
-            if (conversionJob.State == ConversionJob.ConversionState.Done && !System.IO.File.Exists(conversionJob.OutputFilePath))
-            {
-                Debug.LogError("Can't find the output file.");
-            }
-            else if (conversionJob.State == ConversionJob.ConversionState.Failed && System.IO.File.Exists(conversionJob.OutputFilePath))
-            {
-                Debug.Log("The conversion job failed but there is an output file that does exists.");
-            }
         }
 
         private void OnGetLatestVersionDescription(UpgradeVersionDescription upgradeVersionDescription)
@@ -483,7 +494,7 @@ private void OnGetLatestVersionDescription(UpgradeVersionDescription upgradeVers
                 return;
             }
 
-            this.upgradeVersionDescription = upgradeVersionDescription;
+            this.UpgradeVersionDescription = upgradeVersionDescription;
             (this.MainWindow as MainWindow).OnNewVersionReleased(upgradeVersionDescription);
         }
     }
diff --git a/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml b/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml
index 2169861e..f78ef4c4 100644
--- a/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml
+++ b/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml
@@ -3,7 +3,9 @@
              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:valueConverters="clr-namespace:FileConverter.ValueConverters" x:Name="userControl"
+             xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
+             xmlns:project="clr-namespace:FileConverter.Properties"
+             x:Name="userControl"
              x:Class="FileConverter.Controls.EncodingQualitySliderControl"
              mc:Ignorable="d" d:DesignWidth="300" Height="50">
     <UserControl.Resources>
@@ -21,6 +23,6 @@
 
         <Slider Grid.Column="0" x:Name="slider" Margin="0,2,0,0" VerticalAlignment="Top" Maximum="245" AutoToolTipPlacement="TopLeft" SmallChange="8" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="115" SelectionEnd="245" Minimum="65" TickPlacement="BottomRight" LargeChange="32" TickFrequency="8" Ticks="65 85 100 115 130 165 175 190 225 245" Foreground="#004B82" />
         <Label Grid.Column="1" Content="{Binding Value, Converter={StaticResource BitrateToString}, ElementName=slider, Mode=OneWay}" Width="65" />
-        <Label Grid.Column="0" Grid.Row="1" Content="Recommended bitrate range in blue" Foreground="#E5004B82" FontSize="11" />
+        <Label Grid.Column="0" Grid.Row="1" Content="{x:Static project:Resources.RecommendeBitrateRangeInBlue}" Foreground="#E5004B82" FontSize="11" />
     </Grid>
 </UserControl>
diff --git a/Application/FileConverter/ConversionJobs/ConversionJob.cs b/Application/FileConverter/ConversionJobs/ConversionJob.cs
index 89e5001d..be28ce92 100644
--- a/Application/FileConverter/ConversionJobs/ConversionJob.cs
+++ b/Application/FileConverter/ConversionJobs/ConversionJob.cs
@@ -15,10 +15,13 @@ public class ConversionJob : INotifyPropertyChanged
         private float progress = 0f;
         private ConversionState state = ConversionState.Unknown;
         private string errorMessage = string.Empty;
-        private string initialInputPath = string.Empty;
         private string userState = string.Empty;
         private CancelConversionJobCommand cancelCommand;
 
+        private string initialInputPath = string.Empty;
+        private string[] outputFilePaths;
+        private int currentOuputFilePathIndex;
+
         public ConversionJob()
         {
             this.State = ConversionState.Unknown;
@@ -62,10 +65,27 @@ public string InputFilePath
 
         public string OutputFilePath
         {
-            get;
-            private set;
+            get
+            {
+                if (this.outputFilePaths == null)
+                {
+                    return string.Empty;
+                }
+
+                if (this.CurrentOuputFilePathIndex < 0)
+                {
+                    return this.outputFilePaths[0];
+                }
+
+                if (this.CurrentOuputFilePathIndex >= this.outputFilePaths.Length)
+                {
+                    return this.outputFilePaths[this.outputFilePaths.Length - 1];
+                }
+
+                return this.outputFilePaths[this.CurrentOuputFilePathIndex];
+            }
         }
-        
+
         public ConversionState State
         {
             get
@@ -153,6 +173,20 @@ protected bool CancelIsRequested
             private set;
         }
 
+        protected int CurrentOuputFilePathIndex
+        {
+            get
+            {
+                return this.currentOuputFilePathIndex;
+            }
+
+            set
+            {
+                this.currentOuputFilePathIndex = value;
+                this.NotifyPropertyChanged(nameof(this.OutputFilePath));
+            }
+        }
+
         protected virtual InputPostConversionAction InputPostConversionAction
         {
             get
@@ -175,7 +209,7 @@ public void PrepareConversion(string inputFilePath, string outputFilePath = null
         {
             if (string.IsNullOrEmpty(inputFilePath))
             {
-                throw new ArgumentNullException("inputFilePath");
+                throw new ArgumentNullException(nameof(inputFilePath));
             }
 
             if (this.ConversionPreset == null)
@@ -185,76 +219,67 @@ public void PrepareConversion(string inputFilePath, string outputFilePath = null
 
             string extension = System.IO.Path.GetExtension(inputFilePath);
             extension = extension.Substring(1, extension.Length - 1);
-            string extensionCategory = PathHelpers.GetExtensionCategory(extension);
-            if (!PathHelpers.IsOutputTypeCompatibleWithCategory(this.ConversionPreset.OutputType, extensionCategory))
+            string extensionCategory = Helpers.GetExtensionCategory(extension);
+            if (!Helpers.IsOutputTypeCompatibleWithCategory(this.ConversionPreset.OutputType, extensionCategory))
             {
-                this.ConversionFailed("The input file type is not compatible with the output file type.");
+                this.ConversionFailed(Properties.Resources.ErrorInputTypeIncompatibleWithOutputType);
                 return;
             }
 
             this.initialInputPath = inputFilePath;
             this.InputFilePath = inputFilePath;
-            this.OutputFilePath = outputFilePath ?? this.ConversionPreset.GenerateOutputFilePath(inputFilePath);
-            
-            if (!PathHelpers.IsPathValid(this.OutputFilePath))
-            {
-                this.ConversionFailed("Invalid output path generated by output file path template.");
-                Debug.Log(string.Format("Invalid output path generated: {0} from input: {1}.", this.OutputFilePath, this.InputFilePath));
-                return;
-            }
 
-            if (this.OutputFilePath == this.InputFilePath)
-            {
-                // If the input post conversion action is to move or delete the input file, change its name in order to keep the output name intact.
-                if (this.ConversionPreset.InputPostConversionAction == InputPostConversionAction.MoveInArchiveFolder ||
-                    this.ConversionPreset.InputPostConversionAction == InputPostConversionAction.Delete)
-                {
-                    string inputExtension = System.IO.Path.GetExtension(this.InputFilePath);
-                    string pathWithoutExtension = this.InputFilePath.Substring(0, this.InputFilePath.Length - inputExtension.Length);
-                    this.InputFilePath = PathHelpers.GenerateUniquePath(pathWithoutExtension + "_TEMP" + inputExtension);
-                    System.IO.File.Move(inputFilePath, this.InputFilePath);
-                }
-            }
+            int outputFilesCount = this.GetOuputFilesCount();
+            this.outputFilePaths = new string[outputFilesCount];
 
-            // Create output folder that doesn't exist.
+            for (int index = 0; index < outputFilesCount; index++)
             {
-                StringBuilder path = new StringBuilder(this.OutputFilePath.Length);
-                string drive = PathHelpers.GetDrive(this.OutputFilePath);
-                path.Append(drive);
+                string path = outputFilePath ?? this.ConversionPreset.GenerateOutputFilePath(inputFilePath, index + 1, outputFilesCount);
 
-                foreach (string directory in PathHelpers.GetDirectories(this.OutputFilePath))
+                if (!PathHelpers.IsPathValid(path))
                 {
-                    path.Append(directory);
-                    path.Append('\\');
+                    this.ConversionFailed(Properties.Resources.ErrorInvalidOutputPath);
+                    Debug.Log($"Invalid output path generated: {path} from input: {this.InputFilePath}.");
+                    return;
+                }
 
-                    if (!System.IO.Directory.Exists(path.ToString()))
+                if (path == this.InputFilePath)
+                {
+                    // If the input post conversion action is to move or delete the input file, change its name in order to keep the output name intact.
+                    if (this.ConversionPreset.InputPostConversionAction == InputPostConversionAction.MoveInArchiveFolder ||
+                        this.ConversionPreset.InputPostConversionAction == InputPostConversionAction.Delete)
                     {
-                        try
-                        {
-                            System.IO.Directory.CreateDirectory(path.ToString());
-                        }
-                        catch (Exception)
-                        {
-                            this.ConversionFailed("Invalid output path generated by output file path template.");
-                            Debug.Log(string.Format("Can't create directories for path {0}", this.OutputFilePath));
-                            return;
-                        }
+                        string inputExtension = System.IO.Path.GetExtension(this.InputFilePath);
+                        string pathWithoutExtension = this.InputFilePath.Substring(0, this.InputFilePath.Length - inputExtension.Length);
+                        this.InputFilePath = PathHelpers.GenerateUniquePath(pathWithoutExtension + "_TEMP" + inputExtension);
+                        System.IO.File.Move(inputFilePath, this.InputFilePath);
                     }
                 }
-            }
 
-            // Make the output path valid.
-            try
-            {
-                this.OutputFilePath = PathHelpers.GenerateUniquePath(this.OutputFilePath);
-            }
-            catch (Exception exception)
-            {
-                this.ConversionFailed("Can't generate a valid output filename.");
-                Debug.Log(exception.Message);
-                return;
+                // Create output folders that doesn't exist.
+                if (!PathHelpers.CreateFolders(path))
+                {
+                    this.ConversionFailed(Properties.Resources.ErrorFailToCreateOutputPathFolders);
+                    return;
+                }
+
+                // Make the output path valid.
+                try
+                {
+                    path = PathHelpers.GenerateUniquePath(path, this.outputFilePaths);
+                }
+                catch (Exception exception)
+                {
+                    this.ConversionFailed(Properties.Resources.ErrorFailToGenerateUniqueOutputPath);
+                    Debug.Log(exception.Message);
+                    return;
+                }
+
+                this.outputFilePaths[index] = path;
             }
 
+            this.CurrentOuputFilePathIndex = 0;
+
             // Check if the input file is located on a cd drive.
             if (PathHelpers.IsOnCDDrive(this.InputFilePath))
             {
@@ -270,7 +295,7 @@ public void PrepareConversion(string inputFilePath, string outputFilePath = null
 
             Debug.Log("Job initialized: Preset: '{0}' Input: {1} Output: {2}", this.ConversionPreset.Name, this.InputFilePath, this.OutputFilePath);
 
-            this.UserState = "In Queue";
+            this.UserState = Properties.Resources.ConversionStateInQueue;
         }
 
         public void StartConvertion()
@@ -308,6 +333,15 @@ public void StartConvertion()
             {
                 this.OnConversionSucceed();
             }
+
+            if (this.State == ConversionJob.ConversionState.Done && !this.AllOuputFilesExists())
+            {
+                Debug.LogError("Can't find the output file(s).");
+            }
+            else if (this.State == ConversionJob.ConversionState.Failed && this.AtLeastOneOuputFilesExists())
+            {
+                Debug.Log("The conversion job failed but there is an output file that does exists.");
+            }
         }
 
         public virtual void Cancel()
@@ -318,7 +352,12 @@ public virtual void Cancel()
             }
 
             this.CancelIsRequested = true;
-            this.ConversionFailed("Canceled.");
+            this.ConversionFailed(Properties.Resources.ErrorCanceled);
+        }
+
+        protected virtual int GetOuputFilesCount()
+        {
+            return 1;
         }
 
         protected virtual void Convert()
@@ -333,18 +372,22 @@ protected virtual void OnConversionFailed()
         {
             Debug.Log("Conversion Failed.");
 
-            try
+            for (int index = 0; index < this.outputFilePaths.Length; index++)
             {
-                if (System.IO.File.Exists(this.OutputFilePath))
+                string outputFilePath = this.outputFilePaths[index];
+                try
+                {
+                    if (System.IO.File.Exists(outputFilePath))
+                    {
+                        System.IO.File.Delete(outputFilePath);
+                    }
+                }
+                catch (Exception exception)
                 {
-                    System.IO.File.Delete(this.OutputFilePath);
+                    Debug.Log("Can't delete file '{0}' after conversion job failure.", outputFilePath);
+                    Debug.Log("An exception as been thrown: {0}.", exception.ToString());
                 }
             }
-            catch (Exception exception)
-            {
-                Debug.Log("Can't delete file '{0}' after conversion job failure.", this.OutputFilePath);
-                Debug.Log("An exception as been thrown: {0}.", exception.ToString());
-            }
         }
 
         protected virtual void OnConversionSucceed()
@@ -381,7 +424,7 @@ protected virtual void OnConversionSucceed()
 
             this.Progress = 1f;
             this.State = ConversionState.Done;
-            this.UserState = "Done";
+            this.UserState = Properties.Resources.ConversionStateDone;
             Debug.Log("Conversion Done!");
         }
 
@@ -396,7 +439,7 @@ protected void ConversionFailed(string exitingMessage)
             }
 
             this.State = ConversionState.Failed;
-            this.UserState = "Failed";
+            this.UserState = Properties.Resources.ConversionStateFailed;
             this.ErrorMessage = exitingMessage;
         }
 
@@ -407,5 +450,33 @@ protected void NotifyPropertyChanged([CallerMemberName] string propertyName = ""
                 this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
             }
         }
+
+        private bool AllOuputFilesExists()
+        {
+            for (int index = 0; index < this.outputFilePaths.Length; index++)
+            {
+                string outputFilePath = this.outputFilePaths[index];
+                if (!System.IO.File.Exists(outputFilePath))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private bool AtLeastOneOuputFilesExists()
+        {
+            for (int index = 0; index < this.outputFilePaths.Length; index++)
+            {
+                string outputFilePath = this.outputFilePaths[index];
+                if (System.IO.File.Exists(outputFilePath))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 }
diff --git a/Application/FileConverter/ConversionJobs/ConversionJobFactory.cs b/Application/FileConverter/ConversionJobs/ConversionJobFactory.cs
index da1f4eaa..83c8834d 100644
--- a/Application/FileConverter/ConversionJobs/ConversionJobFactory.cs
+++ b/Application/FileConverter/ConversionJobs/ConversionJobFactory.cs
@@ -6,9 +6,9 @@ public static class ConversionJobFactory
     {
         public static ConversionJob Create(ConversionPreset conversionPreset, string inputFilePath)
         {
-            string extension = System.IO.Path.GetExtension(inputFilePath);
-            extension = extension.ToLowerInvariant().Substring(1, extension.Length - 1);
-            if (extension == "cda")
+            string inputFileExtension = System.IO.Path.GetExtension(inputFilePath);
+            inputFileExtension = inputFileExtension.ToLowerInvariant().Substring(1, inputFileExtension.Length - 1);
+            if (inputFileExtension == "cda")
             {
                 return new ConversionJob_ExtractCDA(conversionPreset);    
             }
@@ -23,7 +23,13 @@ public static ConversionJob Create(ConversionPreset conversionPreset, string inp
                 return new ConversionJob_Gif(conversionPreset);
             }
 
-            if (PathHelpers.GetExtensionCategory(extension) == PathHelpers.InputCategoryNames.Image)
+            if (Helpers.GetExtensionCategory(inputFileExtension) == Helpers.InputCategoryNames.Image ||
+                Helpers.GetExtensionCategory(inputFileExtension) == Helpers.InputCategoryNames.Document)
+            {
+                return new ConversionJob_ImageMagick(conversionPreset);
+            }
+
+            if (conversionPreset.OutputType == OutputType.Pdf)
             {
                 return new ConversionJob_ImageMagick(conversionPreset);
             }
diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs b/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs
index 344ae353..85e87261 100644
--- a/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs
+++ b/Application/FileConverter/ConversionJobs/ConversionJob_ExtractCDA.cs
@@ -13,7 +13,7 @@ namespace FileConverter.ConversionJobs
 
     public class ConversionJob_ExtractCDA : ConversionJob
     {
-        private Ripper.CDDrive cdDrive;
+        private Ripper.CDDrive diskDrive;
         private int cdaTrackNumber = -1;
         private WaveWriter waveWriter;
         private string intermediateFilePath;
@@ -49,14 +49,14 @@ protected override void Initialize()
             string pathDriveLetter = PathHelpers.GetPathDriveLetter(this.InputFilePath);
             if (pathDriveLetter.Length == 0)
             {
-                this.ConversionFailed("Can't retrieve input path drive letter.");
+                this.ConversionFailed(Properties.Resources.ErrorFailToRetrieveInputPathDriveLetter);
                 return;
             }
 
             char driveLetter = pathDriveLetter[0];
 
-            this.cdDrive = new Ripper.CDDrive();
-            this.cdDrive.CDRemoved += new EventHandler(this.CdDriveCdRemoved);
+            this.diskDrive = new Ripper.CDDrive();
+            this.diskDrive.CDRemoved += new EventHandler(this.CdDriveCdRemoved);
 
             bool driveLetterFound = false;
             char[] driveLetters = Ripper.CDDrive.GetCDDriveLetters();
@@ -67,7 +67,8 @@ protected override void Initialize()
 
             if (!driveLetterFound)
             {
-                this.ConversionFailed(string.Format("Invalid drive letter {0}.", driveLetter));
+                Debug.Log($"Invalid drive letter {driveLetter}.");
+                this.ConversionFailed(Properties.Resources.ErrorFailToRetrieveInputPathDriveLetter);
                 return;
             }
 
@@ -78,19 +79,20 @@ protected override void Initialize()
             }
             catch (Exception)
             {
-                this.ConversionFailed(string.Format("Can't retrieve the track number from input path '{0}'.", this.InputFilePath));
+                Debug.Log($"Input path: '{this.InputFilePath}'.");
+                this.ConversionFailed(Properties.Resources.ErrorFailToRetrieveTrackNumber);
                 return;
             }
 
-            if (this.cdDrive.IsOpened)
+            if (this.diskDrive.IsOpened)
             {
-                this.ConversionFailed(string.Format("CD drive already used."));
+                this.ConversionFailed(Properties.Resources.ErrorFailToUseCDDriveOpen);
                 return;
             }
 
-            if (!this.cdDrive.Open(driveLetter))
+            if (!this.diskDrive.Open(driveLetter))
             {
-                this.ConversionFailed(string.Format("Fail to open cd drive {0}.", driveLetter));
+                this.ConversionFailed(string.Format(Properties.Resources.ErrorFailToReadCDDrive, driveLetter));
                 return;
             }
 
@@ -102,7 +104,7 @@ protected override void Initialize()
             // Sub conversion job (for compression).
             this.compressionConversionJob = ConversionJobFactory.Create(this.ConversionPreset, this.intermediateFilePath);
             this.compressionConversionJob.PrepareConversion(this.intermediateFilePath, this.OutputFilePath);
-            this.compressionThread = new Thread(this.CompressAsync);
+            this.compressionThread = Helpers.InstantiateThread("CDACompressionThread", this.CompressAsync);
         }
 
         protected override void Convert()
@@ -114,45 +116,47 @@ protected override void Convert()
 
             Debug.Log("Starting CDA extraction.");
 
-            this.UserState = "Extraction";
+            this.UserState = Properties.Resources.ConversionStateExtraction;
 
-            if (!this.cdDrive.IsCDReady())
+            if (!this.diskDrive.IsCDReady())
             {
-                this.ConversionFailed(string.Format("CD drive is not ready."));
+                this.ConversionFailed(Properties.Resources.ErrorCDDriveNotReady);
                 return;
             }
 
-            if (!this.cdDrive.Refresh())
+            if (!this.diskDrive.Refresh())
             {
-                this.ConversionFailed(string.Format("Can't refresh CD drive data."));
+                Debug.Log("Can't refresh CD drive data.");
+                this.ConversionFailed(Properties.Resources.ErrorCDDriveNotReady);
                 return;
             }
 
-            if (!this.cdDrive.LockCD())
+            if (!this.diskDrive.LockCD())
             {
-                this.ConversionFailed(string.Format("Can't lock cd."));
+                Debug.Log("Can\'t lock cd.");
+                this.ConversionFailed(Properties.Resources.ErrorCDDriveNotReady);
                 return;
             }
 
             WaveFormat waveFormat = new WaveFormat(44100, 16, 2);
 
             using (Stream waveStream = new FileStream(this.intermediateFilePath, FileMode.Create, FileAccess.Write))
-            using (this.waveWriter = new WaveWriter(waveStream, waveFormat, this.cdDrive.TrackSize(this.cdaTrackNumber)))
+            using (this.waveWriter = new WaveWriter(waveStream, waveFormat, this.diskDrive.TrackSize(this.cdaTrackNumber)))
             {
-                this.cdDrive.ReadTrack(this.cdaTrackNumber, this.WriteWaveData, this.CdReadProgress);
+                this.diskDrive.ReadTrack(this.cdaTrackNumber, this.WriteWaveData, this.CdReadProgress);
             }
 
             this.waveWriter = null;
 
-            this.cdDrive.UnLockCD();
+            this.diskDrive.UnLockCD();
 
-            this.cdDrive.Close();
+            this.diskDrive.Close();
 
             this.StateFlags = ConversionFlags.None;
 
             if (!File.Exists(this.intermediateFilePath))
             {
-                this.ConversionFailed("Extraction failed.");
+                this.ConversionFailed(Properties.Resources.ErrorCDAExtractionFailed);
                 return;
             }
 
@@ -160,7 +164,7 @@ protected override void Convert()
             Debug.Log(string.Empty);
             Debug.Log("Start compression.");
 
-            this.UserState = "Conversion";
+            this.UserState = Properties.Resources.ConversionStateConversion;
 
             this.compressionThread.Start();
 
diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs
index b5172837..a2e32103 100644
--- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs
+++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs
@@ -19,6 +19,24 @@ private static string Encapsulate(string optionName, string args)
             return string.Format("{0} \"{1}\"", optionName, args);
         }
 
+        /// <summary>
+        /// Compute the argument needed to change the number of channels in an audio file.
+        /// </summary>
+        /// <param name="conversionPreset">The conversion preset</param>
+        /// <returns>The argument string.</returns>
+        /// https://trac.ffmpeg.org/wiki/AudioChannelManipulation
+        private static string ComputeAudioChannelArgs(ConversionPreset conversionPreset)
+        {
+            string channelArgs = string.Empty;
+            int channelCount = conversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioChannelCount);
+            if (channelCount > 0)
+            {
+                channelArgs = $"-ac {channelCount}";
+            }
+
+            return channelArgs;
+        }
+
         private static string ComputeTransformArgs(ConversionPreset conversionPreset)
         {
             float scaleFactor = conversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.VideoScale);
@@ -178,6 +196,18 @@ private int OGGVBRBitrateToQualityIndex(int bitrate)
             throw new Exception("Unknown Ogg VBR bitrate.");
         }
 
+        /// <summary>
+        /// Convert video quality index to lib theora video quality level.
+        /// </summary>
+        /// <param name="quality">The quality index.</param>
+        /// <returns>Returns the video quality index.</returns>
+        /// The range of the video quality level is 0-10: where 10 is the highest quality/largest filesize, 0 being the lowest quality/smallest filesize.
+        /// https://trac.ffmpeg.org/wiki/TheoraVorbisEncodingGuide
+        private int OGVTheoraQualityToQualityIndex(int quality)
+        {
+            return quality;
+        }
+
         /// <summary>
         /// Convert encoding mode setting to <c>ffmpeg</c> argument option.
         /// </summary>
@@ -246,35 +276,35 @@ private int JPGQualityToQualityIndex(int quality)
         /// </summary>
         /// <param name="encodingSpeed">The encoding speed.</param>
         /// <returns>The H264 preset.</returns>
-        private string H264EncodingSpeedToPreset(string encodingSpeed)
+        private string H264EncodingSpeedToPreset(VideoEncodingSpeed encodingSpeed)
         {
             switch (encodingSpeed)
             {
-                case "Ultra Fast":
+                case VideoEncodingSpeed.UltraFast:
                     return "ultrafast";
 
-                case "Super Fast":
+                case VideoEncodingSpeed.SuperFast:
                     return "superfast";
 
-                case "Very Fast":
+                case VideoEncodingSpeed.VeryFast:
                     return "veryfast";
 
-                case "Faster":
+                case VideoEncodingSpeed.Faster:
                     return "faster";
 
-                case "Fast":
+                case VideoEncodingSpeed.Fast:
                     return "fast";
 
-                case "Medium":
+                case VideoEncodingSpeed.Medium:
                     return "medium";
 
-                case "Slow":
+                case VideoEncodingSpeed.Slow:
                     return "slow";
 
-                case "Slower":
+                case VideoEncodingSpeed.Slower:
                     return "slower";
 
-                case "Very Slow":
+                case VideoEncodingSpeed.VerySlow:
                     return "veryslow";
             }
 
diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs
index 7e3405d1..6cb53ef8 100644
--- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs
+++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs
@@ -56,7 +56,7 @@ protected override void Initialize()
             string ffmpegPath = this.FfmpegPath;
             if (!System.IO.File.Exists(ffmpegPath))
             {
-                this.ConversionFailed("Can't find ffmpeg executable. You should try to reinstall the application.");
+                this.ConversionFailed(Properties.Resources.ErrorCantFindFFMPEG);
                 Diagnostics.Debug.Log("Can't find ffmpeg executable ({0}). Try to reinstall the application.", ffmpegPath);
                 return;
             }
@@ -77,9 +77,12 @@ protected virtual void FillFFMpegArgumentsList()
             {
                 case OutputType.Aac:
                     {
+                        string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
+
                         // https://trac.ffmpeg.org/wiki/Encode/AAC
                         int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
-                        string encoderArgs = string.Format("-c:a aac -q:a {0}", this.AACBitrateToQualityIndex(audioEncodingBitrate));
+                        string encoderArgs = $"-c:a aac -q:a {this.AACBitrateToQualityIndex(audioEncodingBitrate)} {channelArgs}";
+
                         string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
 
                         this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
@@ -113,8 +116,10 @@ protected virtual void FillFFMpegArgumentsList()
 
                 case OutputType.Flac:
                     {
+                        string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
+
                         // http://taer-naguur.blogspot.fr/2013/11/flac-audio-encoding-with-ffmpeg.html
-                        string encoderArgs = string.Format("-compression_level 12");
+                        string encoderArgs = $"-compression_level 12 {channelArgs}";
                         string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
 
                         this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
@@ -185,17 +190,19 @@ protected virtual void FillFFMpegArgumentsList()
 
                 case OutputType.Mp3:
                     {
+                        string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
+
                         string encoderArgs = string.Empty;
                         EncodingMode encodingMode = this.ConversionPreset.GetSettingsValue<EncodingMode>(ConversionPreset.ConversionSettingKeys.AudioEncodingMode);
                         int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
                         switch (encodingMode)
                         {
                             case EncodingMode.Mp3VBR:
-                                encoderArgs = string.Format("-codec:a libmp3lame -q:a {0}", this.MP3VBRBitrateToQualityIndex(encodingQuality));
+                                encoderArgs = $"-codec:a libmp3lame -q:a {this.MP3VBRBitrateToQualityIndex(encodingQuality)} {channelArgs}";
                                 break;
 
                             case EncodingMode.Mp3CBR:
-                                encoderArgs = string.Format("-codec:a libmp3lame -b:a {0}k", encodingQuality);
+                                encoderArgs = $"-codec:a libmp3lame -b:a {encodingQuality}k {channelArgs}";
                                 break;
 
                             default:
@@ -215,7 +222,7 @@ protected virtual void FillFFMpegArgumentsList()
                         // https://trac.ffmpeg.org/wiki/Encode/H.264
                         // https://trac.ffmpeg.org/wiki/Encode/AAC
                         int videoEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoQuality);
-                        string videoEncodingSpeed = this.ConversionPreset.GetSettingsValue<string>(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed);
+                        VideoEncodingSpeed videoEncodingSpeed = this.ConversionPreset.GetSettingsValue<VideoEncodingSpeed>(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed);
                         int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
 
                         string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
@@ -243,8 +250,38 @@ protected virtual void FillFFMpegArgumentsList()
 
                 case OutputType.Ogg:
                     {
+                        string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
+
                         int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
-                        string encoderArgs = string.Format("-vn -codec:a libvorbis -qscale:a {0}", this.OGGVBRBitrateToQualityIndex(encodingQuality));
+                        string encoderArgs = $"-vn -codec:a libvorbis -qscale:a {this.OGGVBRBitrateToQualityIndex(encodingQuality)} {channelArgs}";
+                        string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
+
+                        this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
+                    }
+
+                    break;
+
+                case OutputType.Ogv:
+                    {
+                        // https://trac.ffmpeg.org/wiki/TheoraVorbisEncodingGuide
+                        int videoEncodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.VideoQuality);
+                        int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
+
+                        string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
+                        string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs);
+
+                        string audioArgs = "-an";
+                        if (this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.EnableAudio))
+                        {
+                            audioArgs = string.Format("-codec:a libvorbis -qscale:a {0}", this.OGGVBRBitrateToQualityIndex(audioEncodingBitrate));
+                        }
+
+                        string encoderArgs = string.Format(
+                            "-codec:v libtheora -qscale:v {0} {1} {2}",
+                            this.OGVTheoraQualityToQualityIndex(videoEncodingQuality),
+                            audioArgs,
+                            videoFilteringArgs);
+
                         string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
 
                         this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
@@ -273,8 +310,10 @@ protected virtual void FillFFMpegArgumentsList()
 
                 case OutputType.Wav:
                     {
+                        string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset);
+
                         EncodingMode encodingMode = this.ConversionPreset.GetSettingsValue<EncodingMode>(ConversionPreset.ConversionSettingKeys.AudioEncodingMode);
-                        string encoderArgs = string.Format("-acodec {0}", this.WAVEncodingToCodecArgument(encodingMode));
+                        string encoderArgs = $"-acodec {this.WAVEncodingToCodecArgument(encodingMode)} {channelArgs}";
                         string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
 
                         this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
@@ -339,7 +378,7 @@ protected virtual void FillFFMpegArgumentsList()
                 }
             }
         }
-
+        
         protected override void Convert()
         {
             if (this.ConversionPreset == null)
@@ -383,7 +422,7 @@ protected override void Convert()
                 }
                 catch
                 {
-                    this.ConversionFailed("Failed to launch FFMPEG process.");
+                    this.ConversionFailed(Properties.Resources.ErrorFailedToLaunchFFMPEG);
                     throw;
                 }
             }
diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs
index 6d0aaf1a..d14f6cdb 100644
--- a/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs
+++ b/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs
@@ -31,7 +31,7 @@ protected override void Initialize()
             string inputFilePath = string.Empty;
 
             // If the output is an image start to convert it into png before send it to ffmpeg.
-            if (PathHelpers.GetExtensionCategory(extension) == PathHelpers.InputCategoryNames.Image && extension != "png")
+            if (Helpers.GetExtensionCategory(extension) == Helpers.InputCategoryNames.Image && extension != "png")
             {
                 // Generate intermediate file path.
                 string fileName = Path.GetFileName(this.OutputFilePath);
@@ -66,7 +66,7 @@ protected override void Convert()
 
             if (this.pngConversionJob != null)
             {
-                this.UserState = "Read input image";
+                this.UserState = Properties.Resources.ConversionStateReadIntputImage;
 
                 Diagnostics.Debug.Log(string.Empty);
                 Diagnostics.Debug.Log("Convert image to PNG (intermediate format).");
diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs
index 204dd5e3..4ccda9f9 100644
--- a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs
+++ b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs
@@ -9,6 +9,9 @@ namespace FileConverter.ConversionJobs
 
     public class ConversionJob_ImageMagick : ConversionJob
     {
+        private bool isInputFilePdf;
+        private int pageCount;
+
         public ConversionJob_ImageMagick() : base()
         {
         }
@@ -21,12 +24,34 @@ protected override void Initialize()
         {
             base.Initialize();
 
+            string applicationDirectory = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+            MagickNET.SetGhostscriptDirectory(applicationDirectory);
+
+            this.isInputFilePdf = System.IO.Path.GetExtension(this.InputFilePath).ToLowerInvariant() == ".pdf";
+
             if (this.ConversionPreset == null)
             {
                 throw new Exception("The conversion preset must be valid.");
             }
         }
 
+        protected override int GetOuputFilesCount()
+        {
+            if (System.IO.Path.GetExtension(this.InputFilePath).ToLowerInvariant() == ".pdf")
+            {
+                using (MagickImageCollection images = new MagickImageCollection())
+                {
+                    MagickReadSettings settings = new MagickReadSettings();
+                    settings.Density = new Density(1, 1);
+                    images.Read(this.InputFilePath);
+
+                    return images.Count;
+                }
+            }
+
+            return 1;
+        }
+
         protected override void Convert()
         {
             if (this.ConversionPreset == null)
@@ -34,19 +59,79 @@ protected override void Convert()
                 throw new Exception("The conversion preset must be valid.");
             }
 
-            using (MagickImage image = new MagickImage(this.InputFilePath))
+            this.CurrentOuputFilePathIndex = 0;
+
+            if (this.isInputFilePdf)
+            {
+                this.ConvertPdf();
+            }
+            else
+            {
+                this.pageCount = 1;
+                using (MagickImage image = new MagickImage(this.InputFilePath))
+                {
+                    Debug.Log("Load image {0} succeed.", this.InputFilePath);
+
+                    this.ConvertImage(image);
+                }
+            }
+        }
+
+        private void ConvertPdf()
+        {
+            MagickReadSettings settings = new MagickReadSettings();
+
+            float dpi = 200f;
+            float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
+            if (Math.Abs(scaleFactor - 1f) >= 0.005f)
             {
-                image.Progress += this.Image_Progress;
-                Debug.Log("Load image {0} succeed.", this.InputFilePath);
+                Debug.Log("Apply scale factor: {0}%.", scaleFactor*100);
+
+                dpi *= scaleFactor;
+            }
+
+            Debug.Log("Density: {0}dpi.", dpi);
+            settings.Density = new Density(dpi, dpi);
+
+            this.UserState = Properties.Resources.ConversionStateReadPdf;
 
+            using (MagickImageCollection images = new MagickImageCollection())
+            {
+                // Add all the pages of the pdf file to the collection
+                images.Read(this.InputFilePath, settings);
+                Debug.Log("Load pdf {0} succeed.", this.InputFilePath);
+
+                this.pageCount = images.Count;
+
+                this.UserState = Properties.Resources.ConversionStateConversion;
+
+                foreach (MagickImage image in images)
+                {
+                    Debug.Log("Write page {0}/{1}.", this.CurrentOuputFilePathIndex + 1, this.pageCount);
+                    this.ConvertImage(image, true);
+
+                    this.CurrentOuputFilePathIndex++;
+                }
+            }
+        }
+
+        private void ConvertImage(MagickImage image, bool ignoreScale = false)
+        {
+            image.Progress += this.Image_Progress;
+
+            if (!ignoreScale && this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageScale))
+            {
                 float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
                 if (Math.Abs(scaleFactor - 1f) >= 0.005f)
                 {
-                    Debug.Log("Apply scale factor: {0}%.", scaleFactor * 100);
+                    Debug.Log("Apply scale factor: {0}%.", scaleFactor*100);
 
-                    image.Scale(new Percentage(scaleFactor * 100f));
+                    image.Scale(new Percentage(scaleFactor*100f));
                 }
+            }
 
+            if (this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageRotation))
+            {
                 float rotateAngleInDegrees = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageRotation);
                 if (Math.Abs(rotateAngleInDegrees - 0f) >= 0.05f)
                 {
@@ -54,13 +139,16 @@ protected override void Convert()
 
                     image.Rotate(rotateAngleInDegrees);
                 }
+            }
 
+            if (this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2))
+            {
                 bool clampSizeToPowerOf2 = this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2);
                 if (clampSizeToPowerOf2)
                 {
                     int referenceSize = System.Math.Min(image.Width, image.Height);
                     int size = 2;
-                    while (size * 2 <= referenceSize)
+                    while (size*2 <= referenceSize)
                     {
                         size *= 2;
                     }
@@ -69,7 +157,10 @@ protected override void Convert()
 
                     image.Scale(size, size);
                 }
+            }
 
+            if (this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageMaximumSize))
+            {
                 int maximumSize = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageMaximumSize);
                 if (maximumSize > 0)
                 {
@@ -80,32 +171,36 @@ protected override void Convert()
 
                     image.Scale(width, height);
                 }
+            }
 
-                Debug.Log("Convert image (output: {0}).", this.OutputFilePath);
-                switch (this.ConversionPreset.OutputType)
-                {
-                    case OutputType.Png:
-                        image.Quality = 100;
-                        break;
-
-                    case OutputType.Jpg:
-                        image.Quality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
-                        break;
-
-                    default:
-                        this.ConversionFailed(string.Format("Unsupported output format {0}.", this.ConversionPreset.OutputType));
-                        image.Progress -= this.Image_Progress;
-                        return;
-                }
-                
-                image.Write(this.OutputFilePath);
-                image.Progress -= this.Image_Progress;
+            Debug.Log("Convert image (output: {0}).", this.OutputFilePath);
+            switch (this.ConversionPreset.OutputType)
+            {
+                case OutputType.Png:
+                    image.Quality = 100;
+                    break;
+
+                case OutputType.Jpg:
+                    image.Quality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
+                    break;
+
+                case OutputType.Pdf:
+                    break;
+
+                default:
+                    this.ConversionFailed(string.Format(Properties.Resources.ErrorUnsupportedOutputFormat, this.ConversionPreset.OutputType));
+                    image.Progress -= this.Image_Progress;
+                    return;
             }
+
+            image.Write(this.OutputFilePath);
+            image.Progress -= this.Image_Progress;
         }
 
         private void Image_Progress(object sender, ProgressEventArgs eventArgs)
         {
-            this.Progress = (float)eventArgs.Progress.ToDouble() / 100f;
+            float alreadyCompletedPages = this.CurrentOuputFilePathIndex / (float)this.pageCount;
+            this.Progress = alreadyCompletedPages + (float)eventArgs.Progress.ToDouble() / (100f * this.pageCount);
         }
     }
 }
diff --git a/Application/FileConverter/ConversionJobs/VideoEncodingSpeed.cs b/Application/FileConverter/ConversionJobs/VideoEncodingSpeed.cs
new file mode 100644
index 00000000..c2999274
--- /dev/null
+++ b/Application/FileConverter/ConversionJobs/VideoEncodingSpeed.cs
@@ -0,0 +1,17 @@
+// // <copyright file="VideoEncodingSpeed.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
+
+namespace FileConverter.ConversionJobs
+{
+    public enum VideoEncodingSpeed
+    {
+        UltraFast,
+        SuperFast,
+        VeryFast,
+        Faster,
+        Fast,
+        Medium,
+        Slow,
+        Slower,
+        VerySlow,
+    }
+}
\ No newline at end of file
diff --git a/Application/FileConverter/ConversionPreset/ConversionPreset.cs b/Application/FileConverter/ConversionPreset/ConversionPreset.cs
index 38add562..5228799e 100644
--- a/Application/FileConverter/ConversionPreset/ConversionPreset.cs
+++ b/Application/FileConverter/ConversionPreset/ConversionPreset.cs
@@ -24,11 +24,10 @@ public class ConversionPreset : INotifyPropertyChanged, IDataErrorInfo, IXmlSeri
         private InputPostConversionAction inputPostConversionAction;
         private ConversionSettings settings = new ConversionSettings();
         private string outputFileNameTemplate;
-        private FileNameConverter outputFileNameConverter = new FileNameConverter();
 
         public ConversionPreset()
         {
-            this.Name = "New Preset";
+            this.Name = Properties.Resources.DefaultPresetName;
         }
 
         public ConversionPreset(string name, OutputType outputType, string[] inputTypes)
@@ -178,7 +177,7 @@ public ConversionSetting[] XmlSerializableSettings
                     }
                 }
 
-                this.OnPropertyChanged("Settings");
+                this.OnPropertyChanged(nameof(this.Settings));
             }
         }
 
@@ -202,7 +201,7 @@ public string ConversionArchiveFolderName
         {
             get
             {
-                return "Conversion Archives";
+                return Properties.Resources.ConversionArchives;
             }
         }
 
@@ -301,20 +300,20 @@ public void AddInputType(string inputType)
             }
 
             this.inputTypes.Add(inputType);
-            this.OnPropertyChanged("InputTypes");
+            this.OnPropertyChanged(nameof(this.InputTypes));
         }
 
         public void RemoveInputType(string inputType)
         {
             if (this.inputTypes.Remove(inputType))
             {
-                this.OnPropertyChanged("InputTypes");
+                this.OnPropertyChanged(nameof(this.InputTypes));
             }
         }
 
-        public string GenerateOutputFilePath(string inputFilePath)
+        public string GenerateOutputFilePath(string inputFilePath, int numberIndex, int numberMax)
         {
-            return (string)this.outputFileNameConverter.Convert(new object[] { inputFilePath, this.OutputType, this.OutputFileNameTemplate }, typeof(string), null, null);
+            return PathHelpers.GenerateFilePathFromTemplate(inputFilePath, this.OutputType, this.OutputFileNameTemplate, numberIndex, numberMax);
         }
 
         public void SetSettingsValue(string settingsKey, string value)
@@ -341,7 +340,7 @@ public void SetSettingsValue(string settingsKey, string value)
 
             this.settings[settingsKey] = value;
 
-            this.OnPropertyChanged("Settings");
+            this.OnPropertyChanged(nameof(this.Settings));
         }
 
         public string GetSettingsValue(string settingsKey)
@@ -377,6 +376,11 @@ public T GetSettingsValue<T>(string settingsKey)
             return (T)System.Convert.ChangeType(settingsValue, type);
         }
 
+        public bool IsRelevantSetting(string settingsKey)
+        {
+            return this.Settings.ContainsKey(settingsKey);
+        }
+
         [NotifyPropertyChangedInvocator]
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
@@ -393,8 +397,8 @@ private void CoerceInputTypes()
             for (int index = 0; index < this.inputTypes.Count; index++)
             {
                 string inputType = this.inputTypes[index];
-                string inputCategory = PathHelpers.GetExtensionCategory(inputType);
-                if (!PathHelpers.IsOutputTypeCompatibleWithCategory(this.OutputType, inputCategory))
+                string inputCategory = Helpers.GetExtensionCategory(inputType);
+                if (!Helpers.IsOutputTypeCompatibleWithCategory(this.OutputType, inputCategory))
                 {
                     this.RemoveInputType(inputType);
                     index--;
@@ -402,46 +406,39 @@ private void CoerceInputTypes()
             }
         }
 
-        private bool IsRelevantSetting(string settingsKey)
-        {
-            return this.Settings.ContainsKey(settingsKey);
-        }
-
         private void InitializeDefaultSettings(OutputType outputType)
         {
             this.settings.Clear();
 
             switch (outputType)
             {
+                // Audio
                 case OutputType.Aac:
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
                     break;
 
-                case OutputType.Ico:
                 case OutputType.Flac:
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
                     break;
 
-                case OutputType.Gif:
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoFramesPerSecond, "15");
+                case OutputType.Ogg:
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
                     break;
 
-                case OutputType.Png:
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1");
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation, "0");
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False");
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0");
+                case OutputType.Mp3:
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Mp3VBR.ToString(), true);
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
                     break;
 
-                case OutputType.Jpg:
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "90");
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1");
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation, "0");
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False");
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0");
+                case OutputType.Wav:
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Wav16.ToString(), true);
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0");
                     break;
 
+                // Video
                 case OutputType.Avi:
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "20");
@@ -459,11 +456,6 @@ private void InitializeDefaultSettings(OutputType outputType)
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128");
                     break;
 
-                case OutputType.Mp3:
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Mp3VBR.ToString(), true);
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190");
-                    break;
-
                 case OutputType.Mp4:
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "28");
@@ -473,14 +465,14 @@ private void InitializeDefaultSettings(OutputType outputType)
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128");
                     break;
 
-                case OutputType.Ogg:
+                case OutputType.Ogv:
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "7");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160");
                     break;
 
-                case OutputType.Wav:
-                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Wav16.ToString(), true);
-                    break;
-
                 case OutputType.Webm:
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True");
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160");
@@ -489,11 +481,40 @@ private void InitializeDefaultSettings(OutputType outputType)
                     this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
                     break;
 
+                // Images
+                case OutputType.Gif:
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoFramesPerSecond, "15");
+                    break;
+
+                case OutputType.Png:
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation, "0");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0");
+                    break;
+
+                case OutputType.Jpg:
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "90");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation, "0");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False");
+                    this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0");
+                    break;
+
+                case OutputType.Ico:
+                    break;
+
+                // Documents
+                case OutputType.Pdf:
+                    break;
+
                 default:
                     throw new System.Exception("Missing default settings for type " + outputType);
             }
 
-            this.OnPropertyChanged("Settings");
+            this.OnPropertyChanged(nameof(this.Settings));
         }
 
         private void InitializeSettingsValue(string settingsKey, string value, bool force = false)
@@ -547,7 +568,7 @@ private string Validate(string propertyName)
 
                 case "OutputFileNameTemplate":
                     {
-                        string sampleOutputFilePath = this.GenerateOutputFilePath(FileConverter.Properties.Resources.OuputFileNameTemplateSample);
+                        string sampleOutputFilePath = this.GenerateOutputFilePath(FileConverter.Properties.Resources.OuputFileNameTemplateSample, 1, 3);
                         if (string.IsNullOrEmpty(sampleOutputFilePath))
                         {
                             return "The output filename template must produce a non empty result.";
@@ -641,6 +662,7 @@ public struct ConversionSettingKeys
         {
             public const string AudioEncodingMode = "AudioEncodingMode";
             public const string AudioBitrate = "AudioBitrate";
+            public const string AudioChannelCount = "AudioChannelCount";
             public const string ImageQuality = "ImageQuality";
             public const string ImageScale = "ImageScale";
             public const string ImageRotation = "ImageRotation";
diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj
index 7ae41637..f4f9c49f 100644
--- a/Application/FileConverter/FileConverter.csproj
+++ b/Application/FileConverter/FileConverter.csproj
@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -36,6 +36,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
@@ -44,10 +45,30 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\ApplicationIcon.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;BUILD32</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;BUILD32</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
     <Reference Include="Magick.NET-Q16-AnyCPU, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0101\lib\net40-client\Magick.NET-Q16-AnyCPU.dll</HintPath>
+      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.2.900\lib\net40-client\Magick.NET-Q16-AnyCPU.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Markdown.Xaml">
@@ -78,6 +99,10 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="WpfAnimatedGif, Version=1.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\WpfAnimatedGif.1.4.14\lib\net\WpfAnimatedGif.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="yeti.mmedia">
       <HintPath>..\..\Middleware\yeti.mmedia.dll</HintPath>
     </Reference>
@@ -102,28 +127,38 @@
     <Compile Include="ConversionJobs\ConversionJob_Gif.cs" />
     <Compile Include="ConversionJobs\ConversionJob_Ico.cs" />
     <Compile Include="ConversionJobs\ConversionJob_ImageMagick.cs" />
+    <Compile Include="ConversionJobs\VideoEncodingSpeed.cs" />
     <Compile Include="ConversionPreset\ConversionSettingsOverride.cs" />
     <Compile Include="ConversionPreset\ConversionSettings.cs" />
     <Compile Include="Diagnostics\DiagnosticsData.cs" />
     <Compile Include="Controls\EncodingMode.cs" />
     <Compile Include="ConversionPreset\IConversionSettings.cs" />
+    <Compile Include="Helpers.cs" />
     <Compile Include="InputPostConversionAction.cs" />
     <Compile Include="IXmlSerializable.cs" />
     <Compile Include="PathHelpers.cs" />
+    <Compile Include="Properties\Resources.fr.Designer.cs">
+      <DependentUpon>Resources.fr.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="Properties\Resources.en.Designer.cs">
       <DependentUpon>Resources.en.resx</DependentUpon>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <ExcludeFromStyleCop>True</ExcludeFromStyleCop>
     </Compile>
     <Compile Include="Registry.cs" />
+    <Compile Include="Settings.Migration.cs" />
     <Compile Include="Settings.Settings.cs" />
     <Compile Include="Upgrade\Helpers.cs" />
     <Compile Include="Upgrade\UpgradeVersionDescription.cs" />
     <Compile Include="ValueConverters\ApplicationVersionToApplicationName.cs" />
     <Compile Include="ConversionPreset\ConversionPreset.cs" />
+    <Compile Include="ValueConverters\OutputTypeEnumToViewModel.cs" />
     <Compile Include="ValueConverters\BitrateToString.cs" />
     <Compile Include="ValueConverters\FileNameConverter.cs" />
+    <Compile Include="ValueConverters\Generic\ObjectToLocalizedString.cs" />
+    <Compile Include="ValueConverters\Generic\CultureInfoToStringConverter.cs" />
     <Compile Include="ValueConverters\Generic\BoolToVisibility.cs" />
     <Compile Include="ValueConverters\ConversionSettingsToString.cs" />
     <Compile Include="ValueConverters\Generic\BoolInverterConverter.cs" />
@@ -147,6 +182,7 @@
     <Compile Include="Windows\ConversionSettingsTemplateSelector.cs" />
     <Compile Include="Windows\InputExtension.cs" />
     <Compile Include="Windows\InputExtensionCategory.cs" />
+    <Compile Include="Windows\OutputTypeViewModel.cs" />
     <Compile Include="Windows\SettingsWindow.xaml.cs">
       <DependentUpon>SettingsWindow.xaml</DependentUpon>
     </Compile>
@@ -210,6 +246,10 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <EmbeddedResource Include="Properties\Resources.fr.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.fr.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.en.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.en.Designer.cs</LastGenOutput>
@@ -226,7 +266,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\ApplicationIcon.png" />
@@ -237,9 +277,6 @@
   <ItemGroup>
     <Resource Include="Resources\DownloadIcon.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\ContextMenuScreenshot.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\CancelIcon.png" />
   </ItemGroup>
@@ -261,10 +298,19 @@
   <ItemGroup>
     <Resource Include="Resources\Pledge-icon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\FileConverterUsage.gif" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy /Y "$(SolutionDir)Middleware\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
-copy /Y "$(ProjectDir)Settings.default.xml" "$(TargetDir)Settings.default.xml"</PostBuildEvent>
+    <PostBuildEvent>copy /Y "$(SolutionDir)Middleware\ffmpeg\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
+copy /Y "$(SolutionDir)Middleware\gs\x86\gsdll32.dll" "$(TargetDir)gsdll32.dll"
+copy /Y "$(SolutionDir)Middleware\gs\x86\gswin32c.exe" "$(TargetDir)gswin32c.exe"
+copy /Y "$(ProjectDir)Settings.default.xml" "$(TargetDir)Settings.default.xml"
+robocopy $(TargetDir) $(TargetDir)\Languages "$(TargetName).resources.dll" /CREATE /S /XD Languages /IS /IT /NFL /NDL /NJH /NJS /NC /NS /NP
+if %25errorlevel%25 leq 1 exit 0 else exit %25errorlevel%25
+robocopy $(TargetDir) $(TargetDir)\Languages "$(TargetName).resources.dll" /MOVE /S /XD Languages /XL /IS /IT /NFL /NDL /NJH /NJS /NC /NS /NP
+if %25errorlevel%25 leq 1 exit 0 else exit %25errorlevel%25</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Application/FileConverter/Helpers.cs b/Application/FileConverter/Helpers.cs
new file mode 100644
index 00000000..e748b31d
--- /dev/null
+++ b/Application/FileConverter/Helpers.cs
@@ -0,0 +1,167 @@
+// // <copyright file="Helpers.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
+
+namespace FileConverter
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.IO;
+    using System.Linq;
+    using System.Reflection;
+    using System.Threading;
+
+    public static class Helpers
+    {
+        public static IEnumerable<CultureInfo> GetSupportedCultures()
+        {
+            //Get all culture 
+            CultureInfo[] cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
+
+            //Find the location where application installed.
+            string exeLocation = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path));
+
+            //Return all culture for which satellite folder found with culture code.
+            return cultures.Where(cultureInfo => Directory.Exists(Path.Combine(exeLocation, "Languages", cultureInfo.Name)));
+        }
+
+        public static string GetExtensionCategory(string extension)
+        {
+            switch (extension)
+            {
+                case "aac":
+                case "aiff":
+                case "ape":
+                case "cda":
+                case "flac":
+                case "mp3":
+                case "m4a":
+                case "oga":
+                case "ogg":
+                case "wav":
+                case "wma":
+                    return InputCategoryNames.Audio;
+
+                case "3gp":
+                case "avi":
+                case "bik":
+                case "flv":
+                case "m4v":
+                case "mp4":
+                case "mpeg":
+                case "mov":
+                case "mkv":
+                case "ogv":
+                case "vob":
+                case "webm":
+                case "wmv":
+                    return InputCategoryNames.Video;
+
+                case "bmp":
+                case "exr":
+                case "ico":
+                case "jpg":
+                case "jpeg":
+                case "png":
+                case "psd":
+                case "tga":
+                case "tiff":
+                case "svg":
+                case "xcf":
+                    return InputCategoryNames.Image;
+
+                case "gif":
+                    return InputCategoryNames.AnimatedImage;
+
+                case "pdf":
+                    return InputCategoryNames.Document;
+            }
+
+            return InputCategoryNames.Misc;
+        }
+
+        public static bool IsOutputTypeCompatibleWithCategory(OutputType outputType, string category)
+        {
+            if (category == InputCategoryNames.Misc)
+            {
+                // Misc category contains unsorted input extensions, so we consider that they are compatible to be tolerant.
+                return true;
+            }
+
+            switch (outputType)
+            {
+                case OutputType.Aac:
+                case OutputType.Flac:
+                case OutputType.Mp3:
+                case OutputType.Ogg:
+                case OutputType.Wav:
+                    return category == InputCategoryNames.Audio || category == InputCategoryNames.Video;
+
+                case OutputType.Avi:
+                case OutputType.Mkv:
+                case OutputType.Mp4:
+                case OutputType.Ogv:
+                case OutputType.Webm:
+                    return category == InputCategoryNames.Video || category == InputCategoryNames.AnimatedImage;
+
+                case OutputType.Ico:
+                case OutputType.Jpg:
+                case OutputType.Png:
+                    return category == InputCategoryNames.Image || category == InputCategoryNames.Document;
+
+                case OutputType.Gif:
+                    return category == InputCategoryNames.Image || category == InputCategoryNames.Video || category == InputCategoryNames.AnimatedImage;
+
+                case OutputType.Pdf:
+                    return category == InputCategoryNames.Image;
+
+                default:
+                    return false;
+            }
+        }
+
+        public static Thread InstantiateThread(string name, ThreadStart threadStart)
+        {
+            Application application = Application.Current as Application;
+            CultureInfo currentCulture = application?.Settings?.ApplicationLanguage;
+
+            Thread thread = new Thread(threadStart);
+            thread.Name = name;
+
+            if (currentCulture != null)
+            {
+                thread.CurrentCulture = currentCulture;
+                thread.CurrentUICulture = currentCulture;
+            }
+
+            return thread;
+        }
+
+        public static Thread InstantiateThread(string name, ParameterizedThreadStart parameterizedThreadStart)
+        {
+            Application application = Application.Current as Application;
+            CultureInfo currentCulture = application?.Settings?.ApplicationLanguage;
+
+            Thread thread = new Thread(parameterizedThreadStart);
+            thread.Name = name;
+
+            if (currentCulture != null)
+            {
+                thread.CurrentCulture = currentCulture;
+                thread.CurrentUICulture = currentCulture;
+            }
+
+            return thread;
+        }
+        
+        public static class InputCategoryNames
+        {
+            public const string Audio = "Audio";
+            public const string Video = "Video";
+            public const string Image = "Image";
+            public const string AnimatedImage = "Animated Image";
+            public const string Document = "Document";
+
+            public const string Misc = "Misc";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Application/FileConverter/OutputType.cs b/Application/FileConverter/OutputType.cs
index e383e1b0..15d5c773 100644
--- a/Application/FileConverter/OutputType.cs
+++ b/Application/FileConverter/OutputType.cs
@@ -16,6 +16,8 @@ public enum OutputType
         Mp3,
         Mp4,
         Ogg,
+        Ogv,
+        Pdf,
         Png,
         Wav,
         Webm,
diff --git a/Application/FileConverter/PathHelpers.cs b/Application/FileConverter/PathHelpers.cs
index fb64431b..d4e67b3f 100644
--- a/Application/FileConverter/PathHelpers.cs
+++ b/Application/FileConverter/PathHelpers.cs
@@ -2,9 +2,13 @@
 
 namespace FileConverter
 {
+    using System;
+    using System.Text;
     using System.Collections.Generic;
     using System.Text.RegularExpressions;
 
+    using FileConverter.Diagnostics;
+
     public static class PathHelpers
     {
         private static Regex driveLetterRegex = new Regex(@"[a-zA-Z]:\\");
@@ -90,106 +94,48 @@ public static IEnumerable<string> GetDirectories(string path)
             }
         }
 
-        public static string GenerateUniquePath(string path)
+        public static string GenerateUniquePath(string path, params string[] blacklist)
         {
             string baseExtension = System.IO.Path.GetExtension(path);
             string basePath = path.Substring(0, path.Length - baseExtension.Length);
             int index = 2;
-            while (System.IO.File.Exists(path))
+            while (System.IO.File.Exists(path) ||
+                (blacklist != null && System.Array.Exists(blacklist, match => match == path)))
             {
-                path = string.Format("{0} ({1}){2}", basePath, index, baseExtension);
+                path = $"{basePath} ({index}){baseExtension}";
                 index++;
             }
 
             return path;
         }
 
-        public static string GetExtensionCategory(string extension)
+        public static bool CreateFolders(string filePath)
         {
-            switch (extension)
-            {
-                case "aac":
-                case "aiff":
-                case "ape":
-                case "cda":
-                case "flac":
-                case "mp3":
-                case "m4a":
-                case "oga":
-                case "ogg":
-                case "wav":
-                case "wma":
-                    return InputCategoryNames.Audio;
-
-                case "3gp":
-                case "avi":
-                case "bik":
-                case "flv":
-                case "m4v":
-                case "mp4":
-                case "mpeg":
-                case "mov":
-                case "mkv":
-                case "ogv":
-                case "vob":
-                case "webm":
-                case "wmv":
-                    return InputCategoryNames.Video;
-
-                case "bmp":
-                case "exr":
-                case "ico":
-                case "jpg":
-                case "jpeg":
-                case "png":
-                case "psd":
-                case "tga":
-                case "tiff":
-                case "svg":
-                case "xcf":
-                    return InputCategoryNames.Image;
-
-                case "gif":
-                    return InputCategoryNames.AnimatedImage;
-            }
-
-            return InputCategoryNames.Misc;
-        }
+            // Create output folders that doesn't already exist.
+            StringBuilder path = new StringBuilder(filePath.Length);
+            string drive = PathHelpers.GetDrive(filePath);
+            path.Append(drive);
 
-        public static bool IsOutputTypeCompatibleWithCategory(OutputType outputType, string category)
-        {
-            if (category == InputCategoryNames.Misc)
+            foreach (string directory in PathHelpers.GetDirectories(filePath))
             {
-                // Misc category contains unsorted input extensions, so we consider that they are compatible to be tolerant.
-                return true;
-            }
+                path.Append(directory);
+                path.Append('\\');
 
-            switch (outputType)
-            {
-                case OutputType.Aac:
-                case OutputType.Flac:
-                case OutputType.Mp3:
-                case OutputType.Ogg:
-                case OutputType.Wav:
-                    return category == InputCategoryNames.Audio || category == InputCategoryNames.Video;
-
-                case OutputType.Avi:
-                case OutputType.Mkv:
-                case OutputType.Mp4:
-                case OutputType.Webm:
-                    return category == InputCategoryNames.Video || category == InputCategoryNames.AnimatedImage;
-
-                case OutputType.Ico:
-                case OutputType.Jpg:
-                case OutputType.Png:
-                    return category == InputCategoryNames.Image;
-
-                case OutputType.Gif:
-                    return category == InputCategoryNames.Image || category == InputCategoryNames.Video || category == InputCategoryNames.AnimatedImage;
-
-                default:
-                    return false;
+                if (!System.IO.Directory.Exists(path.ToString()))
+                {
+                    try
+                    {
+                        System.IO.Directory.CreateDirectory(path.ToString());
+                    }
+                    catch (Exception)
+                    {
+                        Debug.Log(string.Format("Can't create directories for path {0}", filePath));
+                        return false;
+                    }
+                }
             }
+
+            return true;
         }
 
         public static string GetUserDataFolderPath()
@@ -205,14 +151,78 @@ public static string GetUserDataFolderPath()
             return path;
         }
 
-        public static class InputCategoryNames
+        public static string GenerateFilePathFromTemplate(string inputFilePath, OutputType outputFileExtension, string outputFilePathTemplate, int numberIndex, int numberMax)
         {
-            public const string Audio = "Audio";
-            public const string Video = "Video";
-            public const string Image = "Image";
-            public const string AnimatedImage = "Animated Image";
+            if (string.IsNullOrEmpty(inputFilePath))
+            {
+                return "Invalid input file path (argument 0).";
+            }
+
+            string inputExtension = System.IO.Path.GetExtension(inputFilePath).Substring(1);
+            string inputPathWithoutExtension = inputFilePath.Substring(0, inputFilePath.Length - inputExtension.Length - 1);
+            string outputExtension = outputFileExtension.ToString().ToLowerInvariant();
+
+            if (string.IsNullOrEmpty(outputFilePathTemplate))
+            {
+                // Default output path.
+                return inputPathWithoutExtension + "." + outputExtension;
+            }
+
+            string fileName = System.IO.Path.GetFileName(inputPathWithoutExtension);
+            string parentDirectory = System.IO.Path.GetDirectoryName(inputPathWithoutExtension);
+            if (!parentDirectory.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString()))
+            {
+                parentDirectory += System.IO.Path.DirectorySeparatorChar;
+            }
+
+            string[] directories = parentDirectory.Substring(0, parentDirectory.Length - 1).Split(System.IO.Path.DirectorySeparatorChar);
+
+            // Generate output path from template.
+            string outputPath = outputFilePathTemplate;
+
+            outputPath = outputPath.Replace("(path)", parentDirectory);
+            outputPath = outputPath.Replace("(p)", parentDirectory);
+
+            outputPath = outputPath.Replace("(filename)", fileName);
+            outputPath = outputPath.Replace("(f)", fileName);
+            outputPath = outputPath.Replace("(F)", fileName.ToUpperInvariant());
+
+            outputPath = outputPath.Replace("(outputext)", outputExtension);
+            outputPath = outputPath.Replace("(o)", outputExtension);
+            outputPath = outputPath.Replace("(O)", outputExtension.ToUpperInvariant());
+
+            outputPath = outputPath.Replace("(inputext)", inputExtension);
+            outputPath = outputPath.Replace("(i)", inputExtension);
+            outputPath = outputPath.Replace("(I)", inputExtension.ToUpperInvariant());
+
+            string myDocumentsFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\";
+            outputPath = outputPath.Replace("(p:d)", myDocumentsFolder);
+            outputPath = outputPath.Replace("(p:documents)", myDocumentsFolder);
+
+            string myMusicFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyMusic) + "\\";
+            outputPath = outputPath.Replace("(p:m)", myMusicFolder);
+            outputPath = outputPath.Replace("(p:music)", myMusicFolder);
+
+            string myVideoFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyVideos) + "\\";
+            outputPath = outputPath.Replace("(p:v)", myVideoFolder);
+            outputPath = outputPath.Replace("(p:videos)", myVideoFolder);
+
+            string myPictureFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyPictures) + "\\";
+            outputPath = outputPath.Replace("(p:p)", myPictureFolder);
+            outputPath = outputPath.Replace("(p:pictures)", myPictureFolder);
+
+            for (int index = 0; index < directories.Length; index++)
+            {
+                outputPath = outputPath.Replace(string.Format("(d{0})", directories.Length - index - 1), directories[index]);
+                outputPath = outputPath.Replace(string.Format("(D{0})", directories.Length - index - 1), directories[index].ToUpperInvariant());
+            }
+
+            outputPath = outputPath.Replace("(n:i)", numberIndex.ToString());
+            outputPath = outputPath.Replace("(n:c)", numberMax.ToString());
+
+            outputPath += "." + outputExtension;
 
-            public const string Misc = "Misc";
+            return outputPath;
         }
     }
 }
diff --git a/Application/FileConverter/Properties/Resources.Designer.cs b/Application/FileConverter/Properties/Resources.Designer.cs
index 26a4836d..cc90056d 100644
--- a/Application/FileConverter/Properties/Resources.Designer.cs
+++ b/Application/FileConverter/Properties/Resources.Designer.cs
@@ -60,6 +60,708 @@ internal Resources() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to About.
+        /// </summary>
+        public static string About {
+            get {
+                return ResourceManager.GetString("About", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Allow you to chose what you want to do with your input files if the conversion succeed.
+        /// </summary>
+        public static string ActionWhenConversionSucceedDescription {
+            get {
+                return ResourceManager.GetString("ActionWhenConversionSucceedDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Action when conversion succeed.
+        /// </summary>
+        public static string ActionWhenConversionSucceedTitle {
+            get {
+                return ResourceManager.GetString("ActionWhenConversionSucceedTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add new preset (duplicate selected preset).
+        /// </summary>
+        public static string AddNewPreset {
+            get {
+                return ResourceManager.GetString("AddNewPreset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Application.
+        /// </summary>
+        public static string Application {
+            get {
+                return ResourceManager.GetString("Application", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The application is terminating..
+        /// </summary>
+        public static string ApplicationIsTerminating {
+            get {
+                return ResourceManager.GetString("ApplicationIsTerminating", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The application will automatically terminate in {0} seconds..
+        /// </summary>
+        public static string ApplicationWillTerminateInMultipleSeconds {
+            get {
+                return ResourceManager.GetString("ApplicationWillTerminateInMultipleSeconds", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The application will automatically terminate in 1 second..
+        /// </summary>
+        public static string ApplicationWillTerminateInOneSecond {
+            get {
+                return ResourceManager.GetString("ApplicationWillTerminateInOneSecond", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Audio.
+        /// </summary>
+        public static string AudioTitle {
+            get {
+                return ResourceManager.GetString("AudioTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Automatically check for updates when File Converter starts.
+        /// </summary>
+        public static string AutomaticallyCheckForUpdates {
+            get {
+                return ResourceManager.GetString("AutomaticallyCheckForUpdates", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Automatically exit when all conversions finished.
+        /// </summary>
+        public static string AutomaticallyExitWhenAllConversionsFinished {
+            get {
+                return ResourceManager.GetString("AutomaticallyExitWhenAllConversionsFinished", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Channel count :.
+        /// </summary>
+        public static string ChannelCountTitle {
+            get {
+                return ResourceManager.GetString("ChannelCountTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Change the number of channels of the input file..
+        /// </summary>
+        public static string ChannelCountTooltip {
+            get {
+                return ResourceManager.GetString("ChannelCountTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Clamp to lowest power of 2 size.
+        /// </summary>
+        public static string ClampToLowestPowerOfTwoSize {
+            get {
+                return ResourceManager.GetString("ClampToLowestPowerOfTwoSize", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Close.
+        /// </summary>
+        public static string Close {
+            get {
+                return ResourceManager.GetString("Close", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Conversion Archives.
+        /// </summary>
+        public static string ConversionArchives {
+            get {
+                return ResourceManager.GetString("ConversionArchives", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Conversion Presets.
+        /// </summary>
+        public static string ConversionPresets {
+            get {
+                return ResourceManager.GetString("ConversionPresets", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Files to convert.
+        /// </summary>
+        public static string ConversionQueueTitle {
+            get {
+                return ResourceManager.GetString("ConversionQueueTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Conversion.
+        /// </summary>
+        public static string ConversionStateConversion {
+            get {
+                return ResourceManager.GetString("ConversionStateConversion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Done.
+        /// </summary>
+        public static string ConversionStateDone {
+            get {
+                return ResourceManager.GetString("ConversionStateDone", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Extraction.
+        /// </summary>
+        public static string ConversionStateExtraction {
+            get {
+                return ResourceManager.GetString("ConversionStateExtraction", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Failed.
+        /// </summary>
+        public static string ConversionStateFailed {
+            get {
+                return ResourceManager.GetString("ConversionStateFailed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to In queue.
+        /// </summary>
+        public static string ConversionStateInQueue {
+            get {
+                return ResourceManager.GetString("ConversionStateInQueue", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Read input image.
+        /// </summary>
+        public static string ConversionStateReadIntputImage {
+            get {
+                return ResourceManager.GetString("ConversionStateReadIntputImage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Read document.
+        /// </summary>
+        public static string ConversionStateReadPdf {
+            get {
+                return ResourceManager.GetString("ConversionStateReadPdf", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Converted from.
+        /// </summary>
+        public static string ConvertedFrom {
+            get {
+                return ResourceManager.GetString("ConvertedFrom", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to New preset.
+        /// </summary>
+        public static string DefaultPresetName {
+            get {
+                return ResourceManager.GetString("DefaultPresetName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Logs.
+        /// </summary>
+        public static string Diagnostics {
+            get {
+                return ResourceManager.GetString("Diagnostics", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Logs.
+        /// </summary>
+        public static string DiagnosticsButtonTitle {
+            get {
+                return ResourceManager.GetString("DiagnosticsButtonTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open documentation.
+        /// </summary>
+        public static string DocumentationButtonDescription {
+            get {
+                return ResourceManager.GetString("DocumentationButtonDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Donate.
+        /// </summary>
+        public static string DonateButtonTitle {
+            get {
+                return ResourceManager.GetString("DonateButtonTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Don&apos;t forget to reward my work if you like it :).
+        /// </summary>
+        public static string DonateDescription {
+            get {
+                return ResourceManager.GetString("DonateDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The update will be downloaded in background, and installed once you exit File Converter..
+        /// </summary>
+        public static string DownloadAndInstallButtonDescription {
+            get {
+                return ResourceManager.GetString("DownloadAndInstallButtonDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Install when I exit File Converter.
+        /// </summary>
+        public static string DownloadAndInstallButtonTitle {
+            get {
+                return ResourceManager.GetString("DownloadAndInstallButtonTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to ###Downloading change log ....
+        /// </summary>
+        public static string DownloadingChangeLog {
+            get {
+                return ResourceManager.GetString("DownloadingChangeLog", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Encoding :.
+        /// </summary>
+        public static string Encoding {
+            get {
+                return ResourceManager.GetString("Encoding", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Encoding speed :.
+        /// </summary>
+        public static string EncodingSpeed {
+            get {
+                return ResourceManager.GetString("EncodingSpeed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Canceled..
+        /// </summary>
+        public static string ErrorCanceled {
+            get {
+                return ResourceManager.GetString("ErrorCanceled", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fail to find ffmpeg executable. You should try to reinstall the application..
+        /// </summary>
+        public static string ErrorCantFindFFMPEG {
+            get {
+                return ResourceManager.GetString("ErrorCantFindFFMPEG", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Audio CD track extraction failed.
+        /// </summary>
+        public static string ErrorCDAExtractionFailed {
+            get {
+                return ResourceManager.GetString("ErrorCDAExtractionFailed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to CD drive is not ready..
+        /// </summary>
+        public static string ErrorCDDriveNotReady {
+            get {
+                return ResourceManager.GetString("ErrorCDDriveNotReady", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fail to launch ffmpeg..
+        /// </summary>
+        public static string ErrorFailedToLaunchFFMPEG {
+            get {
+                return ResourceManager.GetString("ErrorFailedToLaunchFFMPEG", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fail to create output path folders..
+        /// </summary>
+        public static string ErrorFailToCreateOutputPathFolders {
+            get {
+                return ResourceManager.GetString("ErrorFailToCreateOutputPathFolders", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fail to generate a unique output file path..
+        /// </summary>
+        public static string ErrorFailToGenerateUniqueOutputPath {
+            get {
+                return ResourceManager.GetString("ErrorFailToGenerateUniqueOutputPath", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fail to read cd drive &apos;{0}&apos;..
+        /// </summary>
+        public static string ErrorFailToReadCDDrive {
+            get {
+                return ResourceManager.GetString("ErrorFailToReadCDDrive", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fail to retrieve input path drive letter..
+        /// </summary>
+        public static string ErrorFailToRetrieveInputPathDriveLetter {
+            get {
+                return ResourceManager.GetString("ErrorFailToRetrieveInputPathDriveLetter", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fail to retrieve track number from the cda input path..
+        /// </summary>
+        public static string ErrorFailToRetrieveTrackNumber {
+            get {
+                return ResourceManager.GetString("ErrorFailToRetrieveTrackNumber", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fail to use the CD drive because it is oppened..
+        /// </summary>
+        public static string ErrorFailToUseCDDriveOpen {
+            get {
+                return ResourceManager.GetString("ErrorFailToUseCDDriveOpen", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The input file type is not compatible with the selected output file type..
+        /// </summary>
+        public static string ErrorInputTypeIncompatibleWithOutputType {
+            get {
+                return ResourceManager.GetString("ErrorInputTypeIncompatibleWithOutputType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid output path generated by output file path template..
+        /// </summary>
+        public static string ErrorInvalidOutputPath {
+            get {
+                return ResourceManager.GetString("ErrorInvalidOutputPath", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Unsupported output format &apos;{0}&apos;..
+        /// </summary>
+        public static string ErrorUnsupportedOutputFormat {
+            get {
+                return ResourceManager.GetString("ErrorUnsupportedOutputFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Waiting duration before application exit.
+        /// </summary>
+        public static string ExitWaitingDuration {
+            get {
+                return ResourceManager.GetString("ExitWaitingDuration", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to File Converter is a shell extension..
+        /// </summary>
+        public static string FileConverterStartHelp1 {
+            get {
+                return ResourceManager.GetString("FileConverterStartHelp1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to That means it is integrated into the Windows explorer..
+        /// </summary>
+        public static string FileConverterStartHelp2 {
+            get {
+                return ResourceManager.GetString("FileConverterStartHelp2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to To use File Converter please open the explorer and right-click on any file you like to bring up the context menu where you will find File Converter commands (see the readme file to see the list of compatible file formats)..
+        /// </summary>
+        public static string FileConverterStartHelp3 {
+            get {
+                return ResourceManager.GetString("FileConverterStartHelp3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to File name template.
+        /// </summary>
+        public static string FileNameTemplate {
+            get {
+                return ResourceManager.GetString("FileNameTemplate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Frames per second :.
+        /// </summary>
+        public static string FramesPerSecond {
+            get {
+                return ResourceManager.GetString("FramesPerSecond", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open GitHub project page.
+        /// </summary>
+        public static string GitHubButtonDescription {
+            get {
+                return ResourceManager.GetString("GitHubButtonDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to help ?.
+        /// </summary>
+        public static string Help {
+            get {
+                return ResourceManager.GetString("Help", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Input example.
+        /// </summary>
+        public static string InputExample {
+            get {
+                return ResourceManager.GetString("InputExample", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Input formats.
+        /// </summary>
+        public static string InputFormats {
+            get {
+                return ResourceManager.GetString("InputFormats", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Delete.
+        /// </summary>
+        public static string InputPostConversionActionDeleteName {
+            get {
+                return ResourceManager.GetString("InputPostConversionActionDeleteName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Move in an archive folder.
+        /// </summary>
+        public static string InputPostConversionActionMoveInArchiveFolderName {
+            get {
+                return ResourceManager.GetString("InputPostConversionActionMoveInArchiveFolderName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to None.
+        /// </summary>
+        public static string InputPostConversionActionNoneName {
+            get {
+                return ResourceManager.GetString("InputPostConversionActionNoneName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The update has been downloaded. Exit File Converter and install the update now..
+        /// </summary>
+        public static string InstallButtonDescription {
+            get {
+                return ResourceManager.GetString("InstallButtonDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Install when I exit File Converter.
+        /// </summary>
+        public static string InstallButtonTitle {
+            get {
+                return ResourceManager.GetString("InstallButtonTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Report an issue.
+        /// </summary>
+        public static string IssueButtonDescription {
+            get {
+                return ResourceManager.GetString("IssueButtonDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Language.
+        /// </summary>
+        public static string Language {
+            get {
+                return ResourceManager.GetString("Language", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to **This program is free software**..
+        /// </summary>
+        public static string LicenceHeader1 {
+            get {
+                return ResourceManager.GetString("LicenceHeader1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You can redistribute it and/or modify it under the terms of the GNU General Public License..
+        /// </summary>
+        public static string LicenceHeader2 {
+            get {
+                return ResourceManager.GetString("LicenceHeader2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details..
+        /// </summary>
+        public static string LicenceHeader3 {
+            get {
+                return ResourceManager.GetString("LicenceHeader3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Maximum number of simultaneous conversions.
+        /// </summary>
+        public static string MaximumNumberOfSimultaneousConversions {
+            get {
+                return ResourceManager.GetString("MaximumNumberOfSimultaneousConversions", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mono.
+        /// </summary>
+        public static string MonoOption {
+            get {
+                return ResourceManager.GetString("MonoOption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Move down selected preset.
+        /// </summary>
+        public static string MoveDownSelectedPreset {
+            get {
+                return ResourceManager.GetString("MoveDownSelectedPreset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Move up selected preset.
+        /// </summary>
+        public static string MoveUpSelectedPreset {
+            get {
+                return ResourceManager.GetString("MoveUpSelectedPreset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Constant bitrate encoding.
+        /// </summary>
+        public static string Mp3CbrDescription {
+            get {
+                return ResourceManager.GetString("Mp3CbrDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Variable bitrate encoding.
+        /// </summary>
+        public static string Mp3VbrDescription {
+            get {
+                return ResourceManager.GetString("Mp3VbrDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 90°.
+        /// </summary>
+        public static string NinetyDegreesRotationTitle {
+            get {
+                return ResourceManager.GetString("NinetyDegreesRotationTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 90° counter clockwise rotation.
         /// </summary>
@@ -69,6 +771,24 @@ public static string NinetyDegreesRotationTooltip {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Ok.
+        /// </summary>
+        public static string Ok {
+            get {
+                return ResourceManager.GetString("Ok", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 180°.
+        /// </summary>
+        public static string OneEightyDegreesRotationTitle {
+            get {
+                return ResourceManager.GetString("OneEightyDegreesRotationTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 180° rotation.
         /// </summary>
@@ -87,6 +807,15 @@ public static string OuputFileNameTemplateSample {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Output.
+        /// </summary>
+        public static string OutputExample {
+            get {
+                return ResourceManager.GetString("OutputExample", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to (p): input file path
         ///(f): input filename
@@ -95,13 +824,16 @@ public static string OuputFileNameTemplateSample {
         ///(d0): input parent folder
         ///(d1): input sub parent folder
         ///...
-        ///use maj for uppercase version
+        ///(n:i): page number index
+        ///(n:c): total page count
         ///
         ///Special paths:
         ///(p:d): my documents path
         ///(p:m): my music path
         ///(p:v): my videos path
-        ///(p:p): my pictures path.
+        ///(p:p): my pictures path
+        ///
+        ///use maj for uppercase version.
         /// </summary>
         public static string OutputFilePathTemplateHelp {
             get {
@@ -109,6 +841,186 @@ public static string OutputFilePathTemplateHelp {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Output format.
+        /// </summary>
+        public static string OutputFormat {
+            get {
+                return ResourceManager.GetString("OutputFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Preset.
+        /// </summary>
+        public static string Preset {
+            get {
+                return ResourceManager.GetString("Preset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Preset Name.
+        /// </summary>
+        public static string PresetName {
+            get {
+                return ResourceManager.GetString("PresetName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Quality :.
+        /// </summary>
+        public static string Quality {
+            get {
+                return ResourceManager.GetString("Quality", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Recommended bitrate range in blue.
+        /// </summary>
+        public static string RecommendeBitrateRangeInBlue {
+            get {
+                return ResourceManager.GetString("RecommendeBitrateRangeInBlue", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remove selected preset.
+        /// </summary>
+        public static string RemoveSelectedPreset {
+            get {
+                return ResourceManager.GetString("RemoveSelectedPreset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rotate :.
+        /// </summary>
+        public static string Rotate {
+            get {
+                return ResourceManager.GetString("Rotate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Same than input file.
+        /// </summary>
+        public static string SameChannelCountOption {
+            get {
+                return ResourceManager.GetString("SameChannelCountOption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Save.
+        /// </summary>
+        public static string Save {
+            get {
+                return ResourceManager.GetString("Save", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Scale :.
+        /// </summary>
+        public static string Scale {
+            get {
+                return ResourceManager.GetString("Scale", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to See change log ....
+        /// </summary>
+        public static string SeeChangeLog {
+            get {
+                return ResourceManager.GetString("SeeChangeLog", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Settings.
+        /// </summary>
+        public static string Settings {
+            get {
+                return ResourceManager.GetString("Settings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Settings.
+        /// </summary>
+        public static string SettingsButtonTitle {
+            get {
+                return ResourceManager.GetString("SettingsButtonTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Stereo.
+        /// </summary>
+        public static string StereoOption {
+            get {
+                return ResourceManager.GetString("StereoOption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Animated Image.
+        /// </summary>
+        public static string StringAnimatedImageName {
+            get {
+                return ResourceManager.GetString("StringAnimatedImageName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Audio.
+        /// </summary>
+        public static string StringAudioName {
+            get {
+                return ResourceManager.GetString("StringAudioName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Document.
+        /// </summary>
+        public static string StringDocumentName {
+            get {
+                return ResourceManager.GetString("StringDocumentName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Image.
+        /// </summary>
+        public static string StringImageName {
+            get {
+                return ResourceManager.GetString("StringImageName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Video.
+        /// </summary>
+        public static string StringVideoName {
+            get {
+                return ResourceManager.GetString("StringVideoName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 270°.
+        /// </summary>
+        public static string TwoSeventyDegreesRotationTitle {
+            get {
+                return ResourceManager.GetString("TwoSeventyDegreesRotationTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 90° clockwise rotation.
         /// </summary>
@@ -118,6 +1030,33 @@ public static string TwoSeventyDegreesRotationTooltip {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to An update for File Converter is available. It is strongly recommended that you install it as soon as possible!.
+        /// </summary>
+        public static string UpgradeAvailable {
+            get {
+                return ResourceManager.GetString("UpgradeAvailable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade download in progress....
+        /// </summary>
+        public static string UpgradeDownloadInProgress {
+            get {
+                return ResourceManager.GetString("UpgradeDownloadInProgress", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to File Converter Updates.
+        /// </summary>
+        public static string UpgradeWindowTitle {
+            get {
+                return ResourceManager.GetString("UpgradeWindowTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Define the ratio &apos;file size&apos; versus &apos;video quality&apos;. A lower value will give you a smaller file, a greater value give you a better video quality..
         /// </summary>
@@ -127,6 +1066,60 @@ public static string VideoEncodingQualityTooltip {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Faster.
+        /// </summary>
+        public static string VideoEncodingSpeedFasterName {
+            get {
+                return ResourceManager.GetString("VideoEncodingSpeedFasterName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fast.
+        /// </summary>
+        public static string VideoEncodingSpeedFastName {
+            get {
+                return ResourceManager.GetString("VideoEncodingSpeedFastName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Medium.
+        /// </summary>
+        public static string VideoEncodingSpeedMediumName {
+            get {
+                return ResourceManager.GetString("VideoEncodingSpeedMediumName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Slower.
+        /// </summary>
+        public static string VideoEncodingSpeedSlowerName {
+            get {
+                return ResourceManager.GetString("VideoEncodingSpeedSlowerName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Slow.
+        /// </summary>
+        public static string VideoEncodingSpeedSlowName {
+            get {
+                return ResourceManager.GetString("VideoEncodingSpeedSlowName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Super Fast.
+        /// </summary>
+        public static string VideoEncodingSpeedSuperFastName {
+            get {
+                return ResourceManager.GetString("VideoEncodingSpeedSuperFastName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Define the ratio &apos;file size&apos; versus &apos;compression duration&apos;. A slow compression will give you a smaller file (for the same video quality) than a faster compression..
         /// </summary>
@@ -136,6 +1129,87 @@ public static string VideoEncodingSpeedTooltip {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Ultra Fast.
+        /// </summary>
+        public static string VideoEncodingSpeedUltraFastName {
+            get {
+                return ResourceManager.GetString("VideoEncodingSpeedUltraFastName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Very Fast.
+        /// </summary>
+        public static string VideoEncodingSpeedVeryFastName {
+            get {
+                return ResourceManager.GetString("VideoEncodingSpeedVeryFastName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Very Slow.
+        /// </summary>
+        public static string VideoEncodingSpeedVerySlowName {
+            get {
+                return ResourceManager.GetString("VideoEncodingSpeedVerySlowName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Video.
+        /// </summary>
+        public static string VideoTitle {
+            get {
+                return ResourceManager.GetString("VideoTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to PCM signed 16-bit little-endian.
+        /// </summary>
+        public static string Wav16bitsDescription {
+            get {
+                return ResourceManager.GetString("Wav16bitsDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to PCM signed 24-bit little-endian.
+        /// </summary>
+        public static string Wav24bitsDescription {
+            get {
+                return ResourceManager.GetString("Wav24bitsDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to PCM signed 32-bit little-endian.
+        /// </summary>
+        public static string Wav32bitsDescription {
+            get {
+                return ResourceManager.GetString("Wav32bitsDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to PCM signed 8-bit little-endian.
+        /// </summary>
+        public static string Wav8bitsDescription {
+            get {
+                return ResourceManager.GetString("Wav8bitsDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to None.
+        /// </summary>
+        public static string ZeroDegreesRotationTitle {
+            get {
+                return ResourceManager.GetString("ZeroDegreesRotationTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to No rotation.
         /// </summary>
diff --git a/Application/FileConverter/Properties/Resources.en.resx b/Application/FileConverter/Properties/Resources.en.resx
index b3bfa2f2..c178ff17 100644
--- a/Application/FileConverter/Properties/Resources.en.resx
+++ b/Application/FileConverter/Properties/Resources.en.resx
@@ -117,15 +117,147 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="About" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="ActionWhenConversionSucceedDescription" xml:space="preserve">
+    <value>Allow you to chose what you want to do with your input files if the conversion succeed</value>
+  </data>
+  <data name="ActionWhenConversionSucceedTitle" xml:space="preserve">
+    <value>Action when conversion succeed</value>
+  </data>
+  <data name="AddNewPreset" xml:space="preserve">
+    <value>Add new preset (duplicate selected preset)</value>
+  </data>
+  <data name="Application" xml:space="preserve">
+    <value>Application</value>
+  </data>
+  <data name="AudioTitle" xml:space="preserve">
+    <value>Audio</value>
+  </data>
+  <data name="AutomaticallyCheckForUpdates" xml:space="preserve">
+    <value>Automatically check for updates when File Converter starts</value>
+  </data>
+  <data name="AutomaticallyExitWhenAllConversionsFinished" xml:space="preserve">
+    <value>Automatically exit when all conversions finished</value>
+  </data>
+  <data name="ClampToLowestPowerOfTwoSize" xml:space="preserve">
+    <value>Clamp to lowest power of 2 size</value>
+  </data>
+  <data name="Close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="ConversionPresets" xml:space="preserve">
+    <value>Conversion Presets</value>
+  </data>
+  <data name="ConversionQueueTitle" xml:space="preserve">
+    <value>Files to convert</value>
+  </data>
+  <data name="ConvertedFrom" xml:space="preserve">
+    <value>Converted from</value>
+  </data>
+  <data name="Diagnostics" xml:space="preserve">
+    <value>Logs</value>
+  </data>
+  <data name="DiagnosticsButtonTitle" xml:space="preserve">
+    <value>Logs</value>
+  </data>
+  <data name="DocumentationButtonDescription" xml:space="preserve">
+    <value>Open documentation</value>
+  </data>
+  <data name="DonateButtonTitle" xml:space="preserve">
+    <value>Donate</value>
+  </data>
+  <data name="DonateDescription" xml:space="preserve">
+    <value>Don't forget to reward my work if you like it :)</value>
+  </data>
+  <data name="DownloadAndInstallButtonDescription" xml:space="preserve">
+    <value>The update will be downloaded in background, and installed once you exit File Converter.</value>
+  </data>
+  <data name="DownloadAndInstallButtonTitle" xml:space="preserve">
+    <value>Install when I exit File Converter</value>
+  </data>
+  <data name="Encoding" xml:space="preserve">
+    <value>Encoding :</value>
+  </data>
+  <data name="EncodingSpeed" xml:space="preserve">
+    <value>Encoding speed :</value>
+  </data>
+  <data name="FileConverterStartHelp1" xml:space="preserve">
+    <value>File Converter is a shell extension.</value>
+  </data>
+  <data name="FileConverterStartHelp2" xml:space="preserve">
+    <value>That means it is integrated into the Windows explorer.</value>
+  </data>
+  <data name="FileNameTemplate" xml:space="preserve">
+    <value>File name template</value>
+  </data>
+  <data name="FramesPerSecond" xml:space="preserve">
+    <value>Frames per second :</value>
+  </data>
+  <data name="GitHubButtonDescription" xml:space="preserve">
+    <value>Open GitHub project page</value>
+  </data>
+  <data name="Help" xml:space="preserve">
+    <value>help ?</value>
+  </data>
+  <data name="InputExample" xml:space="preserve">
+    <value>Input example</value>
+  </data>
+  <data name="InputFormats" xml:space="preserve">
+    <value>Input formats</value>
+  </data>
+  <data name="InputPostConversionActionDeleteName" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="InputPostConversionActionMoveInArchiveFolderName" xml:space="preserve">
+    <value>Move in an archive folder</value>
+  </data>
+  <data name="InputPostConversionActionNoneName" xml:space="preserve">
+    <value>None</value>
+  </data>
+  <data name="InstallButtonDescription" xml:space="preserve">
+    <value>The update has been downloaded. Exit File Converter and install the update now.</value>
+  </data>
+  <data name="InstallButtonTitle" xml:space="preserve">
+    <value>Install when I exit File Converter</value>
+  </data>
+  <data name="IssueButtonDescription" xml:space="preserve">
+    <value>Report an issue</value>
+  </data>
+  <data name="MoveDownSelectedPreset" xml:space="preserve">
+    <value>Move down selected preset</value>
+  </data>
+  <data name="MoveUpSelectedPreset" xml:space="preserve">
+    <value>Move up selected preset</value>
+  </data>
+  <data name="Mp3CbrDescription" xml:space="preserve">
+    <value>Constant bitrate encoding</value>
+  </data>
+  <data name="Mp3VbrDescription" xml:space="preserve">
+    <value>Variable bitrate encoding</value>
+  </data>
+  <data name="NinetyDegreesRotationTitle" xml:space="preserve">
+    <value>90°</value>
+  </data>
   <data name="NinetyDegreesRotationTooltip" xml:space="preserve">
     <value>90° counter clockwise rotation</value>
   </data>
+  <data name="Ok" xml:space="preserve">
+    <value>Ok</value>
+  </data>
+  <data name="OneEightyDegreesRotationTitle" xml:space="preserve">
+    <value>180°</value>
+  </data>
   <data name="OneEightyDegreesRotationTooltip" xml:space="preserve">
     <value>180° rotation</value>
   </data>
   <data name="OuputFileNameTemplateSample" xml:space="preserve">
     <value>C:\Music\Artist\Album\Song.wav</value>
   </data>
+  <data name="OutputExample" xml:space="preserve">
+    <value>Output</value>
+  </data>
   <data name="OutputFilePathTemplateHelp" xml:space="preserve">
     <value>(p): input file path
 (f): input filename
@@ -134,24 +266,252 @@
 (d0): input parent folder
 (d1): input sub parent folder
 ...
-use maj for uppercase version
+(n:i): page number index
+(n:c): total page count
 
 Special paths:
 (p:d): my documents path
 (p:m): my music path
 (p:v): my videos path
-(p:p): my pictures path</value>
+(p:p): my pictures path
+
+use maj for uppercase version</value>
+  </data>
+  <data name="OutputFormat" xml:space="preserve">
+    <value>Output format</value>
+  </data>
+  <data name="Preset" xml:space="preserve">
+    <value>Preset</value>
+  </data>
+  <data name="PresetName" xml:space="preserve">
+    <value>Preset Name</value>
+  </data>
+  <data name="Quality" xml:space="preserve">
+    <value>Quality :</value>
+  </data>
+  <data name="RecommendeBitrateRangeInBlue" xml:space="preserve">
+    <value>Recommended bitrate range in blue</value>
+  </data>
+  <data name="RemoveSelectedPreset" xml:space="preserve">
+    <value>Remove selected preset</value>
+  </data>
+  <data name="Rotate" xml:space="preserve">
+    <value>Rotate :</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="Scale" xml:space="preserve">
+    <value>Scale :</value>
+  </data>
+  <data name="SeeChangeLog" xml:space="preserve">
+    <value>See change log ...</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="SettingsButtonTitle" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
+    <value>270°</value>
   </data>
   <data name="TwoSeventyDegreesRotationTooltip" xml:space="preserve">
     <value>90° clockwise rotation</value>
   </data>
+  <data name="UpgradeAvailable" xml:space="preserve">
+    <value>An update for File Converter is available. It is strongly recommended that you install it as soon as possible!</value>
+  </data>
+  <data name="UpgradeDownloadInProgress" xml:space="preserve">
+    <value>Upgrade download in progress...</value>
+  </data>
+  <data name="UpgradeWindowTitle" xml:space="preserve">
+    <value>File Converter Updates</value>
+  </data>
   <data name="VideoEncodingQualityTooltip" xml:space="preserve">
     <value>Define the ratio 'file size' versus 'video quality'. A lower value will give you a smaller file, a greater value give you a better video quality.</value>
   </data>
+  <data name="VideoEncodingSpeedFasterName" xml:space="preserve">
+    <value>Faster</value>
+  </data>
+  <data name="VideoEncodingSpeedFastName" xml:space="preserve">
+    <value>Fast</value>
+  </data>
+  <data name="VideoEncodingSpeedMediumName" xml:space="preserve">
+    <value>Medium</value>
+  </data>
+  <data name="VideoEncodingSpeedSlowerName" xml:space="preserve">
+    <value>Slower</value>
+  </data>
+  <data name="VideoEncodingSpeedSlowName" xml:space="preserve">
+    <value>Slow</value>
+  </data>
+  <data name="VideoEncodingSpeedSuperFastName" xml:space="preserve">
+    <value>Super Fast</value>
+  </data>
   <data name="VideoEncodingSpeedTooltip" xml:space="preserve">
     <value>Define the ratio 'file size' versus 'compression duration'. A slow compression will give you a smaller file (for the same video quality) than a faster compression.</value>
   </data>
+  <data name="VideoEncodingSpeedUltraFastName" xml:space="preserve">
+    <value>Ultra Fast</value>
+  </data>
+  <data name="VideoEncodingSpeedVeryFastName" xml:space="preserve">
+    <value>Very Fast</value>
+  </data>
+  <data name="VideoEncodingSpeedVerySlowName" xml:space="preserve">
+    <value>Very Slow</value>
+  </data>
+  <data name="VideoTitle" xml:space="preserve">
+    <value>Video</value>
+  </data>
+  <data name="Wav16bitsDescription" xml:space="preserve">
+    <value>PCM signed 16-bit little-endian</value>
+  </data>
+  <data name="Wav24bitsDescription" xml:space="preserve">
+    <value>PCM signed 24-bit little-endian</value>
+  </data>
+  <data name="Wav32bitsDescription" xml:space="preserve">
+    <value>PCM signed 32-bit little-endian</value>
+  </data>
+  <data name="Wav8bitsDescription" xml:space="preserve">
+    <value>PCM signed 8-bit little-endian</value>
+  </data>
+  <data name="ZeroDegreesRotationTitle" xml:space="preserve">
+    <value>None</value>
+  </data>
   <data name="ZeroDegreesRotationTooltip" xml:space="preserve">
     <value>No rotation</value>
   </data>
+  <data name="ConversionStateConversion" xml:space="preserve">
+    <value>Conversion</value>
+  </data>
+  <data name="ConversionStateDone" xml:space="preserve">
+    <value>Done</value>
+  </data>
+  <data name="ConversionStateExtraction" xml:space="preserve">
+    <value>Extraction</value>
+  </data>
+  <data name="ConversionStateFailed" xml:space="preserve">
+    <value>Failed</value>
+  </data>
+  <data name="ConversionStateInQueue" xml:space="preserve">
+    <value>In queue</value>
+  </data>
+  <data name="ConversionStateReadIntputImage" xml:space="preserve">
+    <value>Read input image</value>
+  </data>
+  <data name="ConversionStateReadPdf" xml:space="preserve">
+    <value>Read document</value>
+  </data>
+  <data name="StringAnimatedImageName" xml:space="preserve">
+    <value>Animated Image</value>
+  </data>
+  <data name="StringAudioName" xml:space="preserve">
+    <value>Audio</value>
+  </data>
+  <data name="StringDocumentName" xml:space="preserve">
+    <value>Document</value>
+  </data>
+  <data name="StringImageName" xml:space="preserve">
+    <value>Image</value>
+  </data>
+  <data name="StringVideoName" xml:space="preserve">
+    <value>Video</value>
+  </data>
+  <data name="ExitWaitingDuration" xml:space="preserve">
+    <value>Waiting duration before application exit</value>
+  </data>
+  <data name="Language" xml:space="preserve">
+    <value>Language</value>
+  </data>
+  <data name="MaximumNumberOfSimultaneousConversions" xml:space="preserve">
+    <value>Maximum number of simultaneous conversions</value>
+  </data>
+  <data name="DefaultPresetName" xml:space="preserve">
+    <value>New preset</value>
+  </data>
+  <data name="DownloadingChangeLog" xml:space="preserve">
+    <value>###Downloading change log ...</value>
+  </data>
+  <data name="ConversionArchives" xml:space="preserve">
+    <value>Conversion Archives</value>
+  </data>
+  <data name="ErrorCanceled" xml:space="preserve">
+    <value>Canceled.</value>
+  </data>
+  <data name="ErrorCantFindFFMPEG" xml:space="preserve">
+    <value>Fail to find ffmpeg executable. You should try to reinstall the application.</value>
+  </data>
+  <data name="ErrorCDAExtractionFailed" xml:space="preserve">
+    <value>Audio CD track extraction failed</value>
+  </data>
+  <data name="ErrorCDDriveNotReady" xml:space="preserve">
+    <value>CD drive is not ready.</value>
+  </data>
+  <data name="ErrorFailedToLaunchFFMPEG" xml:space="preserve">
+    <value>Fail to launch ffmpeg.</value>
+  </data>
+  <data name="ErrorFailToCreateOutputPathFolders" xml:space="preserve">
+    <value>Fail to create output path folders.</value>
+  </data>
+  <data name="ErrorFailToGenerateUniqueOutputPath" xml:space="preserve">
+    <value>Fail to generate a unique output file path.</value>
+  </data>
+  <data name="ErrorFailToReadCDDrive" xml:space="preserve">
+    <value>Fail to read cd drive '{0}'.</value>
+  </data>
+  <data name="ErrorFailToRetrieveInputPathDriveLetter" xml:space="preserve">
+    <value>Fail to retrieve input path drive letter.</value>
+  </data>
+  <data name="ErrorFailToRetrieveTrackNumber" xml:space="preserve">
+    <value>Fail to retrieve track number from the cda input path.</value>
+  </data>
+  <data name="ErrorFailToUseCDDriveOpen" xml:space="preserve">
+    <value>Fail to use the CD drive because it is oppened.</value>
+  </data>
+  <data name="ErrorInputTypeIncompatibleWithOutputType" xml:space="preserve">
+    <value>The input file type is not compatible with the selected output file type.</value>
+  </data>
+  <data name="ErrorInvalidOutputPath" xml:space="preserve">
+    <value>Invalid output path generated by output file path template.</value>
+  </data>
+  <data name="ErrorUnsupportedOutputFormat" xml:space="preserve">
+    <value>Unsupported output format '{0}'.</value>
+  </data>
+  <data name="ChannelCountTitle" xml:space="preserve">
+    <value>Channel count :</value>
+  </data>
+  <data name="ChannelCountTooltip" xml:space="preserve">
+    <value>Change the number of channels of the input file.</value>
+  </data>
+  <data name="MonoOption" xml:space="preserve">
+    <value>Mono</value>
+  </data>
+  <data name="SameChannelCountOption" xml:space="preserve">
+    <value>Same than input file</value>
+  </data>
+  <data name="StereoOption" xml:space="preserve">
+    <value>Stereo</value>
+  </data>
+  <data name="FileConverterStartHelp3" xml:space="preserve">
+    <value>To use File Converter please open the explorer and right-click on any file you like to bring up the context menu where you will find File Converter commands (see the online documentation to see the list of compatible file formats).</value>
+  </data>
+  <data name="LicenceHeader1" xml:space="preserve">
+    <value>**This program is free software**.</value>
+  </data>
+  <data name="LicenceHeader2" xml:space="preserve">
+    <value>You can redistribute it and/or modify it under the terms of the GNU General Public License.</value>
+  </data>
+  <data name="LicenceHeader3" xml:space="preserve">
+    <value>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.</value>
+  </data>
+  <data name="ApplicationIsTerminating" xml:space="preserve">
+    <value>The application is terminating.</value>
+  </data>
+  <data name="ApplicationWillTerminateInMultipleSeconds" xml:space="preserve">
+    <value>The application will automatically terminate in {0} seconds.</value>
+  </data>
+  <data name="ApplicationWillTerminateInOneSecond" xml:space="preserve">
+    <value>The application will automatically terminate in 1 second.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Application/FileConverter/Properties/Resources.fr.Designer.cs b/Application/FileConverter/Properties/Resources.fr.Designer.cs
new file mode 100644
index 00000000..e69de29b
diff --git a/Application/FileConverter/Properties/Resources.fr.resx b/Application/FileConverter/Properties/Resources.fr.resx
new file mode 100644
index 00000000..9ccf4355
--- /dev/null
+++ b/Application/FileConverter/Properties/Resources.fr.resx
@@ -0,0 +1,535 @@
+<?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="About" xml:space="preserve">
+    <value>A propos</value>
+  </data>
+  <data name="ActionWhenConversionSucceedDescription" xml:space="preserve">
+    <value>Cette option vous permet de choisir ce que vous souhaitez faire du fichier d'origine après une conversion réussie</value>
+    <comment>Allow you to chose what you want to do with your input files if the conversion succeed</comment>
+  </data>
+  <data name="ActionWhenConversionSucceedTitle" xml:space="preserve">
+    <value>Action après conversion réussie</value>
+  </data>
+  <data name="AddNewPreset" xml:space="preserve">
+    <value>Ajoute un nouveau preset (duplique le preset selectionné)</value>
+  </data>
+  <data name="Application" xml:space="preserve">
+    <value>Application</value>
+  </data>
+  <data name="AudioTitle" xml:space="preserve">
+    <value>Audio</value>
+  </data>
+  <data name="AutomaticallyCheckForUpdates" xml:space="preserve">
+    <value>Vérifier automatiquement les mises à jour au démarage de File Converter</value>
+    <comment>Automatically check for updates when File Converter starts</comment>
+  </data>
+  <data name="AutomaticallyExitWhenAllConversionsFinished" xml:space="preserve">
+    <value>Terminer File Converter lorsque toutes les conversions ont réussies</value>
+  </data>
+  <data name="ClampToLowestPowerOfTwoSize" xml:space="preserve">
+    <value>Ajuster à la taille en puissance de 2 la plus proche</value>
+  </data>
+  <data name="Close" xml:space="preserve">
+    <value>Fermer</value>
+  </data>
+  <data name="ConversionPresets" xml:space="preserve">
+    <value>Presets de conversion</value>
+  </data>
+  <data name="ConversionQueueTitle" xml:space="preserve">
+    <value>Fichiers à convertir</value>
+  </data>
+  <data name="ConvertedFrom" xml:space="preserve">
+    <value>Converti depuis</value>
+  </data>
+  <data name="Diagnostics" xml:space="preserve">
+    <value>Historique d'activité</value>
+  </data>
+  <data name="DiagnosticsButtonTitle" xml:space="preserve">
+    <value>Historique d'activité</value>
+  </data>
+  <data name="DocumentationButtonDescription" xml:space="preserve">
+    <value>Ouvrir la documentation</value>
+  </data>
+  <data name="DonateButtonTitle" xml:space="preserve">
+    <value>Faire un don</value>
+  </data>
+  <data name="DonateDescription" xml:space="preserve">
+    <value>N'oubliez pas de récompenser mon travail si vous l'apréciez :)</value>
+  </data>
+  <data name="DownloadAndInstallButtonDescription" xml:space="preserve">
+    <value>La mise à jour sera téléchargé en tache de fond et sera installé à la fermeture de File Converter.</value>
+    <comment>The update will be downloaded in background, and installed once you exit File Converter.</comment>
+  </data>
+  <data name="DownloadAndInstallButtonTitle" xml:space="preserve">
+    <value>Installer lorsque je quitte File Converter</value>
+    <comment>Install when I exit File Converter</comment>
+  </data>
+  <data name="Encoding" xml:space="preserve">
+    <value>Encodage :</value>
+  </data>
+  <data name="EncodingSpeed" xml:space="preserve">
+    <value>Vitesse d'encodage :</value>
+  </data>
+  <data name="FileConverterStartHelp1" xml:space="preserve">
+    <value>File Converter est une extension.</value>
+  </data>
+  <data name="FileConverterStartHelp2" xml:space="preserve">
+    <value>Cela signifie qu'il est intégré dans l'explorateur Windows.</value>
+    <comment>That means it is integrated into the Windows explorer.</comment>
+  </data>
+  <data name="FileConverterStartHelp3" xml:space="preserve">
+    <value>Pour utiliser File Converter, ouvrez l'explorateur et faites un clic droit sur le ou les fichier(s) que vous souhaitez convertir pour faire apparaitre le menu contextuel ou vous trouverez File Converter (visitez la documentation en ligne pour connaître la liste des extensions de fichiers compatibles).</value>
+    <comment>To use File Converter please open the explorer and right-click on any file you like to bring up the context menu where you will find File Converter commands (see the online documentation to see the list of compatible file formats).</comment>
+  </data>
+  <data name="FileNameTemplate" xml:space="preserve">
+    <value>Modèle de nom de fichier</value>
+  </data>
+  <data name="FramesPerSecond" xml:space="preserve">
+    <value>Images par seconde :</value>
+  </data>
+  <data name="GitHubButtonDescription" xml:space="preserve">
+    <value>Ouvrir la page de projet GitHub</value>
+  </data>
+  <data name="Help" xml:space="preserve">
+    <value>aide ?</value>
+  </data>
+  <data name="InputExample" xml:space="preserve">
+    <value>Example de chemin d'origine</value>
+  </data>
+  <data name="InputFormats" xml:space="preserve">
+    <value>Formats compatibles</value>
+  </data>
+  <data name="InputPostConversionActionDeleteName" xml:space="preserve">
+    <value>Supprimer</value>
+  </data>
+  <data name="InputPostConversionActionMoveInArchiveFolderName" xml:space="preserve">
+    <value>Déplacer dans un dossier d'archive</value>
+  </data>
+  <data name="InputPostConversionActionNoneName" xml:space="preserve">
+    <value>Aucune</value>
+  </data>
+  <data name="InstallButtonDescription" xml:space="preserve">
+    <value>La mise à jour a été téléchargé. Quitte File Conveter et installe la mise à jour maintenant.</value>
+    <comment>The update has been downloaded. Exit File Converter and install the update now.</comment>
+  </data>
+  <data name="InstallButtonTitle" xml:space="preserve">
+    <value>Installer quand je quitte File Converter</value>
+    <comment>Install when I exit File Converter</comment>
+  </data>
+  <data name="IssueButtonDescription" xml:space="preserve">
+    <value>Signaler un problème</value>
+  </data>
+  <data name="MoveDownSelectedPreset" xml:space="preserve">
+    <value>Déplace le preset selectionné vers le bas</value>
+  </data>
+  <data name="MoveUpSelectedPreset" xml:space="preserve">
+    <value>Déplace le preset selectionné vers le haut</value>
+  </data>
+  <data name="Mp3CbrDescription" xml:space="preserve">
+    <value>Taux d'encodage constant</value>
+  </data>
+  <data name="Mp3VbrDescription" xml:space="preserve">
+    <value>Taux d'encodage variable</value>
+  </data>
+  <data name="NinetyDegreesRotationTitle" xml:space="preserve">
+    <value>90°</value>
+  </data>
+  <data name="NinetyDegreesRotationTooltip" xml:space="preserve">
+    <value>rotation de 90° dans le sens antihoraire</value>
+  </data>
+  <data name="Ok" xml:space="preserve">
+    <value>Ok</value>
+  </data>
+  <data name="OneEightyDegreesRotationTitle" xml:space="preserve">
+    <value>180°</value>
+  </data>
+  <data name="OneEightyDegreesRotationTooltip" xml:space="preserve">
+    <value>rotation de 180°</value>
+  </data>
+  <data name="OuputFileNameTemplateSample" xml:space="preserve">
+    <value>C:\Musique\Artiste\Album\Chanson.wav</value>
+  </data>
+  <data name="OutputExample" xml:space="preserve">
+    <value>Destination</value>
+  </data>
+  <data name="OutputFilePathTemplateHelp" xml:space="preserve">
+    <value>(p): chemin du fichier d'origine
+(f): nom du fichier d'origine
+(o): extension du fichier de destination
+(i): extension du fichier d'origine
+(d0): dossier parent du fichier d'origine
+(d1): parent du dossier parent du fichier d'origine
+...
+(n:i): index du numéro de page
+(n:c): nombre total de pages
+
+Chemin spéciaux:
+(p:d): chemin vers mes documents
+(p:m): chemin vers ma musique
+(p:v): chemin vers mes vidéos
+(p:p): chemin vers mes images
+
+utilisez maj pour une version en majuscules</value>
+  </data>
+  <data name="OutputFormat" xml:space="preserve">
+    <value>Format de destination</value>
+  </data>
+  <data name="Preset" xml:space="preserve">
+    <value>Preset</value>
+  </data>
+  <data name="PresetName" xml:space="preserve">
+    <value>Nom du preset</value>
+  </data>
+  <data name="Quality" xml:space="preserve">
+    <value>Qualité :</value>
+  </data>
+  <data name="RecommendeBitrateRangeInBlue" xml:space="preserve">
+    <value>Taux recommandés en bleu</value>
+  </data>
+  <data name="RemoveSelectedPreset" xml:space="preserve">
+    <value>Supprime le preset selectionné</value>
+  </data>
+  <data name="Rotate" xml:space="preserve">
+    <value>Rotation :</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Enregistrer</value>
+  </data>
+  <data name="Scale" xml:space="preserve">
+    <value>Echelle :</value>
+  </data>
+  <data name="SeeChangeLog" xml:space="preserve">
+    <value>Voir les changements ...</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="SettingsButtonTitle" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
+    <value>270°</value>
+  </data>
+  <data name="TwoSeventyDegreesRotationTooltip" xml:space="preserve">
+    <value>rotation de 90° dans le sens horaire</value>
+  </data>
+  <data name="UpgradeAvailable" xml:space="preserve">
+    <value>Une mise à jour de File Converter est disponible. Il est vivement recommandé de l'installer dès que possible!</value>
+    <comment>An update for File Converter is available. It is strongly recommended that you install it as soon as possible!</comment>
+  </data>
+  <data name="UpgradeDownloadInProgress" xml:space="preserve">
+    <value>Téléchargement de la mise à jour en cours...</value>
+  </data>
+  <data name="UpgradeWindowTitle" xml:space="preserve">
+    <value>Mise à jour de File Converter</value>
+  </data>
+  <data name="VideoEncodingQualityTooltip" xml:space="preserve">
+    <value>Défini le rapport 'poid du fichier' contre 'qualité vidéo'. Une valeur basse donnera un fichier plus léger, une valeur haute une meilleur qualité vidéo.</value>
+    <comment>Define the ratio 'file size' versus 'video quality'. A lower value will give you a smaller file, a greater value give you a better video quality.</comment>
+  </data>
+  <data name="VideoEncodingSpeedFasterName" xml:space="preserve">
+    <value>Très Rapide</value>
+  </data>
+  <data name="VideoEncodingSpeedFastName" xml:space="preserve">
+    <value>Rapide</value>
+  </data>
+  <data name="VideoEncodingSpeedMediumName" xml:space="preserve">
+    <value>Normal</value>
+  </data>
+  <data name="VideoEncodingSpeedSlowerName" xml:space="preserve">
+    <value>Très Lent</value>
+  </data>
+  <data name="VideoEncodingSpeedSlowName" xml:space="preserve">
+    <value>Lent</value>
+  </data>
+  <data name="VideoEncodingSpeedSuperFastName" xml:space="preserve">
+    <value>Super Rapide</value>
+  </data>
+  <data name="VideoEncodingSpeedTooltip" xml:space="preserve">
+    <value>Défini le ratio 'poid du fichier' contre 'temps de compression'. Une compression lente donnera un fichier plus léger (pour la même qualité vidéo) qu'une compression rapide.</value>
+    <comment>Define the ratio 'file size' versus 'compression duration'. A slow compression will give you a smaller file (for the same video quality) than a faster compression.</comment>
+  </data>
+  <data name="VideoEncodingSpeedUltraFastName" xml:space="preserve">
+    <value>Ultra Rapide</value>
+  </data>
+  <data name="VideoEncodingSpeedVeryFastName" xml:space="preserve">
+    <value>Très Très Rapide</value>
+  </data>
+  <data name="VideoEncodingSpeedVerySlowName" xml:space="preserve">
+    <value>Très Très Lent</value>
+  </data>
+  <data name="VideoTitle" xml:space="preserve">
+    <value>Vidéo</value>
+  </data>
+  <data name="Wav16bitsDescription" xml:space="preserve">
+    <value>PCM signé 16-bit little-endian</value>
+  </data>
+  <data name="Wav24bitsDescription" xml:space="preserve">
+    <value>PCM signé 24-bit little-endian</value>
+  </data>
+  <data name="Wav32bitsDescription" xml:space="preserve">
+    <value>PCM signé 32-bit little-endian</value>
+  </data>
+  <data name="Wav8bitsDescription" xml:space="preserve">
+    <value>PCM signé gned 8-bit little-endian</value>
+  </data>
+  <data name="ZeroDegreesRotationTitle" xml:space="preserve">
+    <value>Aucune</value>
+  </data>
+  <data name="ZeroDegreesRotationTooltip" xml:space="preserve">
+    <value>Aucune rotation</value>
+  </data>
+  <data name="ConversionStateConversion" xml:space="preserve">
+    <value>Conversion</value>
+  </data>
+  <data name="ConversionStateDone" xml:space="preserve">
+    <value>Réussi</value>
+  </data>
+  <data name="ConversionStateExtraction" xml:space="preserve">
+    <value>Extraction</value>
+  </data>
+  <data name="ConversionStateFailed" xml:space="preserve">
+    <value>Echec</value>
+  </data>
+  <data name="ConversionStateInQueue" xml:space="preserve">
+    <value>En attente</value>
+  </data>
+  <data name="ConversionStateReadIntputImage" xml:space="preserve">
+    <value>Lecture de l'image d'origine</value>
+  </data>
+  <data name="ConversionStateReadPdf" xml:space="preserve">
+    <value>Lecture du document</value>
+  </data>
+  <data name="StringAnimatedImageName" xml:space="preserve">
+    <value>Image Animée</value>
+  </data>
+  <data name="StringAudioName" xml:space="preserve">
+    <value>Audio</value>
+  </data>
+  <data name="StringDocumentName" xml:space="preserve">
+    <value>Document</value>
+  </data>
+  <data name="StringImageName" xml:space="preserve">
+    <value>Image</value>
+  </data>
+  <data name="StringVideoName" xml:space="preserve">
+    <value>Vidéo</value>
+  </data>
+  <data name="ExitWaitingDuration" xml:space="preserve">
+    <value>Temps d'attente avant l'arret de l'application</value>
+  </data>
+  <data name="Language" xml:space="preserve">
+    <value>Langue</value>
+  </data>
+  <data name="MaximumNumberOfSimultaneousConversions" xml:space="preserve">
+    <value>Nombre maximum de conversions simultanées</value>
+  </data>
+  <data name="DefaultPresetName" xml:space="preserve">
+    <value>Nouveau preset</value>
+  </data>
+  <data name="DownloadingChangeLog" xml:space="preserve">
+    <value>###Téléchargement des notes de mise à jour ...</value>
+  </data>
+  <data name="ConversionArchives" xml:space="preserve">
+    <value>Archives de conversions</value>
+  </data>
+  <data name="ErrorCanceled" xml:space="preserve">
+    <value>Annulé.</value>
+  </data>
+  <data name="ErrorCantFindFFMPEG" xml:space="preserve">
+    <value>L'exécutable ffmpeg n'a pas été trouvé. Vous pouvez essayer de réinstaller l'application pour corriger le problème.</value>
+  </data>
+  <data name="ErrorCDAExtractionFailed" xml:space="preserve">
+    <value>Echec de l'extraction de la piste audio.</value>
+  </data>
+  <data name="ErrorCDDriveNotReady" xml:space="preserve">
+    <value>Le lecteur CD n'est pas prêt.</value>
+  </data>
+  <data name="ErrorFailedToLaunchFFMPEG" xml:space="preserve">
+    <value>Ffmpeg n'a pas pu être lancé.</value>
+  </data>
+  <data name="ErrorFailToCreateOutputPathFolders" xml:space="preserve">
+    <value>Les dossiers de destination n'ont pas pu être créés.</value>
+  </data>
+  <data name="ErrorFailToGenerateUniqueOutputPath" xml:space="preserve">
+    <value>La génération d'un chemin de destination unique a échoué.</value>
+  </data>
+  <data name="ErrorFailToReadCDDrive" xml:space="preserve">
+    <value>Impossible de lire le lecteur cd '{0}'.</value>
+  </data>
+  <data name="ErrorFailToRetrieveInputPathDriveLetter" xml:space="preserve">
+    <value>Impossible de récupérer la lettre du disque du chemin d'origine.</value>
+    <comment>Fail to retrieve input path drive letter.</comment>
+  </data>
+  <data name="ErrorFailToRetrieveTrackNumber" xml:space="preserve">
+    <value>Impossible de récupérer le numéro de piste à partir du chemin d'origine.</value>
+    <comment>Fail to retrieve track number from the cda input path.</comment>
+  </data>
+  <data name="ErrorFailToUseCDDriveOpen" xml:space="preserve">
+    <value>Impossible d'utiliser le lecteur CD car il est ouvert.</value>
+  </data>
+  <data name="ErrorInputTypeIncompatibleWithOutputType" xml:space="preserve">
+    <value>Le type du fichier d'origine n'est pas compatible avec le type de fichier de destination selectionné.</value>
+    <comment>The input file type is not compatible with the selected output file type.</comment>
+  </data>
+  <data name="ErrorInvalidOutputPath" xml:space="preserve">
+    <value>Le chemin de destination généré par le modèle de nom de fichier est invalide.</value>
+    <comment>Invalid output path generated by output file path template.</comment>
+  </data>
+  <data name="ErrorUnsupportedOutputFormat" xml:space="preserve">
+    <value>Format de fichier de destion non supporté '{0}'.</value>
+  </data>
+  <data name="ChannelCountTitle" xml:space="preserve">
+    <value>Nombre de canaux :</value>
+  </data>
+  <data name="ChannelCountTooltip" xml:space="preserve">
+    <value>Change le nombre de canaux du fichier d'origine</value>
+  </data>
+  <data name="MonoOption" xml:space="preserve">
+    <value>Mono</value>
+  </data>
+  <data name="SameChannelCountOption" xml:space="preserve">
+    <value>Identique au fichier d'origine</value>
+  </data>
+  <data name="StereoOption" xml:space="preserve">
+    <value>Stéréo</value>
+  </data>
+  <data name="LicenceHeader1" xml:space="preserve">
+    <value>**Ce programme est gratuit**.</value>
+    <comment>**This program is free software**.</comment>
+  </data>
+  <data name="LicenceHeader2" xml:space="preserve">
+    <value>Vous pouvez le redistribuer et/ou le modifier selon les termes de la licence GNU General Public Licence.</value>
+    <comment>You can redistribute it and/or modify it under the terms of the GNU General Public License.</comment>
+  </data>
+  <data name="LicenceHeader3" xml:space="preserve">
+    <value>Ce programme est distribué dans l'espoir d'être utile, mais SANS AUCUNE GARANTIE. Voir la GNU General Public Licence (disponible dans le dossier d'installation: `LICENCE.md`) pour plus de détails.</value>
+    <comment>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.</comment>
+  </data>
+  <data name="ApplicationIsTerminating" xml:space="preserve">
+    <value>Fermeture de l'application.</value>
+  </data>
+  <data name="ApplicationWillTerminateInMultipleSeconds" xml:space="preserve">
+    <value>L'application se fermera automatiquement dans {0} secondes.</value>
+  </data>
+  <data name="ApplicationWillTerminateInOneSecond" xml:space="preserve">
+    <value>L'application se fermera automatiquement dans 1 seconde.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Application/FileConverter/Properties/Resources.resx b/Application/FileConverter/Properties/Resources.resx
index b3bfa2f2..be70475c 100644
--- a/Application/FileConverter/Properties/Resources.resx
+++ b/Application/FileConverter/Properties/Resources.resx
@@ -117,15 +117,150 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="About" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="ActionWhenConversionSucceedDescription" xml:space="preserve">
+    <value>Allow you to chose what you want to do with your input files if the conversion succeed</value>
+  </data>
+  <data name="ActionWhenConversionSucceedTitle" xml:space="preserve">
+    <value>Action when conversion succeed</value>
+  </data>
+  <data name="AddNewPreset" xml:space="preserve">
+    <value>Add new preset (duplicate selected preset)</value>
+  </data>
+  <data name="Application" xml:space="preserve">
+    <value>Application</value>
+  </data>
+  <data name="AudioTitle" xml:space="preserve">
+    <value>Audio</value>
+  </data>
+  <data name="AutomaticallyCheckForUpdates" xml:space="preserve">
+    <value>Automatically check for updates when File Converter starts</value>
+  </data>
+  <data name="AutomaticallyExitWhenAllConversionsFinished" xml:space="preserve">
+    <value>Automatically exit when all conversions finished</value>
+  </data>
+  <data name="ClampToLowestPowerOfTwoSize" xml:space="preserve">
+    <value>Clamp to lowest power of 2 size</value>
+  </data>
+  <data name="Close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="ConversionPresets" xml:space="preserve">
+    <value>Conversion Presets</value>
+  </data>
+  <data name="ConversionQueueTitle" xml:space="preserve">
+    <value>Files to convert</value>
+  </data>
+  <data name="ConvertedFrom" xml:space="preserve">
+    <value>Converted from</value>
+  </data>
+  <data name="Diagnostics" xml:space="preserve">
+    <value>Logs</value>
+  </data>
+  <data name="DiagnosticsButtonTitle" xml:space="preserve">
+    <value>Logs</value>
+  </data>
+  <data name="DocumentationButtonDescription" xml:space="preserve">
+    <value>Open documentation</value>
+  </data>
+  <data name="DonateButtonTitle" xml:space="preserve">
+    <value>Donate</value>
+  </data>
+  <data name="DonateDescription" xml:space="preserve">
+    <value>Don't forget to reward my work if you like it :)</value>
+  </data>
+  <data name="DownloadAndInstallButtonDescription" xml:space="preserve">
+    <value>The update will be downloaded in background, and installed once you exit File Converter.</value>
+  </data>
+  <data name="DownloadAndInstallButtonTitle" xml:space="preserve">
+    <value>Install when I exit File Converter</value>
+  </data>
+  <data name="Encoding" xml:space="preserve">
+    <value>Encoding :</value>
+  </data>
+  <data name="EncodingSpeed" xml:space="preserve">
+    <value>Encoding speed :</value>
+  </data>
+  <data name="FileConverterStartHelp1" xml:space="preserve">
+    <value>File Converter is a shell extension.</value>
+  </data>
+  <data name="FileConverterStartHelp2" xml:space="preserve">
+    <value>That means it is integrated into the Windows explorer.</value>
+  </data>
+  <data name="FileConverterStartHelp3" xml:space="preserve">
+    <value>To use File Converter please open the explorer and right-click on any file you like to bring up the context menu where you will find File Converter commands (see the readme file to see the list of compatible file formats).</value>
+  </data>
+  <data name="FileNameTemplate" xml:space="preserve">
+    <value>File name template</value>
+  </data>
+  <data name="FramesPerSecond" xml:space="preserve">
+    <value>Frames per second :</value>
+  </data>
+  <data name="GitHubButtonDescription" xml:space="preserve">
+    <value>Open GitHub project page</value>
+  </data>
+  <data name="Help" xml:space="preserve">
+    <value>help ?</value>
+  </data>
+  <data name="InputExample" xml:space="preserve">
+    <value>Input example</value>
+  </data>
+  <data name="InputFormats" xml:space="preserve">
+    <value>Input formats</value>
+  </data>
+  <data name="InputPostConversionActionDeleteName" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="InputPostConversionActionMoveInArchiveFolderName" xml:space="preserve">
+    <value>Move in an archive folder</value>
+  </data>
+  <data name="InputPostConversionActionNoneName" xml:space="preserve">
+    <value>None</value>
+  </data>
+  <data name="InstallButtonDescription" xml:space="preserve">
+    <value>The update has been downloaded. Exit File Converter and install the update now.</value>
+  </data>
+  <data name="InstallButtonTitle" xml:space="preserve">
+    <value>Install when I exit File Converter</value>
+  </data>
+  <data name="IssueButtonDescription" xml:space="preserve">
+    <value>Report an issue</value>
+  </data>
+  <data name="MoveDownSelectedPreset" xml:space="preserve">
+    <value>Move down selected preset</value>
+  </data>
+  <data name="MoveUpSelectedPreset" xml:space="preserve">
+    <value>Move up selected preset</value>
+  </data>
+  <data name="Mp3CbrDescription" xml:space="preserve">
+    <value>Constant bitrate encoding</value>
+  </data>
+  <data name="Mp3VbrDescription" xml:space="preserve">
+    <value>Variable bitrate encoding</value>
+  </data>
+  <data name="NinetyDegreesRotationTitle" xml:space="preserve">
+    <value>90°</value>
+  </data>
   <data name="NinetyDegreesRotationTooltip" xml:space="preserve">
     <value>90° counter clockwise rotation</value>
   </data>
+  <data name="Ok" xml:space="preserve">
+    <value>Ok</value>
+  </data>
+  <data name="OneEightyDegreesRotationTitle" xml:space="preserve">
+    <value>180°</value>
+  </data>
   <data name="OneEightyDegreesRotationTooltip" xml:space="preserve">
     <value>180° rotation</value>
   </data>
   <data name="OuputFileNameTemplateSample" xml:space="preserve">
     <value>C:\Music\Artist\Album\Song.wav</value>
   </data>
+  <data name="OutputExample" xml:space="preserve">
+    <value>Output</value>
+  </data>
   <data name="OutputFilePathTemplateHelp" xml:space="preserve">
     <value>(p): input file path
 (f): input filename
@@ -134,24 +269,249 @@
 (d0): input parent folder
 (d1): input sub parent folder
 ...
-use maj for uppercase version
+(n:i): page number index
+(n:c): total page count
 
 Special paths:
 (p:d): my documents path
 (p:m): my music path
 (p:v): my videos path
-(p:p): my pictures path</value>
+(p:p): my pictures path
+
+use maj for uppercase version</value>
+  </data>
+  <data name="OutputFormat" xml:space="preserve">
+    <value>Output format</value>
+  </data>
+  <data name="Preset" xml:space="preserve">
+    <value>Preset</value>
+  </data>
+  <data name="PresetName" xml:space="preserve">
+    <value>Preset Name</value>
+  </data>
+  <data name="Quality" xml:space="preserve">
+    <value>Quality :</value>
+  </data>
+  <data name="RecommendeBitrateRangeInBlue" xml:space="preserve">
+    <value>Recommended bitrate range in blue</value>
+  </data>
+  <data name="RemoveSelectedPreset" xml:space="preserve">
+    <value>Remove selected preset</value>
+  </data>
+  <data name="Rotate" xml:space="preserve">
+    <value>Rotate :</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="Scale" xml:space="preserve">
+    <value>Scale :</value>
+  </data>
+  <data name="SeeChangeLog" xml:space="preserve">
+    <value>See change log ...</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="SettingsButtonTitle" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
+    <value>270°</value>
   </data>
   <data name="TwoSeventyDegreesRotationTooltip" xml:space="preserve">
     <value>90° clockwise rotation</value>
   </data>
+  <data name="UpgradeAvailable" xml:space="preserve">
+    <value>An update for File Converter is available. It is strongly recommended that you install it as soon as possible!</value>
+  </data>
+  <data name="UpgradeDownloadInProgress" xml:space="preserve">
+    <value>Upgrade download in progress...</value>
+  </data>
+  <data name="UpgradeWindowTitle" xml:space="preserve">
+    <value>File Converter Updates</value>
+  </data>
   <data name="VideoEncodingQualityTooltip" xml:space="preserve">
     <value>Define the ratio 'file size' versus 'video quality'. A lower value will give you a smaller file, a greater value give you a better video quality.</value>
   </data>
+  <data name="VideoEncodingSpeedFasterName" xml:space="preserve">
+    <value>Faster</value>
+  </data>
+  <data name="VideoEncodingSpeedFastName" xml:space="preserve">
+    <value>Fast</value>
+  </data>
+  <data name="VideoEncodingSpeedMediumName" xml:space="preserve">
+    <value>Medium</value>
+  </data>
+  <data name="VideoEncodingSpeedSlowerName" xml:space="preserve">
+    <value>Slower</value>
+  </data>
+  <data name="VideoEncodingSpeedSlowName" xml:space="preserve">
+    <value>Slow</value>
+  </data>
+  <data name="VideoEncodingSpeedSuperFastName" xml:space="preserve">
+    <value>Super Fast</value>
+  </data>
   <data name="VideoEncodingSpeedTooltip" xml:space="preserve">
     <value>Define the ratio 'file size' versus 'compression duration'. A slow compression will give you a smaller file (for the same video quality) than a faster compression.</value>
   </data>
+  <data name="VideoEncodingSpeedUltraFastName" xml:space="preserve">
+    <value>Ultra Fast</value>
+  </data>
+  <data name="VideoEncodingSpeedVeryFastName" xml:space="preserve">
+    <value>Very Fast</value>
+  </data>
+  <data name="VideoEncodingSpeedVerySlowName" xml:space="preserve">
+    <value>Very Slow</value>
+  </data>
+  <data name="VideoTitle" xml:space="preserve">
+    <value>Video</value>
+  </data>
+  <data name="Wav16bitsDescription" xml:space="preserve">
+    <value>PCM signed 16-bit little-endian</value>
+  </data>
+  <data name="Wav24bitsDescription" xml:space="preserve">
+    <value>PCM signed 24-bit little-endian</value>
+  </data>
+  <data name="Wav32bitsDescription" xml:space="preserve">
+    <value>PCM signed 32-bit little-endian</value>
+  </data>
+  <data name="Wav8bitsDescription" xml:space="preserve">
+    <value>PCM signed 8-bit little-endian</value>
+  </data>
+  <data name="ZeroDegreesRotationTitle" xml:space="preserve">
+    <value>None</value>
+  </data>
   <data name="ZeroDegreesRotationTooltip" xml:space="preserve">
     <value>No rotation</value>
   </data>
+  <data name="ConversionStateConversion" xml:space="preserve">
+    <value>Conversion</value>
+  </data>
+  <data name="ConversionStateDone" xml:space="preserve">
+    <value>Done</value>
+  </data>
+  <data name="ConversionStateExtraction" xml:space="preserve">
+    <value>Extraction</value>
+  </data>
+  <data name="ConversionStateFailed" xml:space="preserve">
+    <value>Failed</value>
+  </data>
+  <data name="ConversionStateInQueue" xml:space="preserve">
+    <value>In queue</value>
+  </data>
+  <data name="ConversionStateReadIntputImage" xml:space="preserve">
+    <value>Read input image</value>
+  </data>
+  <data name="ConversionStateReadPdf" xml:space="preserve">
+    <value>Read document</value>
+  </data>
+  <data name="StringAnimatedImageName" xml:space="preserve">
+    <value>Animated Image</value>
+  </data>
+  <data name="StringAudioName" xml:space="preserve">
+    <value>Audio</value>
+  </data>
+  <data name="StringDocumentName" xml:space="preserve">
+    <value>Document</value>
+  </data>
+  <data name="StringImageName" xml:space="preserve">
+    <value>Image</value>
+  </data>
+  <data name="StringVideoName" xml:space="preserve">
+    <value>Video</value>
+  </data>
+  <data name="ExitWaitingDuration" xml:space="preserve">
+    <value>Waiting duration before application exit</value>
+  </data>
+  <data name="Language" xml:space="preserve">
+    <value>Language</value>
+  </data>
+  <data name="MaximumNumberOfSimultaneousConversions" xml:space="preserve">
+    <value>Maximum number of simultaneous conversions</value>
+  </data>
+  <data name="DefaultPresetName" xml:space="preserve">
+    <value>New preset</value>
+  </data>
+  <data name="DownloadingChangeLog" xml:space="preserve">
+    <value>###Downloading change log ...</value>
+  </data>
+  <data name="ConversionArchives" xml:space="preserve">
+    <value>Conversion Archives</value>
+  </data>
+  <data name="ErrorCanceled" xml:space="preserve">
+    <value>Canceled.</value>
+  </data>
+  <data name="ErrorCantFindFFMPEG" xml:space="preserve">
+    <value>Fail to find ffmpeg executable. You should try to reinstall the application.</value>
+  </data>
+  <data name="ErrorCDAExtractionFailed" xml:space="preserve">
+    <value>Audio CD track extraction failed</value>
+  </data>
+  <data name="ErrorCDDriveNotReady" xml:space="preserve">
+    <value>CD drive is not ready.</value>
+  </data>
+  <data name="ErrorFailedToLaunchFFMPEG" xml:space="preserve">
+    <value>Fail to launch ffmpeg.</value>
+  </data>
+  <data name="ErrorFailToCreateOutputPathFolders" xml:space="preserve">
+    <value>Fail to create output path folders.</value>
+  </data>
+  <data name="ErrorFailToGenerateUniqueOutputPath" xml:space="preserve">
+    <value>Fail to generate a unique output file path.</value>
+  </data>
+  <data name="ErrorFailToReadCDDrive" xml:space="preserve">
+    <value>Fail to read cd drive '{0}'.</value>
+  </data>
+  <data name="ErrorFailToRetrieveInputPathDriveLetter" xml:space="preserve">
+    <value>Fail to retrieve input path drive letter.</value>
+  </data>
+  <data name="ErrorFailToRetrieveTrackNumber" xml:space="preserve">
+    <value>Fail to retrieve track number from the cda input path.</value>
+  </data>
+  <data name="ErrorFailToUseCDDriveOpen" xml:space="preserve">
+    <value>Fail to use the CD drive because it is oppened.</value>
+  </data>
+  <data name="ErrorInputTypeIncompatibleWithOutputType" xml:space="preserve">
+    <value>The input file type is not compatible with the selected output file type.</value>
+  </data>
+  <data name="ErrorInvalidOutputPath" xml:space="preserve">
+    <value>Invalid output path generated by output file path template.</value>
+  </data>
+  <data name="ErrorUnsupportedOutputFormat" xml:space="preserve">
+    <value>Unsupported output format '{0}'.</value>
+  </data>
+  <data name="ChannelCountTitle" xml:space="preserve">
+    <value>Channel count :</value>
+  </data>
+  <data name="ChannelCountTooltip" xml:space="preserve">
+    <value>Change the number of channels of the input file.</value>
+  </data>
+  <data name="MonoOption" xml:space="preserve">
+    <value>Mono</value>
+  </data>
+  <data name="SameChannelCountOption" xml:space="preserve">
+    <value>Same than input file</value>
+  </data>
+  <data name="StereoOption" xml:space="preserve">
+    <value>Stereo</value>
+  </data>
+  <data name="LicenceHeader1" xml:space="preserve">
+    <value>**This program is free software**.</value>
+  </data>
+  <data name="LicenceHeader2" xml:space="preserve">
+    <value>You can redistribute it and/or modify it under the terms of the GNU General Public License.</value>
+  </data>
+  <data name="LicenceHeader3" xml:space="preserve">
+    <value>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.</value>
+  </data>
+  <data name="ApplicationIsTerminating" xml:space="preserve">
+    <value>The application is terminating.</value>
+  </data>
+  <data name="ApplicationWillTerminateInMultipleSeconds" xml:space="preserve">
+    <value>The application will automatically terminate in {0} seconds.</value>
+  </data>
+  <data name="ApplicationWillTerminateInOneSecond" xml:space="preserve">
+    <value>The application will automatically terminate in 1 second.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Application/FileConverter/Resources/ContextMenuScreenshot.png b/Application/FileConverter/Resources/ContextMenuScreenshot.png
deleted file mode 100644
index c0e8140e..00000000
Binary files a/Application/FileConverter/Resources/ContextMenuScreenshot.png and /dev/null differ
diff --git a/Application/FileConverter/Resources/FileConverterUsage.gif b/Application/FileConverter/Resources/FileConverterUsage.gif
new file mode 100644
index 00000000..de4af49b
Binary files /dev/null and b/Application/FileConverter/Resources/FileConverterUsage.gif differ
diff --git a/Application/FileConverter/Settings.Migration.cs b/Application/FileConverter/Settings.Migration.cs
new file mode 100644
index 00000000..da293e82
--- /dev/null
+++ b/Application/FileConverter/Settings.Migration.cs
@@ -0,0 +1,59 @@
+// // <copyright file="Settings.Migration.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
+
+namespace FileConverter
+{
+    using System;
+
+    using FileConverter.ConversionJobs;
+
+    public partial class Settings
+    {
+        private static void MigrateSettingsToCurrentVersion(Settings settings)
+        {
+            int settingsVersion = settings.SerializationVersion;
+
+            // Migrate conversion settings.
+            if (settings.ConversionPresets != null)
+            {
+                foreach (ConversionPreset conversionPreset in settings.ConversionPresets)
+                {
+                    Settings.MigrateConversionPresetToCurrentVersion(conversionPreset, settingsVersion);
+                }
+            }
+        }
+
+        private static void MigrateConversionPresetToCurrentVersion(ConversionPreset preset, int settingsVersion)
+        {
+            if (settingsVersion <= 2)
+            {
+                // Migrate video encoding speed.
+                string videoEncodingSpeed = preset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed);
+                if (videoEncodingSpeed != null)
+                {
+                    VideoEncodingSpeed encodingSpeed;
+                    if (!Enum.TryParse(videoEncodingSpeed, out encodingSpeed))
+                    {
+                        switch (videoEncodingSpeed)
+                        {
+                            case "Ultra Fast":
+                                preset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, VideoEncodingSpeed.UltraFast.ToString());
+                                break;
+
+                            case "Super Fast":
+                                preset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, VideoEncodingSpeed.SuperFast.ToString());
+                                break;
+
+                            case "Very Fast":
+                                preset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, VideoEncodingSpeed.VeryFast.ToString());
+                                break;
+
+                            case "Very Slow":
+                                preset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, VideoEncodingSpeed.VerySlow.ToString());
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Application/FileConverter/Settings.Settings.cs b/Application/FileConverter/Settings.Settings.cs
index 28eee9d2..5d3f5824 100644
--- a/Application/FileConverter/Settings.Settings.cs
+++ b/Application/FileConverter/Settings.Settings.cs
@@ -1,5 +1,9 @@
 // <copyright file="Settings.Settings.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
 
+using System.Globalization;
+using System.Windows;
+using System.Windows.Markup;
+
 namespace FileConverter
 {
     using System.Collections.ObjectModel;
@@ -8,12 +12,14 @@ namespace FileConverter
 
     public partial class Settings : IXmlSerializable
     {
-        public const int Version = 1;
+        public const int Version = 3;
         
         private bool exitApplicationWhenConversionsFinished = true;
         private float durationBetweenEndOfConversionsAndApplicationExit = 3f;
         private ObservableCollection<ConversionPreset> conversionPresets = new ObservableCollection<ConversionPreset>();
         private bool checkUpgradeAtStartup = true;
+        private CultureInfo applicationLanguage;
+        private int maximumNumberOfSimultaneousConversions;
 
         [XmlAttribute]
         public int SerializationVersion
@@ -22,6 +28,57 @@ public int SerializationVersion
             set;
         } = Version;
 
+        [XmlIgnore]
+        public CultureInfo ApplicationLanguage
+        {
+            get
+            {
+                return this.applicationLanguage;
+            }
+
+            set
+            {
+                if (this.applicationLanguage != null && this.applicationLanguage.Equals(value))
+                {
+                    return;
+                }
+
+                this.applicationLanguage = value;
+                if (this.applicationLanguage != null)
+                {
+                    System.Threading.Thread.CurrentThread.CurrentCulture = this.applicationLanguage;
+                    System.Threading.Thread.CurrentThread.CurrentUICulture = this.applicationLanguage;
+                }
+
+                this.OnPropertyChanged();
+            }
+        }
+
+        [XmlElement]
+        public string ApplicationLanguageName
+        {
+            get
+            {
+                if (this.ApplicationLanguage == null)
+                {
+                    return string.Empty;
+                }
+
+                return this.ApplicationLanguage.Name;
+            }
+
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    this.ApplicationLanguage = null;
+                    return;
+                }
+
+                this.ApplicationLanguage = CultureInfo.GetCultureInfo(value);
+            }
+        }
+
         [XmlIgnore]
         public ObservableCollection<ConversionPreset> ConversionPresets
         {
@@ -67,6 +124,21 @@ public float DurationBetweenEndOfConversionsAndApplicationExit
             }
         }
 
+        [XmlElement]
+        public int MaximumNumberOfSimultaneousConversions
+        {
+            get
+            {
+                return this.maximumNumberOfSimultaneousConversions;
+            }
+
+            set
+            {
+                this.maximumNumberOfSimultaneousConversions = value;
+                this.OnPropertyChanged();
+            }
+        }
+
         [XmlElement("ConversionPreset")]
         public ConversionPreset[] SerializableConversionPresets
         {
@@ -107,6 +179,35 @@ public void OnDeserializationComplete()
             {
                 this.ConversionPresets[index].OnDeserializationComplete();
             }
+
+            // Initialize application if it was not deserialized from the settings.
+            if (this.ApplicationLanguage == null)
+            {
+                CultureInfo bestCandidate = null;
+                CultureInfo currentUICulture = System.Threading.Thread.CurrentThread.CurrentUICulture;
+                foreach (CultureInfo culture in Helpers.GetSupportedCultures())
+                {
+                    if (culture.Equals(currentUICulture))
+                    {
+                        bestCandidate = culture;
+                        break;
+                    }
+                    else if (culture.Equals(currentUICulture.Parent))
+                    {
+                        bestCandidate = culture;
+                    }
+                }
+
+                if (bestCandidate != null)
+                {
+                    this.ApplicationLanguage = bestCandidate;
+                }
+                else
+                {
+                    Diagnostics.Debug.Log("Can't find supported culture info for culture {0}. Fallback to default culture.", currentUICulture);
+                    this.ApplicationLanguage = CultureInfo.GetCultureInfo("en");
+                }
+            }
         }
     }
 }
diff --git a/Application/FileConverter/Settings.cs b/Application/FileConverter/Settings.cs
index 45441603..185e60a7 100644
--- a/Application/FileConverter/Settings.cs
+++ b/Application/FileConverter/Settings.cs
@@ -133,6 +133,8 @@ public static void PostInstallationInitialization()
                 {
                     if (userSettings.SerializationVersion != Version)
                     {
+                        Settings.MigrateSettingsToCurrentVersion(userSettings);
+
                         Diagnostics.Debug.Log("File converter settings has been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
                         userSettings.SerializationVersion = Version;
                     }
@@ -189,6 +191,8 @@ public static Settings Load()
 
                 if (userSettings != null && userSettings.SerializationVersion != Version)
                 {
+                    Settings.MigrateSettingsToCurrentVersion(userSettings);
+
                     Diagnostics.Debug.Log("File converter settings has been imported from version {0} to version {1}.", userSettings.SerializationVersion, Version);
                     userSettings.SerializationVersion = Version;
                     userSettings.Save();
diff --git a/Application/FileConverter/Settings.default.xml b/Application/FileConverter/Settings.default.xml
index fe492c53..4489b1c9 100644
--- a/Application/FileConverter/Settings.default.xml
+++ b/Application/FileConverter/Settings.default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" SerializationVersion="1">
+<Settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" SerializationVersion="3">
     <ExitApplicationWhenConversionsFinished>true</ExitApplicationWhenConversionsFinished>
     <DurationBetweenEndOfConversionsAndApplicationExit>3</DurationBetweenEndOfConversionsAndApplicationExit>
     <ConversionPreset Name="To Mkv" OutputType="Mkv" IsDefaultSettings="true">
@@ -139,6 +139,28 @@
         <Settings Key="VideoRotation" Value="0" />
         <OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
     </ConversionPreset>
+    <ConversionPreset Name="To Ogv" OutputType="Ogv" IsDefaultSettings="true">
+        <InputTypes>3gp</InputTypes>
+        <InputTypes>avi</InputTypes>
+        <InputTypes>bik</InputTypes>
+        <InputTypes>flv</InputTypes>
+        <InputTypes>m4v</InputTypes>
+        <InputTypes>mkv</InputTypes>
+        <InputTypes>mov</InputTypes>
+        <InputTypes>mp4</InputTypes>
+        <InputTypes>mpeg</InputTypes>
+        <InputTypes>ogv</InputTypes>
+        <InputTypes>webm</InputTypes>
+        <InputTypes>wmv</InputTypes>
+        <InputTypes>gif</InputTypes>
+        <InputPostConversionAction>None</InputPostConversionAction>
+        <Settings Key="EnableAudio" Value="True" />
+        <Settings Key="VideoQuality" Value="8" />
+        <Settings Key="VideoScale" Value="1" />
+        <Settings Key="VideoRotation" Value="0" />
+        <Settings Key="AudioBitrate" Value="160" />
+        <OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
+    </ConversionPreset>
     <ConversionPreset Name="To Avi" OutputType="Avi" IsDefaultSettings="true">
         <InputTypes>3gp</InputTypes>
         <InputTypes>avi</InputTypes>
@@ -412,6 +434,16 @@
         <Settings Key="ImageMaximumSize" Value="0" />
         <OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
     </ConversionPreset>
+    <ConversionPreset Name="To Png (paged)" OutputType="Png" IsDefaultSettings="true">
+        <InputTypes>xcf</InputTypes>
+        <InputTypes>pdf</InputTypes>
+        <InputPostConversionAction>None</InputPostConversionAction>
+        <Settings Key="ImageScale" Value="1" />
+        <Settings Key="ImageRotation" Value="0" />
+        <Settings Key="ImageClampSizePowerOf2" Value="False" />
+        <Settings Key="ImageMaximumSize" Value="0" />
+        <OutputFileNameTemplate>(p)(f) (n:i) of (n:c)</OutputFileNameTemplate>
+    </ConversionPreset>
     <ConversionPreset Name="To small Png (25%)" OutputType="Png" IsDefaultSettings="true">
         <InputTypes>bmp</InputTypes>
         <InputTypes>exr</InputTypes>
@@ -502,5 +534,19 @@
         <InputPostConversionAction>None</InputPostConversionAction>
         <OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
     </ConversionPreset>
+    <ConversionPreset Name="To Pdf" OutputType="Pdf" IsDefaultSettings="true">
+        <InputTypes>bmp</InputTypes>
+        <InputTypes>exr</InputTypes>
+        <InputTypes>jpg</InputTypes>
+        <InputTypes>jpeg</InputTypes>
+        <InputTypes>png</InputTypes>
+        <InputTypes>psd</InputTypes>
+        <InputTypes>svg</InputTypes>
+        <InputTypes>tga</InputTypes>
+        <InputTypes>tiff</InputTypes>
+        <InputTypes>xcf</InputTypes>
+        <InputPostConversionAction>None</InputPostConversionAction>
+        <OutputFileNameTemplate>(p)(f)</OutputFileNameTemplate>
+    </ConversionPreset>
     <CheckUpgradeAtStartup>true</CheckUpgradeAtStartup>
 </Settings>
\ No newline at end of file
diff --git a/Application/FileConverter/Upgrade/Helpers.cs b/Application/FileConverter/Upgrade/Helpers.cs
index 0f0a1ce7..dfcb2b4f 100644
--- a/Application/FileConverter/Upgrade/Helpers.cs
+++ b/Application/FileConverter/Upgrade/Helpers.cs
@@ -6,7 +6,6 @@ namespace FileConverter.Upgrade
     using System.IO;
     using System.Net;
     using System.Text.RegularExpressions;
-    using System.Threading;
     using System.Threading.Tasks;
     using System.Xml;
     using System.Xml.Serialization;
@@ -14,18 +13,24 @@ namespace FileConverter.Upgrade
     public static class Helpers
     {
 #if DEBUG
-        private const string BaseURI = "https://raw.githubusercontent.com/Tichau/FileConverter/development/";
+        private const string BaseURI = "http://raw.githubusercontent.com/Tichau/FileConverter/development/";
 #else
-        private const string BaseURI = "https://raw.githubusercontent.com/Tichau/FileConverter/master/";
+        private const string BaseURI = "http://raw.githubusercontent.com/Tichau/FileConverter/master/";
 #endif
 
         private static WebClient webClient = new WebClient();
+        private static UpgradeVersionDescription currentlyDownloadedVersionDescription;
 
         public delegate void OnUpgradeOperationCompletedEventHandler(UpgradeVersionDescription upgradeVersionDescription);
 
         public static async Task<UpgradeVersionDescription> GetLatestVersionDescriptionAsync(OnUpgradeOperationCompletedEventHandler onGetCompleteDelegate = null)
         {
+#if BUILD32
+            Uri uri = new Uri(Helpers.BaseURI + "version (x86).xml");
+#else
             Uri uri = new Uri(Helpers.BaseURI + "version.xml");
+#endif
+
             Stream stream = await Helpers.webClient.OpenReadTaskAsync(uri);
 
             UpgradeVersionDescription upgradeVersionDescription = null;
@@ -64,7 +69,7 @@ public static async Task<string> GetChangeLogAsync(UpgradeVersionDescription upg
         {
             if (upgradeVersionDescription == null)
             {
-                throw new ArgumentNullException("upgradeVersionDescription");
+                throw new ArgumentNullException(nameof(upgradeVersionDescription));
             }
 
             Uri uri = new Uri(Helpers.BaseURI + "CHANGELOG.md");
@@ -87,21 +92,18 @@ public static async Task<string> GetChangeLogAsync(UpgradeVersionDescription upg
             return upgradeVersionDescription.ChangeLog;
         }
 
-        public static void DownloadInstallerAsync(UpgradeVersionDescription upgradeVersionDescription)
+        public static async Task DownloadInstallerAsync(UpgradeVersionDescription upgradeVersionDescription)
         {
-            Thread thread = new Thread(Helpers.DownloadInstallerAsync);
-            thread.Start(upgradeVersionDescription);
-        }
-
-        private static void DownloadInstallerAsync(object parameter)
-        {
-            UpgradeVersionDescription upgradeVersionDescription = parameter as UpgradeVersionDescription;
-
             if (upgradeVersionDescription == null)
             {
                 throw new ArgumentNullException("upgradeVersionDescription");
             }
 
+            if (Helpers.currentlyDownloadedVersionDescription != null)
+            {
+                throw new Exception("The installer download is currently in progress.");
+            }
+
             Uri uri = new Uri(upgradeVersionDescription.InstallerURL);
 
             string fileName = "FileConverter-setup.msi";
@@ -121,10 +123,34 @@ private static void DownloadInstallerAsync(object parameter)
 
             upgradeVersionDescription.InstallerPath = installerPath;
             upgradeVersionDescription.InstallerDownloadInProgress = true;
+            upgradeVersionDescription.InstallerDownloadProgress = 0;
 
-            Helpers.webClient.DownloadFile(uri, installerPath);
+            Helpers.currentlyDownloadedVersionDescription = upgradeVersionDescription;
 
-            upgradeVersionDescription.InstallerDownloadInProgress = false;
+            Helpers.webClient.DownloadProgressChanged += Helpers.WebClient_DownloadProgressChanged;
+            Helpers.webClient.DownloadFileCompleted += Helpers.WebClient_DownloadFileCompleted; ;
+            Task downloadTask = Helpers.webClient.DownloadFileTaskAsync(uri, installerPath);
+        }
+
+        private static void WebClient_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
+        {
+            Helpers.webClient.DownloadProgressChanged -= WebClient_DownloadProgressChanged;
+            Helpers.webClient.DownloadFileCompleted -= WebClient_DownloadFileCompleted;
+
+            if (Helpers.currentlyDownloadedVersionDescription != null)
+            {
+                Helpers.currentlyDownloadedVersionDescription.InstallerDownloadProgress = 100;
+                Helpers.currentlyDownloadedVersionDescription.InstallerDownloadInProgress = false;
+                Helpers.currentlyDownloadedVersionDescription = null;
+            }
+        }
+
+        private static void WebClient_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs eventArgs)
+        {
+            if (Helpers.currentlyDownloadedVersionDescription != null)
+            {
+                Helpers.currentlyDownloadedVersionDescription.InstallerDownloadProgress = eventArgs.ProgressPercentage;
+            }
         }
     }
 }
diff --git a/Application/FileConverter/Upgrade/UpgradeVersionDescription.cs b/Application/FileConverter/Upgrade/UpgradeVersionDescription.cs
index 3d68e7eb..081d403a 100644
--- a/Application/FileConverter/Upgrade/UpgradeVersionDescription.cs
+++ b/Application/FileConverter/Upgrade/UpgradeVersionDescription.cs
@@ -1,25 +1,33 @@
 // <copyright file="UpgradeVersionDescription.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
 
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using FileConverter.Annotations;
+
 namespace FileConverter
 {
     using System.Xml.Serialization;
 
-    public class UpgradeVersionDescription
+    public class UpgradeVersionDescription : INotifyPropertyChanged
     {
+        private int installerDownloadProgress;
+        private bool installerDownloadInProgress;
+        public event PropertyChangedEventHandler PropertyChanged;
+
         [XmlElement("Latest")]
         public Version LatestVersion
         {
             get;
             set;
         }
-
+        
         [XmlElement("URL")]
         public string InstallerURL
         {
             get;
             set;
         }
-
+        
         [XmlIgnore]
         public string ChangeLog
         {
@@ -37,8 +45,53 @@ public string InstallerPath
         [XmlIgnore]
         public bool InstallerDownloadInProgress
         {
-            get;
-            set;
+            get
+            {
+                return this.installerDownloadInProgress;
+            }
+
+            set
+            {
+                this.installerDownloadInProgress = value;
+                this.OnPropertyChanged();
+                this.OnPropertyChanged(nameof(this.InstallerDownloadDone));
+                this.OnPropertyChanged(nameof(this.InstallerDownloadNotStarted));
+            }
+        }
+
+        [XmlIgnore]
+        public int InstallerDownloadProgress
+        {
+            get
+            {
+                return this.installerDownloadProgress;
+            }
+
+            set
+            {
+                this.installerDownloadProgress = value;
+                this.OnPropertyChanged();
+                this.OnPropertyChanged(nameof(this.InstallerDownloadDone));
+                this.OnPropertyChanged(nameof(this.InstallerDownloadNotStarted));
+            }
+        }
+
+        [XmlIgnore]
+        public bool InstallerDownloadDone
+        {
+            get
+            {
+                return !this.InstallerDownloadInProgress && this.InstallerDownloadProgress == 100;
+            }
+        }
+
+        [XmlIgnore]
+        public bool InstallerDownloadNotStarted
+        {
+            get
+            {
+                return !this.InstallerDownloadInProgress && this.InstallerDownloadProgress == 0;
+            }
         }
 
         [XmlIgnore]
@@ -47,5 +100,11 @@ public bool NeedToUpgrade
             get;
             set;
         }
+        
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
     }
 }
\ No newline at end of file
diff --git a/Application/FileConverter/ValueConverters/FileNameConverter.cs b/Application/FileConverter/ValueConverters/FileNameConverter.cs
index bd364072..d8cb0a87 100644
--- a/Application/FileConverter/ValueConverters/FileNameConverter.cs
+++ b/Application/FileConverter/ValueConverters/FileNameConverter.cs
@@ -24,73 +24,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
             OutputType outputFileExtension = (OutputType)values[1];
             string outputFileTemplate = values[2] as string;
 
-            if (inputFilePath == null)
-            {
-                return "Invalid input file path (argument 0).";
-            }
-            
-            string inputExtension = System.IO.Path.GetExtension(inputFilePath).Substring(1);
-            string inputPathWithoutExtension = inputFilePath.Substring(0, inputFilePath.Length - inputExtension.Length - 1);
-            string outputExtension = outputFileExtension.ToString().ToLowerInvariant();
-
-            if (outputFileTemplate == null)
-            {
-                // Default output path.
-                return inputPathWithoutExtension + "." + outputExtension;
-            }
-
-            string fileName = System.IO.Path.GetFileName(inputPathWithoutExtension);
-            string parentDirectory = System.IO.Path.GetDirectoryName(inputPathWithoutExtension);
-            if (!parentDirectory.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString()))
-            {
-                parentDirectory += System.IO.Path.DirectorySeparatorChar;
-            }
-
-            string[] directories = parentDirectory.Substring(0, parentDirectory.Length - 1).Split(System.IO.Path.DirectorySeparatorChar);
-
-            // Generate output path from template.
-            string outputPath = outputFileTemplate;
-
-            outputPath = outputPath.Replace("(path)", parentDirectory);
-            outputPath = outputPath.Replace("(p)", parentDirectory);
-
-            outputPath = outputPath.Replace("(filename)", fileName);
-            outputPath = outputPath.Replace("(f)", fileName);
-            outputPath = outputPath.Replace("(F)", fileName.ToUpperInvariant());
-
-            outputPath = outputPath.Replace("(outputext)", outputExtension);
-            outputPath = outputPath.Replace("(o)", outputExtension);
-            outputPath = outputPath.Replace("(O)", outputExtension.ToUpperInvariant());
-
-            outputPath = outputPath.Replace("(inputext)", inputExtension);
-            outputPath = outputPath.Replace("(i)", inputExtension);
-            outputPath = outputPath.Replace("(I)", inputExtension.ToUpperInvariant());
-
-            string myDocumentsFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments) + "\\";
-            outputPath = outputPath.Replace("(p:d)", myDocumentsFolder);
-            outputPath = outputPath.Replace("(p:documents)", myDocumentsFolder);
-
-            string myMusicFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyMusic) + "\\";
-            outputPath = outputPath.Replace("(p:m)", myMusicFolder);
-            outputPath = outputPath.Replace("(p:music)", myMusicFolder);
-
-            string myVideoFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyVideos) + "\\";
-            outputPath = outputPath.Replace("(p:v)", myVideoFolder);
-            outputPath = outputPath.Replace("(p:videos)", myVideoFolder);
-
-            string myPictureFolder = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyPictures) + "\\";
-            outputPath = outputPath.Replace("(p:p)", myPictureFolder);
-            outputPath = outputPath.Replace("(p:pictures)", myPictureFolder);
-
-            for (int index = 0; index < directories.Length; index++)
-            {
-                outputPath = outputPath.Replace(string.Format("(d{0})", directories.Length - index - 1), directories[index]);
-                outputPath = outputPath.Replace(string.Format("(D{0})", directories.Length - index - 1), directories[index].ToUpperInvariant());
-            }
-
-            outputPath += "." + outputExtension;
-            
-            return outputPath;
+            return PathHelpers.GenerateFilePathFromTemplate(inputFilePath, outputFileExtension, outputFileTemplate, 1, 3);
         }
 
         public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
diff --git a/Application/FileConverter/ValueConverters/Generic/CultureInfoToStringConverter.cs b/Application/FileConverter/ValueConverters/Generic/CultureInfoToStringConverter.cs
new file mode 100644
index 00000000..76798ba8
--- /dev/null
+++ b/Application/FileConverter/ValueConverters/Generic/CultureInfoToStringConverter.cs
@@ -0,0 +1,38 @@
+// <copyright file="BoolInverterConverter.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
+
+namespace FileConverter.ValueConverters.Generic
+{
+    using System;
+    using System.Globalization;
+    using System.Windows.Data;
+
+    public class CultureInfoToStringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            CultureInfo cultureInfo = value as CultureInfo;
+            if (cultureInfo == null)
+            {
+                throw new System.ArgumentException("The object must be a culture info instance.");
+            }
+
+            string nativeName = cultureInfo.NativeName;
+            if (string.IsNullOrEmpty(nativeName))
+            {
+                return cultureInfo.Name;
+            }
+
+            if (nativeName.Length == 1)
+            {
+                return nativeName.ToUpper(cultureInfo);
+            }
+
+            return nativeName.Substring(0, 1).ToUpper(cultureInfo) + nativeName.Substring(1, nativeName.Length - 1); ;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Application/FileConverter/ValueConverters/Generic/ObjectToLocalizedString.cs b/Application/FileConverter/ValueConverters/Generic/ObjectToLocalizedString.cs
new file mode 100644
index 00000000..434a55ed
--- /dev/null
+++ b/Application/FileConverter/ValueConverters/Generic/ObjectToLocalizedString.cs
@@ -0,0 +1,38 @@
+// <copyright file="BoolInverterConverter.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
+
+namespace FileConverter.ValueConverters.Generic
+{
+    using System;
+    using System.Globalization;
+    using System.Windows.Data;
+
+    public class ObjectToLocalizedString : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                throw new System.ArgumentNullException("value.");
+            }
+
+            string stringValue = value.ToString();
+            string typeName = value.GetType().Name;
+
+            string localizationKey = $"{typeName}{stringValue}Name";
+            localizationKey = localizationKey.Replace(" ", string.Empty);
+
+            string resource = Properties.Resources.ResourceManager.GetString(localizationKey);
+            if (resource == null)
+            {
+                return localizationKey;
+            }
+
+            return resource;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Application/FileConverter/ValueConverters/Generic/StringToEnum.cs b/Application/FileConverter/ValueConverters/Generic/StringToEnum.cs
index 16d7441a..d11984fb 100644
--- a/Application/FileConverter/ValueConverters/Generic/StringToEnum.cs
+++ b/Application/FileConverter/ValueConverters/Generic/StringToEnum.cs
@@ -34,7 +34,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            throw new NotImplementedException();
+            return value?.ToString();
         }
     }
 }
diff --git a/Application/FileConverter/ValueConverters/OutputTypeEnumToViewModel.cs b/Application/FileConverter/ValueConverters/OutputTypeEnumToViewModel.cs
new file mode 100644
index 00000000..377665cc
--- /dev/null
+++ b/Application/FileConverter/ValueConverters/OutputTypeEnumToViewModel.cs
@@ -0,0 +1,36 @@
+// <copyright file="BitrateToString.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
+
+namespace FileConverter.ValueConverters
+{
+    using System;
+    using System.Globalization;
+    using System.Windows.Data;
+    using System.Linq;
+    using FileConverter.Windows;
+
+    public class OutputTypeEnumToViewModel : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (!(value is OutputType))
+            {
+                throw new ArgumentException("The value must be an output type value.");
+            }
+
+            OutputType outputType = (OutputType)value;
+
+            return SettingsWindow.OutputTypeViewModels.FirstOrDefault(match => match.Type == outputType);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            OutputTypeViewModel outputTypeViewModel = value as OutputTypeViewModel;
+            if (outputTypeViewModel == null)
+            {
+                return OutputType.None;
+            }
+
+            return outputTypeViewModel.Type;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Application/FileConverter/Windows/ApplicationStartHelp.xaml b/Application/FileConverter/Windows/ApplicationStartHelp.xaml
index 19c80566..b3ccae6b 100644
--- a/Application/FileConverter/Windows/ApplicationStartHelp.xaml
+++ b/Application/FileConverter/Windows/ApplicationStartHelp.xaml
@@ -3,21 +3,23 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:FileConverter.Windows"
         xmlns:fileConverter="clr-namespace:FileConverter"
-        xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
-        mc:Ignorable="d"
-        Height="480" Width="640" Icon="/FileConverter;component/Resources/ApplicationIcon.ico" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow" ResizeMode="NoResize">
+        xmlns:project="clr-namespace:FileConverter.Properties"
+        xmlns:gif="http://wpfanimatedgif.codeplex.com"
+        mc:Ignorable="d" Icon="/FileConverter;component/Resources/ApplicationIcon.ico" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow" ResizeMode="NoResize" 
+        Width="640" Height="545">
     <Window.Resources>
     </Window.Resources>
     <Window.Title>
         <Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(fileConverter:Application.ApplicationVersion)"/>
     </Window.Title>
-    <StackPanel Margin="5">
-        <TextBlock Margin="0,0,0,4"  Text="File Converter is a shell extension." TextWrapping="Wrap" FontWeight="Bold" FontSize="13.333"/>
-        <TextBlock Text="That means it is integrated into the Windows explorer." TextWrapping="Wrap"/>
-        <TextBlock Text="To use File Converter please open the explorer and right-click on any file you like to bring up the context menu where you will find File Converter commands (see the readme file to see the list of compatible file formats)." TextWrapping="Wrap" />
-        <Image Margin="0,7,0,7" HorizontalAlignment="Left" Height="Auto" VerticalAlignment="Top" Width="Auto" Source="/FileConverter;component/Resources/ContextMenuScreenshot.png" Stretch="None"/>
-        <Button Content="Ok" Height="28" Click="OkButton_Click"/>
+    <StackPanel Margin="5" VerticalAlignment="Center">
+        <TextBlock Margin="0,0,0,4"  Text="{x:Static project:Resources.FileConverterStartHelp1}" TextWrapping="Wrap" FontWeight="Bold" FontSize="13.333"/>
+        <TextBlock Text="{x:Static project:Resources.FileConverterStartHelp2}" TextWrapping="Wrap"/>
+        <TextBlock Text="{x:Static project:Resources.FileConverterStartHelp3}" TextWrapping="Wrap" />
+        <Image Margin="0,7,0,7" HorizontalAlignment="Left" Height="Auto" VerticalAlignment="Top" Width="Auto" 
+               gif:ImageBehavior.AnimatedSource="/FileConverter;component/Resources/FileConverterUsage.gif"
+               Stretch="Fill"/>
+        <Button Content="{x:Static project:Resources.Ok}" Height="28" Click="OkButton_Click"/>
     </StackPanel>
 </Window>
diff --git a/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs b/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs
index ed05e921..16bf79e7 100644
--- a/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs
+++ b/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs
@@ -19,6 +19,12 @@ public DataTemplate AviSettingsDataTemplate
             set;
         }
 
+        public DataTemplate FlacSettingsDataTemplate
+        {
+            get;
+            set;
+        }
+
         public DataTemplate WavSettingsDataTemplate
         {
             get;
@@ -43,6 +49,12 @@ public DataTemplate OggSettingsDataTemplate
             set;
         }
 
+        public DataTemplate OgvSettingsDataTemplate
+        {
+            get;
+            set;
+        }
+
         public DataTemplate AacSettingsDataTemplate
         {
             get;
@@ -96,6 +108,9 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
                 case OutputType.Avi:
                     return this.AviSettingsDataTemplate;
 
+                case OutputType.Flac:
+                    return this.FlacSettingsDataTemplate;
+
                 case OutputType.Gif:
                     return this.GifSettingsDataTemplate;
 
@@ -114,6 +129,9 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
                 case OutputType.Ogg:
                     return this.OggSettingsDataTemplate;
 
+                case OutputType.Ogv:
+                    return this.OgvSettingsDataTemplate;
+
                 case OutputType.Png:
                     return this.PngSettingsDataTemplate;
 
diff --git a/Application/FileConverter/Windows/DiagnosticsWindow.xaml b/Application/FileConverter/Windows/DiagnosticsWindow.xaml
index 1779f31d..de5d142e 100644
--- a/Application/FileConverter/Windows/DiagnosticsWindow.xaml
+++ b/Application/FileConverter/Windows/DiagnosticsWindow.xaml
@@ -3,17 +3,20 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:FileConverter.Windows"
-        xmlns:fileConverter="clr-namespace:FileConverter"
         xmlns:diagnostics="clr-namespace:FileConverter.Diagnostics"
+        xmlns:project="clr-namespace:FileConverter.Properties"
+        xmlns:local="clr-namespace:FileConverter"
         mc:Ignorable="d"
-        Title="Diagnostics" Height="600" Width="800" Icon="/FileConverter;component/Resources/ApplicationIcon.ico">
+        Height="600" Width="800" Icon="/FileConverter;component/Resources/ApplicationIcon.ico">
+    <Window.Title>
+        <Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
+    </Window.Title>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Label  Grid.Row="0" Content="Logs" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold" />
+        <Label  Grid.Row="0" Content="{x:Static project:Resources.Diagnostics}" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold" />
 
         <TabControl Grid.Row="1" Margin="5" ItemsSource="{Binding Path=(diagnostics:Debug.Data), Mode=OneWay}">
             <TabControl.ItemTemplate>
diff --git a/Application/FileConverter/Windows/MainWindow.xaml b/Application/FileConverter/Windows/MainWindow.xaml
index 573e877e..d15af3ec 100644
--- a/Application/FileConverter/Windows/MainWindow.xaml
+++ b/Application/FileConverter/Windows/MainWindow.xaml
@@ -6,6 +6,7 @@
         xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
         xmlns:conversionJobs="clr-namespace:FileConverter.ConversionJobs"
         xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
+        xmlns:project="clr-namespace:FileConverter.Properties"
         mc:Ignorable="d" x:Class="FileConverter.MainWindow"
         x:Name="FileConverterMainWindow" Height="500" Width="950" MinHeight="250" MinWidth="500" WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico">
     <Window.Resources>
@@ -14,7 +15,6 @@
         <generic:ValueConverterGroup x:Key="EnumEqualsToVisibility">
             <generic:ValueToString/>
             <generic:EqualsConverter/>
-            <!--<generic:BoolInverterConverter/>-->
             <generic:BoolToVisibility/>
         </generic:ValueConverterGroup>
     </Window.Resources>
@@ -24,23 +24,23 @@
 
     <Grid Margin="10">
         <Grid.RowDefinitions>
-            <RowDefinition Height="30" />
+            <RowDefinition Height="35" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="100" />
-                <ColumnDefinition Width="100" />
+                <ColumnDefinition Width="120" />
+                <ColumnDefinition Width="120" />
             </Grid.ColumnDefinitions>
 
             <DockPanel Grid.Column="0">
-                <Label Content="Files to convert" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold"/>
+                <Label Content="{x:Static project:Resources.ConversionQueueTitle}" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold"/>
                 <Label Content="{Binding InformationMessage, ElementName=FileConverterMainWindow}" VerticalAlignment="Top" Height="30" FontSize="13.333" HorizontalAlignment="Right"/>
             </DockPanel>
-            <Button x:Name="DiagnosticsButton" Grid.Column="1" Content="Logs" Margin="3,3" Click="DiagnosticsButton_OnClick"/>
-            <Button x:Name="SettingsButton"  Grid.Column="2" Content="Settings" Margin="3,3" Click="SettingsButton_OnClick"/>
+            <Button x:Name="DiagnosticsButton" Grid.Column="1" Content="{x:Static project:Resources.DiagnosticsButtonTitle}" Margin="3,3" Click="DiagnosticsButton_OnClick"/>
+            <Button x:Name="SettingsButton"  Grid.Column="2" Content="{x:Static project:Resources.SettingsButtonTitle}" Margin="3,3" Click="SettingsButton_OnClick"/>
         </Grid>
 
         <ScrollViewer x:Name="ScrollViewer" Grid.Row="1" VerticalScrollBarVisibility="Auto" CanContentScroll="True">
@@ -67,7 +67,7 @@
 
                                 <StackPanel Grid.Row="1" Grid.Column="0" Margin="10,0,0,0">
                                     <WrapPanel>
-                                        <TextBlock Text="Converted from " FontSize="11" FontStyle="Italic" />
+                                        <TextBlock Text="{x:Static project:Resources.ConvertedFrom}" FontSize="11" FontStyle="Italic" Margin="0,0,5,0" />
                                         <TextBlock Text="{Binding InputFilePath}" FontSize="11" FontStyle="Italic" />
                                     </WrapPanel>
                                     <TextBlock  Text="{Binding ErrorMessage}" Foreground="{Binding State, ConverterParameter=Foreground, Converter={StaticResource ConversionStateToColor}}" />
diff --git a/Application/FileConverter/Windows/MainWindow.xaml.cs b/Application/FileConverter/Windows/MainWindow.xaml.cs
index 2cf90c83..70f2514b 100644
--- a/Application/FileConverter/Windows/MainWindow.xaml.cs
+++ b/Application/FileConverter/Windows/MainWindow.xaml.cs
@@ -76,6 +76,20 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
             }
         }
 
+        protected override void OnClosing(CancelEventArgs eventArgs)
+        {
+            base.OnClosing(eventArgs);
+
+            Application application = Application.Current as Application;
+
+            if (application.UpgradeVersionDescription != null && application.UpgradeVersionDescription.NeedToUpgrade && !application.UpgradeVersionDescription.InstallerDownloadDone)
+            {
+                eventArgs.Cancel = true;
+                this.ShowUpgradeWindow();
+                this.upgradeWindow.VersionDescription = application.UpgradeVersionDescription;
+            }
+        }
+
         private void SettingsButton_OnClick(object sender, RoutedEventArgs e)
         {
             this.ShowSettingsWindow();
@@ -130,16 +144,32 @@ private void ShowUpgradeWindow()
             {
                 return;
             }
-            else
+            else if (this.upgradeWindow == null)
             {
                 this.upgradeWindow = new UpgradeWindow();
+                this.upgradeWindow.Closed += UpgradeWindow_Closed;
             }
-
+            
             Application application = Application.Current as Application;
             application?.CancelAutoExit();
             this.upgradeWindow.Show();
         }
 
+        private void UpgradeWindow_Closed(object sender, System.EventArgs e)
+        {
+            Application application = Application.Current as Application;
+
+            if (this.IsVisible)
+            {
+                return;
+            }
+
+            if (application.UpgradeVersionDescription != null && application.UpgradeVersionDescription.NeedToUpgrade && application.UpgradeVersionDescription.InstallerDownloadDone)
+            {
+                this.Close();
+            }
+        }
+
         private void Application_OnApplicationTerminate(object sender, ApplicationTerminateArgs eventArgs)
         {
             if (float.IsNaN(eventArgs.RemainingTimeBeforeTermination))
@@ -152,16 +182,16 @@ private void Application_OnApplicationTerminate(object sender, ApplicationTermin
 
             if (remaingingSeconds >= 2)
             {
-                this.InformationMessage = string.Format("The application will automatically terminate in {0} seconds.", remaingingSeconds);
+                this.InformationMessage = string.Format(Properties.Resources.ApplicationWillTerminateInMultipleSeconds, remaingingSeconds);
             }
             else if (remaingingSeconds == 1)
             {
-                this.InformationMessage = string.Format("The application will automatically terminate in {0} second.", remaingingSeconds);
+                this.InformationMessage = Properties.Resources.ApplicationWillTerminateInOneSecond;
             }
 
             if (remaingingSeconds <= 0)
             {
-                this.InformationMessage = string.Format("The application is terminating.");
+                this.InformationMessage = Properties.Resources.ApplicationIsTerminating;
             }
         }
     }
diff --git a/Application/FileConverter/Windows/OutputTypeViewModel.cs b/Application/FileConverter/Windows/OutputTypeViewModel.cs
new file mode 100644
index 00000000..0f46b960
--- /dev/null
+++ b/Application/FileConverter/Windows/OutputTypeViewModel.cs
@@ -0,0 +1,37 @@
+// <copyright file="OutputFileType.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
+
+namespace FileConverter.Windows
+{
+    public class OutputTypeViewModel 
+    {
+        public OutputTypeViewModel(OutputType type)
+        {
+            this.Type = type;
+            this.Category = Helpers.GetExtensionCategory(type.ToString().ToLowerInvariant());
+        }
+
+        public OutputType Type
+        {
+            get;
+            private set;
+        }
+
+        public string Category
+        {
+            get;
+            set;
+        }
+
+        public override bool Equals(object other)
+        {
+            OutputTypeViewModel outputTypeViewModel = other as OutputTypeViewModel;
+
+            return outputTypeViewModel?.Type == this.Type;
+        }
+
+        public override int GetHashCode()
+        {
+            return this.Type.GetHashCode();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml b/Application/FileConverter/Windows/SettingsWindow.xaml
index 82c41dea..4cfec490 100644
--- a/Application/FileConverter/Windows/SettingsWindow.xaml
+++ b/Application/FileConverter/Windows/SettingsWindow.xaml
@@ -7,13 +7,13 @@
         xmlns:windows="clr-namespace:FileConverter.Windows"
         xmlns:project="clr-namespace:FileConverter.Properties"
         xmlns:System="clr-namespace:System;assembly=mscorlib"
-        xmlns:xaml="clr-namespace:Markdown.Xaml;assembly=Markdown.Xaml"
         x:Name="window" x:Class="FileConverter.SettingsWindow"
         MinWidth="640" MinHeight="480" 
         Width="900" Height="675"
         WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico"
         Closing="SettingsWindow_OnClosing">
     <Window.Resources>
+        
         <!-- Donation button style -->
 
         <Style x:Key="DonateFocusVisual">
@@ -84,11 +84,13 @@
             </Setter>
         </Style>
 
+        <generic:CultureInfoToStringConverter x:Key="CultureInfoToString"/>
+        <generic:ObjectToLocalizedString x:Key="ObjectToLocalizedString"/>
         <generic:DoubleToTimeString x:Key="DoubleToTimeString"/>
         <valueConverters:FileNameConverter x:Key="FileNameConverter"/>
-        <generic:BoolToVisibility x:Key="BoolToVisibility"/>
         <generic:CollectionContainsElementToBool x:Key="CollectionContainsElementToBool"/>
         <generic:FormatStringConverter x:Key="FormatStringConverter"/>
+        <valueConverters:OutputTypeEnumToViewModel x:Key="OutputTypeEnumToViewModel"/>
 
         <generic:ValueConverterGroup x:Key="ConversionSettingsToEnum">
             <valueConverters:ConversionSettingsToString/>
@@ -129,58 +131,139 @@
             </Setter>
         </Style>
 
+        <!-- Conversion settings data template -->
+        
         <DataTemplate x:Key="EmptyDataTemplate">
             <StackPanel/>
         </DataTemplate>
 
         <DataTemplate x:Key="WavSettingsDataTemplate">
-            <StackPanel>
-                <DockPanel>
-                    <Label Content="Encoding :" />
-                    <RadioButton x:Name="WAV8radioButton" Content="8-bits" ToolTip="PCM signed 8-bit little-endian" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Wav8, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
-                    <RadioButton x:Name="WAV16radioButton" Content="16-bits" ToolTip="PCM signed 16-bit little-endian" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Wav16, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
-                    <RadioButton x:Name="WAV24radioButton" Content="24-bits" ToolTip="PCM signed 24-bit little-endian" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Wav24, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
-                    <RadioButton x:Name="WAV32radioButton" Content="32-bits" ToolTip="PCM signed 32-bit little-endian" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Wav32, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                
+                <Label Grid.Row="0" Grid.Column="0" Content="{x:Static project:Resources.Encoding}" />
+                <DockPanel Grid.Row="0" Grid.Column="1">
+                    <RadioButton x:Name="WAV8radioButton" Content="8-bits" ToolTip="{x:Static project:Resources.Wav8bitsDescription}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Wav8, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton x:Name="WAV16radioButton" Content="16-bits" ToolTip="{x:Static project:Resources.Wav16bitsDescription}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Wav16, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton x:Name="WAV24radioButton" Content="24-bits" ToolTip="{x:Static project:Resources.Wav24bitsDescription}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Wav24, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton x:Name="WAV32radioButton" Content="32-bits" ToolTip="{x:Static project:Resources.Wav32bitsDescription}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Wav32, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                </DockPanel>
+
+                <Label Grid.Row="1" Grid.Column="0" Content="{x:Static project:Resources.ChannelCountTitle}" ToolTip="{x:Static project:Resources.ChannelCountTooltip}" />
+                <DockPanel Grid.Row="1" Grid.Column="1">
+                    <RadioButton Content="{x:Static project:Resources.SameChannelCountOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton Content="{x:Static project:Resources.MonoOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|1, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton Content="{x:Static project:Resources.StereoOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|2, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
                 </DockPanel>
-            </StackPanel>
+            </Grid>
         </DataTemplate>
 
         <DataTemplate x:Key="Mp3SettingsDataTemplate">
-            <StackPanel>
-                <DockPanel>
-                    <Label Content="Encoding :" />
-                    <RadioButton x:Name="VBRradioButton" Content="VBR" ToolTip="Variable bitrate encoding" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Mp3VBR, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
-                    <RadioButton x:Name="CBRradioButton" Content="CBR" ToolTip="Constant bitrate encoding" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Mp3CBR, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <Label Grid.Row="0" Grid.Column="0" Content="{x:Static project:Resources.Encoding}" />
+                <DockPanel Grid.Row="0" Grid.Column="1">
+                    <RadioButton x:Name="VBRradioButton" Content="VBR" ToolTip="{x:Static project:Resources.Mp3VbrDescription}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Mp3VBR, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton x:Name="CBRradioButton" Content="CBR" ToolTip="{x:Static project:Resources.Mp3CbrDescription}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Mp3CBR, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
                 </DockPanel>
-                <DockPanel>
-                    <Label Content="Quality :" />
-                    <controls:EncodingQualitySliderControl x:Name="EncodingQualitySlider"
-        				EncodingMode="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|FileConverter.Controls.EncodingMode, Converter={StaticResource ConversionSettingsToEnum}, ElementName=window, Mode=OneWay, TargetNullValue=VBR}" 
-        				Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=190}" />
+
+                <Label Grid.Row="1" Grid.Column="0" Content="{x:Static project:Resources.Quality}" />
+                <controls:EncodingQualitySliderControl Grid.Row="1" Grid.Column="1"
+        			EncodingMode="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|FileConverter.Controls.EncodingMode, Converter={StaticResource ConversionSettingsToEnum}, ElementName=window, Mode=OneWay, TargetNullValue=VBR}" 
+        			Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=190}" />
+
+                <Label Grid.Row="2" Grid.Column="0" Content="{x:Static project:Resources.ChannelCountTitle}" ToolTip="{x:Static project:Resources.ChannelCountTooltip}" />
+                <DockPanel Grid.Row="2" Grid.Column="1">
+                    <RadioButton Content="{x:Static project:Resources.SameChannelCountOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton Content="{x:Static project:Resources.MonoOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|1, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton Content="{x:Static project:Resources.StereoOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|2, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
                 </DockPanel>
-            </StackPanel>
+            </Grid>
         </DataTemplate>
 
         <DataTemplate x:Key="OggSettingsDataTemplate">
-            <StackPanel>
-                <DockPanel>
-                    <Label Content="Quality :" />
-                    <controls:EncodingQualitySliderControl x:Name="EncodingQualitySlider" EncodingMode="OggVBR" 
-        				Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=160}" />
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <Label Grid.Row="0" Grid.Column="0" Content="{x:Static project:Resources.Quality}" />
+                <controls:EncodingQualitySliderControl Grid.Row="0" Grid.Column="1" EncodingMode="OggVBR" 
+        			Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=160}" />
+
+                <Label Grid.Row="1" Grid.Column="0" Content="{x:Static project:Resources.ChannelCountTitle}" ToolTip="{x:Static project:Resources.ChannelCountTooltip}" />
+                <DockPanel Grid.Row="1" Grid.Column="1">
+                    <RadioButton Content="{x:Static project:Resources.SameChannelCountOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton Content="{x:Static project:Resources.MonoOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|1, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton Content="{x:Static project:Resources.StereoOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|2, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
                 </DockPanel>
-            </StackPanel>
+            </Grid>
         </DataTemplate>
 
         <DataTemplate x:Key="AacSettingsDataTemplate">
-            <StackPanel>
-                <DockPanel>
-                    <Label Content="Quality :" />
-                    <controls:EncodingQualitySliderControl x:Name="EncodingQualitySlider" EncodingMode="AacVBR" 
-        				Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=128}" />
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                
+                <Label Grid.Row="0" Grid.Column="0" Content="{x:Static project:Resources.Quality}" />
+                <controls:EncodingQualitySliderControl Grid.Row="0" Grid.Column="1" EncodingMode="AacVBR" 
+        			Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=128}" />
+
+                <Label Grid.Row="1" Grid.Column="0" Content="{x:Static project:Resources.ChannelCountTitle}" ToolTip="{x:Static project:Resources.ChannelCountTooltip}" />
+                <DockPanel Grid.Row="1" Grid.Column="1">
+                    <RadioButton Content="{x:Static project:Resources.SameChannelCountOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton Content="{x:Static project:Resources.MonoOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|1, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton Content="{x:Static project:Resources.StereoOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|2, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
                 </DockPanel>
-            </StackPanel>
+            </Grid>
         </DataTemplate>
-        
+
+        <DataTemplate x:Key="FlacSettingsDataTemplate">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <Label Grid.Row="0" Grid.Column="0" Content="{x:Static project:Resources.ChannelCountTitle}" ToolTip="{x:Static project:Resources.ChannelCountTooltip}" />
+                <DockPanel Grid.Row="0" Grid.Column="1">
+                    <RadioButton Content="{x:Static project:Resources.SameChannelCountOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton Content="{x:Static project:Resources.MonoOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|1, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                    <RadioButton Content="{x:Static project:Resources.StereoOption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioChannelCount|2, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
+                </DockPanel>
+            </Grid>
+        </DataTemplate>
+
         <DataTemplate x:Key="GifSettingsDataTemplate">
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -194,12 +277,12 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
 
-                <Label Content="Frames per second :" Grid.Row="0" Grid.Column="0" HorizontalContentAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.FramesPerSecond}" Grid.Row="0" Grid.Column="0" HorizontalContentAlignment="Right"/>
                 <Slider x:Name="QualitySlider" Grid.Row="0" Grid.Column="1" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoFramesPerSecond|System.Int32, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
                             Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="10" SelectionEnd="20" Minimum="1" Maximum="30" TickPlacement="BottomRight" SmallChange="1" LargeChange="4" TickFrequency="1" Foreground="#004B82" />
 
                 <!-- Scale -->
-                <Label Content="Scale :" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Scale}" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
                 <Grid Grid.Row="1" Grid.Column="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -217,12 +300,16 @@
                 </Grid>
 
                 <!--Rotate-->
-                <Label Content="Rotate :" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Rotate}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-                    <RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
-                    <RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
+                    <RadioButton Content="{x:Static project:Resources.ZeroDegreesRotationTitle}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.NinetyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.OneEightyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.TwoSeventyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
                 </StackPanel>
             </Grid>
         </DataTemplate>
@@ -243,16 +330,16 @@
                 </Grid.RowDefinitions>
 
                 <DockPanel Grid.Row="0" Grid.Column="0">
-                    <Label Content="Video" FontWeight="Bold" Margin="17,0,0,0" />
+                    <Label Content="{x:Static project:Resources.VideoTitle}" FontWeight="Bold" Margin="17,0,0,0" />
                     <Label Content="(Xvid)" FontWeight="Light" Foreground="#004B82" />
                 </DockPanel>
 
-                <Label Content="Quality :" Grid.Row="1" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Quality}" Grid.Row="1" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
                 <Slider x:Name="QualitySlider" Grid.Row="1" Grid.Column="1" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
                             Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="28" Minimum="0" Maximum="30" TickPlacement="BottomRight" SmallChange="1" LargeChange="5" TickFrequency="1" Foreground="#004B82" />
 
                 <!-- Scale -->
-                <Label Content="Scale :" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Scale}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
                 <Grid Grid.Row="2" Grid.Column="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -270,21 +357,25 @@
                 </Grid>
 
                 <!--Rotate-->
-                <Label Content="Rotate :" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Rotate}" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
-                    <RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
-                    <RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
+                    <RadioButton Content="{x:Static project:Resources.ZeroDegreesRotationTitle}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.NinetyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.OneEightyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.TwoSeventyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
                 </StackPanel>
 
                 <DockPanel Grid.Row="4" Grid.Column="0">
                     <CheckBox IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,6,0,0" />
-                    <Label Content="Audio" FontWeight="Bold" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
+                    <Label Content="{x:Static project:Resources.AudioTitle}" FontWeight="Bold" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
                     <Label Content="(Mp3)" FontWeight="Light" Foreground="#004B82" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
                 </DockPanel>
 
-                <Label Content="Quality :" Grid.Row="5" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
+                <Label Content="{x:Static project:Resources.Quality}" Grid.Row="5" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
                 <controls:EncodingQualitySliderControl Grid.Row="5" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="Mp3VBR" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"
         				Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
             </Grid>
@@ -307,28 +398,26 @@
                 </Grid.RowDefinitions>
 
                 <DockPanel Grid.Row="0" Grid.Column="0">
-                    <Label Content="Video" FontWeight="Bold" Margin="17,0,0,0"/>
+                    <Label Content="{x:Static project:Resources.VideoTitle}" FontWeight="Bold" Margin="17,0,0,0"/>
                     <Label Content="(H.264)" FontWeight="Light" Foreground="#004B82" />
                 </DockPanel>
 
-                <Label Content="Quality :" Grid.Row="1" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Quality}" Grid.Row="1" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
                 <Slider x:Name="QualitySlider" Grid.Row="1" Grid.Column="1" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
                             Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="33" Minimum="0" Maximum="51" TickPlacement="BottomRight" SmallChange="1" LargeChange="6" TickFrequency="1" Foreground="#004B82" />
 
-                <Label Content="Encoding speed :" Grid.Row="2" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingSpeedTooltip}" HorizontalContentAlignment="Right"/>
-                <ComboBox Grid.Row="2" Grid.Column="1" SelectedValue="{Binding SelectedPreset.Settings, ConverterParameter=VideoEncodingSpeed|System.String, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=veryslow}">
-                    <System:String>Ultra Fast</System:String>
-                    <System:String>Super Fast</System:String>
-                    <System:String>Very Fast</System:String>
-                    <System:String>Faster</System:String>
-                    <System:String>Fast</System:String>
-                    <System:String>Medium</System:String>
-                    <System:String>Slow</System:String>
-                    <System:String>Slower</System:String>
-                    <System:String>Very Slow</System:String>
+                <Label Content="{x:Static project:Resources.EncodingSpeed}" Grid.Row="2" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingSpeedTooltip}" HorizontalContentAlignment="Right"/>
+                <ComboBox Grid.Row="2" Grid.Column="1" 
+                          ItemsSource="{Binding VideoEncodingSpeeds, ElementName=window, Mode=OneTime}"
+                          SelectedValue="{Binding SelectedPreset.Settings, ConverterParameter=VideoEncodingSpeed|FileConverter.ConversionJobs.VideoEncodingSpeed, Converter={StaticResource ConversionSettingsToEnum}, ElementName=window, Mode=TwoWay, TargetNullValue=veryslow}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <ContentPresenter Content="{Binding Converter={StaticResource ObjectToLocalizedString}, Mode=OneTime}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
                 </ComboBox>
 
-                <Label Content="Scale :" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Scale}" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
                 <Grid Grid.Row="3" Grid.Column="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -346,26 +435,96 @@
                 </Grid>
 
                 <!--Rotate-->
-                <Label Content="Rotate :" Grid.Row="4" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Rotate}" Grid.Row="4" Grid.Column="0" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal">
-                    <RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
-                    <RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
+                    <RadioButton Content="{x:Static project:Resources.ZeroDegreesRotationTitle}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.NinetyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.OneEightyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.TwoSeventyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
                 </StackPanel>
 
                 <DockPanel Grid.Row="5" Grid.Column="0">
                     <CheckBox IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,6,0,0" />
-                    <Label Content="Audio" FontWeight="Bold" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
+                    <Label Content="{x:Static project:Resources.AudioTitle}" FontWeight="Bold" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
                     <Label Content="(AAC)" FontWeight="Light" Foreground="#004B82" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
                 </DockPanel>
 
-                <Label Content="Quality :" Grid.Row="6" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
+                <Label Content="{x:Static project:Resources.Quality}" Grid.Row="6" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
                 <controls:EncodingQualitySliderControl Grid.Row="6" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="AacVBR" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"
         				Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=128}" />
             </Grid>
         </DataTemplate>
 
+        <DataTemplate x:Key="OgvSettingsDataTemplate">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <DockPanel Grid.Row="0" Grid.Column="0">
+                    <Label Content="{x:Static project:Resources.VideoTitle}" FontWeight="Bold" Margin="17,0,0,0"/>
+                    <Label Content="(theora)" FontWeight="Light" Foreground="#004B82" />
+                </DockPanel>
+
+                <Label Content="{x:Static project:Resources.Quality}" Grid.Row="1" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
+                <Slider x:Name="QualitySlider" Grid.Row="1" Grid.Column="1" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
+                            Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="5" SelectionEnd="8" Minimum="0" Maximum="10" TickPlacement="BottomRight" SmallChange="1" LargeChange="3" TickFrequency="1" Foreground="#004B82" />
+
+                <Label Content="{x:Static project:Resources.Scale}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Grid Grid.Row="2" Grid.Column="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="60"/>
+                    </Grid.ColumnDefinitions>
+                    <Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="2" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2" Foreground="#004B82"/>
+                    <Label Grid.Column="1">
+                        <Label.Content>
+                            <MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
+                                <MultiBinding.ConverterParameter>{0:P1}</MultiBinding.ConverterParameter>
+                                <Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
+                            </MultiBinding>
+                        </Label.Content>
+                    </Label>
+                </Grid>
+
+                <!--Rotate-->
+                <Label Content="{x:Static project:Resources.Rotate}" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
+                <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
+                    <RadioButton Content="{x:Static project:Resources.ZeroDegreesRotationTitle}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.NinetyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.OneEightyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.TwoSeventyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                </StackPanel>
+
+                <DockPanel Grid.Row="4" Grid.Column="0">
+                    <CheckBox IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,6,0,0" />
+                    <Label Content="{x:Static project:Resources.AudioTitle}" FontWeight="Bold" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
+                    <Label Content="(vorbis)" FontWeight="Light" Foreground="#004B82" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
+                </DockPanel>
+
+                <Label Content="{x:Static project:Resources.Quality}" Grid.Row="5" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
+                <controls:EncodingQualitySliderControl Grid.Row="5" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="OggVBR" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"
+        				Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=128}" />
+            </Grid>
+        </DataTemplate>
+        
         <DataTemplate x:Key="WebmSettingsDataTemplate">
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -382,16 +541,16 @@
                 </Grid.RowDefinitions>
 
                 <DockPanel Grid.Row="0" Grid.Column="0">
-                    <Label Content="Video" FontWeight="Bold" Margin="17,0,0,0" />
+                    <Label Content="{x:Static project:Resources.VideoTitle}" FontWeight="Bold" Margin="17,0,0,0" />
                     <Label Content="(vp9)" FontWeight="Light" Foreground="#004B82" />
                 </DockPanel>
 
-                <Label Content="Quality :" Grid.Row="1" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Quality}" Grid.Row="1" Grid.Column="0" ToolTip="{x:Static project:Resources.VideoEncodingQualityTooltip}" HorizontalContentAlignment="Right"/>
                 <Slider x:Name="QualitySlider" Grid.Row="1" Grid.Column="1" Value="{Binding SelectedPreset.Settings, ConverterParameter=VideoQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}"
                             Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="40" Minimum="0" Maximum="63" TickPlacement="BottomRight" SmallChange="1" LargeChange="5" TickFrequency="1" Foreground="#004B82" />
 
                 <!-- Scale -->
-                <Label Content="Scale :" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Scale}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
                 <Grid Grid.Row="2" Grid.Column="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -409,21 +568,25 @@
                 </Grid>
 
                 <!--Rotate-->
-                <Label Content="Rotate :" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Rotate}" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
-                    <RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
-                    <RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
+                    <RadioButton Content="{x:Static project:Resources.ZeroDegreesRotationTitle}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.NinetyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.OneEightyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.TwoSeventyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=VideoRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
                 </StackPanel>
 
                 <DockPanel Grid.Row="4" Grid.Column="0">
                     <CheckBox IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,6,0,0" />
-                    <Label Content="Audio" FontWeight="Bold" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
+                    <Label Content="{x:Static project:Resources.AudioTitle}" FontWeight="Bold" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
                     <Label Content="(Ogg vorbis)" FontWeight="Light" Foreground="#004B82" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
                 </DockPanel>
 
-                <Label Content="Quality :" Grid.Row="5" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
+                <Label Content="{x:Static project:Resources.Quality}" Grid.Row="5" Grid.Column="0" HorizontalContentAlignment="Right" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"/>
                 <controls:EncodingQualitySliderControl Grid.Row="5" Grid.Column="1" x:Name="EncodingQualitySlider" EncodingMode="OggVBR" IsEnabled="{Binding SelectedPreset.Settings, ConverterParameter=EnableAudio|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=OneWay}"
         				Bitrate="{Binding SelectedPreset.Settings, ConverterParameter=AudioBitrate|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
             </Grid>
@@ -441,11 +604,11 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
                 <!--Quality-->
-                <Label Content="Quality :" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Quality}" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"/>
                 <Slider Grid.Row="0" Grid.Column="1" x:Name="QualitySlider" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=25}"
-                        Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="30" SelectionEnd="100" Minimum="0" Maximum="100" TickPlacement="BottomRight" SmallChange="5" LargeChange="15" TickFrequency="5" Foreground="#004B82" />
+                        Margin="0,5,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="30" SelectionEnd="100" Minimum="0" Maximum="100" TickPlacement="BottomRight" SmallChange="5" LargeChange="15" TickFrequency="5" Foreground="#004B82" />
                 <!--Scale-->
-                <Label Content="Scale :" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Scale}" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
                 <Grid Grid.Row="1" Grid.Column="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -456,7 +619,7 @@
                         <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
                     <Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.075" Maximum="16" SmallChange="0.075" LargeChange="0.25" TickPlacement="BottomRight" Ticks="0.075 0.125 0.25 0.5 0.75 1 1.25 1.5 1.75 2 3 4 6 8 12 16" Foreground="#004B82"/>
-                    <Label Grid.Column="1">
+                    <Label Grid.Row="0"  Grid.Column="1">
                         <Label.Content>
                             <MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
                                 <MultiBinding.ConverterParameter>{0:P1}</MultiBinding.ConverterParameter>
@@ -464,15 +627,21 @@
                             </MultiBinding>
                         </Label.Content>
                     </Label>
-                    <CheckBox Grid.Row="1" Grid.Column="0" Content="Clamp to lowest power of 2 size" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageClampSizePowerOf2|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
+                    <CheckBox Grid.Row="1" Grid.Column="0" Margin="0,5,0,5"
+                              Content="{x:Static project:Resources.ClampToLowestPowerOfTwoSize}" 
+                              IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageClampSizePowerOf2|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
                 </Grid>
                 <!--Rotate-->
-                <Label Content="Rotate :" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Rotate}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-                    <RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
-                    <RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
+                    <RadioButton Content="{x:Static project:Resources.ZeroDegreesRotationTitle}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.NinetyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.OneEightyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.TwoSeventyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
                 </StackPanel>
             </Grid>
         </DataTemplate>
@@ -488,7 +657,7 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
                 <!--Scale-->
-                <Label Content="Scale :" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Scale}" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"/>
                 <Grid Grid.Row="0" Grid.Column="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -507,16 +676,22 @@
                             </MultiBinding>
                         </Label.Content>
                     </Label>
-                    
-                    <CheckBox Grid.Row="1" Grid.Column="0" Content="Clamp to lowest power of 2 size" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageClampSizePowerOf2|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
+
+                    <CheckBox Grid.Row="1" Grid.Column="0" Margin="0,5,0,5"
+                              Content="{x:Static project:Resources.ClampToLowestPowerOfTwoSize}" 
+                              IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageClampSizePowerOf2|System.Boolean, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" />
                 </Grid>
                 <!--Rotate-->
-                <Label Content="Rotate :" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
+                <Label Content="{x:Static project:Resources.Rotate}" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
-                    <RadioButton Content="None" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"/>
-                    <RadioButton Content="90°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="180°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"/>
-                    <RadioButton Content="270°" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"/>
+                    <RadioButton Content="{x:Static project:Resources.ZeroDegreesRotationTitle}" ToolTip="{x:Static project:Resources.ZeroDegreesRotationTooltip}" Margin="0,7,7,7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|0, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.NinetyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.NinetyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|90, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.OneEightyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.OneEightyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|180, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
+                    <RadioButton Content="{x:Static project:Resources.TwoSeventyDegreesRotationTitle}" ToolTip="{x:Static project:Resources.TwoSeventyDegreesRotationTooltip}" Margin="7"
+                                 IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=ImageRotation|270, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
                 </StackPanel>
             </Grid>
         </DataTemplate>
@@ -525,12 +700,14 @@
             DefaultDataTemplate="{StaticResource EmptyDataTemplate}"
             AacSettingsDataTemplate="{StaticResource AacSettingsDataTemplate}"
             AviSettingsDataTemplate="{StaticResource AviSettingsDataTemplate}"
+            FlacSettingsDataTemplate="{StaticResource FlacSettingsDataTemplate}"
             GifSettingsDataTemplate="{StaticResource GifSettingsDataTemplate}" 
             JpgSettingsDataTemplate="{StaticResource JpgSettingsDataTemplate}" 
             MkvSettingsDataTemplate="{StaticResource MkvSettingsDataTemplate}" 
             Mp3SettingsDataTemplate="{StaticResource Mp3SettingsDataTemplate}"
             Mp4SettingsDataTemplate="{StaticResource MkvSettingsDataTemplate}"
             OggSettingsDataTemplate="{StaticResource OggSettingsDataTemplate}"
+            OgvSettingsDataTemplate="{StaticResource OgvSettingsDataTemplate}"
             PngSettingsDataTemplate="{StaticResource PngSettingsDataTemplate}"
             WavSettingsDataTemplate="{StaticResource WavSettingsDataTemplate}"
             WebmSettingsDataTemplate="{StaticResource WebmSettingsDataTemplate}" />
@@ -559,7 +736,7 @@
             </Grid.ColumnDefinitions>
 
             <Image HorizontalAlignment="Left" Height="48" Width="48" VerticalAlignment="Top" Source="..\Resources\ApplicationIcon.png" />
-            <Label Grid.Column="1" Content="Settings" FontSize="20" Margin="4" VerticalAlignment="Center" />
+            <Label Grid.Column="1" Content="{x:Static project:Resources.Settings}" FontSize="20" Margin="4" VerticalAlignment="Center" />
             <Label Grid.Column="2" HorizontalAlignment="Right" FontStyle="Italic" FontSize="14" VerticalAlignment="Center">
                 <Label.Content>
                     <Binding Path="(local:Application.ApplicationVersion)" Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" />
@@ -570,7 +747,7 @@
         <TabControl Grid.Row="1">
             
             <!-- Conversion presets settings -->
-            <TabItem Header="Conversion Presets">
+            <TabItem Header="{x:Static project:Resources.ConversionPresets}">
                 <Grid Grid.Row="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -585,7 +762,8 @@
                             <RowDefinition Height="*"/>
                             <RowDefinition Height="30"/>
                         </Grid.RowDefinitions>
-                        <ListBox x:Name="PresetList" Grid.Row="0" HorizontalAlignment="Left" IsSynchronizedWithCurrentItem="True" SelectedItem="{Binding SelectedPreset, ElementName=window}" Width="{Binding ActualWidth, ElementName=PresetListGrid, Mode=OneWay}">
+                        <ListBox x:Name="PresetList" Grid.Row="0" HorizontalAlignment="Left" IsSynchronizedWithCurrentItem="True" 
+                                 SelectedItem="{Binding SelectedPreset, ElementName=window}" Width="{Binding ActualWidth, ElementName=PresetListGrid, Mode=OneWay}">
                             <ListBox.DataContext>
                                 <local:ConversionPreset/>
                             </ListBox.DataContext>
@@ -597,15 +775,18 @@
                         </ListBox>
 
                         <DockPanel Grid.Row="1" Margin="0,5,0,0" HorizontalAlignment="Center">
-                            <Button x:Name="MoveUpPresetButton" Content="^" HorizontalAlignment="Left" Width="25" Margin="0,0,2,0" Click="MovePresetUpButton_Click"/>
-                            <Button x:Name="AddPresetButton" Content="+" HorizontalAlignment="Left" Width="25" Margin="2,0" Click="AddPresetButton_Click"/>
-                            <Button x:Name="RemovePresetButton" Content="-" HorizontalAlignment="Left" Width="25" Margin="2,0" Click="RemovePresetButton_Click"/>
-                            <Button x:Name="MoveDownPresetButton" Content="v" HorizontalAlignment="Left" Width="25" Margin="2,0,0,0" Click="MovePresetDownButton_Click"/>
+                            <Button x:Name="MoveUpPresetButton" Content="^" ToolTip="{x:Static project:Resources.MoveUpSelectedPreset}" HorizontalAlignment="Left" Width="25" Margin="0,0,2,0" Click="MovePresetUpButton_Click"/>
+                            <Button x:Name="AddPresetButton" Content="+" ToolTip="{x:Static project:Resources.AddNewPreset}" HorizontalAlignment="Left" Width="25" Margin="2,0" Click="AddPresetButton_Click"/>
+                            <Button x:Name="RemovePresetButton" Content="-" ToolTip="{x:Static project:Resources.RemoveSelectedPreset}" HorizontalAlignment="Left" Width="25" Margin="2,0" Click="RemovePresetButton_Click"/>
+                            <Button x:Name="MoveDownPresetButton" Content="v" ToolTip="{x:Static project:Resources.MoveDownSelectedPreset}" HorizontalAlignment="Left" Width="25" Margin="2,0,0,0" Click="MovePresetDownButton_Click"/>
+                            <TextBlock Margin="5,5,0,0">
+                                <Hyperlink CommandParameter="http://github.com/Tichau/FileConverter/wiki/How-to-create-a-new-custom-preset%3F" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" Foreground="#1E6BB8"><x:Static Member="project:Resources.Help" /></Hyperlink>
+                            </TextBlock>
                         </DockPanel>
                     </Grid>
 
                     <!-- Preset settings -->
-                    <GroupBox Header="Preset" Margin="5,5,0,0" Grid.Column="1" Visibility="{Binding SelectedPreset, Converter={StaticResource ReferenceToVisibility}, ElementName=window}">
+                    <GroupBox Header="{x:Static project:Resources.Preset}" Margin="5,5,0,0" Grid.Column="1" Visibility="{Binding SelectedPreset, Converter={StaticResource ReferenceToVisibility}, ElementName=window}">
                         <Grid Margin="5">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" MaxWidth="240"/>
@@ -615,10 +796,12 @@
                                 <RowDefinition Height="30"/>
                                 <RowDefinition Height="*"/>
                             </Grid.RowDefinitions>
-                            <Label Content="Preset name" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,5,0"/>
-                            <TextBox x:Name="PresetNameTextBox" Grid.Row="0" Grid.Column="1" Margin="5,2,25,2" Text="{Binding SelectedPreset.Name, ElementName=window, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" TextWrapping="Wrap" Width="Auto" />
 
-                            <GroupBox Grid.Row="1" Grid.Column="0" Header="Input formats" Margin="5">
+                            <Label Content="{x:Static project:Resources.PresetName}" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,5,0"/>
+                            <TextBox x:Name="PresetNameTextBox" Grid.Row="0" Grid.Column="1" Margin="5,2,25,2" TextWrapping="Wrap" Width="Auto" FontSize="15"
+                                     Text="{Binding SelectedPreset.Name, ElementName=window, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+
+                            <GroupBox Grid.Row="1" Grid.Column="0" Header="{x:Static project:Resources.InputFormats}" Margin="5">
                                 <Grid Margin="5">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="*"/>
@@ -633,7 +816,7 @@
                                     <TreeView x:Name="InputTypesTreeView" ItemsSource="{Binding InputCategories, ElementName=window}" >
                                         <TreeView.Resources>
                                             <HierarchicalDataTemplate DataType="{x:Type local:InputExtensionCategory}" ItemsSource="{Binding InputExtensions}">
-                                                <CheckBox Content="{Binding Name}" Height="20" VerticalAlignment="Top" Margin="2" Checked="OnInputTypeCategoryChecked" Unchecked="OnInputTypeCategoryUnchecked" IsThreeState="True" >
+                                                <CheckBox Content="{Binding Name, Converter={StaticResource ObjectToLocalizedString}}" Height="20" VerticalAlignment="Top" Margin="2" Checked="OnInputTypeCategoryChecked" Unchecked="OnInputTypeCategoryUnchecked" IsThreeState="True" >
                                                     <CheckBox.IsChecked>
                                                         <MultiBinding Converter="{StaticResource CollectionContainsElementToBool}" Mode="OneWay">
                                                             <Binding ElementName="window" Path="SelectedPreset.InputTypes" Mode="OneWay"/>
@@ -660,21 +843,45 @@
                                         </TreeView.ItemContainerStyle>
                                     </TreeView>
 
-                                    <Label Grid.Row="1" Content="Action when conversion succeed"/>
-                                    <ComboBox Grid.Row="2" x:Name="PostConversionActionComboBox" SelectedItem="{Binding SelectedPreset.InputPostConversionAction, ElementName=window, Mode=TwoWay}" />
+                                    <Label Grid.Row="1" Content="{x:Static project:Resources.ActionWhenConversionSucceedTitle}" ToolTip="{x:Static project:Resources.ActionWhenConversionSucceedDescription}" />
+                                    <ComboBox Grid.Row="2" ItemsSource="{Binding InputPostConversionActions, ElementName=window, Mode=OneTime}"
+                                              SelectedItem="{Binding SelectedPreset.InputPostConversionAction, ElementName=window, Mode=TwoWay}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <ContentPresenter Content="{Binding Converter={StaticResource ObjectToLocalizedString}}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
 
                                     <TextBlock Grid.Row="3" Margin="0,5,0,0">
-                                        <Hyperlink CommandParameter="http://github.com/Tichau/FileConverter/wiki/Input-file-post-conversion-actions" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" Foreground="#1E6BB8">help ?</Hyperlink>
+                                        <Hyperlink CommandParameter="http://github.com/Tichau/FileConverter/wiki/Input-file-post-conversion-actions" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" Foreground="#1E6BB8"><x:Static Member="project:Resources.Help" /></Hyperlink>
                                     </TextBlock>
                                 </Grid>
                             </GroupBox>
 
-                            <GroupBox Header="Output format" Grid.Row="1" Grid.Column="1" Margin="5">
+                            <GroupBox Header="{x:Static project:Resources.OutputFormat}" Grid.Row="1" Grid.Column="1" Margin="5">
                                 <StackPanel>
-                                    <ComboBox x:Name="OutputFormats" Margin="5" Height="25" VerticalAlignment="Top" SelectedItem="{Binding SelectedPreset.OutputType, ElementName=window, Mode=TwoWay}"/>
+                                    <ComboBox x:Name="OutputFormats" Margin="5" Height="29" VerticalAlignment="Top" 
+                                              SelectedItem="{Binding SelectedPreset.OutputType, Converter={StaticResource OutputTypeEnumToViewModel}, ElementName=window, Mode=TwoWay}">
+                                        <ComboBox.GroupStyle>
+                                            <GroupStyle>
+                                                <GroupStyle.HeaderTemplate>
+                                                    <DataTemplate>
+                                                        <TextBlock Foreground="#004B82" Background="#86C8F6" FontWeight="Bold" Padding="5,5,5,5"
+                                                                   Text="{Binding Name, Converter={StaticResource ObjectToLocalizedString}}"/>
+                                                    </DataTemplate>
+                                                </GroupStyle.HeaderTemplate>
+                                            </GroupStyle>
+                                        </ComboBox.GroupStyle>
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate DataType="windows:OutputTypeViewModel">
+                                                <TextBlock Text="{Binding Type}" Padding="10,2,2,2"/>
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
 
                                     <ContentControl ContentTemplateSelector="{StaticResource ResourceKey=ConversionSettingsSelector}" 
-								Content="{Binding SelectedPreset.OutputType, ElementName=window, UpdateSourceTrigger=PropertyChanged}" />
+								        Content="{Binding SelectedPreset.OutputType, ElementName=window, UpdateSourceTrigger=PropertyChanged}" />
 
                                     <Separator/>
 
@@ -690,11 +897,11 @@
                                             <RowDefinition Height="23"/>
                                             <RowDefinition Height="23"/>
                                         </Grid.RowDefinitions>
-                                        <Label Content="File name template" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,5,0"/>
+                                        <Label Content="{x:Static project:Resources.FileNameTemplate}" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,5,0"/>
                                         <TextBox x:Name="FileNameTemplateTextBox" Grid.Row="0" Grid.Column="1" Margin="5,2,25,2" Text="{Binding SelectedPreset.OutputFileNameTemplate, ElementName=window, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" TextWrapping="Wrap" Width="Auto" ToolTip="{x:Static project:Resources.OutputFilePathTemplateHelp}" />
-                                        <Label Content="Input example" Grid.Row="1" Grid.Column="0" HorizontalContentAlignment="Right" Margin="0,0,5,0" Foreground="Gray" FontSize="10"/>
+                                        <Label Content="{x:Static project:Resources.InputExample}" Grid.Row="1" Grid.Column="0" HorizontalContentAlignment="Right" Margin="0,0,5,0" Foreground="Gray" FontSize="10"/>
                                         <TextBlock Text="{x:Static project:Resources.OuputFileNameTemplateSample}" Grid.Row="1" Grid.Column="1" Margin="5,0,5,0" Foreground="Gray" FontSize="10" VerticalAlignment="Center"/>
-                                        <Label Content="Output" Grid.Row="2" Grid.Column="0" HorizontalContentAlignment="Right" Margin="0,0,5,0" Foreground="Gray" FontSize="10"/>
+                                        <Label Content="{x:Static project:Resources.OutputExample}" Grid.Row="2" Grid.Column="0" HorizontalContentAlignment="Right" Margin="0,0,5,0" Foreground="Gray" FontSize="10"/>
                                         <TextBlock Grid.Row="2" Grid.Column="1" Margin="5,0,5,0" Foreground="Gray" FontSize="10" VerticalAlignment="Center">
                                             <TextBlock.Text>
                                                 <MultiBinding Converter="{StaticResource FileNameConverter}">
@@ -705,7 +912,7 @@
                                             </TextBlock.Text>
                                         </TextBlock>
                                         <TextBlock Grid.Row="3" Grid.Column="1" Margin="5,0,5,0">
-                                            <Hyperlink CommandParameter="http://github.com/Tichau/FileConverter/wiki/Output-file-path-template" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" Foreground="#1E6BB8">help ?</Hyperlink>
+                                            <Hyperlink CommandParameter="http://github.com/Tichau/FileConverter/wiki/Output-file-path-template" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" Foreground="#1E6BB8"><x:Static Member="project:Resources.Help" /></Hyperlink>
                                         </TextBlock>
                                     </Grid>
 
@@ -717,20 +924,50 @@
             </TabItem>
 
             <!-- Application settings -->
-            <TabItem Header="Application">
-                <StackPanel Margin="5,10,5,5">
-                    <CheckBox x:Name="QuitAtEndCheckBox" Content="Automatically exit when all conversions finished" IsChecked="{Binding ApplicationSettings.ExitApplicationWhenConversionsFinished, ElementName=window, Mode=TwoWay}" Margin="0,0,0,5" />
-                    <DockPanel Margin="40,0,0,5" Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibility}, ConverterParameter=Collapsed, ElementName=QuitAtEndCheckBox}">
-                        <Label Content="Waiting duration :"/>
+            <TabItem Header="{x:Static project:Resources.Application}">
+                <Grid Margin="5">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+
+                    <Label Grid.Row="0" Grid.Column="0" Content="{x:Static project:Resources.Language}" HorizontalAlignment="Right" Margin="0,0,5,0"/>
+                    <ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding SupportedCultures, ElementName=window, Mode=OneTime}" Margin="0,0,0,1"
+                            SelectedValue="{Binding ApplicationSettings.ApplicationLanguage, ElementName=window, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <ContentPresenter Content="{Binding Converter={StaticResource CultureInfoToString}}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+
+                    <Label Grid.Row="1" Grid.Column="0" Content="{x:Static project:Resources.MaximumNumberOfSimultaneousConversions}" HorizontalAlignment="Right" Margin="0,0,5,0"/>
+                    <Slider Grid.Row="1" Grid.Column="1" Minimum="1" Maximum="16" SmallChange="1" TickPlacement="BottomRight" Margin="0,5,0,5"
+                            Value="{Binding ApplicationSettings.MaximumNumberOfSimultaneousConversions, ElementName=window, Mode=TwoWay}" AutoToolTipPlacement="TopLeft" />
+
+                    <Label Grid.Row="2" Grid.Column="0" Content="{x:Static project:Resources.AutomaticallyExitWhenAllConversionsFinished}" HorizontalAlignment="Right" Margin="0,0,5,0"/>
+                    <CheckBox Grid.Row="2" Grid.Column="1" x:Name="QuitAtEndCheckBox" IsChecked="{Binding ApplicationSettings.ExitApplicationWhenConversionsFinished, ElementName=window, Mode=TwoWay}"  Margin="0,5,0,5" />
+
+                    <Label Grid.Row="3" Grid.Column="0" Content="{x:Static project:Resources.ExitWaitingDuration}" HorizontalAlignment="Right" Margin="0,0,5,0" Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibility}, ConverterParameter=Collapsed, ElementName=QuitAtEndCheckBox}"/>
+                    <DockPanel Grid.Row="3" Grid.Column="1"  Margin="0,5,0,5" Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibility}, ConverterParameter=Collapsed, ElementName=QuitAtEndCheckBox}">
                         <Slider x:Name="DurationBeforeQuitSlider" Value="{Binding ApplicationSettings.DurationBetweenEndOfConversionsAndApplicationExit, ElementName=window, Mode=TwoWay}" Minimum="0" Maximum="10" SmallChange="0.1" IsSnapToTickEnabled="True" Width="250" TickFrequency="0.1"/>
                         <Label Content="{Binding Value, Converter={StaticResource DoubleToTimeString}, ElementName=DurationBeforeQuitSlider}"/>
                     </DockPanel>
-                    <CheckBox Content="Automatically check for updates when File Converter starts" IsChecked="{Binding ApplicationSettings.CheckUpgradeAtStartup, ElementName=window, Mode=TwoWay}"  />
-                </StackPanel>
+
+                    <Label Grid.Row="4" Grid.Column="0" Content="{x:Static project:Resources.AutomaticallyCheckForUpdates}" HorizontalAlignment="Right" Margin="0,0,5,0"/>
+                    <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding ApplicationSettings.CheckUpgradeAtStartup, ElementName=window, Mode=TwoWay}" Margin="0,5,0,5" />
+                </Grid>
             </TabItem>
             
             <!-- About -->
-            <TabItem Header="About">
+            <TabItem Header="{x:Static project:Resources.About}">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -754,17 +991,17 @@
                         </TextBlock>
                     </DockPanel>
                     <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,5,0,0">
-                        <Button ToolTip="Open GitHub project page" Background="WhiteSmoke" BorderBrush="DarkGray" Padding="1" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://github.com/Tichau/FileConverter/?from=about">
+                        <Button ToolTip="{x:Static project:Resources.GitHubButtonDescription}" Background="WhiteSmoke" BorderBrush="DarkGray" Padding="1" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://github.com/Tichau/FileConverter/?from=about">
                             <Button.Content>
                                 <Image Source="/FileConverter;component/Resources/GitHub-Icon.png"></Image>
                             </Button.Content>
                         </Button>
-                        <Button ToolTip="Report an issue" Background="WhiteSmoke" BorderBrush="DarkGray" Padding="1" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://github.com/Tichau/FileConverter/issues?from=about">
+                        <Button ToolTip="{x:Static project:Resources.IssueButtonDescription}" Background="WhiteSmoke" BorderBrush="DarkGray" Padding="1" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://github.com/Tichau/FileConverter/issues?from=about">
                             <Button.Content>
                                 <Image Source="/FileConverter;component/Resources/GitHub-Issue-Icon.png"></Image>
                             </Button.Content>
                         </Button>
-                        <Button ToolTip="Open documentation" Background="WhiteSmoke" BorderBrush="DarkGray" Padding="1" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://github.com/Tichau/FileConverter/wiki?from=about">
+                        <Button ToolTip="{x:Static project:Resources.DocumentationButtonDescription}" Background="WhiteSmoke" BorderBrush="DarkGray" Padding="1" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://github.com/Tichau/FileConverter/wiki?from=about">
                             <Button.Content>
                                 <Image Source="/FileConverter;component/Resources/GitHub-Documentation-Icon.png"></Image>
                             </Button.Content>
@@ -776,19 +1013,19 @@
                                           Document="{Binding AboutSectionContent, Converter={StaticResource TextToFlowDocumentConverter}, ElementName=window}" DockPanel.Dock="Top"/>
 
                         <TextBlock Grid.Row="1" Margin="5" DockPanel.Dock="Top" FontSize="14" HorizontalAlignment="Center" Visibility="{Binding DisplaySeeChangeLogLink, ElementName=window, Mode=OneWay, Converter={StaticResource BoolToVisibility}}">
-                                <Hyperlink Foreground="#1E6BB8" Command="{Binding GetChangeLogContentCommand, ElementName=window, Mode=OneWay}">See change log ...</Hyperlink>
+                            <Hyperlink Foreground="#1E6BB8" Command="{Binding GetChangeLogContentCommand, ElementName=window, Mode=OneWay}"><x:Static Member="project:Resources.SeeChangeLog" /></Hyperlink>
                         </TextBlock>
                     </DockPanel>
 
                     <Image Grid.Row="1" Grid.Column="1" Margin="0,5,0,5"  Source="/FileConverter;component/Resources/ApplicationIcon.ico"></Image>
                         
                     <StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center">
-                        <Label Content="Don't forget to reward my work if you like it :)" VerticalAlignment="Center"/>
+                        <Label Content="{x:Static project:Resources.DonateDescription}" VerticalAlignment="Center"/>
                         <Button Style="{StaticResource DonateButton}" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://pledgie.com/campaigns/31615?from=about">
                             <Button.Content>
                                 <DockPanel>
                                     <Image Source="/FileConverter;component/Resources/Pledge-icon.png"></Image>
-                                    <Label Margin="5,0,5,0" Content="Donate" Foreground="WhiteSmoke" FontWeight="Bold" FontSize="14"/>
+                                    <Label Content="{x:Static project:Resources.DonateButtonTitle}" Margin="5,0,5,0" Foreground="WhiteSmoke" FontWeight="Bold" FontSize="14"/>
                                 </DockPanel>
                             </Button.Content>
                         </Button>
@@ -799,7 +1036,7 @@
             </TabItem>
         </TabControl>
 
-        <Button x:Name="CloseButton" Grid.Row="2" Content="Close" HorizontalAlignment="Right" Width="100" Margin="0,4,105,0" Click="CloseButton_Click" />
-        <Button x:Name="SaveButton" Grid.Row="2" Content="Save" HorizontalAlignment="Right" Width="100" Margin="0,4,0,0" Click="SaveButton_Click" Command="New"/>
+        <Button x:Name="CloseButton" Grid.Row="2" Content="{x:Static project:Resources.Close}" HorizontalAlignment="Right" Width="100" Margin="0,4,105,0" Click="CloseButton_Click" />
+        <Button x:Name="SaveButton" Grid.Row="2" Content="{x:Static project:Resources.Save}" HorizontalAlignment="Right" Width="100" Margin="0,4,0,0" Click="SaveButton_Click" Command="New"/>
     </Grid>
 </Window>
diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml.cs b/Application/FileConverter/Windows/SettingsWindow.xaml.cs
index 91b4baa1..8d962da7 100644
--- a/Application/FileConverter/Windows/SettingsWindow.xaml.cs
+++ b/Application/FileConverter/Windows/SettingsWindow.xaml.cs
@@ -5,15 +5,18 @@ namespace FileConverter
     using System;
     using System.Collections.Generic;
     using System.ComponentModel;
+    using System.Globalization;
     using System.Linq;
     using System.Runtime.CompilerServices;
     using System.Windows;
     using System.Windows.Controls;
+    using System.Windows.Data;
     using System.Windows.Input;
 
+    using FileConverter.Windows;
     using FileConverter.Annotations;
     using FileConverter.Commands;
-    using FileConverter.Upgrade;
+    using FileConverter.ConversionJobs;
     using Microsoft.Win32;
 
     /// <summary>
@@ -31,49 +34,28 @@ public partial class SettingsWindow : Window, INotifyPropertyChanged
         private OpenUrlCommand openUrlCommand;
         private DelegateCommand getChangeLogContentCommand;
         private bool displaySeeChangeLogLink = true;
-
+        
         public SettingsWindow()
         {
+            this.SupportedCultures = Helpers.GetSupportedCultures().Where(cultureInfo => cultureInfo.IsNeutralCulture).ToArray();
+
             this.InitializeComponent();
             
             Application application = Application.Current as Application;
             this.ApplicationSettings = application.Settings;
             this.PresetList.ItemsSource = this.settings.ConversionPresets;
-
-            OutputType[] outputTypes = new[]
-                                           {
-                                               OutputType.Ogg, 
-                                               OutputType.Mp3,
-                                               OutputType.Aac,
-                                               OutputType.Flac,
-                                               OutputType.Wav,
-                                               OutputType.Mkv,
-                                               OutputType.Mp4,
-                                               OutputType.Webm,
-                                               OutputType.Avi,
-                                               OutputType.Ico,
-                                               OutputType.Jpg,
-                                               OutputType.Png,
-                                               OutputType.Gif,
-                                           };
-
-            this.OutputFormats.ItemsSource = outputTypes;
-
-            InputPostConversionAction[] postConversionActions = new[]
-                                           {
-                                               InputPostConversionAction.None,
-                                               InputPostConversionAction.MoveInArchiveFolder,
-                                               InputPostConversionAction.Delete,
-                                           };
-
-            this.PostConversionActionComboBox.ItemsSource = postConversionActions;
             
+            ListCollectionView collectionView = new ListCollectionView(new List<OutputTypeViewModel>(SettingsWindow.OutputTypeViewModels));
+            collectionView.GroupDescriptions.Add(new PropertyGroupDescription("Category"));
+
+            this.OutputFormats.ItemsSource = collectionView;
+
             this.InitializeCompatibleInputExtensions();
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
 
-        public event System.EventHandler<System.EventArgs> OnSettingsWindowHide;
+        public event EventHandler<EventArgs> OnSettingsWindowHide;
 
         public ICommand OpenUrlCommand
         {
@@ -123,7 +105,7 @@ public ConversionPreset SelectedPreset
                 }
 
                 this.OnPropertyChanged();
-                this.OnPropertyChanged("InputCategories");
+                this.OnPropertyChanged(nameof(this.InputCategories));
             }
         }
 
@@ -153,7 +135,7 @@ public IEnumerable<InputExtensionCategory> InputCategories
                 for (int index = 0; index < this.inputCategories.Length; index++)
                 {
                     InputExtensionCategory category = this.inputCategories[index];
-                    if (this.SelectedPreset == null || PathHelpers.IsOutputTypeCompatibleWithCategory(this.SelectedPreset.OutputType, category.Name))
+                    if (this.SelectedPreset == null || Helpers.IsOutputTypeCompatibleWithCategory(this.SelectedPreset.OutputType, category.Name))
                     {
                         yield return category;
                     }
@@ -161,11 +143,60 @@ public IEnumerable<InputExtensionCategory> InputCategories
             }
         }
 
+        public CultureInfo[] SupportedCultures
+        {
+            get;
+            set;
+        }
+
+        public static OutputTypeViewModel[] OutputTypeViewModels => new[]
+        {
+            new OutputTypeViewModel(OutputType.Ogg),
+            new OutputTypeViewModel(OutputType.Mp3),
+            new OutputTypeViewModel(OutputType.Aac),
+            new OutputTypeViewModel(OutputType.Flac),
+            new OutputTypeViewModel(OutputType.Wav),
+            new OutputTypeViewModel(OutputType.Mkv),
+            new OutputTypeViewModel(OutputType.Mp4),
+            new OutputTypeViewModel(OutputType.Ogv),
+            new OutputTypeViewModel(OutputType.Webm),
+            new OutputTypeViewModel(OutputType.Avi),
+            new OutputTypeViewModel(OutputType.Png),
+            new OutputTypeViewModel(OutputType.Jpg),
+            new OutputTypeViewModel(OutputType.Ico),
+            new OutputTypeViewModel(OutputType.Gif),
+            new OutputTypeViewModel(OutputType.Pdf),
+        };
+
+        public InputPostConversionAction[] InputPostConversionActions => new[]
+        {
+            InputPostConversionAction.None,
+            InputPostConversionAction.MoveInArchiveFolder,
+            InputPostConversionAction.Delete,
+        };
+
+        public VideoEncodingSpeed[] VideoEncodingSpeeds => new[]
+        {
+            VideoEncodingSpeed.UltraFast,
+            VideoEncodingSpeed.SuperFast,
+            VideoEncodingSpeed.VeryFast,
+            VideoEncodingSpeed.Faster,
+            VideoEncodingSpeed.Fast,
+            VideoEncodingSpeed.Medium,
+            VideoEncodingSpeed.Slow,
+            VideoEncodingSpeed.Slower,
+            VideoEncodingSpeed.VerySlow,
+        };
+
         public string AboutSectionContent
         {
             get
-            {
-                return "**This program is free software**.\n You can redistribute it and/or modify it under the terms of the GNU General Public License.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.\n\n" + this.releaseNoteContent;
+            { 
+                string content = Properties.Resources.LicenceHeader1 + "\n";
+                content += Properties.Resources.LicenceHeader2 + "\n\n";
+                content += Properties.Resources.LicenceHeader3 + "\n\n";
+                content += this.releaseNoteContent;
+                return content;
             }
 
             set
@@ -190,7 +221,7 @@ private set
                 this.OnPropertyChanged();
             }
         }
-
+        
         [NotifyPropertyChangedInvocator]
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
@@ -200,9 +231,9 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
         private void DownloadChangeLogAction()
         {
 #pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            Helpers.GetChangeLogAsync(new UpgradeVersionDescription(), this.OnChangeLogRetrieved);
+            Upgrade.Helpers.GetChangeLogAsync(new UpgradeVersionDescription(), this.OnChangeLogRetrieved);
 #pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            this.AboutSectionContent = "###Downloading change log ...";
+            this.AboutSectionContent = Properties.Resources.DownloadingChangeLog;
             this.DisplaySeeChangeLogLink = false;
         }
 
@@ -215,7 +246,7 @@ private void SelectedPresetPropertyChanged(object sender, PropertyChangedEventAr
         {
             if (e.PropertyName == "OutputType")
             {
-                this.OnPropertyChanged("InputCategories");
+                this.OnPropertyChanged(nameof(this.InputCategories));
             }
         }
 
@@ -316,12 +347,12 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
         private void AddPresetButton_Click(object sender, RoutedEventArgs e)
         {
             Application application = Application.Current as Application;
-            string presetName = "New preset";
+            string presetName = Properties.Resources.DefaultPresetName;
             int index = 1;
             while (application.Settings.ConversionPresets.Any(match => match.Name == presetName))
             {
                 index++;
-                presetName = string.Format("New preset ({0})", index);
+                presetName = $"{Properties.Resources.DefaultPresetName} ({index})";
             }
 
             ConversionPreset newPreset = null;
@@ -419,7 +450,7 @@ private void InitializeCompatibleInputExtensions()
             for (int index = 0; index < compatibleInputExtensions.Length; index++)
             {
                 string compatibleInputExtension = compatibleInputExtensions[index];
-                string extensionCategory = PathHelpers.GetExtensionCategory(compatibleInputExtension);
+                string extensionCategory = Helpers.GetExtensionCategory(compatibleInputExtension);
                 InputExtensionCategory category = categories.Find(match => match.Name == extensionCategory);
                 if (category == null)
                 {
@@ -431,7 +462,7 @@ private void InitializeCompatibleInputExtensions()
             }
 
             this.inputCategories = categories.ToArray();
-            this.OnPropertyChanged("InputCategories");
+            this.OnPropertyChanged(nameof(this.InputCategories));
         }
     }
 }
diff --git a/Application/FileConverter/Windows/UpgradeWindow.xaml b/Application/FileConverter/Windows/UpgradeWindow.xaml
index e3985847..44450558 100644
--- a/Application/FileConverter/Windows/UpgradeWindow.xaml
+++ b/Application/FileConverter/Windows/UpgradeWindow.xaml
@@ -3,12 +3,9 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:FileConverter.Windows"
-        xmlns:fileConverter="clr-namespace:FileConverter"
-        xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
-        xmlns:xaml="clr-namespace:Markdown.Xaml;assembly=Markdown.Xaml"
+        xmlns:project="clr-namespace:FileConverter.Properties"
         mc:Ignorable="d"
-        Title="File Converter Updates"
+        Title="{x:Static project:Resources.UpgradeWindowTitle}"
         WindowStartupLocation="CenterScreen" Icon="/FileConverter;component/Resources/ApplicationIcon.ico"
         MinHeight="300" MinWidth="450"
         Height="450" Width="450" WindowStyle="ToolWindow">
@@ -19,21 +16,19 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
-            <!--<RowDefinition Height="{Binding Height, ElementName=ApplicationSettingsPanel, Mode=OneWay}"/>-->
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <TextBlock Margin="5"
-            Text="An update for File Converter is available. It is strongly recommended that you install it as soon as possible!" TextWrapping="Wrap"/>
-
-        <!--<Label Grid.Row="1" Margin="5" 
-               Content="{Binding VersionDescription.LatestVersion, Converter={StaticResource ApplicationVersionToApplicationName}, ElementName=window}" FontWeight="Bold" FontSize="14.667"/>-->
+            Text="{x:Static project:Resources.UpgradeAvailable}" TextWrapping="Wrap"/>
 
         <FlowDocumentScrollViewer Grid.Row="2" Margin="5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  
                                   Document="{Binding ReleaseNote, Converter={StaticResource TextToFlowDocumentConverter}, ElementName=window}"/>
 
-        <Button Background="WhiteSmoke" Grid.Row="3" Padding="10,5,10,5" Margin="5" HorizontalContentAlignment="Left" Click="OnInstallButtonClick" >
+        <!-- Download button -->
+        <Button Background="WhiteSmoke" Grid.Row="3" Padding="10,5,10,5" Margin="5" HorizontalContentAlignment="Left" Command="{Binding DownloadInstallerCommand, ElementName=window}" 
+                Visibility="{Binding VersionDescription.InstallerDownloadNotStarted, Converter={StaticResource BoolToVisibility}, ConverterParameter=Collapsed, ElementName=window}">
             <Button.Content>
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -46,8 +41,49 @@
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Label Grid.Row="0" Content="Install when I exit File Converter" FontSize="14.667"/>
-                        <TextBlock Grid.Row="1" Text="The update will be downloaded in background, and installed once you exit File Converter." TextWrapping="Wrap" FontSize="10.667"/>
+                        <Label Grid.Row="0" Content="{x:Static project:Resources.DownloadAndInstallButtonTitle}" FontSize="14.667"/>
+                        <TextBlock Grid.Row="1" Text="{x:Static project:Resources.DownloadAndInstallButtonDescription}" TextWrapping="Wrap" FontSize="10.667"/>
+                    </Grid>
+                </Grid>
+            </Button.Content>
+        </Button>
+
+        <!-- Download in progress -->
+        <Grid Grid.Row="3" Margin="5" 
+              Visibility="{Binding VersionDescription.InstallerDownloadInProgress, Converter={StaticResource BoolToVisibility}, ConverterParameter=Collapsed, ElementName=window}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="64"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Image Source="/FileConverter;component/Resources/DownloadIcon.png" Stretch="Fill"/>
+            <Grid Grid.Column="1" Margin="10,0,0,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                <Label Grid.Row="0" Content="{x:Static project:Resources.UpgradeDownloadInProgress}" FontSize="14.667"/>
+                <ProgressBar Grid.Row="1" Margin="5" Height="30" Foreground="#004B82" Minimum="0" Maximum="100"
+                     Value="{Binding VersionDescription.InstallerDownloadProgress, ElementName=window}"/>
+            </Grid>
+        </Grid>
+
+        <!-- Install button -->
+        <Button Background="WhiteSmoke" Grid.Row="3" Padding="10,5,10,5" Margin="5" HorizontalContentAlignment="Left" Command="{Binding LaunchInstallerCommand, ElementName=window}" 
+                Visibility="{Binding VersionDescription.InstallerDownloadDone, Converter={StaticResource BoolToVisibility}, ConverterParameter=Collapsed, ElementName=window}">
+            <Button.Content>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="64"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Image Source="/FileConverter;component/Resources/ApplicationIcon.png" Stretch="Fill"/>
+                    <Grid Grid.Column="1" Margin="10,0,0,0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <Label Grid.Row="0" Content="{x:Static project:Resources.InstallButtonTitle}" FontSize="14.667"/>
+                        <TextBlock Grid.Row="1" Text="{x:Static project:Resources.InstallButtonDescription}" TextWrapping="Wrap" FontSize="10.667"/>
                     </Grid>
                 </Grid>
             </Button.Content>
diff --git a/Application/FileConverter/Windows/UpgradeWindow.xaml.cs b/Application/FileConverter/Windows/UpgradeWindow.xaml.cs
index abf7eec8..6cd43ea1 100644
--- a/Application/FileConverter/Windows/UpgradeWindow.xaml.cs
+++ b/Application/FileConverter/Windows/UpgradeWindow.xaml.cs
@@ -2,12 +2,15 @@
 
 namespace FileConverter.Windows
 {
+    using System;
+    using System.Windows.Input;
     using System.ComponentModel;
     using System.Runtime.CompilerServices;
     using System.Threading.Tasks;
     using System.Windows;
 
     using FileConverter.Annotations;
+    using FileConverter.Commands;
     using FileConverter.Upgrade;
     
     public partial class UpgradeWindow : Window, INotifyPropertyChanged
@@ -15,6 +18,9 @@ public partial class UpgradeWindow : Window, INotifyPropertyChanged
         private UpgradeVersionDescription upgradeVersionDescription;
         private string releaseNoteContent;
 
+        private DelegateCommand downloadInstallerCommand;
+        private DelegateCommand launchInstallerCommand;
+
         public UpgradeWindow()
         {
             this.InitializeComponent();
@@ -22,6 +28,32 @@ public UpgradeWindow()
 
         public event PropertyChangedEventHandler PropertyChanged;
 
+        public ICommand DownloadInstallerCommand
+        {
+            get
+            {
+                if (this.downloadInstallerCommand == null)
+                {
+                    this.downloadInstallerCommand = new DelegateCommand(this.ExecuteDownloadInstallerCommand);
+                }
+
+                return this.downloadInstallerCommand;
+            }
+        }
+
+        public ICommand LaunchInstallerCommand
+        {
+            get
+            {
+                if (this.launchInstallerCommand == null)
+                {
+                    this.launchInstallerCommand = new DelegateCommand(this.ExecuteLaunchInstallerCommand);
+                }
+
+                return this.launchInstallerCommand;
+            }
+        }
+        
         public UpgradeVersionDescription VersionDescription
         {
             get
@@ -38,14 +70,14 @@ public UpgradeVersionDescription VersionDescription
                 this.OnPropertyChanged();
             }
         }
-
+        
         public string ReleaseNote
         {
             get
             {
                 if (string.IsNullOrEmpty(this.releaseNoteContent))
                 {
-                    return "###Downloading change log ...";
+                    return Properties.Resources.DownloadingChangeLog;
                 }
 
                 return this.releaseNoteContent;
@@ -58,7 +90,7 @@ public string ReleaseNote
                 this.OnPropertyChanged();
             }
         }
-
+        
         [NotifyPropertyChangedInvocator]
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
@@ -70,10 +102,15 @@ private void OnChangeLogRetrieved(UpgradeVersionDescription versionDescription)
             this.ReleaseNote = versionDescription.ChangeLog;
         }
 
-        private void OnInstallButtonClick(object sender, RoutedEventArgs e)
+        private void ExecuteDownloadInstallerCommand()
         {
             this.upgradeVersionDescription.NeedToUpgrade = true;
             Helpers.DownloadInstallerAsync(this.upgradeVersionDescription);
+            this.Hide();
+        }
+
+        private void ExecuteLaunchInstallerCommand()
+        {
             this.Close();
         }
     }
diff --git a/Application/FileConverter/packages.config b/Application/FileConverter/packages.config
index a3bcfb39..09cd3f92 100644
--- a/Application/FileConverter/packages.config
+++ b/Application/FileConverter/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Magick.NET-Q16-AnyCPU" version="7.0.0.0101" targetFramework="net45" />
+  <package id="Magick.NET-Q16-AnyCPU" version="7.0.2.900" targetFramework="net45" />
+  <package id="WpfAnimatedGif" version="1.4.14" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aff04354..34ae3bae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Change Log
 
+## Version 1.1
+- New: Localization system. File Converter can now be translated in multiple languages. The default language is the same than your OS language (if available).
+- New: Add the possibility to choose the application language in the application settings.
+- New: Add french localization.
+- New: Possibility to convert a Pdf file into image files (one image per page).
+- New: Possibility to convert an image into a Pdf file.
+- New: Possibility to encode videos using theora video codec and Ogg vorbis audio codec in a ogv container.
+- New: Possibility to change the number of channels of an audio file (stereo -> mono, 5.1 -> stereo, ...).
+- New: Improve the application upgrade UI. If you quit the application during the upgrade downloading, you will now see the download progress.
+- New: File converter is now available for Windows 32 bits systems (download the x86 installer).
+- New: Add an application option to choose the maximum number of simultaneous conversions.
+- Change: Improve the application help start page (when you launch File Converter directly from the executable) with an animated picture.
+- Change: Improve the output type dropdown visualization (splitting it by categories).
+- Fixed: Issue where it was impossible to rotate an image for the output types: jpg and png.
+
 ## Version 1.0
 - New: File Converter is now certified by Microsoft Authenticode. 
 - New: Add an about section that contains information on the software development (change log, documentation link, report issue link).
diff --git a/FileConverter.sln b/FileConverter.sln
index edd6990c..e4e5d6e9 100644
--- a/FileConverter.sln
+++ b/FileConverter.sln
@@ -11,44 +11,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileConverterExtension", "A
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.Build.0 = Debug|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.Build.0 = Debug|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.ActiveCfg = Release|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.Build.0 = Release|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.ActiveCfg = Release|Any CPU
-		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.Build.0 = Release|Any CPU
-		{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.ActiveCfg = Debug|x64
+		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.Build.0 = Debug|x64
+		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.ActiveCfg = Debug|x86
+		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.Build.0 = Debug|x86
+		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.ActiveCfg = Release|x64
+		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.Build.0 = Release|x64
+		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.ActiveCfg = Release|x86
+		{D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.Build.0 = Release|x86
 		{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x64.ActiveCfg = Debug|x64
 		{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x64.Build.0 = Debug|x64
 		{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x86.ActiveCfg = Debug|x86
 		{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x86.Build.0 = Debug|x86
-		{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|Any CPU.ActiveCfg = Release|x86
 		{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x64.ActiveCfg = Release|x64
 		{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x64.Build.0 = Release|x64
 		{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x86.ActiveCfg = Release|x86
 		{F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x86.Build.0 = Release|x86
-		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x86.Build.0 = Debug|Any CPU
-		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x64.ActiveCfg = Release|Any CPU
 		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x64.Build.0 = Release|Any CPU
 		{0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x86.ActiveCfg = Release|Any CPU
diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
index adcf2fa9..afd10f2d 100644
--- a/Installer/Installer.wixproj
+++ b/Installer/Installer.wixproj
@@ -30,6 +30,7 @@
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Languages.wxs" />
     <Compile Include="Product.wxs" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +40,14 @@
     </WixExtension>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Application\FileConverterExtension\FileConverterExtension.csproj">
+      <Name>FileConverterExtension</Name>
+      <Project>{0c44ca69-42d6-4357-bdfd-83069d1aba2f}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\Application\FileConverter\FileConverter.csproj">
       <Name>FileConverter</Name>
       <Project>{d27a76d2-43e4-43cc-9da3-334b0b46f4e5}</Project>
@@ -52,10 +61,11 @@
     <Content Include="packages.config" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
-  
   <!-- congigure the project to sign the installer. Comment this line to produce an unsigned installer. -->
   <Import Project=".\Installer.sign" />
-  
+  <PropertyGroup>
+    <PreBuildEvent>"C:\Program Files (x86)\WiX Toolset v3.10\bin\heat.exe" dir "$(SolutionDir)Application\FileConverter\$(OutDir)Languages" -gg -template fragment -cg "Languages" -dr "INSTALLFOLDER" -var "var.FileConverter.TargetDir" -out "$(ProjectDir)Languages.wxs"</PreBuildEvent>
+  </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.
diff --git a/Installer/Languages.wxs b/Installer/Languages.wxs
new file mode 100644
index 00000000..e154616e
--- /dev/null
+++ b/Installer/Languages.wxs
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <DirectoryRef Id="INSTALLFOLDER">
+            <Directory Id="dir59665241F3CDDE1A2AC55595EAB82331" Name="Languages" />
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="Languages">
+            <Component Id="cmp416BC2ED150FADE2B6C889B2E30BEFF1" Directory="dir69039193B93E3CF7D8D647984CD644EA" Guid="{0CA9BF52-0792-493A-8758-B4A5B8958F71}">
+                <File Id="fil5460820E8FE9AB69A71E15E4E9BEB1E2" KeyPath="yes" Source="$(var.FileConverter.TargetDir)\en\FileConverter.resources.dll" />
+            </Component>
+            <Component Id="cmpF149529191A3B87AAB82B9301A2CAB8B" Directory="dir6DD71661C1CC5A2A0CCF37D75E6494F1" Guid="{8488EC70-06C5-4FD0-A8DA-F68481FEA431}">
+                <File Id="fil47BB5F07444A2330EB2978EA5E7A488E" KeyPath="yes" Source="$(var.FileConverter.TargetDir)\fr\FileConverter.resources.dll" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir59665241F3CDDE1A2AC55595EAB82331">
+            <Directory Id="dir69039193B93E3CF7D8D647984CD644EA" Name="en" />
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir59665241F3CDDE1A2AC55595EAB82331">
+            <Directory Id="dir6DD71661C1CC5A2A0CCF37D75E6494F1" Name="fr" />
+        </DirectoryRef>
+    </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/Installer/Product.wxs b/Installer/Product.wxs
index c6dbe204..9ffc5239 100644
--- a/Installer/Product.wxs
+++ b/Installer/Product.wxs
@@ -5,15 +5,19 @@
 <?define Win64 = "yes" ?>
 <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
 <?else ?>
-<?define ProductName = "File Converter" ?>
+<?define ProductName = "File Converter (32 bit)" ?>
 <?define Win64 = "no" ?>
 <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
 <?endif ?>
 
 <!-- Upgrade documentation: http://wixtoolset.org/documentation/manual/v3/howtos/updates/major_upgrade.html -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.0.0" Manufacturer="Adrien Allard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b">
-        <Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" />
+    <Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.1.0" Manufacturer="Adrien Allard" UpgradeCode="e3ca717b-a897-418a-bbef-5c7e35c76e4b">
+        <?if $(var.Platform) = x64 ?>
+            <Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" />        
+        <?else ?>
+            <Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />        
+        <?endif ?>
         
         <Icon Id="icon.ico" SourceFile="..\Resources\ApplicationIcon.ico"/>
         <Property Id="ARPPRODUCTICON" Value="icon.ico" />
@@ -24,7 +28,8 @@
         <Media Id="1" Cabinet="CabFile.cab" EmbedCab="yes" />
 
         <Feature Id="Application" Title="Installer" Level="1">
-            <ComponentGroupRef Id="ProductComponents" /> 
+            <ComponentGroupRef Id="ProductComponents" />
+            <ComponentGroupRef Id="Languages" />
         </Feature>
         
         <CustomAction Id="InstallShell" FileKey="srm.exe" ExeCommand='install "[INSTALLFOLDER]\FileConverterExtension.dll" -codebase' Execute="deferred" Return="check" Impersonate="no" />
@@ -78,13 +83,16 @@
                 </File>
                 <RemoveFolder Id='RemoveStartMenuDir' Directory='ApplicationStartMenuShortcut' On='uninstall' />
             </Component>
+            <Component Guid="{1B14FF2D-C82D-4425-A447-DED14CCBEA5C}" Win64="$(var.Win64)">
+                <File Id="FileConverter.exe.config" Source="$(var.FileConverter.TargetDir)FileConverter.exe.config" KeyPath="yes" Checksum="yes" />
+            </Component>
             
             <!-- Extension -->
             <Component Guid="{AA5EA6F7-C443-488B-8E48-7CF000B9AD2A}" Win64="$(var.Win64)">
-                <File Id="FileConverterExtension.dll" KeyPath="yes" Source="..\Application\FileConverterExtension\bin\$(var.Configuration)\FileConverterExtension.dll" Checksum="yes" />
+                <File Id="FileConverterExtension.dll" Source="$(var.FileConverterExtension.TargetDir)FileConverterExtension.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Guid="{9BF0AC45-A586-41C9-BA93-6048B46DA65F}" Win64="$(var.Win64)">
-                <File Id="SharpShell.dll" KeyPath="yes" Source="..\packages\SharpShell.2.2.0.0\lib\net40\SharpShell.dll" Checksum="yes"/>
+                <File Id="SharpShell.dll" Source="$(var.FileConverterExtension.TargetDir)SharpShell.dll" KeyPath="yes" Checksum="yes"/>
             </Component>
             <Component Guid="{EC580BEF-F962-42BD-B46D-4E4C126F2641}" Win64="$(var.Win64)">
                 <File Id="srm.exe" Source="..\packages\SharpShellTools.2.2.0.0\lib\srm.exe" KeyPath="yes" Checksum="yes"/>
@@ -92,24 +100,33 @@
             
             <!-- Third parties -->
             <Component Guid="{1790B82E-86BC-4B95-AA1D-9859FF3B6CA4}" Win64="$(var.Win64)">
-                <File Source="..\Middleware\ffmpeg.exe" KeyPath="yes" Checksum="yes" />
+                <File Source="$(var.FileConverter.TargetDir)ffmpeg.exe" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Guid="{C59B7F72-D8D6-47A3-B1D9-515CBC9FCE6F}" Win64="$(var.Win64)">
-                <File Id="Magick.NET.dll" KeyPath="yes" Source="..\Application\FileConverter\bin\$(var.Configuration)\Magick.NET-Q16-AnyCPU.dll" Checksum="yes"/>
+                <File Id="Magick.NET.dll" Source="$(var.FileConverter.TargetDir)Magick.NET-Q16-AnyCPU.dll" KeyPath="yes" Checksum="yes"/>
+            </Component>
+            <Component Guid="{C28EDCA8-AE86-4672-8B14-6686AC35F5E6}" Win64="$(var.Win64)">
+                <File Id="gsdll64.dll" Source="$(var.FileConverter.TargetDir)gsdll32.dll" KeyPath="yes" Checksum="yes"/>
+            </Component>
+            <Component Guid="{6AC1B233-477A-42CF-8F6F-87CA22295BE0}" Win64="$(var.Win64)">
+                <File Id="gswin64c.exe" Source="$(var.FileConverter.TargetDir)gswin32c.exe" KeyPath="yes" Checksum="yes"/>
             </Component>
             <Component Guid="{E1B1C09C-B089-40D8-859B-0E55F640CAE1}" Win64="$(var.Win64)">
-                <File Id="Markdown.Xaml.dll" KeyPath="yes" Source="..\Middleware\Markdown.Xaml.dll" Checksum="yes"/>
+                <File Id="Markdown.Xaml.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)Markdown.Xaml.dll" Checksum="yes"/>
             </Component>
             <Component Guid="{55CD0B47-D5B0-4F0C-A54E-3E11DF345B48}" Win64="$(var.Win64)">
-                <File Id="Ripper.dll" KeyPath="yes" Source="..\Middleware\Ripper.dll" Checksum="yes"/>
+                <File Id="Ripper.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)Ripper.dll" Checksum="yes"/>
             </Component>
             <Component Guid="{3CE6CF1B-431C-41FD-8381-3F73EDAF7B8A}" Win64="$(var.Win64)">
-                <File Id="yeti.mmedia.dll" KeyPath="yes" Source="..\Middleware\yeti.mmedia.dll" Checksum="yes"/>
+                <File Id="yeti.mmedia.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)yeti.mmedia.dll" Checksum="yes"/>
+            </Component>
+            <Component Guid="{0FC2EE41-35DB-49B1-8FD6-77E57254A6A5}" Win64="$(var.Win64)">
+                <File Id="WpfAnimatedGif.dll" KeyPath="yes" Source="$(var.FileConverter.TargetDir)WpfAnimatedGif.dll" Checksum="yes"/>
             </Component>
             
             <!-- Configuration and documentation -->
             <Component Guid="{86AEF5B3-C25B-4662-BAEF-20969D1821A5}" Win64="$(var.Win64)">
-                <File Source="..\Application\FileConverter\Settings.default.xml" KeyPath="yes" />
+                <File Source="$(var.FileConverter.ProjectDir)\Settings.default.xml" KeyPath="yes" />
             </Component>
             <Component Guid="{A5158756-A107-4010-9E2F-3C0333F5A5F6}" Win64="$(var.Win64)">
                 <File Source="..\README.md" KeyPath="yes" />
@@ -125,7 +142,7 @@
             <Component Id="RegistryEntries" Guid="{C3EF3D67-0206-4DBD-B2EA-78FF2E290093}">
                 <RegistryKey Root="HKCU" Key="Software\FileConverter" ForceDeleteOnUninstall="yes">
                     <RegistryValue Name="Path" Type="string" Value="[INSTALLFOLDER]FileConverter.exe"/>
-                    <RegistryValue Name="CompatibleInputExtensions" Type="string" Value="3gp;aac;aiff;ape;avi;bik;bmp;cda;exr;flac;flv;gif;ico;jpg;jpeg;m4a;m4v;mkv;mov;mp3;mp4;mpeg;oga;ogg;ogv;png;psd;svg;tga;tiff;vob;wav;webm;wma;wmv"/>
+                    <RegistryValue Name="CompatibleInputExtensions" Type="string" Value="3gp;aac;aiff;ape;avi;bik;bmp;cda;exr;flac;flv;gif;ico;jpg;jpeg;m4a;m4v;mkv;mov;mp3;mp4;mpeg;oga;ogg;ogv;pdf;png;psd;svg;tga;tiff;vob;wav;webm;wma;wmv"/>
                 </RegistryKey>
             </Component>
         </ComponentGroup>
diff --git a/Middleware/ffmpeg.exe b/Middleware/ffmpeg/x64/ffmpeg.exe
similarity index 78%
rename from Middleware/ffmpeg.exe
rename to Middleware/ffmpeg/x64/ffmpeg.exe
index 51e121b5..b1b90b2c 100644
Binary files a/Middleware/ffmpeg.exe and b/Middleware/ffmpeg/x64/ffmpeg.exe differ
diff --git a/Middleware/ffmpeg/x86/ffmpeg.exe b/Middleware/ffmpeg/x86/ffmpeg.exe
new file mode 100644
index 00000000..b556064b
Binary files /dev/null and b/Middleware/ffmpeg/x86/ffmpeg.exe differ
diff --git a/Middleware/gs/x86/gsdll32.dll b/Middleware/gs/x86/gsdll32.dll
new file mode 100644
index 00000000..486ebc09
Binary files /dev/null and b/Middleware/gs/x86/gsdll32.dll differ
diff --git a/Middleware/gs/x86/gswin32c.exe b/Middleware/gs/x86/gswin32c.exe
new file mode 100644
index 00000000..7f0b08d2
Binary files /dev/null and b/Middleware/gs/x86/gswin32c.exe differ
diff --git a/README.md b/README.md
index 17b2919a..dbcc90c8 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,9 @@ Thanks to ffmpeg devs for this awesome open source file conversion tool. [Web si
 Thanks to image magick devs for this awesome open source image edition software suite.  [Web site link](http://imagemagick.net/)
 And thanks to dlemstra for the C# wrapper of this software. [CodePlex link](https://magick.codeplex.com/)
 
+**Ghostscript** as pdf edition software.
+Thanks to ghostscript devs. [Download link](http://www.ghostscript.com/download/gsdnld.html)
+
 **SharpShell** to easily create windows context menu extensions.
 Thanks to Dave Kerr for his work on SharpShell. [CodePlex link](https://sharpshell.codeplex.com/)
 
@@ -27,7 +30,10 @@ Thanks to Dave Kerr for his work on SharpShell. [CodePlex link](https://sharpshe
 Thanks to Idael Cardoso for his work on CD Audio ripper. [Code project link](http://www.codeproject.com/Articles/5458/C-Sharp-Ripper)
 
 **Markdown.XAML** for markdown rendering in the wpf application.
-Thanks to Bevan Arps for his work on Markdown.XAML. [GitHub link](https://github.com/theunrepentantgeek/Markdown.XAML)
+Thanks to Bevan Arps for his work on Markdown.XAML. [GitHub link](http://github.com/theunrepentantgeek/Markdown.XAML)
+
+**WpfAnimatedGif** for animated gif rendering in the wpf application.
+Thanks to Thomas Levesque for his work on WpfAnimatedGif. [GitHub link](http://github.com/XamlAnimatedGif/WpfAnimatedGif)
 
 ## License
 
diff --git a/version (x86).xml b/version (x86).xml
new file mode 100644
index 00000000..afab0953
--- /dev/null
+++ b/version (x86).xml	
@@ -0,0 +1,4 @@
+<Version>
+    <Latest Major="1" Minor="0" Patch="0"/>
+    <URL>http://github.com/Tichau/FileConverter/releases/download/v1.0/FileConverter-1.0-x86-setup.msi</URL>
+</Version>
\ No newline at end of file