From efba37a270714e52dea41bd629595f38dc9f8707 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 17:56:27 +0100
Subject: [PATCH 01/24] Teach 'Open Folder' button in Syncthing GUI to handle
 both 0.10 and 0.11

Fixes #65
---
 src/SyncTrayzor/Pages/ViewerViewModel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/Pages/ViewerViewModel.cs b/src/SyncTrayzor/Pages/ViewerViewModel.cs
index 39e49711..bb9c14e2 100644
--- a/src/SyncTrayzor/Pages/ViewerViewModel.cs
+++ b/src/SyncTrayzor/Pages/ViewerViewModel.cs
@@ -112,8 +112,9 @@ private void InitializeBrowser(ChromiumWebBrowser webBrowser)
             {
                 if (e.IsMainFrame && e.Url != "about:blank")
                 {
+                    // In 0.11, it changed from 'folder.ID' to 'folder.id'
                     var script = @"$('#folders .panel-footer .pull-right').prepend(" +
-                    @"'<button class=""btn btn-sm btn-default"" onclick=""callbackObject.openFolder(angular.element(this).scope().folder.ID)"">" +
+                    @"'<button class=""btn btn-sm btn-default"" onclick=""callbackObject.openFolder(angular.element(this).scope().folder.id || angular.element(this).folder.ID)"">" +
                     @"<span class=""glyphicon glyphicon-folder-open""></span>" +
                     @"<span style=""margin-left: 12px"">" +
                     Localizer.Translate("ViewerView_OpenFolder") +

From 3e05b88e379f16d04bcb464bbc8cc5ee145ab78f Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 18:01:05 +0100
Subject: [PATCH 02/24] Bump portable Syncthing version to 0.11

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 763838a3..d066bada 100644
--- a/Rakefile
+++ b/Rakefile
@@ -19,7 +19,7 @@ PORTABLE_DIR = 'portable'
 
 PFX = ENV['PFX'] || File.join(INSTALLER_DIR, 'SyncTrayzorCA.pfx')
 
-PORTABLE_SYNCTHING_VERSION = '0.10'
+PORTABLE_SYNCTHING_VERSION = '0.11'
 
 class ArchDirConfig
   attr_reader :arch

From a31ac59462dd965a8a311f4bd634b673cb58f48d Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 21:10:56 +0100
Subject: [PATCH 03/24] Scroll Console to end when size changed

Fixes #67
---
 src/SyncTrayzor/Xaml/ScrollToEndBehaviour.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/SyncTrayzor/Xaml/ScrollToEndBehaviour.cs b/src/SyncTrayzor/Xaml/ScrollToEndBehaviour.cs
index 202ff314..4fc09071 100644
--- a/src/SyncTrayzor/Xaml/ScrollToEndBehaviour.cs
+++ b/src/SyncTrayzor/Xaml/ScrollToEndBehaviour.cs
@@ -13,17 +13,19 @@ public class ScrollToEndBehaviour : DetachingBehaviour<TextBox>
     {
         protected override void AttachHandlers()
         {
-            this.AssociatedObject.TextChanged += TextChanged;
+            this.AssociatedObject.TextChanged += this.SomethingChanged;
+            this.AssociatedObject.SizeChanged += this.SomethingChanged;
 
             this.AssociatedObject.ScrollToEnd();
         }
 
         protected override void DetachHandlers()
         {
-            this.AssociatedObject.TextChanged -= TextChanged;
+            this.AssociatedObject.TextChanged -= this.SomethingChanged;
+            this.AssociatedObject.SizeChanged -= this.SomethingChanged;
         }
 
-        private void TextChanged(object sender, TextChangedEventArgs e)
+        private void SomethingChanged(object sender, EventArgs e)
         {
             this.AssociatedObject.ScrollToEnd();
         }

From 1e62423ead9147216e80e007d29a83b93606f530 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Tue, 28 Apr 2015 21:02:17 +0200
Subject: [PATCH 04/24] Fix NuGet <> referenced assembly version mismatch for
 package "Stylet"

---
 src/SyncTrayzor/SyncTrayzor.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index f83b72d4..869fea0f 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -94,9 +94,9 @@
     <Reference Include="Refit">
       <HintPath>..\packages\refit.2.2.0\lib\Net45\Refit.dll</HintPath>
     </Reference>
-    <Reference Include="Stylet, Version=1.1.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Stylet, Version=1.1.5.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Stylet.1.1.4\lib\net45\Stylet.dll</HintPath>
+      <HintPath>..\packages\Stylet.1.1.5\lib\net45\Stylet.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

From 60f7729d6cdf9285573a0f168e5d25592f42f135 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Tue, 28 Apr 2015 21:03:46 +0200
Subject: [PATCH 05/24] Fix a crash when renaming a file in a folder with path
 length > ~255 characters Fixes canton7/SyncTrayzor#72

---
 src/SyncTrayzor/Services/DirectoryWatcher.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/SyncTrayzor/Services/DirectoryWatcher.cs b/src/SyncTrayzor/Services/DirectoryWatcher.cs
index ee75fe74..1135ca24 100644
--- a/src/SyncTrayzor/Services/DirectoryWatcher.cs
+++ b/src/SyncTrayzor/Services/DirectoryWatcher.cs
@@ -95,7 +95,7 @@ private FileSystemWatcher TryToCreateWatcher(string directory)
                 watcher.Changed += OnChanged;
                 watcher.Created += OnChanged;
                 watcher.Deleted += OnChanged;
-                watcher.Renamed += OnRenamed;
+                watcher.Renamed += OnChanged;
 
                 watcher.EnableRaisingEvents = true;
 
@@ -115,12 +115,6 @@ private void OnChanged(object source, FileSystemEventArgs e)
             this.PathChanged(e.FullPath);
         }
 
-        private void OnRenamed(object source, RenamedEventArgs e)
-        {
-            this.PathChanged(e.FullPath);
-            this.PathChanged(e.OldFullPath);
-        }
-
         private void PathChanged(string path)
         {
             if (!path.StartsWith(this.directory))

From 6915e58f2c60f070cc2146715593e8a6e1962509 Mon Sep 17 00:00:00 2001
From: dartraiden <wowemuh@gmail.com>
Date: Tue, 28 Apr 2015 20:38:27 +0100
Subject: [PATCH 06/24] Fix typos

---
 CHANGELOG.txt                                             | 8 ++++----
 README.md                                                 | 4 ++--
 server/version_check.php                                  | 6 +++---
 src/SyncTrayzor/Pages/ThirdPartyComponentsViewModel.cs    | 2 +-
 src/SyncTrayzor/Properties/Strings/Resources.resx         | 2 +-
 .../Services/UpdateManagement/UpdateDownloader.cs         | 2 +-
 src/SyncTrayzor/SyncThing/SyncThingManager.cs             | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f2323521..9ae90f4d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -46,7 +46,7 @@ v1.0.12
  - Add option to hide the console (#41)
  - Obfuscate Device IDs in log files, as well as in the console
  - Logging will take less space if Syncthing is spamming messages (#42)
- - Updated translations (all langauges)
+ - Updated translations (all languages)
  - New translations:
    - Czech (thanks Václav Obrtlík)
    - Greek (thanks alexxtasi and Wasilis Mandratzis-Walz)
@@ -84,8 +84,8 @@ v1.0.9
  - Fix bug with directory watcher and paths containing a tilde (~)
  - Fix resolution issue with taskbar icon
  - Add 'device connected/disconnected' tray icon balloon messages
- - Add Dutch transation (thanks Heimen Stoffels!)
- - Small redution in memory usage
+ - Add Dutch translation (thanks Heimen Stoffels!)
+ - Small reduction in memory usage
  - Add menu item to restart Syncthing
 
 v1.0.8
@@ -156,7 +156,7 @@ v1.0.1
 ------
 
  - Add support for new ItemFinished event
- - Handle lots of log messages in quick successino
+ - Handle lots of log messages in quick succession
 
 v1.0.0
 ------
diff --git a/README.md b/README.md
index bf3d4cf8..979ea9e7 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Features include:
 Installation
 ------------
 
-SyncTrayzor is packged as both an installer and a standalone zip.
+SyncTrayzor is packaged as both an installer and a standalone zip.
 
 ### Installer
 
@@ -46,7 +46,7 @@ Something went wrong!
 
 First, what went wrong? Remember that SyncTrayzor is a wrapper around [Syncthing](http://github.com/syncthing/syncthing).
 Syncthing is the file synchronization program, which has a web interface.
-SyncTrayzor is the tray utilty, looks like a normal Windows program, and has menus and suchlike, and a big area where Syncthing's web interface is displayed.
+SyncTrayzor is the tray utility, looks like a normal Windows program, and has menus and suchlike, and a big area where Syncthing's web interface is displayed.
 
  - If you're having problems connection to other devices, your files aren't synchronizing, or you're getting error messages in the console area, [raise an issue with Syncthing](http://github.com/syncthing/syncthing) or [post on the Syncthing forums](http://discourse.syncthing.net).
  - If SyncTrayzor isn't talking to Syncthing, you're getting error dialogs, it's not auto-starting, etc, [raise an issue with SyncTrayzor](http://github.com/canton7/SyncTrayzor).
diff --git a/server/version_check.php b/server/version_check.php
index 73da4fdf..923a16d5 100644
--- a/server/version_check.php
+++ b/server/version_check.php
@@ -5,11 +5,11 @@
  * 
  * Clients request this with their current version, arch, and variant (portable, etc)
  * and this gives them a version to upgrade to (if any), along with the method of
- * ugprading to it (manual navigation to github release page, automatic silent upgrade,
+ * upgrading to it (manual navigation to Github release page, automatic silent upgrade,
  * etc). 
  * 
  * $versions is a record of all of the current releases, which we might want to upgrade
- * people to. It has the struture:
+ * people to. It has the structure:
  * [
  *    version => [
  *       variant => [
@@ -41,7 +41,7 @@
  * ]
  *
  * old_version: version being upgraded from
- * new_version: version to upgrade ot
+ * new_version: version to upgrade to
  * formatter_version: formatter version to use (in $response_formatters)
  * overrides: optional overrides, used by the formatter
  */
diff --git a/src/SyncTrayzor/Pages/ThirdPartyComponentsViewModel.cs b/src/SyncTrayzor/Pages/ThirdPartyComponentsViewModel.cs
index 93d97d02..4f93f7e0 100644
--- a/src/SyncTrayzor/Pages/ThirdPartyComponentsViewModel.cs
+++ b/src/SyncTrayzor/Pages/ThirdPartyComponentsViewModel.cs
@@ -100,7 +100,7 @@ public ThirdPartyComponentsViewModel(IProcessStartProvider processStartProvider)
                     Description = "Injects INotifyPropertyChanged code into properties at compile time",
                     Homepage = "https://github.com/Fody/PropertyChanged",
                     License = "MIT",
-                    Notes = "Not distributed with SyncTrayzor, but provides aweomse compile-time features",
+                    Notes = "Not distributed with SyncTrayzor, but provides awesome compile-time features",
                     LicenseText = this.LoadLicense("Fody.txt")
                 },
             });
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.resx b/src/SyncTrayzor/Properties/Strings/Resources.resx
index 29ead54e..f42cfcd6 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.resx
@@ -444,7 +444,7 @@ SyncTrayzor is going to have to close. Sorry about that</value>
   </data>
   <data name="UnhandledExceptionView_Title" xml:space="preserve">
     <value>Error!</value>
-    <comment>Title of the dialog shown when an unhandled excepotion occurs</comment>
+    <comment>Title of the dialog shown when an unhandled exception occurs</comment>
   </data>
   <data name="ViewerView_SyncthingStarting" xml:space="preserve">
     <value>Syncthing Starting...</value>
diff --git a/src/SyncTrayzor/Services/UpdateManagement/UpdateDownloader.cs b/src/SyncTrayzor/Services/UpdateManagement/UpdateDownloader.cs
index 706ee61a..13b004ee 100644
--- a/src/SyncTrayzor/Services/UpdateManagement/UpdateDownloader.cs
+++ b/src/SyncTrayzor/Services/UpdateManagement/UpdateDownloader.cs
@@ -20,7 +20,7 @@ public class UpdateDownloader : IUpdateDownloader
     {
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        private static readonly TimeSpan fileMaxAge = TimeSpan.FromDays(3); // Arbitary, but long
+        private static readonly TimeSpan fileMaxAge = TimeSpan.FromDays(3); // Arbitrary, but long
         private const string downloadFileName = "SyncTrayzorUpdate-{0}.exe";
 
         private readonly string downloadsDir;
diff --git a/src/SyncTrayzor/SyncThing/SyncThingManager.cs b/src/SyncTrayzor/SyncThing/SyncThingManager.cs
index 9506b1bd..8e627f96 100644
--- a/src/SyncTrayzor/SyncThing/SyncThingManager.cs
+++ b/src/SyncTrayzor/SyncThing/SyncThingManager.cs
@@ -69,7 +69,7 @@ public class SyncThingManager : ISyncThingManager
         private readonly ISyncThingEventWatcherFactory eventWatcherFactory;
         private readonly ISyncThingConnectionsWatcherFactory connectionsWatcherFactory;
 
-        // Ths lock covers the eventWatcher, connectionsWatcher, apiClients, and the CTS
+        // This lock covers the eventWatcher, connectionsWatcher, apiClients, and the CTS
         private readonly object apiClientsLock = new object();
         private ISyncThingEventWatcher eventWatcher;
         private ISyncThingConnectionsWatcher connectionsWatcher;
@@ -255,7 +255,7 @@ private void SetState(SyncThingState state)
                 // We really need a proper state machine here....
                 // There's a race if Syncthing can't start because the database is locked by another process on the same port
                 // In this case, we see the process as having failed, but the event watcher chimes in a split-second later with the 'Started' event.
-                // This runs the risk of transitioning us from Stopped -> Starting -> Stopepd -> Running, which is bad news for everyone
+                // This runs the risk of transitioning us from Stopped -> Starting -> Stopped -> Running, which is bad news for everyone
                 // So, get around this by enforcing strict state transitions.
                 if (this._state == SyncThingState.Stopped && state == SyncThingState.Running)
                     return;

From e7eb5a9d9df5026faf5e8a8ffb298c3c51a97d0d Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 30 Apr 2015 21:48:25 +0100
Subject: [PATCH 07/24] State that SyncTrayzor runs on Vista, 7, and 8

Fixes #75
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 979ea9e7..51194218 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Features include:
 Installation
 ------------
 
-SyncTrayzor is packaged as both an installer and a standalone zip.
+SyncTrayzor is packaged as both an installer and a standalone zip. It will run on Windows Vista, 7, and 8.
 
 ### Installer
 

From 0b1506d76443dc35a31fd7d9417d8450a466a60b Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 29 Apr 2015 08:36:39 +0100
Subject: [PATCH 08/24] Revert "Fix a crash when renaming a file in a folder
 with path length > ~255 characters"

This reverts commit 60f7729d6cdf9285573a0f168e5d25592f42f135.
---
 src/SyncTrayzor/Services/DirectoryWatcher.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/Services/DirectoryWatcher.cs b/src/SyncTrayzor/Services/DirectoryWatcher.cs
index 1135ca24..ee75fe74 100644
--- a/src/SyncTrayzor/Services/DirectoryWatcher.cs
+++ b/src/SyncTrayzor/Services/DirectoryWatcher.cs
@@ -95,7 +95,7 @@ private FileSystemWatcher TryToCreateWatcher(string directory)
                 watcher.Changed += OnChanged;
                 watcher.Created += OnChanged;
                 watcher.Deleted += OnChanged;
-                watcher.Renamed += OnChanged;
+                watcher.Renamed += OnRenamed;
 
                 watcher.EnableRaisingEvents = true;
 
@@ -115,6 +115,12 @@ private void OnChanged(object source, FileSystemEventArgs e)
             this.PathChanged(e.FullPath);
         }
 
+        private void OnRenamed(object source, RenamedEventArgs e)
+        {
+            this.PathChanged(e.FullPath);
+            this.PathChanged(e.OldFullPath);
+        }
+
         private void PathChanged(string path)
         {
             if (!path.StartsWith(this.directory))

From 16d9095bb93137b048a2bf07a5f61c5f55d2761f Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 30 Apr 2015 21:42:47 +0100
Subject: [PATCH 09/24] Handle long paths in DirectoryWatcher

Fix crash when a file is renamed in a directory longer
than the windows path length limit
---
 src/SyncTrayzor/Services/DirectoryWatcher.cs | 10 +++++++++-
 src/SyncTrayzor/SyncTrayzor.csproj           |  3 +++
 src/SyncTrayzor/packages.config              |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/Services/DirectoryWatcher.cs b/src/SyncTrayzor/Services/DirectoryWatcher.cs
index ee75fe74..0619f3a7 100644
--- a/src/SyncTrayzor/Services/DirectoryWatcher.cs
+++ b/src/SyncTrayzor/Services/DirectoryWatcher.cs
@@ -8,6 +8,8 @@
 using System.Threading.Tasks;
 using System.Timers;
 
+using Path = Pri.LongPath.Path;
+
 namespace SyncTrayzor.Services
 {
     public class DirectoryChangedEventArgs : EventArgs
@@ -118,7 +120,13 @@ private void OnChanged(object source, FileSystemEventArgs e)
         private void OnRenamed(object source, RenamedEventArgs e)
         {
             this.PathChanged(e.FullPath);
-            this.PathChanged(e.OldFullPath);
+            // Irritatingly, e.OldFullPath will throw an exception if the path is longer than the windows max
+            // (but e.FullPath is fine).
+            // So, construct it from e.FullPath and e.OldName
+            // Note that we're using Pri.LongPath to get a Path.GetDirectoryName implementation that can handle
+            // long paths
+            var oldFullPath = Path.Combine(Path.GetDirectoryName(e.FullPath), Path.GetFileName(e.OldName));
+            this.PathChanged(oldFullPath);
         }
 
         private void PathChanged(string path)
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 869fea0f..6865bb85 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -91,6 +91,9 @@
       <HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework" />
+    <Reference Include="Pri.LongPath">
+      <HintPath>..\packages\Pri.LongPath.1.3.2.0\lib\net45\Pri.LongPath.dll</HintPath>
+    </Reference>
     <Reference Include="Refit">
       <HintPath>..\packages\refit.2.2.0\lib\Net45\Refit.dll</HintPath>
     </Reference>
diff --git a/src/SyncTrayzor/packages.config b/src/SyncTrayzor/packages.config
index 9dde970c..ebd17418 100644
--- a/src/SyncTrayzor/packages.config
+++ b/src/SyncTrayzor/packages.config
@@ -9,6 +9,7 @@
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
   <package id="NLog" version="3.2.0.0" targetFramework="net45" />
+  <package id="Pri.LongPath" version="1.3.2.0" targetFramework="net45" />
   <package id="PropertyChanged.Fody" version="1.49.0" targetFramework="net45" developmentDependency="true" />
   <package id="refit" version="2.2.0" targetFramework="net45" />
   <package id="Stylet" version="1.1.5" targetFramework="net45" />

From 9dcae36d74b2c52b66dddc76e702b4d1d69efba4 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sat, 2 May 2015 10:54:50 +0100
Subject: [PATCH 10/24] Make sure DirectoryWatcher converts paths to their long
 form

It's feasable that the user manipulates the short form, particularly
(but not exclusively) while working with paths longer than the length
limit. The short form won't match the ignore regex, and Syncthing won't
understand them, so we need to convert
---
 src/SyncTrayzor/Services/DirectoryWatcher.cs |  5 +-
 src/SyncTrayzor/SyncTrayzor.csproj           |  1 +
 src/SyncTrayzor/Utils/PathEx.cs              | 53 ++++++++++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 src/SyncTrayzor/Utils/PathEx.cs

diff --git a/src/SyncTrayzor/Services/DirectoryWatcher.cs b/src/SyncTrayzor/Services/DirectoryWatcher.cs
index 0619f3a7..c99d8896 100644
--- a/src/SyncTrayzor/Services/DirectoryWatcher.cs
+++ b/src/SyncTrayzor/Services/DirectoryWatcher.cs
@@ -1,4 +1,5 @@
 using NLog;
+using SyncTrayzor.Utils;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -7,7 +8,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
-
 using Path = Pri.LongPath.Path;
 
 namespace SyncTrayzor.Services
@@ -131,6 +131,9 @@ private void OnRenamed(object source, RenamedEventArgs e)
 
         private void PathChanged(string path)
         {
+            // First, we need to convert to a long path, just in case anyone's using the short path
+            path = PathEx.GetLongPathName(path);
+
             if (!path.StartsWith(this.directory))
                 return;
 
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 6865bb85..f302f330 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -274,6 +274,7 @@
     <Compile Include="Utils\FluentModelValidator.cs" />
     <Compile Include="Utils\FormatUtils.cs" />
     <Compile Include="Utils\ObservableQueue.cs" />
+    <Compile Include="Utils\PathEx.cs" />
     <Compile Include="Utils\SafeSyncthingExtensions.cs" />
     <Compile Include="Utils\SemaphoreSlimExtensions.cs" />
     <Compile Include="Utils\StreamExtensions.cs" />
diff --git a/src/SyncTrayzor/Utils/PathEx.cs b/src/SyncTrayzor/Utils/PathEx.cs
new file mode 100644
index 00000000..c0feb3db
--- /dev/null
+++ b/src/SyncTrayzor/Utils/PathEx.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyncTrayzor.Utils
+{
+    public static class PathEx
+    {
+        /// <summary>
+        /// Converts a short path to a long path.
+        /// </summary>
+        /// <param name="shortPath">A path that may contain short path elements (~1).</param>
+        /// <returns>The long path.  Null or empty if the input is null or empty.</returns>
+        // Adapted from http://pinvoke.net/default.aspx/kernel32/GetLongPathName.html
+        public static string GetLongPathName(string shortPath)
+        {
+            if (String.IsNullOrWhiteSpace(shortPath))
+                return shortPath;
+
+            var builder = new StringBuilder(255);
+            int result = GetLongPathName(shortPath, builder, builder.Capacity);
+            if (result > 0 && result < builder.Capacity)
+            {
+                return builder.ToString(0, result);
+            }
+            else
+            {
+                if (result > 0)
+                {
+                    builder = new StringBuilder(result);
+                    result = GetLongPathName(shortPath, builder, builder.Capacity);
+                    return builder.ToString(0, result);
+                }
+                else
+                {
+                    throw new FileNotFoundException(String.Format("File {0} not found", shortPath));
+                }
+            }
+        }
+
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [return: MarshalAs(UnmanagedType.U4)]
+        private static extern int GetLongPathName(
+            [MarshalAs(UnmanagedType.LPTStr)] string lpszShortPath,
+            [MarshalAs(UnmanagedType.LPTStr)] StringBuilder lpszLongPath,
+            [MarshalAs(UnmanagedType.U4)] int cchBuffer);
+    }
+}

From 7f0a7b85f59018e34f7eea2d3cd820cac4cf013a Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 6 May 2015 13:02:38 +0100
Subject: [PATCH 11/24] Fix oversize issue on Settings screen re folders list

If there are too many folders, the Settings screen would happily size
itself beyond the bounds of the window. Not ideal.

I've gone for making the folders list scrollable, and automatically setting the
window's MaxHeight so that it doesn't push the save/cancel buttons below
the bottom border of the window.

There's potential confusion here because we don't allow the user to resize
the Settings screen, but that's a significant headache in itself

Fixes #76
---
 src/SyncTrayzor/Pages/SettingsView.xaml       | 59 +++++++++++--------
 src/SyncTrayzor/Pages/SettingsViewModel.cs    |  1 +
 src/SyncTrayzor/SyncTrayzor.csproj            |  1 +
 .../Xaml/NoSizeBelowScreenBehaviour.cs        | 45 ++++++++++++++
 4 files changed, 80 insertions(+), 26 deletions(-)
 create mode 100644 src/SyncTrayzor/Xaml/NoSizeBelowScreenBehaviour.cs

diff --git a/src/SyncTrayzor/Pages/SettingsView.xaml b/src/SyncTrayzor/Pages/SettingsView.xaml
index 74cea72d..c2e399f9 100644
--- a/src/SyncTrayzor/Pages/SettingsView.xaml
+++ b/src/SyncTrayzor/Pages/SettingsView.xaml
@@ -4,6 +4,7 @@
         xmlns:s="https://github.com/canton7/Stylet"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:pages="clr-namespace:SyncTrayzor.Pages"
         xmlns:xaml="clr-namespace:SyncTrayzor.Xaml"
         xmlns:l="clr-namespace:SyncTrayzor.Localization"
@@ -12,6 +13,9 @@
         Title="{l:Loc SettingsView_Title}"
         MinWidth="420"
         ResizeMode="NoResize" SizeToContent="WidthAndHeight">
+    <i:Interaction.Behaviors>
+        <xaml:NoSizeBelowScreenBehaviour/>
+    </i:Interaction.Behaviors>
     <Window.Resources>
         <s:BoolToVisibilityConverter x:Key="InverseVisibilityConverter" TrueVisibility="Collapsed" FalseVisibility="Visible"/>
     </Window.Resources>
@@ -104,32 +108,7 @@
                         </DockPanel>
                     </GroupBox>
 
-                    <GroupBox DockPanel.Dock="Top" Header="{l:Loc SettingsView_Section_WatchedFolders}">
-                        <DockPanel>
-                            <Grid DockPanel.Dock="Top">
-                                <TextBlock TextWrapping="Wrap" Text="{l:Loc SettingsView_WatchedFolders_Unavailable}"
-                                   Visibility="{Binding WatchedFolders, Converter={StaticResource InverseVisibilityConverter}}"
-                                   Width="{Binding Parent.ActualWidth, RelativeSource={RelativeSource Self}}"/>
-
-                                <TextBlock TextWrapping="Wrap" Margin="0,0,0,10" Text="{l:Loc SettingsView_WatchedFolders_Explanation}"
-                                   Visibility="{Binding WatchedFolders, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"
-                                   Width="{Binding Parent.ActualWidth, RelativeSource={RelativeSource Self}}"/>
-                            </Grid>
-
-                            <ItemsControl ItemsSource="{Binding WatchedFolders}">
-                                <ItemsControl.ItemTemplate>
-                                    <DataTemplate>
-                                        <CheckBox IsChecked="{Binding IsSelected}">
-                                            <!-- TextBlock needed so that underscores aren't turned into mnemonics -->
-                                            <TextBlock Text="{Binding Folder}"/>
-                                        </CheckBox>
-                                    </DataTemplate>
-                                </ItemsControl.ItemTemplate>
-                            </ItemsControl>
-                        </DockPanel>
-                    </GroupBox>
-
-                    <Expander DockPanel.Dock="Top" Header="{l:Loc SettingsView_Section_Advanced}">
+                    <Expander DockPanel.Dock="Bottom" Header="{l:Loc SettingsView_Section_Advanced}">
                         <GroupBox Header="{l:Loc SettingsView_Section_Advanced}">
                             <DockPanel LastChildFill="False">
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding SyncthingUseCustomHome}"
@@ -143,6 +122,34 @@
                             </DockPanel>
                         </GroupBox>
                     </Expander>
+
+                    <!-- In case the window exceeds the screen height, something needs to give, and it's this. Therefore place it as the fill child -->
+                    <GroupBox Header="{l:Loc SettingsView_Section_WatchedFolders}">
+                        <DockPanel>
+                            <Grid DockPanel.Dock="Top">
+                                <TextBlock TextWrapping="Wrap" Text="{l:Loc SettingsView_WatchedFolders_Unavailable}"
+                                   Visibility="{Binding WatchedFolders, Converter={StaticResource InverseVisibilityConverter}}"
+                                   Width="{Binding Parent.ActualWidth, RelativeSource={RelativeSource Self}}"/>
+
+                                <TextBlock TextWrapping="Wrap" Margin="0,0,0,10" Text="{l:Loc SettingsView_WatchedFolders_Explanation}"
+                                   Visibility="{Binding WatchedFolders, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"
+                                   Width="{Binding Parent.ActualWidth, RelativeSource={RelativeSource Self}}"/>
+                            </Grid>
+
+                            <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                <ItemsControl ItemsSource="{Binding WatchedFolders}">
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <CheckBox IsChecked="{Binding IsSelected}">
+                                                <!-- TextBlock needed so that underscores aren't turned into mnemonics -->
+                                                <TextBlock Text="{Binding Folder}"/>
+                                            </CheckBox>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+                            </ScrollViewer>
+                        </DockPanel>
+                    </GroupBox>
                 </DockPanel>
             </TabItem>
         </TabControl>
diff --git a/src/SyncTrayzor/Pages/SettingsViewModel.cs b/src/SyncTrayzor/Pages/SettingsViewModel.cs
index 1494ca6f..320fc1d3 100644
--- a/src/SyncTrayzor/Pages/SettingsViewModel.cs
+++ b/src/SyncTrayzor/Pages/SettingsViewModel.cs
@@ -174,6 +174,7 @@ public SettingsViewModel(
                 Folder = x.ID,
                 IsSelected = x.IsWatched
             }));
+
             this.SyncthingUseCustomHome = configuration.SyncthingUseCustomHome;
             this.SyncThingEnvironmentalVariables = EnvironmentalVariablesParser.Format(configuration.SyncthingEnvironmentalVariables);
             this.SyncthingDenyUpgrade = configuration.SyncthingDenyUpgrade;
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index f302f330..046e100b 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -281,6 +281,7 @@
     <Compile Include="Utils\SynchronizedEventDispatcher.cs" />
     <Compile Include="Xaml\GridLengthToAbsoluteConverter.cs" />
     <Compile Include="Xaml\MouseWheelGesture.cs" />
+    <Compile Include="Xaml\NoSizeBelowScreenBehaviour.cs" />
     <Compile Include="Xaml\RemoveMnemonicsConverter.cs" />
     <Compile Include="Xaml\UacImageSource.cs" />
     <Compile Include="Utils\UriExtensions.cs" />
diff --git a/src/SyncTrayzor/Xaml/NoSizeBelowScreenBehaviour.cs b/src/SyncTrayzor/Xaml/NoSizeBelowScreenBehaviour.cs
new file mode 100644
index 00000000..bbca8489
--- /dev/null
+++ b/src/SyncTrayzor/Xaml/NoSizeBelowScreenBehaviour.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace SyncTrayzor.Xaml
+{
+    public class NoSizeBelowScreenBehaviour : DetachingBehaviour<Window>
+    {
+        private const int taskbarHeight = 40; // Max height
+
+        private bool haveSet = false;
+
+        private static readonly DependencyProperty WindowLeftProperty =
+            DependencyProperty.Register("WindowTop", typeof(double), typeof(NoSizeBelowScreenBehaviour), new PropertyMetadata(Double.NaN, (d, e) =>
+            {
+                ((NoSizeBelowScreenBehaviour)d).ScreenTopChanged((double)e.NewValue);
+            }));
+
+        private void ScreenTopChanged(double topValue)
+        {
+            // This is set twice in succession when loaded - the first time the height is NaN, the second time it isn't
+            // We only want to set this once, one the second time that top is set
+
+            if (!Double.IsNaN(this.AssociatedObject.Height) && !Double.IsNaN(topValue) && !this.haveSet)
+            {
+                this.AssociatedObject.MaxHeight = SystemParameters.VirtualScreenHeight - topValue - taskbarHeight;
+                this.haveSet = true;
+            }
+        }
+
+        protected override void AttachHandlers()
+        {
+            var topBinding = new Binding("WindowTop")
+            {
+                Source = this,
+                Mode = BindingMode.TwoWay,
+            };
+            BindingOperations.SetBinding(this.AssociatedObject, Window.TopProperty, topBinding);
+        }
+    }
+}

From abdedc833a86919d9599c0aed64bac60d6a98e2f Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 6 May 2015 13:07:20 +0100
Subject: [PATCH 12/24] Clarify Start/Stop/Restart items in tray icon context
 menu

Fixes #71
---
 src/SyncTrayzor/Properties/Strings/Resources.Designer.cs | 6 +++---
 src/SyncTrayzor/Properties/Strings/Resources.resx        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs b/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
index 67e85a9f..4698f11d 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
+++ b/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
@@ -997,7 +997,7 @@ public static string TrayIcon_Menu_OpenFolder {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to R_estart.
+        ///   Looks up a localized string similar to R_estart Syncthing.
         /// </summary>
         public static string TrayIcon_Menu_RestartSyncthing {
             get {
@@ -1024,7 +1024,7 @@ public static string TrayIcon_Menu_Settings {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to _Start.
+        ///   Looks up a localized string similar to _Start Syncthing.
         /// </summary>
         public static string TrayIcon_Menu_StartSyncthing {
             get {
@@ -1033,7 +1033,7 @@ public static string TrayIcon_Menu_StartSyncthing {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to S_top.
+        ///   Looks up a localized string similar to S_top Syncthing.
         /// </summary>
         public static string TrayIcon_Menu_StopSyncthing {
             get {
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.resx b/src/SyncTrayzor/Properties/Strings/Resources.resx
index f42cfcd6..78a7f85b 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.resx
@@ -415,11 +415,11 @@ Details on each component, and its license text, are shown below.</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to show the Settings dialog</comment>
   </data>
   <data name="TrayIcon_Menu_StartSyncthing" xml:space="preserve">
-    <value>_Start</value>
+    <value>_Start Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to start Syncthing. Only available if Syncthing isn't running</comment>
   </data>
   <data name="TrayIcon_Menu_StopSyncthing" xml:space="preserve">
-    <value>S_top</value>
+    <value>S_top Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to stop Syncthing. Only available if Syncthing is running</comment>
   </data>
   <data name="UnhandledExceptionView_IntroMessage" xml:space="preserve">
@@ -498,7 +498,7 @@ SyncTrayzor is going to have to close. Sorry about that</value>
     <value>R_estart</value>
   </data>
   <data name="TrayIcon_Menu_RestartSyncthing" xml:space="preserve">
-    <value>R_estart</value>
+    <value>R_estart Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restart</comment>
   </data>
   <data name="SettingsView_Tab_Syncthing" xml:space="preserve">

From 8025c98c335309c8d635f40f7970f4a900a444c3 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 6 May 2015 15:42:50 +0100
Subject: [PATCH 13/24] Properly localize new version alert toast title

---
 src/SyncTrayzor/Pages/NewVersionAlertToastView.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/Pages/NewVersionAlertToastView.xaml b/src/SyncTrayzor/Pages/NewVersionAlertToastView.xaml
index bbbc11d6..2b051340 100644
--- a/src/SyncTrayzor/Pages/NewVersionAlertToastView.xaml
+++ b/src/SyncTrayzor/Pages/NewVersionAlertToastView.xaml
@@ -10,7 +10,7 @@
              Width="500">
     <Border CornerRadius="6" BorderThickness="4" BorderBrush="Gray" Background="White">
         <DockPanel Margin="10" LastChildFill="False">
-            <TextBlock DockPanel.Dock="Top" TextAlignment="Center" FontWeight="Bold" FontSize="20">SyncTrayzor Update Available</TextBlock>
+            <TextBlock DockPanel.Dock="Top" TextAlignment="Center" FontWeight="Bold" FontSize="20" Text="{l:Loc NewVersionAlertView_Title}"/>
             <TextBlock DockPanel.Dock="Top" TextWrapping="Wrap" Margin="0,10,0,0">
                 <ContentControl Content="{l:Loc NewVersionAlertView_NewVersionAvailable, ValueBinding={Binding Version}}"/>
             </TextBlock>

From e596dc9c5cef4b8d9b5e56882464875070561ff2 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 6 May 2015 16:34:57 +0100
Subject: [PATCH 14/24] Handle shutdown requests by the Restart Manager

This should mean we no longer have to use taskkill in the installer
---
 src/SyncTrayzor/Bootstrapper.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/Bootstrapper.cs b/src/SyncTrayzor/Bootstrapper.cs
index eca6e224..4a6d0aa6 100644
--- a/src/SyncTrayzor/Bootstrapper.cs
+++ b/src/SyncTrayzor/Bootstrapper.cs
@@ -111,7 +111,14 @@ protected override void Configure()
 
             // Horrible workaround for a CefSharp crash on logout/shutdown
             // https://github.com/cefsharp/CefSharp/issues/800#issuecomment-75058534
-            this.Application.SessionEnding += (o, e) => Process.GetCurrentProcess().Kill();
+            // Also handles Restart Manager requests - sent by the installer. We need to shutdown syncthing and Cef in this case
+            this.Application.SessionEnding += (o, e) =>
+            {
+                var manager = this.Container.Get<ISyncThingManager>();
+                manager.StopAsync().Wait(250);
+                manager.Kill();
+                Process.GetCurrentProcess().Kill();
+            };
 
             MessageBoxViewModel.ButtonLabels = new Dictionary<MessageBoxResult, string>()
             {

From f984ba0731eccc3869155f8fa9d672861160a0e9 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 7 May 2015 12:55:38 +0100
Subject: [PATCH 15/24] Drop Syncthing 0.10, and don't replace binary in
 AppData

There's more thinking to be done around when we replace the Syncthing
binary in AppData, but it's not required right now.

This fixes a potential issue where people let Syncthing upgrade itself
to 0.11, but the installer's still in 0.10 mode, so their 0.11 version
gets overwritten by the installer. Not ideal.

We now only write the binary to AppData if it doesn't already exist.
This puts more responsibility on the user to keep this up to date,
but it should be auto-updated by default. In future we may want some
mechanism to run 'syncthing.exe -version' and check whether it's too
old: if it is, offer to replace it. However, there's no current
(known) 'too old to be compatible' version, so this isn't (yet) an
issue

Fixes #66
---
 .gitignore                                        |  1 +
 Rakefile                                          |  2 +-
 installer/x64/installer-x64.iss                   | 13 ++-----------
 installer/x86/installer-x86.iss                   | 10 +---------
 .../Services/Config/ConfigurationProvider.cs      | 15 ---------------
 5 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b01fc8d..4193d2cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ packages/
 SyncTrayzorSetup*.exe
 SyncTrayzorPortable*
 syncthing-*.exe
+syncthing.exe
 
 *.gjq
 *.tmp
diff --git a/Rakefile b/Rakefile
index d066bada..3d75d9a0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -39,7 +39,7 @@ class ArchDirConfig
     @installer_iss = File.join(@installer_dir, "installer-#{@arch}.iss")
     @portable_output_dir = "SyncTrayzorPortable-#{@arch}"
     @portable_output_file = File.join(PORTABLE_DIR, "SyncTrayzorPortable-#{@arch}.zip")
-    @syncthing_binaries = { '0.10' => 'syncthing-0.10.x.exe', '0.11' => 'syncthing-0.11.x.exe' }
+    @syncthing_binaries = { '0.11' => 'syncthing.exe' }
   end
 end
 
diff --git a/installer/x64/installer-x64.iss b/installer/x64/installer-x64.iss
index 627eabc8..6c898be7 100644
--- a/installer/x64/installer-x64.iss
+++ b/installer/x64/installer-x64.iss
@@ -42,14 +42,8 @@ TouchDate=current
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
-[CustomMessages]
-SyncthingVersion=%nPlease select the Syncthing version.%n%nv0.11 and v0.10 are incompatible. All of your devices must either use v0.11 or v0.10.%n
-
 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "syncthing0p11"; Description: "Syncthing v0.11 (recommended)"; GroupDescription: "{cm:SyncthingVersion}"; Flags: exclusive 
-Name: "syncthing0p10"; Description: "Syncthing v0.10"; GroupDescription: "{cm:SyncthingVersion}"; Flags: exclusive unchecked             
-
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked           
 
 [Dirs]
 Name: "{userappdata}\{#AppDataFolder}"
@@ -61,10 +55,7 @@ Source: "{#AppSrc}\Icons\default.ico"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.md"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "*.dll"; DestDir: "{app}"; Flags: ignoreversion
-
-; It's important to touch, otherwise SyncTrayzor won't pick up on the modification, and won't copy it into %APPDATA%
-Source: "syncthing-0.10.x.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Tasks: "syncthing0p10"; Flags: ignoreversion touch
-Source: "syncthing-0.11.x.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Tasks: "syncthing0p11"; Flags: ignoreversion touch
+Source: "syncthing.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Flags: ignoreversion
 
 Source: "..\dotNet451Setup.exe"; DestDir: {tmp}; Flags: deleteafterinstall; Check: FrameworkIsNotInstalled
 
diff --git a/installer/x86/installer-x86.iss b/installer/x86/installer-x86.iss
index 99755da6..f79d2f5c 100644
--- a/installer/x86/installer-x86.iss
+++ b/installer/x86/installer-x86.iss
@@ -40,13 +40,8 @@ TouchDate=current
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
-[CustomMessages]
-SyncthingVersion=%nPlease select the Syncthing version.%n%nv0.11 and v0.10 are incompatible. All of your devices must either use v0.11 or v0.10.%n
-
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "syncthing0p11"; Description: "Syncthing v0.11 (recommended)"; GroupDescription: "{cm:SyncthingVersion}"; Flags: exclusive 
-Name: "syncthing0p10"; Description: "Syncthing v0.10"; GroupDescription: "{cm:SyncthingVersion}"; Flags: exclusive unchecked 
 
 [Dirs]
 Name: "{userappdata}\{#AppDataFolder}"
@@ -58,10 +53,7 @@ Source: "{#AppSrc}\Icons\default.ico"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.md"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "*.dll"; DestDir: "{app}"; Flags: ignoreversion
-
-; It's important to touch, otherwise SyncTrayzor won't pick up on the modification, and won't copy it into %APPDATA%
-Source: "syncthing-0.10.x.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Tasks: "syncthing0p10"; Flags: ignoreversion touch
-Source: "syncthing-0.11.x.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Tasks: "syncthing0p11"; Flags: ignoreversion touch
+Source: "syncthing.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Flags: ignoreversion
 
 Source: "..\dotNet451Setup.exe"; DestDir: {tmp}; Flags: deleteafterinstall; Check: FrameworkIsNotInstalled
 
diff --git a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
index 144e8c0b..308b574f 100644
--- a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
+++ b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
@@ -112,21 +112,6 @@ public void Initialize(Configuration defaultConfiguration)
                         throw new Exception(String.Format("Unable to find Syncthing at {0} or {1}", this.paths.SyncthingPath, this.paths.SyncthingBackupPath));
                     }
                 }
-                else if (installCountChanged)
-                {
-                    // If we hit this, then latestInstallCount is set to a real value
-                    logger.Info("Install Count changed, so updating Syncthing at {0} from {1}", this.paths.SyncthingPath, this.paths.SyncthingBackupPath);
-                    try
-                    {
-                        File.Copy(this.paths.SyncthingBackupPath, this.paths.SyncthingPath, true);
-                    }
-                    catch (IOException e)
-                    {
-                        // Syncthing.exe was probably running. We'll try again next time
-                        updateConfigInstallCount = false;
-                        logger.Error(String.Format("Failed to copy Syncthing from {0} to {1}", this.paths.SyncthingBackupPath, this.paths.SyncthingPath), e);
-                    }
-                }
             }
 
             if (updateConfigInstallCount)

From b8c61f258566f40eeb4a65c663fe71c00baf6208 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 6 May 2015 13:25:55 +0100
Subject: [PATCH 16/24] Start SyncTrayzor minimized after upgrade if minimized
 to start with

---
 .../InstalledUpdateVariantHandler.cs               | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/SyncTrayzor/Services/UpdateManagement/InstalledUpdateVariantHandler.cs b/src/SyncTrayzor/Services/UpdateManagement/InstalledUpdateVariantHandler.cs
index 0cb71d16..c52e35da 100644
--- a/src/SyncTrayzor/Services/UpdateManagement/InstalledUpdateVariantHandler.cs
+++ b/src/SyncTrayzor/Services/UpdateManagement/InstalledUpdateVariantHandler.cs
@@ -11,17 +11,23 @@ public class InstalledUpdateVariantHandler : IUpdateVariantHandler
         private readonly IUpdateDownloader updateDownloader;
         private readonly IProcessStartProvider processStartProvider;
         private readonly IAssemblyProvider assemblyProvider;
+        private readonly IApplicationState applicationState;
 
         private string installerPath;
 
         public string VariantName { get { return "installed"; } }
         public bool CanAutoInstall { get; private set; }
 
-        public InstalledUpdateVariantHandler(IUpdateDownloader updateDownloader, IProcessStartProvider processStartProvider, IAssemblyProvider assemblyProvider)
+        public InstalledUpdateVariantHandler(
+            IUpdateDownloader updateDownloader,
+            IProcessStartProvider processStartProvider,
+            IAssemblyProvider assemblyProvider,
+            IApplicationState applicationState)
         {
             this.updateDownloader = updateDownloader;
             this.processStartProvider = processStartProvider;
             this.assemblyProvider = assemblyProvider;
+            this.applicationState = applicationState;
         }
 
         public async Task<bool> TryHandleUpdateAvailableAsync(VersionCheckResults checkResult)
@@ -50,7 +56,11 @@ public void AutoInstall()
             if (this.installerPath == null)
                 throw new InvalidOperationException("TryHandleUpdateAvailableAsync returned false: cannot call AutoInstall");
 
-            this.processStartProvider.StartElevatedDetached(this.installerPath, "/SILENT", this.assemblyProvider.Location);
+            var path = String.Format("\"{0}\"", this.assemblyProvider.Location);
+            if (this.applicationState.HasMainWindow)
+                path += " -minimized";
+
+            this.processStartProvider.StartElevatedDetached(this.installerPath, "/SILENT", path);
         }
     }
 }

From b295bea44e742e86336a372ba1060c1f1804b0b6 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 6 May 2015 14:53:51 +0100
Subject: [PATCH 17/24] Refactor the balloon logic

---
 .../NotifyIcon/BalloonConductor.cs            |  2 +-
 .../NotifyIcon/NotifyIconManager.cs           | 23 ++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/SyncTrayzor/NotifyIcon/BalloonConductor.cs b/src/SyncTrayzor/NotifyIcon/BalloonConductor.cs
index 28976500..97847f63 100644
--- a/src/SyncTrayzor/NotifyIcon/BalloonConductor.cs
+++ b/src/SyncTrayzor/NotifyIcon/BalloonConductor.cs
@@ -35,7 +35,7 @@ public void CloseItem(object item, bool? dialogResult = null)
             if (this.taskbarIcon.CustomBalloon.Child != this.view)
                 return;
 
-            this.tcs.SetResult(dialogResult);
+            this.tcs.TrySetResult(dialogResult);
             this.taskbarIcon.CloseBalloon();
         }
     }
diff --git a/src/SyncTrayzor/NotifyIcon/NotifyIconManager.cs b/src/SyncTrayzor/NotifyIcon/NotifyIconManager.cs
index 50700ac8..15ca48b5 100644
--- a/src/SyncTrayzor/NotifyIcon/NotifyIconManager.cs
+++ b/src/SyncTrayzor/NotifyIcon/NotifyIconManager.cs
@@ -134,8 +134,7 @@ private void SetShutdownMode()
 
         public async Task<bool?> ShowBalloonAsync(object viewModel, CancellationToken cancellationToken)
         {
-            if (this.balloonTcs != null)
-                this.balloonTcs.SetResult(null);
+            this.CloseCurrentlyOpenBalloon(cancel: false);
 
             var view = this.viewManager.CreateViewForModel(viewModel);
             this.taskbarIcon.ShowCustomBalloon(view, System.Windows.Controls.Primitives.PopupAnimation.Slide, null);
@@ -147,16 +146,28 @@ private void SetShutdownMode()
             using (cancellationToken.Register(() =>
             {
                 if (this.taskbarIcon.CustomBalloon.Child == view)
-                {
-                    this.balloonTcs.SetCanceled();
-                    this.taskbarIcon.CloseBalloon();
-                }
+                    this.CloseCurrentlyOpenBalloon(cancel: true);
             }))
             {
                 return await this.balloonTcs.Task;
             }
         }
 
+        private void CloseCurrentlyOpenBalloon(bool cancel)
+        {
+            if (this.balloonTcs == null)
+                return;
+
+            this.taskbarIcon.CloseBalloon();
+
+            if (cancel)
+                this.balloonTcs.TrySetCanceled();
+            else
+                this.balloonTcs.TrySetResult(null);
+
+            this.balloonTcs = null;
+        }
+
         public void EnsureIconVisible()
         {
             this.viewModel.Visible = true;

From e08462bcbac777999f8fc14fff38dffcb9a5d0e9 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 6 May 2015 16:03:12 +0100
Subject: [PATCH 18/24] Show toast when upgraded and minimized

---
 src/SyncTrayzor/Bootstrapper.cs                | 16 +++++++++++++++-
 .../NotifyIcon/NotifyIconManager.cs            | 10 ++++++----
 .../Pages/NewVersionInstalledToastView.xaml    | 15 +++++++++++++++
 .../Pages/NewVersionInstalledToastViewModel.cs | 18 ++++++++++++++++++
 .../Properties/Strings/Resources.Designer.cs   | 18 ++++++++++++++++++
 .../Properties/Strings/Resources.resx          |  6 ++++++
 src/SyncTrayzor/Services/AssemblyProvider.cs   |  9 +++++----
 .../Services/Config/ConfigurationProvider.cs   |  5 +++--
 .../UpdateManagement/UpdatePromptProvider.cs   |  2 +-
 src/SyncTrayzor/SyncTrayzor.csproj             |  5 +++++
 10 files changed, 92 insertions(+), 12 deletions(-)
 create mode 100644 src/SyncTrayzor/Pages/NewVersionInstalledToastView.xaml
 create mode 100644 src/SyncTrayzor/Pages/NewVersionInstalledToastViewModel.cs

diff --git a/src/SyncTrayzor/Bootstrapper.cs b/src/SyncTrayzor/Bootstrapper.cs
index 4a6d0aa6..633d9e57 100644
--- a/src/SyncTrayzor/Bootstrapper.cs
+++ b/src/SyncTrayzor/Bootstrapper.cs
@@ -31,6 +31,12 @@ namespace SyncTrayzor
     public class Bootstrapper : Bootstrapper<ShellViewModel>
     {
         private bool exiting;
+        private bool startMinimized;
+
+        protected override void OnStart()
+        {
+            this.startMinimized = this.Args.Contains("-minimized");
+        }
 
         protected override void ConfigureIoC(IStyletIoCBuilder builder)
         {
@@ -133,7 +139,7 @@ protected override void Configure()
 
         protected override void Launch()
         {
-            if (this.Args.Contains("-minimized"))
+            if (this.startMinimized)
                 this.Container.Get<INotifyIconManager>().EnsureIconVisible();
             else
                 base.Launch();
@@ -144,6 +150,14 @@ protected override void OnLaunch()
             var config = this.Container.Get<IConfigurationProvider>().Load();
             if (config.StartSyncthingAutomatically && !this.Args.Contains("-noautostart"))
                 ((ShellViewModel)this.RootViewModel).Start();
+
+            // If we've just been upgraded, and we're minimized, show a bit of toast explaining the fact
+            if (this.startMinimized && this.Container.Get<IConfigurationProvider>().WasUpgraded)
+            {
+                var updatedVm = this.Container.Get<NewVersionInstalledToastViewModel>();
+                updatedVm.Version = this.Container.Get<IAssemblyProvider>().Version;
+                this.Container.Get<INotifyIconManager>().ShowBalloonAsync(updatedVm, timeout: 5000); 
+            }
         }
 
         protected override void OnUnhandledException(DispatcherUnhandledExceptionEventArgs e)
diff --git a/src/SyncTrayzor/NotifyIcon/NotifyIconManager.cs b/src/SyncTrayzor/NotifyIcon/NotifyIconManager.cs
index 15ca48b5..94666b09 100644
--- a/src/SyncTrayzor/NotifyIcon/NotifyIconManager.cs
+++ b/src/SyncTrayzor/NotifyIcon/NotifyIconManager.cs
@@ -23,7 +23,7 @@ public interface INotifyIconManager
 
         void EnsureIconVisible();
 
-        Task<bool?> ShowBalloonAsync(object viewModel, CancellationToken cancellationToken);
+        Task<bool?> ShowBalloonAsync(object viewModel, int? timeout = null, CancellationToken? cancellationToken = null);
     }
 
     public class NotifyIconManager : INotifyIconManager
@@ -132,18 +132,20 @@ private void SetShutdownMode()
             this.application.ShutdownMode = this._closeToTray ? ShutdownMode.OnExplicitShutdown : ShutdownMode.OnMainWindowClose;
         }
 
-        public async Task<bool?> ShowBalloonAsync(object viewModel, CancellationToken cancellationToken)
+        public async Task<bool?> ShowBalloonAsync(object viewModel, int? timeout = null, CancellationToken? cancellationToken = null)
         {
+            var token = cancellationToken ?? CancellationToken.None;
+
             this.CloseCurrentlyOpenBalloon(cancel: false);
 
             var view = this.viewManager.CreateViewForModel(viewModel);
-            this.taskbarIcon.ShowCustomBalloon(view, System.Windows.Controls.Primitives.PopupAnimation.Slide, null);
+            this.taskbarIcon.ShowCustomBalloon(view, System.Windows.Controls.Primitives.PopupAnimation.Slide, timeout);
             this.viewManager.BindViewToModel(view, viewModel); // Re-assign DataContext, after NotifyIcon overwrote it ><
 
             this.balloonTcs = new TaskCompletionSource<bool?>();
             new BalloonConductor(this.taskbarIcon, viewModel, view, this.balloonTcs);
 
-            using (cancellationToken.Register(() =>
+            using (token.Register(() =>
             {
                 if (this.taskbarIcon.CustomBalloon.Child == view)
                     this.CloseCurrentlyOpenBalloon(cancel: true);
diff --git a/src/SyncTrayzor/Pages/NewVersionInstalledToastView.xaml b/src/SyncTrayzor/Pages/NewVersionInstalledToastView.xaml
new file mode 100644
index 00000000..57760937
--- /dev/null
+++ b/src/SyncTrayzor/Pages/NewVersionInstalledToastView.xaml
@@ -0,0 +1,15 @@
+<UserControl x:Class="SyncTrayzor.Pages.NewVersionInstalledToastView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             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:l="clr-namespace:SyncTrayzor.Localization"
+             xmlns:s="https://github.com/canton7/Stylet"
+             mc:Ignorable="d">
+    <Border CornerRadius="6" BorderThickness="2" BorderBrush="Gray" Background="White">
+        <DockPanel Margin="10" LastChildFill="False">
+            <TextBlock DockPanel.Dock="Top" TextAlignment="Center" FontWeight="Bold" FontSize="20" Text="{l:Loc NewVersionInstalledView_Title}"/>
+            <TextBlock DockPanel.Dock="Top" Margin="0,10" Text="{l:Loc NewVersionInstalledView_Message, ValueBinding={Binding Version}}"/>
+        </DockPanel>
+    </Border>
+</UserControl>
diff --git a/src/SyncTrayzor/Pages/NewVersionInstalledToastViewModel.cs b/src/SyncTrayzor/Pages/NewVersionInstalledToastViewModel.cs
new file mode 100644
index 00000000..861a732b
--- /dev/null
+++ b/src/SyncTrayzor/Pages/NewVersionInstalledToastViewModel.cs
@@ -0,0 +1,18 @@
+using Stylet;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyncTrayzor.Pages
+{
+    public class NewVersionInstalledToastViewModel : Screen
+    {
+        public Version Version { get; set; }
+        public string VersionString
+        {
+            get { return this.Version.ToString(3); }
+        }
+    }
+}
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs b/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
index 4698f11d..c5debc04 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
+++ b/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
@@ -329,6 +329,24 @@ public static string NewVersionAlertView_ViewChangelog {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to SyncTrayzor version {0} was successfully installed..
+        /// </summary>
+        public static string NewVersionInstalledView_Message {
+            get {
+                return ResourceManager.GetString("NewVersionInstalledView_Message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SyncTrayzor Updated.
+        /// </summary>
+        public static string NewVersionInstalledView_Title {
+            get {
+                return ResourceManager.GetString("NewVersionInstalledView_Title", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Alert if a new version of SyncTrayzor is available.
         /// </summary>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.resx b/src/SyncTrayzor/Properties/Strings/Resources.resx
index 78a7f85b..d0ad26a8 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.resx
@@ -560,4 +560,10 @@ SyncTrayzor is going to have to close. Sorry about that</value>
   <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
     <value>Must be in the format 'VAR=value VAR2="val1 val2"'</value>
   </data>
+  <data name="NewVersionInstalledView_Message" xml:space="preserve">
+    <value>SyncTrayzor version {0} was successfully installed.</value>
+  </data>
+  <data name="NewVersionInstalledView_Title" xml:space="preserve">
+    <value>SyncTrayzor Updated</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/SyncTrayzor/Services/AssemblyProvider.cs b/src/SyncTrayzor/Services/AssemblyProvider.cs
index 965e9b0b..fed2a95f 100644
--- a/src/SyncTrayzor/Services/AssemblyProvider.cs
+++ b/src/SyncTrayzor/Services/AssemblyProvider.cs
@@ -23,13 +23,14 @@ public class AssemblyProvider : IAssemblyProvider
         public AssemblyProvider()
         {
             this.assembly = Assembly.GetExecutingAssembly();
-        }
 
-        public Version Version
-        {
-            get { return this.assembly.GetName().Version; }
+            // Don't include the revision in this version
+            var version = this.assembly.GetName().Version;
+            this.Version = new Version(version.Major, version.Minor, version.Build);
         }
 
+        public Version Version { get; private set; }
+
         public string Location
         {
             get { return this.assembly.Location; }
diff --git a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
index 308b574f..74fd1713 100644
--- a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
+++ b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
@@ -34,6 +34,7 @@ public interface IConfigurationProvider
         event EventHandler<ConfigurationChangedEventArgs> ConfigurationChanged;
 
         bool HadToCreateConfiguration { get; }
+        bool WasUpgraded { get; }
 
         void Initialize(Configuration defaultConfiguration);
         Configuration Load();
@@ -59,6 +60,7 @@ public class ConfigurationProvider : IConfigurationProvider
         public event EventHandler<ConfigurationChangedEventArgs> ConfigurationChanged;
 
         public bool HadToCreateConfiguration { get; private set; }
+        public bool WasUpgraded { get; private set; }
 
         public ConfigurationProvider(IApplicationPathsProvider paths)
         {
@@ -82,7 +84,6 @@ public void Initialize(Configuration defaultConfiguration)
 
             this.currentConfig = this.LoadFromDisk(defaultConfiguration);
 
-            bool installCountChanged = false;
             bool updateConfigInstallCount = false;
             int latestInstallCount = 0;
             // Might be portable, in which case this file won't exist
@@ -92,7 +93,7 @@ public void Initialize(Configuration defaultConfiguration)
                 if (latestInstallCount != this.currentConfig.LastSeenInstallCount)
                 {
                     logger.Debug("InstallCount changed from {0} to {1}", this.currentConfig.LastSeenInstallCount, latestInstallCount);
-                    installCountChanged = true;
+                    this.WasUpgraded = true;
                     updateConfigInstallCount = true;
                 }
             }
diff --git a/src/SyncTrayzor/Services/UpdateManagement/UpdatePromptProvider.cs b/src/SyncTrayzor/Services/UpdateManagement/UpdatePromptProvider.cs
index c7e1e902..410e3535 100644
--- a/src/SyncTrayzor/Services/UpdateManagement/UpdatePromptProvider.cs
+++ b/src/SyncTrayzor/Services/UpdateManagement/UpdatePromptProvider.cs
@@ -65,7 +65,7 @@ public async Task<VersionPromptResult> ShowToast(VersionCheckResults checkResult
             vm.Version = checkResults.NewVersion;
             vm.CanInstall = canAutoInstall;
 
-            var dialogResult = await this.notifyIconManager.ShowBalloonAsync(vm, cancellationToken);
+            var dialogResult = await this.notifyIconManager.ShowBalloonAsync(vm, cancellationToken: cancellationToken);
 
             if (dialogResult == true)
                 return canAutoInstall ? VersionPromptResult.InstallNow : VersionPromptResult.Download;
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 046e100b..41f8317f 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -125,6 +125,7 @@
     </Compile>
     <Compile Include="NotifyIcon\BalloonConductor.cs" />
     <Compile Include="NotifyIcon\NotifyIconResolutionUtilities.cs" />
+    <Compile Include="Pages\NewVersionInstalledToastViewModel.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
@@ -357,6 +358,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\NewVersionInstalledToastView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Pages\SettingsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

From fd9163369d16b8535d3ebbc1fb3ffc573e111d62 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 7 May 2015 17:38:29 +0100
Subject: [PATCH 19/24] Add LongPath to list of third party libraries

---
 .../Pages/ThirdPartyComponentsViewModel.cs    |   9 +
 .../Resources/Licenses/LongPath.txt           | 165 ++++++++++++++++++
 src/SyncTrayzor/SyncTrayzor.csproj            |   3 +
 3 files changed, 177 insertions(+)
 create mode 100644 src/SyncTrayzor/Resources/Licenses/LongPath.txt

diff --git a/src/SyncTrayzor/Pages/ThirdPartyComponentsViewModel.cs b/src/SyncTrayzor/Pages/ThirdPartyComponentsViewModel.cs
index 4f93f7e0..0348d670 100644
--- a/src/SyncTrayzor/Pages/ThirdPartyComponentsViewModel.cs
+++ b/src/SyncTrayzor/Pages/ThirdPartyComponentsViewModel.cs
@@ -95,6 +95,15 @@ public ThirdPartyComponentsViewModel(IProcessStartProvider processStartProvider)
                     LicenseText = this.LoadLicense("FluentValidation.txt")
                 },
                 new ThirdPartyComponent()
+                {
+                    Name = "LongPath",
+                    Description = "Drop-in library to support long paths in .NET",
+                    Homepage = "https://github.com/peteraritchie/LongPath",
+                    License = "LGPLv3",
+                    Notes = "Required for long path support (since .NET sucks here)",
+                    LicenseText = this.LoadLicense("LongPath.txt")
+                },
+                new ThirdPartyComponent()
                 {
                     Name = "PropertyChanged.Fody",
                     Description = "Injects INotifyPropertyChanged code into properties at compile time",
diff --git a/src/SyncTrayzor/Resources/Licenses/LongPath.txt b/src/SyncTrayzor/Resources/Licenses/LongPath.txt
new file mode 100644
index 00000000..7a82d726
--- /dev/null
+++ b/src/SyncTrayzor/Resources/Licenses/LongPath.txt
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
\ No newline at end of file
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 41f8317f..a6480a4f 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -465,6 +465,9 @@
   <ItemGroup>
     <Folder Include="Core\" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Licenses\LongPath.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.4\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

From 4b2ac7a04a0ee1323693fe5d954ab1c37ddeae42 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 7 May 2015 18:30:26 +0100
Subject: [PATCH 20/24] Fix starting minimized after automatic upgrade

See #59
---
 src/ProcessRunner/ProcessRunner.csproj        |  1 +
 src/ProcessRunner/Program.cs                  | 21 ++++++-
 src/ProcessRunner/StringExtensions.cs         | 57 +++++++++++++++++++
 .../Services/ProcessStartProvider.cs          | 16 +++++-
 .../InstalledUpdateVariantHandler.cs          |  2 +-
 5 files changed, 90 insertions(+), 7 deletions(-)
 create mode 100644 src/ProcessRunner/StringExtensions.cs

diff --git a/src/ProcessRunner/ProcessRunner.csproj b/src/ProcessRunner/ProcessRunner.csproj
index 29daae85..e483bb85 100644
--- a/src/ProcessRunner/ProcessRunner.csproj
+++ b/src/ProcessRunner/ProcessRunner.csproj
@@ -65,6 +65,7 @@
     <Compile Include="Options.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="StringExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
diff --git a/src/ProcessRunner/Program.cs b/src/ProcessRunner/Program.cs
index 734f58c2..82cc0f95 100644
--- a/src/ProcessRunner/Program.cs
+++ b/src/ProcessRunner/Program.cs
@@ -60,7 +60,7 @@ static int Main(string[] args)
             var startInfo = new ProcessStartInfo()
             {
                 FileName = remainder[0],
-                Arguments = String.Join(" ", remainder.Skip(1).Select(x => x.Contains(' ') ? String.Format("\"{0}\"", x) : x)),
+                Arguments = StringExtensions.JoinCommandLine(remainder.Skip(1)),
                 UseShellExecute = shell,
                 CreateNoWindow = noWindow,
             };
@@ -71,13 +71,28 @@ static int Main(string[] args)
                 startInfo.UseShellExecute = true;
             }
 
+            string launchFilename = null;
+            string launchArguments = null;
+
+            if (!String.IsNullOrWhiteSpace(launch))
+            {
+                var parts = StringExtensions.SplitCommandLine(launch);
+                launchFilename = parts.First();
+                launchArguments = StringExtensions.JoinCommandLine(parts.Skip(1));
+            }
+
             try
             { 
                 var process = Process.Start(startInfo);
-                if (!String.IsNullOrWhiteSpace(launch))
+                if (!String.IsNullOrWhiteSpace(launchFilename))
                 {
                     process.WaitForExit();
-                    Process.Start(launch);
+                    var launchStartInfo = new ProcessStartInfo()
+                    {
+                        FileName = launchFilename,
+                        Arguments = launchArguments,
+                    };
+                    Process.Start(launchStartInfo);
                 }
             }
             catch (Win32Exception e)
diff --git a/src/ProcessRunner/StringExtensions.cs b/src/ProcessRunner/StringExtensions.cs
new file mode 100644
index 00000000..02ea2321
--- /dev/null
+++ b/src/ProcessRunner/StringExtensions.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProcessRunner
+{
+    // Stolen from http://stackoverflow.com/a/298990/1086121
+    public static class StringExtensions
+    {
+        public static IEnumerable<string> SplitCommandLine(string commandLine)
+        {
+            bool inQuotes = false;
+
+            return commandLine.Split(c =>
+            {
+                if (c == '\"')
+                    inQuotes = !inQuotes;
+
+                return !inQuotes && c == ' ';
+            })
+                              .Select(arg => arg.Trim().TrimMatchingQuotes('\"'))
+                              .Where(arg => !string.IsNullOrEmpty(arg));
+        }
+
+        public static IEnumerable<string> Split(this string str, Func<char, bool> controller)
+        {
+            int nextPiece = 0;
+
+            for (int c = 0; c < str.Length; c++)
+            {
+                if (controller(str[c]))
+                {
+                    yield return str.Substring(nextPiece, c - nextPiece);
+                    nextPiece = c + 1;
+                }
+            }
+
+            yield return str.Substring(nextPiece);
+        }
+
+        public static string TrimMatchingQuotes(this string input, char quote)
+        {
+            if ((input.Length >= 2) &&
+                (input[0] == quote) && (input[input.Length - 1] == quote))
+                return input.Substring(1, input.Length - 2);
+
+            return input;
+        }
+
+        public static string JoinCommandLine(IEnumerable<string> input)
+        {
+            return String.Join(" ", input.Select(x => x.Contains(' ') ? String.Format("\"{0}\"", x.Replace("\"", "\\\"")) : x));
+        }
+    }
+}
diff --git a/src/SyncTrayzor/Services/ProcessStartProvider.cs b/src/SyncTrayzor/Services/ProcessStartProvider.cs
index b8f2f1fa..4a3bb6ea 100644
--- a/src/SyncTrayzor/Services/ProcessStartProvider.cs
+++ b/src/SyncTrayzor/Services/ProcessStartProvider.cs
@@ -1,4 +1,5 @@
-using System;
+using NLog;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -21,6 +22,7 @@ public interface IProcessStartProvider
     public class ProcessStartProvider : IProcessStartProvider
     {
         private static readonly string processRunner = "ProcessRunner.exe";
+        private static readonly Logger logger = LogManager.GetCurrentClassLogger();
         private readonly string processRunnerPath;
 
         public ProcessStartProvider(IAssemblyProvider assemblyProvider)
@@ -30,11 +32,13 @@ public ProcessStartProvider(IAssemblyProvider assemblyProvider)
 
         public void Start(string filename)
         {
+            logger.Info("Starting {0}", filename);
             Process.Start(filename);
         }
 
         public void Start(string filename, string arguments)
         {
+            logger.Info("Starting {0} {1}", filename, arguments);
             Process.Start(filename, arguments);
         }
 
@@ -48,10 +52,13 @@ public void StartDetached(string filename, string arguments)
             if (arguments == null)
                 arguments = String.Empty;
 
+            var formattedArguments = String.Format("--shell -- \"{0}\" {1}", filename, arguments);
+
+            logger.Info("Starting {0} {1}", processRunnerPath, formattedArguments);
             var startInfo = new ProcessStartInfo()
             {
                 FileName = processRunnerPath,
-                Arguments = String.Format("--shell -- \"{0}\" {1}", filename, arguments),
+                Arguments = formattedArguments,
                 CreateNoWindow = true,
                 UseShellExecute = false,
             };
@@ -65,11 +72,14 @@ public void StartElevatedDetached(string filename, string arguments, string laun
                 arguments = String.Empty;
 
             var launch = launchAfterFinished == null ? null : String.Format("--launch=\"{0}\"", launchAfterFinished.Replace("\"", "\\\""));
+            var formattedArguments = String.Format("--nowindow -- \"{0}\" --runas {1} -- \"{2}\" {3}", processRunnerPath, launch, filename, arguments);
+
+            logger.Info("Starting {0} {1}", processRunnerPath, formattedArguments);
 
             var startInfo = new ProcessStartInfo()
             {
                 FileName = processRunnerPath,
-                Arguments = String.Format("--nowindow -- \"{0}\" --runas {1} -- \"{2}\" {3}", processRunnerPath, launch, filename, arguments),
+                Arguments = formattedArguments,
                 CreateNoWindow = true,
                 UseShellExecute = false,
             };
diff --git a/src/SyncTrayzor/Services/UpdateManagement/InstalledUpdateVariantHandler.cs b/src/SyncTrayzor/Services/UpdateManagement/InstalledUpdateVariantHandler.cs
index c52e35da..019b4590 100644
--- a/src/SyncTrayzor/Services/UpdateManagement/InstalledUpdateVariantHandler.cs
+++ b/src/SyncTrayzor/Services/UpdateManagement/InstalledUpdateVariantHandler.cs
@@ -57,7 +57,7 @@ public void AutoInstall()
                 throw new InvalidOperationException("TryHandleUpdateAvailableAsync returned false: cannot call AutoInstall");
 
             var path = String.Format("\"{0}\"", this.assemblyProvider.Location);
-            if (this.applicationState.HasMainWindow)
+            if (!this.applicationState.HasMainWindow)
                 path += " -minimized";
 
             this.processStartProvider.StartElevatedDetached(this.installerPath, "/SILENT", path);

From 4779e1a9a52774efcc8485efd62555ef1d85eb36 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 7 May 2015 18:32:22 +0100
Subject: [PATCH 21/24] Update translations

---
 .../Properties/Strings/Resources.cs.resx      |   20 +-
 .../Properties/Strings/Resources.de.resx      |   96 +-
 .../Properties/Strings/Resources.el.resx      |   16 +-
 .../Properties/Strings/Resources.es.resx      |   14 +-
 .../Properties/Strings/Resources.fr.resx      |   44 +-
 .../Strings/Resources.it_IT.Designer.cs       | 1153 +++++++++++++++++
 .../Properties/Strings/Resources.it_IT.resx   |  569 ++++++++
 .../Properties/Strings/Resources.nl.resx      |   14 +-
 .../Properties/Strings/Resources.ru.resx      |   32 +-
 .../Properties/Strings/Resources.sk.resx      |   14 +-
 10 files changed, 1871 insertions(+), 101 deletions(-)
 create mode 100644 src/SyncTrayzor/Properties/Strings/Resources.it_IT.Designer.cs
 create mode 100644 src/SyncTrayzor/Properties/Strings/Resources.it_IT.resx

diff --git a/src/SyncTrayzor/Properties/Strings/Resources.cs.resx b/src/SyncTrayzor/Properties/Strings/Resources.cs.resx
index e9357053..5c0741ff 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.cs.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.cs.resx
@@ -415,11 +415,11 @@ Detaily a licence každé komponenty jsou zobrazeny níže.</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to show the Settings dialog</comment>
   </data>
   <data name="TrayIcon_Menu_StartSyncthing" xml:space="preserve">
-    <value>_Spustit</value>
+    <value>_Spustit Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to start Syncthing. Only available if Syncthing isn't running</comment>
   </data>
   <data name="TrayIcon_Menu_StopSyncthing" xml:space="preserve">
-    <value>_Ukončit</value>
+    <value>U_končit Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to stop Syncthing. Only available if Syncthing is running</comment>
   </data>
   <data name="UnhandledExceptionView_IntroMessage" xml:space="preserve">
@@ -444,7 +444,7 @@ Je nám líto, ale SyncTrayzor se musí ukončit.</value>
   </data>
   <data name="UnhandledExceptionView_Title" xml:space="preserve">
     <value>Chyba!</value>
-    <comment>Title of the dialog shown when an unhandled excepotion occurs</comment>
+    <comment>Title of the dialog shown when an unhandled exception occurs</comment>
   </data>
   <data name="ViewerView_SyncthingStarting" xml:space="preserve">
     <value>Syncthing se spouští...</value>
@@ -477,7 +477,7 @@ Je nám líto, ale SyncTrayzor se musí ukončit.</value>
     <value>Zobrazovat bublinová upozornění &apos;Zařízení připojeno/odpojeno&apos;</value>
   </data>
   <data name="TrayIcon_Balloon_DeviceConnected_Message" xml:space="preserve">
-    <value>{0} připojen</value>
+    <value>{0} připojeno</value>
     <comment>Message of tray icon balloon show when another device connects
 {0}: device name</comment>
   </data>
@@ -486,7 +486,7 @@ Je nám líto, ale SyncTrayzor se musí ukončit.</value>
     <comment>Title of tray icon balloon when another device connected</comment>
   </data>
   <data name="TrayIcon_Balloon_DeviceDisconnected_Message" xml:space="preserve">
-    <value>{0} odpojen</value>
+    <value>{0} odpojeno</value>
     <comment>Message of tray icon balloon show when another device disconnects
 {0}: device name</comment>
   </data>
@@ -498,7 +498,7 @@ Je nám líto, ale SyncTrayzor se musí ukončit.</value>
     <value>_Restartovat</value>
   </data>
   <data name="TrayIcon_Menu_RestartSyncthing" xml:space="preserve">
-    <value>_Restartovat</value>
+    <value>_Restartovat Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restart</comment>
   </data>
   <data name="SettingsView_Tab_Syncthing" xml:space="preserve">
@@ -519,7 +519,7 @@ Je nám líto, ale SyncTrayzor se musí ukončit.</value>
     <value>Spouštět Syncthing jako proces s nízkou prioritou</value>
   </data>
   <data name="TrayIcon_Menu_OpenFolder" xml:space="preserve">
-    <value>Ote_vřít adresář</value>
+    <value>_Otevřít adresář</value>
     <comment>Menu option available when right-clicking the tray icon. Is a header for a list of folders, each of which can be clicked to open it in Explorer</comment>
   </data>
   <data name="ViewerView_OpenFolder" xml:space="preserve">
@@ -560,4 +560,10 @@ Je nám líto, ale SyncTrayzor se musí ukončit.</value>
   <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
     <value>Musí být ve formátu &apos;PROM=hodnota PROM2=&quot;hodnota1 hodnota2&quot;&apos;</value>
   </data>
+  <data name="NewVersionInstalledView_Message" xml:space="preserve">
+    <value>Instalace SyncTrayzor verze {0} proběhla úspěšně.</value>
+  </data>
+  <data name="NewVersionInstalledView_Title" xml:space="preserve">
+    <value>SyncTrayzor aktualizován</value>
+  </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.de.resx b/src/SyncTrayzor/Properties/Strings/Resources.de.resx
index 2fac1059..a80389c6 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.de.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.de.resx
@@ -121,7 +121,7 @@
     <value>Erstellt von Antony Male.</value>
   </data>
   <data name="AboutView_DownloadNewVersion" xml:space="preserve">
-    <value>Herunterladen Seite öffnen</value>
+    <value>Downloadseite öffnen</value>
     <comment>Clickable link allowing the user to download the latest version of SyncTrayzor</comment>
   </data>
   <data name="AboutView_NewAppVersionAvailable" xml:space="preserve">
@@ -130,13 +130,13 @@
 {0}: Latest version of SyncTrayzor </comment>
   </data>
   <data name="AboutView_ReleasedLicense" xml:space="preserve">
-    <value>Veröffentlicht unter MIT-Lizenz.</value>
+    <value>Veröffentlicht unter der MIT-Lizenz.</value>
   </data>
   <data name="AboutView_ShowOtherLicenses" xml:space="preserve">
     <value>Zeige Open-Source-Lizenzen</value>
   </data>
   <data name="AboutView_SyncthingVersion" xml:space="preserve">
-    <value>SyncThing Version: {0}</value>
+    <value>Version von Syncthing: {0}</value>
     <comment>Information showing the user the current version of Syncthing
 {0}: Current Syncthing version</comment>
   </data>
@@ -179,7 +179,7 @@
     <value>Prozess _beenden</value>
   </data>
   <data name="ShellView_Menu_Syncthing_KillAll" xml:space="preserve">
-    <value>_Alle Syncthing Prozesse beenden</value>
+    <value>Alle _Syncthing-Prozesse beenden</value>
   </data>
   <data name="ShellView_Menu_Syncthing_OpenExternal" xml:space="preserve">
     <value>In e_xternem Browser öffnen</value>
@@ -198,7 +198,7 @@
     <comment>When a new version is available, the user receives a prompt. This button allows the user to say they want want to be prompted to upgrade to this particular version again</comment>
   </data>
   <data name="NewVersionAlertView_Button_Download" xml:space="preserve">
-    <value>Herunterladen Seite öffnen</value>
+    <value>Downloadseite öffnen</value>
     <comment>When a new version is available, the user receives a prompt. This button allows them to download the new version</comment>
   </data>
   <data name="NewVersionAlertView_Button_RemindLater" xml:space="preserve">
@@ -213,39 +213,39 @@
     <comment>When a new version is available, the user receives a prompt. This message tells the user how to permanently disable new version prompts. 'The Settings page' corresponds to ShellView_Menu_File. 'Help -&gt;About' corresponds to ShellView_Menu_Help_About.</comment>
   </data>
   <data name="NewVersionAlertView_NewVersionAvailable" xml:space="preserve">
-    <value>Sync Rayzor Version {0} ist verfügbar!</value>
+    <value>Version {0} von SyncTrayzor ist verfügbar!</value>
     <comment>When a new version is available, the user receives a prompt. This text appears at the top of that prompt</comment>
   </data>
   <data name="NewVersionAlertView_Title" xml:space="preserve">
-    <value>SyncTrayzor Update verfügbar</value>
+    <value>Update für SyncTrayzor verfügbar</value>
     <comment>When a new version is available, the user receives a prompt. This is the title of that prompt.</comment>
   </data>
   <data name="SettingsView_AlertOnNewVersion" xml:space="preserve">
-    <value>Benachrichtigen wenn eine neue SyncTrayzor-Version verfügbar ist</value>
+    <value>Benachrichtigen, wenn eine neue Version von SyncTrayzor verfügbar ist</value>
   </data>
   <data name="SettingsView_ApiKey" xml:space="preserve">
     <value>API-Schlüssel:</value>
   </data>
   <data name="SettingsView_ApiKey_ToolTip" xml:space="preserve">
-    <value>SyncTrayzor überschreibt den API-Schlüssel der in Syncthing konfiguriert wurde. Für einen eigenen Wert kann dieser jedoch hier hinterlegt werden.</value>
+    <value>SyncTrayzor überschreibt den in Syncthing festgelegten API-Schlüssel. Ein alternativer Wert kann hier angegeben werden.</value>
     <comment>ToolTip shown when a user hovers over the SettingsView_ApiKey text input. This shows more information on the input.</comment>
   </data>
   <data name="SettingsView_CloseToTray" xml:space="preserve">
-    <value>Beim schließen in den Infobereich minimieren</value>
+    <value>Beim Schließen in den Infobereich minimieren</value>
     <comment>Setting allowing the user to indicate that the 'close' button on the top right of the window should put Syncthing down into the tray, rather than closing the application</comment>
   </data>
   <data name="SettingsView_MinimizeToTray" xml:space="preserve">
-    <value>Beim minieren im Infobereich anzeigen</value>
+    <value>Beim Minimieren im Infobereich anzeigen</value>
     <comment>Setting allowing the user to indicate that the 'minimize' button on the top right of the window should put Syncthing down into the tray, rather than minimizing the application</comment>
   </data>
   <data name="SettingsView_MustRestartSyncthingWarning" xml:space="preserve">
-    <value>Syncthing muss neu gestartet werden damit die Änderungen wirksam werden.</value>
+    <value>Syncthing muss neu gestartet werden, damit die Änderungen wirksam werden</value>
   </data>
   <data name="SettingsView_ObfuscateDeviceIds" xml:space="preserve">
-    <value>Geräte-IDs verkürzt darstellen</value>
+    <value>Geräte-IDs verkürzt darstellen in Logdatei</value>
   </data>
   <data name="SettingsView_OnlyShowTrayIconOnClose" xml:space="preserve">
-    <value>Symbol im Infobereich nur beim schließen anzeigen</value>
+    <value>Symbol im Infobereich nur beim Schließen anzeigen</value>
   </data>
   <data name="SettingsView_Section_Advanced" xml:space="preserve">
     <value>Erweitert</value>
@@ -264,11 +264,11 @@
     <comment>Section header for settings to do with configuring SyncTrayzor</comment>
   </data>
   <data name="SettingsView_Section_WatchedFolders" xml:space="preserve">
-    <value>Überwachte Ordner</value>
+    <value>Überwachte Verzeichnisse</value>
     <comment>Section header for settings to do with configuring SyncTrayzor's ability to watch folders for changes</comment>
   </data>
   <data name="SettingsView_ShowBalloonWhenSynchronized" xml:space="preserve">
-    <value>Synchronieserungs-Benachrichtigungen im Infobereich anzeigen</value>
+    <value>Synchronisierungs-Benachrichtigungen im Infobereich anzeigen</value>
     <comment>Setting allowing the user to specify that a balloon message (white area down by the tray icon, linked to the tray icon) should be shown whenever a folder finishes synchronizing</comment>
   </data>
   <data name="SettingsView_StartMinimized" xml:space="preserve">
@@ -280,7 +280,7 @@
     <comment>Setting allowing the user to specify that SyncTrayzor should be started when the user logs in</comment>
   </data>
   <data name="SettingsView_StartOnLogin_PermissionDenied" xml:space="preserve">
-    <value>Zugriff verweigert. Bitte starten Sie SyncTrayzor als Administrator um diese Einstellungen anzupassen.</value>
+    <value>Zugriff verweigert. Bitte starten Sie SyncTrayzor als Administrator, um diese Einstellungen anpassen zu können.</value>
     <comment>Message displayed instead of SettingsView_StartOnLogin SettingsView_StartMinimized when the user doesn't have permission to edit the registry</comment>
   </data>
   <data name="SettingsView_StartSyncthingAutomatically" xml:space="preserve">
@@ -291,14 +291,14 @@
     <value>Listen-Adresse der GUI:</value>
   </data>
   <data name="SettingsView_SyncthingAddress_ToolTip" xml:space="preserve">
-    <value>SyncTrayzor überschreibt die &quot;Listen-Adresse der GUI&quot; die in Syncthing konfiguriert wurde. Für einen eigenen Wert kann dieser jedoch hier hinterlegt werden.</value>
+    <value>SyncTrayzor überschreibt die in Syncthing festgelegte &quot;Listen-Adresse der GUI&quot;. Ein alternativer Wert kann hier angegeben werden.</value>
     <comment>ToolTip shown when a user hovers over the SettingsView_SyncthingAddress text input. This shows more information on the input.</comment>
   </data>
   <data name="SettingsView_SyncthingUseCustomHome" xml:space="preserve">
-    <value>Eigenen Stammordner für Syncthing verwenden.</value>
+    <value>Alternatives Basisverzeichnis für Syncthing verwenden.</value>
   </data>
   <data name="SettingsView_SyncthingUseCustomHome_ToolTip" xml:space="preserve">
-    <value>Dies bedeutet das SyncTrayzor eine unterschiedliche Sammlung von eingestellten Ordnern sehen wird.</value>
+    <value>Dies bedeutet, dass SyncTrayzor nur die Verzeichnisse derjenigen Syncthing-Installation sehen wird.</value>
     <comment>ToolTip shown when a user hovers over the SettingsView_SyncthingUseCustomHome text input. This shows more information on the input.</comment>
   </data>
   <data name="SettingsView_Title" xml:space="preserve">
@@ -306,20 +306,20 @@
     <comment>Title of the 'settings' dialog</comment>
   </data>
   <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
-    <value>Syncthing Umgebungsvariablen:</value>
+    <value>Umgebungsvariablen von Syncthing:</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
+    <value>Die folgenden Ordner werden auf Änderungen überwacht. Dadurch lässt sich ein höherer Abfrageintervall setzen.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
-    <value>Ordner nicht verfügbar, bitte Syncthing starten.</value>
+    <value>Ordner nicht verfügbar. Bitte Syncthing starten!</value>
   </data>
   <data name="AboutView_UnknownVersion" xml:space="preserve">
     <value>Unbekannt</value>
     <comment>Shown within AboutView_SyncthingVersion if Syncthing's version couldn't be determined</comment>
   </data>
   <data name="Dialog_ConfirmKillAllProcesses_Message" xml:space="preserve">
-    <value>Sicher das Sie alle Syncthing-Prozesse beenden wollen, auch solche die nicht durch SyncTrayzor verwaltet werden?</value>
+    <value>Sind Sie sich sicher, dass Sie alle Syncthing-Prozesse beenden möchten, auch solche die nicht durch SyncTrayzor verwaltet werden?</value>
     <comment>Body for the dialog show when the user clicks on ShellView_Menu_Syncthing_KillAll</comment>
   </data>
   <data name="Dialog_ConfirmKillAllProcesses_Title" xml:space="preserve">
@@ -329,9 +329,9 @@
   <data name="Dialog_FailedToStartSyncthing_Message" xml:space="preserve">
     <value>Syncthing konnte nicht gestartet werden.
 
-Bitte das Logfile analysieren um den Grund festzustellen.
+Bitte das Logfile untersuchen, um die Ursache feststellen zu können.
 
-Wenn eine Meldung &quot;FATAL: Cannot open database&quot; erscheint, bitte kontrollieren das keine anderen Instanzen von Syncthing auf diesem Computer laufen. Falls SyncTrayzor vorher abgestürzt ist, können noch unbeaufsichtigte Prozesse laufen, in diesem Fall bitte alle Prozesse über das Syncthing-Menü beenden. Danach Syncthing einfach wieder starten.</value>
+Wenn eine Meldung &quot;FATAL: Cannot open database&quot; erscheint, bitte überprüfen ob keine anderen Instanzen von Syncthing auf diesem Computer laufen. Falls SyncTrayzor zuvor abgestürzt ist, können noch unbeaufsichtigte Prozesse laufen. In diesem Fall bitte alle Prozesse über das Syncthing-Menü beenden. Danach Syncthing einfach wieder starten.</value>
     <comment>Content of the dialog shown when Syncthing couldn't be started (and exited with an error). Instructs the user on how to proceed.
 
 "FATAL: Cannot Open Database" should remain in English
@@ -339,21 +339,21 @@ Wenn eine Meldung &quot;FATAL: Cannot open database&quot; erscheint, bitte kontr
 The menu option "Syncthing -&gt;Kill all Syncthing processes" corresponds to ShellView_Menu_Syncthing_KillAll, while "Syncthing -&gt;Start" corresponds to ShellView_Menu_Syncthing_Start</comment>
   </data>
   <data name="Dialog_FailedToStartSyncthing_Title" xml:space="preserve">
-    <value>Beim starten von Syncthing trat ein Fehler auf</value>
+    <value>Beim Starten von Syncthing trat ein Fehler auf</value>
     <comment>Title of the dialog shown when Syncthing couldn't be started (and exited with an error)</comment>
   </data>
   <data name="Dialog_SyncthingBlockedByGroupPolicy_Message" xml:space="preserve">
     <value>Syncthing konnte nicht gestartet werden: {0}
 
-Dies kann passieren wenn keine Dateien aus dem %APPDATA%-Verzeichnis gestartet werden können. Mögliche Gründe können Viren- oder Malwareschutz-Programme sein (z.B. CryptoPrevent) welche dies gezielt verhindern.
+Dies kann passieren, wenn Windows das Ausführen von Programmdateien im %APPDATA%-Verzeichnis unterbindet. Mögliche Gründe können Viren- oder Malwareschutz-Programme sein (z. B. CryptoPrevent), welche dies gezielt verhindern.
 
-Bitte die Einstellung entsprechend anpassen bzw. &apos;{1}&apos; in die Whitelists eintragen.</value>
+Bitte die Einstellung entsprechend anpassen bzw. &apos;{1}&apos; in die Whitelist eintragen.</value>
     <comment>Content of dialog shown when Syncthing couldn't start because of group policy settings (probably)
 {0}: Exact exception message
 {1}: Path to Syncthing executable</comment>
   </data>
   <data name="Dialog_SyncthingBlockedByGroupPolicy_Title" xml:space="preserve">
-    <value>Fehler beim starten von Syncthing</value>
+    <value>Fehler beim Starten von Syncthing</value>
     <comment>Title of dialog shown when Syncthing couldn't start because of group policy settings (probably)</comment>
   </data>
   <data name="SettingsView_Validation_InvalidUrl" xml:space="preserve">
@@ -374,7 +374,7 @@ Bitte die Einstellung entsprechend anpassen bzw. &apos;{1}&apos; in die Whitelis
     <value>Lizenz:</value>
   </data>
   <data name="ThirdPartyComponentsView_ComponentLicenseTextLabel" xml:space="preserve">
-    <value>Lizenz-Text:</value>
+    <value>Lizenztext:</value>
   </data>
   <data name="ThirdPartyComponentsView_ComponentNameLabel" xml:space="preserve">
     <value>Name:</value>
@@ -383,8 +383,8 @@ Bitte die Einstellung entsprechend anpassen bzw. &apos;{1}&apos; in die Whitelis
     <value>Anmerkungen:</value>
   </data>
   <data name="ThirdPartyComponentsView_Intro" xml:space="preserve">
-    <value>SyncTrayzor verwendet viele Open-Source-Komponenten ohne die es nicht existieren würde.
-Genaueres zu jeder Komponente, sowie die entsprechenden Lizenz-Texte, werden unten angezeigt.</value>
+    <value>SyncTrayzor verwendet mehrere Open-Source-Komponenten, ohne die es nicht existieren würde.
+Genaueres zu jeder Komponente, sowie die entsprechenden Lizenztexte, werden unten angezeigt.</value>
   </data>
   <data name="ThirdPartyComponentsView_Title" xml:space="preserve">
     <value>Dritt-Komponenten</value>
@@ -399,7 +399,7 @@ Genaueres zu jeder Komponente, sowie die entsprechenden Lizenz-Texte, werden unt
     <value>Synchronisation abgeschlossen</value>
   </data>
   <data name="TrayIcon_Menu_CloseToTray" xml:space="preserve">
-    <value>Beim schließen in den Infobereich minimieren</value>
+    <value>In Infobereich minimieren</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to minimize itself to the tray</comment>
   </data>
   <data name="TrayIcon_Menu_Exit" xml:space="preserve">
@@ -415,11 +415,11 @@ Genaueres zu jeder Komponente, sowie die entsprechenden Lizenz-Texte, werden unt
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to show the Settings dialog</comment>
   </data>
   <data name="TrayIcon_Menu_StartSyncthing" xml:space="preserve">
-    <value>_Starten</value>
+    <value>_Start Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to start Syncthing. Only available if Syncthing isn't running</comment>
   </data>
   <data name="TrayIcon_Menu_StopSyncthing" xml:space="preserve">
-    <value>_Anhalten</value>
+    <value>S_top Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to stop Syncthing. Only available if Syncthing is running</comment>
   </data>
   <data name="UnhandledExceptionView_IntroMessage" xml:space="preserve">
@@ -431,7 +431,7 @@ SyncTrayzor wird nun geschlossen.</value>
     <comment>When an unhandled exception occurs, the user is informed that they may have to provide a log file, and gives the path. This text appears immediately after the log path</comment>
   </data>
   <data name="UnhandledExceptionView_LogFileLocation_Pre" xml:space="preserve">
-    <value>Falls Sie gefragt nach einem Logfile gefragt werden finden Sie dies in:</value>
+    <value>Falls Sie nach einem Logfile gefragt werden, finden Sie dies in:</value>
     <comment>When an unhandled exception occurs, the user is informed that they may have to provide a log file, and gives the path. This text appears immediately before the log path</comment>
   </data>
   <data name="UnhandledExceptionView_PleaseOpenIssue_Post" xml:space="preserve">
@@ -444,7 +444,7 @@ SyncTrayzor wird nun geschlossen.</value>
   </data>
   <data name="UnhandledExceptionView_Title" xml:space="preserve">
     <value>Fehler!</value>
-    <comment>Title of the dialog shown when an unhandled excepotion occurs</comment>
+    <comment>Title of the dialog shown when an unhandled exception occurs</comment>
   </data>
   <data name="ViewerView_SyncthingStarting" xml:space="preserve">
     <value>Syncthing startet...</value>
@@ -498,7 +498,7 @@ SyncTrayzor wird nun geschlossen.</value>
     <value>_Neustart</value>
   </data>
   <data name="TrayIcon_Menu_RestartSyncthing" xml:space="preserve">
-    <value>_Neustart</value>
+    <value>R_estart Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restart</comment>
   </data>
   <data name="SettingsView_Tab_Syncthing" xml:space="preserve">
@@ -510,10 +510,10 @@ SyncTrayzor wird nun geschlossen.</value>
     <comment>'SyncTrayzor' settings tab</comment>
   </data>
   <data name="SettingsView_SyncthingDenyUpgrade" xml:space="preserve">
-    <value>Syncthing-Version nicht automatisch aktualisieren</value>
+    <value>Syncthing nicht automatisch aktualisieren</value>
   </data>
   <data name="SettingsView_SyncthingDenyUpgrade_ToolTip" xml:space="preserve">
-    <value>Verhindert das Syncthing sich automatisch aktualisiert. Dies kann dabei helfen die Kompatibilität von SyncTrayzor zu erhalten. Im Fehlerfall muss sonst die syncthing.exe in SyncTrayzors &quot;config&quot;-Ordner ersetzt werden.</value>
+    <value>Verhindert, dass Syncthing sich automatisch aktualisiert. Dies kann dabei helfen, die Kompatibilität von SyncTrayzor zu erhalten. Im Fehlerfall muss sonst die syncthing.exe in SyncTrayzors &quot;config&quot;-Ordner ersetzt werden.</value>
   </data>
   <data name="SettingsView_SyncthingRunLowPriority" xml:space="preserve">
     <value>Syncthing mit niedriger Prozess-Priorität laufen lassen.</value>
@@ -531,13 +531,13 @@ SyncTrayzor wird nun geschlossen.</value>
     <comment>Link show in the centre of the screen when Syncthing is stopped, allowing the user to start syncthing</comment>
   </data>
   <data name="SettingsView_UseComputerCulture" xml:space="preserve">
-    <value>Benutze die Sprache meines Betriebssystems, wo verfügbar. SyncTrayzor muss neu gestartet werden um diese Änderung anzuwenden.</value>
+    <value>Benutze die Sprache meines Betriebssystems (falls verfügbar). SyncTrayzor muss neu gestartet werden, damit diese Änderung wirksam wird.</value>
   </data>
   <data name="ShellView_Menu_View" xml:space="preserve">
     <value>_Ansicht</value>
   </data>
   <data name="ShellView_Menu_View_SyncthingConsole" xml:space="preserve">
-    <value>Syncthing Κonsole</value>
+    <value>Syncthing-Κonsole</value>
   </data>
   <data name="NewVersionAlertView_Button_Install" xml:space="preserve">
     <value>Jetzt installieren</value>
@@ -546,7 +546,7 @@ SyncTrayzor wird nun geschlossen.</value>
     <value>Änderungshistorie anzeigen</value>
   </data>
   <data name="ShellView_Menu_Zoom" xml:space="preserve">
-    <value>_Zoom Browser</value>
+    <value>_Webseitenzoom</value>
   </data>
   <data name="ShellView_Menu_Zoom_In" xml:space="preserve">
     <value>Hineinzoomen</value>
@@ -558,6 +558,12 @@ SyncTrayzor wird nun geschlossen.</value>
     <value>Zurücksetzen</value>
   </data>
   <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
-    <value>Muss im folgenden Format sein &apos;VAR=value VAR2=&quot;val1 val2&quot;&apos;</value>
+    <value>Muss in diesem Format sein: &apos;VAR=value VAR2=&quot;val1 val2&quot;&apos;</value>
+  </data>
+  <data name="NewVersionInstalledView_Message" xml:space="preserve">
+    <value>SyncTrayzor version {0} was successfully installed.</value>
+  </data>
+  <data name="NewVersionInstalledView_Title" xml:space="preserve">
+    <value>SyncTrayzor Updated</value>
   </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.el.resx b/src/SyncTrayzor/Properties/Strings/Resources.el.resx
index 2f7c1c91..6cc26792 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.el.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.el.resx
@@ -309,7 +309,7 @@
     <value>Syncthing περιβαλλοντικές μεταβλητές:</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
+    <value>Οι ακόλουθοι φάκελοι θα παρακολουθούνται για αλλαγές, πράγμα που σημαίνει ότι μπορείτε να ορίσετε ένα μεγαλύτερο χρονικό διάστημα των δημοσκοπήσεων.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Φάκελοι μη διαθέσιμη. Παρακαλούμε ξεκινήστε το Syncthing</value>
@@ -415,11 +415,11 @@ The menu option "Syncthing -&gt;Kill all Syncthing processes" corresponds to She
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to show the Settings dialog</comment>
   </data>
   <data name="TrayIcon_Menu_StartSyncthing" xml:space="preserve">
-    <value>_Έναρξη</value>
+    <value>_Start Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to start Syncthing. Only available if Syncthing isn't running</comment>
   </data>
   <data name="TrayIcon_Menu_StopSyncthing" xml:space="preserve">
-    <value>Σ_τοπ</value>
+    <value>S_top Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to stop Syncthing. Only available if Syncthing is running</comment>
   </data>
   <data name="UnhandledExceptionView_IntroMessage" xml:space="preserve">
@@ -444,7 +444,7 @@ The menu option "Syncthing -&gt;Kill all Syncthing processes" corresponds to She
   </data>
   <data name="UnhandledExceptionView_Title" xml:space="preserve">
     <value>Σφάλμα!</value>
-    <comment>Title of the dialog shown when an unhandled excepotion occurs</comment>
+    <comment>Title of the dialog shown when an unhandled exception occurs</comment>
   </data>
   <data name="ViewerView_SyncthingStarting" xml:space="preserve">
     <value>Έναρξη του Syncthing...</value>
@@ -498,7 +498,7 @@ The menu option "Syncthing -&gt;Kill all Syncthing processes" corresponds to She
     <value>Επανεκκίνηση</value>
   </data>
   <data name="TrayIcon_Menu_RestartSyncthing" xml:space="preserve">
-    <value>Επανεκκίνηση</value>
+    <value>R_estart Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restart</comment>
   </data>
   <data name="SettingsView_Tab_Syncthing" xml:space="preserve">
@@ -560,4 +560,10 @@ The menu option "Syncthing -&gt;Kill all Syncthing processes" corresponds to She
   <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
     <value>Πρέπει να είναι στη μορφή &apos;VAR=value VAR2=&quot;val1 val2&quot;&apos;</value>
   </data>
+  <data name="NewVersionInstalledView_Message" xml:space="preserve">
+    <value>SyncTrayzor version {0} was successfully installed.</value>
+  </data>
+  <data name="NewVersionInstalledView_Title" xml:space="preserve">
+    <value>SyncTrayzor Updated</value>
+  </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.es.resx b/src/SyncTrayzor/Properties/Strings/Resources.es.resx
index 1ec58bb7..50344442 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.es.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.es.resx
@@ -415,11 +415,11 @@ Debajo se muestran los detalles de cada componente y sus licencias.</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to show the Settings dialog</comment>
   </data>
   <data name="TrayIcon_Menu_StartSyncthing" xml:space="preserve">
-    <value>_Iniciar</value>
+    <value>_Iniciar Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to start Syncthing. Only available if Syncthing isn't running</comment>
   </data>
   <data name="TrayIcon_Menu_StopSyncthing" xml:space="preserve">
-    <value>_Parar</value>
+    <value>_Parar Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to stop Syncthing. Only available if Syncthing is running</comment>
   </data>
   <data name="UnhandledExceptionView_IntroMessage" xml:space="preserve">
@@ -444,7 +444,7 @@ SyncTrayzor se va a cerrar. Lo sentimos.</value>
   </data>
   <data name="UnhandledExceptionView_Title" xml:space="preserve">
     <value>¡Error!</value>
-    <comment>Title of the dialog shown when an unhandled excepotion occurs</comment>
+    <comment>Title of the dialog shown when an unhandled exception occurs</comment>
   </data>
   <data name="ViewerView_SyncthingStarting" xml:space="preserve">
     <value>Iniciando Syncthing...</value>
@@ -498,7 +498,7 @@ SyncTrayzor se va a cerrar. Lo sentimos.</value>
     <value>_Reiniciar</value>
   </data>
   <data name="TrayIcon_Menu_RestartSyncthing" xml:space="preserve">
-    <value>_Reiniciar</value>
+    <value>_Reiniciar Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restart</comment>
   </data>
   <data name="SettingsView_Tab_Syncthing" xml:space="preserve">
@@ -560,4 +560,10 @@ SyncTrayzor se va a cerrar. Lo sentimos.</value>
   <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
     <value>Debe estar en el formato &apos;VAR=valor VAR2=&quot;val1 val2&quot;&apos;</value>
   </data>
+  <data name="NewVersionInstalledView_Message" xml:space="preserve">
+    <value>La versión {0} de SyncTrayzor se instaló correctamente.</value>
+  </data>
+  <data name="NewVersionInstalledView_Title" xml:space="preserve">
+    <value>SyncTrayzor se actualizó</value>
+  </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.fr.resx b/src/SyncTrayzor/Properties/Strings/Resources.fr.resx
index 61468788..ab427ec9 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.fr.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.fr.resx
@@ -121,7 +121,7 @@
     <value>Créé par Antony Male.</value>
   </data>
   <data name="AboutView_DownloadNewVersion" xml:space="preserve">
-    <value>Open Download Page</value>
+    <value>Accéder à la page de téléchargement</value>
     <comment>Clickable link allowing the user to download the latest version of SyncTrayzor</comment>
   </data>
   <data name="AboutView_NewAppVersionAvailable" xml:space="preserve">
@@ -130,7 +130,7 @@
 {0}: Latest version of SyncTrayzor </comment>
   </data>
   <data name="AboutView_ReleasedLicense" xml:space="preserve">
-    <value>Distribué sous licence MIT</value>
+    <value>Distribué sous licence MIT.</value>
   </data>
   <data name="AboutView_ShowOtherLicenses" xml:space="preserve">
     <value>Montrer les licences open source</value>
@@ -176,7 +176,7 @@
     <value>_Syncthing</value>
   </data>
   <data name="ShellView_Menu_Syncthing_Kill" xml:space="preserve">
-    <value>_Arrêter</value>
+    <value>_Forcer l&apos;arrêt</value>
   </data>
   <data name="ShellView_Menu_Syncthing_KillAll" xml:space="preserve">
     <value>Arrêter _tous les processus Syncthing</value>
@@ -198,7 +198,7 @@
     <comment>When a new version is available, the user receives a prompt. This button allows the user to say they want want to be prompted to upgrade to this particular version again</comment>
   </data>
   <data name="NewVersionAlertView_Button_Download" xml:space="preserve">
-    <value>Open Download Page</value>
+    <value>Télécharger la dernière version</value>
     <comment>When a new version is available, the user receives a prompt. This button allows them to download the new version</comment>
   </data>
   <data name="NewVersionAlertView_Button_RemindLater" xml:space="preserve">
@@ -268,7 +268,7 @@
     <comment>Section header for settings to do with configuring SyncTrayzor's ability to watch folders for changes</comment>
   </data>
   <data name="SettingsView_ShowBalloonWhenSynchronized" xml:space="preserve">
-    <value>Montrer les notifications de synchronisation</value>
+    <value>Montrer les notifications de fin de synchronisation</value>
     <comment>Setting allowing the user to specify that a balloon message (white area down by the tray icon, linked to the tray icon) should be shown whenever a folder finishes synchronizing</comment>
   </data>
   <data name="SettingsView_StartMinimized" xml:space="preserve">
@@ -309,7 +309,7 @@
     <value>Variables d’environnement de Syncthing :</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
+    <value>Les changements dans les dossiers suivants seront surveillés, ce qui signifie que vous pouvez régler un intervalle de scan plus grand.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Dossiers indisponibles. Veuillez démarrer Syncthing</value>
@@ -327,11 +327,11 @@
     <comment>Title for the dialog shown when the user clicks on ShellView_Menu_Syncthing_KillAll</comment>
   </data>
   <data name="Dialog_FailedToStartSyncthing_Message" xml:space="preserve">
-    <value>Failed to start Syncthing.
+    <value>Impossible de démarrer Syncthing.
 
-Please read the log to determine the cause.
+Veuillez lire le journal pour en déterminer la cause.
 
-If &quot;FATAL: Cannot open database&quot; appears, please close any other open instances of Syncthing. If SyncTrayzor crashed previously, there may still be zombine Syncthing processes alive. Please use the menu option &quot;Syncthing -&gt; Kill all Syncthing processes&quot; to stop them, then use &quot;Syncthing -&gt; Start&quot; to start Syncthing again.</value>
+Si &quot;FATAL: Cannot open database&quot; apparait, vous devez fermer toute autres instances de Syncthing en cours d&apos;exécution. Si SyncTrayzor a planté juste avant, il se peut qu&apos;il reste un processus zombie de Syncthing. Veuillez alors utiliser le menu &quot;Syncthing &gt; Arrêter tous les processus Syncthing&quot; puis &quot;Syncthing &gt; Démarrer&quot;</value>
     <comment>Content of the dialog shown when Syncthing couldn't be started (and exited with an error). Instructs the user on how to proceed.
 
 "FATAL: Cannot Open Database" should remain in English
@@ -343,11 +343,11 @@ The menu option "Syncthing -&gt;Kill all Syncthing processes" corresponds to She
     <comment>Title of the dialog shown when Syncthing couldn't be started (and exited with an error)</comment>
   </data>
   <data name="Dialog_SyncthingBlockedByGroupPolicy_Message" xml:space="preserve">
-    <value>Unable to start Syncthing: {0}
+    <value>Impossible de démarrer Syncthing : {0}
 
-This could be because Windows if set up to forbid executing files in AppData, or because you have anti-malware installed (e.g. CryptoPrevent ) which prevents executing files in AppData.
+C&apos;est peut-être Windows qui est paramétré pour interdire l&apos;exécution de programmes dans le dossier AppData, ou vous avez un logiciel anti-malware (ex : CryptoPrevent) qui empêche l&apos;exécution de programmes dans le dossier AppData.
 
-Please adjust your settings / whitelists to allow &apos;{1}&apos; to execute</value>
+Veuillez ajuster vos paramètres/whitelist pour permettre l&apos;exécution de {1}</value>
     <comment>Content of dialog shown when Syncthing couldn't start because of group policy settings (probably)
 {0}: Exact exception message
 {1}: Path to Syncthing executable</comment>
@@ -415,11 +415,11 @@ Les détails de chaque composant ainsi que l&apos;énoncé de la licence corresp
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to show the Settings dialog</comment>
   </data>
   <data name="TrayIcon_Menu_StartSyncthing" xml:space="preserve">
-    <value>_Démarrage</value>
+    <value>_Start Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to start Syncthing. Only available if Syncthing isn't running</comment>
   </data>
   <data name="TrayIcon_Menu_StopSyncthing" xml:space="preserve">
-    <value>A_rrêt</value>
+    <value>S_top Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to stop Syncthing. Only available if Syncthing is running</comment>
   </data>
   <data name="UnhandledExceptionView_IntroMessage" xml:space="preserve">
@@ -439,12 +439,12 @@ SyncTrayzor doit se fermer. Veuillez nous excuser.</value>
     <comment>When an unhandled exception occurs, the user is prompted to visit the Github issues page. This text appears immediately after the link to github, and also prompts the user to include the stack trace shown directly below this text</comment>
   </data>
   <data name="UnhandledExceptionView_PleaseOpenIssue_Pre" xml:space="preserve">
-    <value>Please open an issue at</value>
+    <value>Merci de signaler le bogue à l&apos;adresse suivante : </value>
     <comment>When an unhandled exception occurs, the user is prompted to visit the Github issues page. This text appears immediately before the link to github</comment>
   </data>
   <data name="UnhandledExceptionView_Title" xml:space="preserve">
     <value>Erreur !</value>
-    <comment>Title of the dialog shown when an unhandled excepotion occurs</comment>
+    <comment>Title of the dialog shown when an unhandled exception occurs</comment>
   </data>
   <data name="ViewerView_SyncthingStarting" xml:space="preserve">
     <value>Démarrage de Syncthing...</value>
@@ -498,7 +498,7 @@ SyncTrayzor doit se fermer. Veuillez nous excuser.</value>
     <value>R_edémarrer</value>
   </data>
   <data name="TrayIcon_Menu_RestartSyncthing" xml:space="preserve">
-    <value>R_edémarrer</value>
+    <value>R_estart Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restart</comment>
   </data>
   <data name="SettingsView_Tab_Syncthing" xml:space="preserve">
@@ -513,7 +513,7 @@ SyncTrayzor doit se fermer. Veuillez nous excuser.</value>
     <value>Arrêter la mise à jour automatique de Syncthing</value>
   </data>
   <data name="SettingsView_SyncthingDenyUpgrade_ToolTip" xml:space="preserve">
-    <value>Empêcher Syncting de se mettre à jour automatiquement. Ceci est utile lorsqu&apos;une nouvelle version de Syncthing n&apos;est plus compatible avec SyncTrayzor. Vous devrez rétrograder la version du fichier syncthing.exe dans le dossier de configuration de SyncTrayzor</value>
+    <value>Empêcher Syncthing de se mettre à jour automatiquement. Ceci est utile lorsqu&apos;une nouvelle version de Syncthing n&apos;est plus compatible avec SyncTrayzor. Vous devrez rétrograder la version du fichier syncthing.exe dans le dossier de configuration de SyncTrayzor</value>
   </data>
   <data name="SettingsView_SyncthingRunLowPriority" xml:space="preserve">
     <value>Démarrer Syncthing en tant que processus à faible priorité</value>
@@ -543,7 +543,7 @@ SyncTrayzor doit se fermer. Veuillez nous excuser.</value>
     <value>Installer maintenant</value>
   </data>
   <data name="NewVersionAlertView_ViewChangelog" xml:space="preserve">
-    <value>View Changelog</value>
+    <value>Voir la liste des modifications </value>
   </data>
   <data name="ShellView_Menu_Zoom" xml:space="preserve">
     <value>Zoom</value>
@@ -560,4 +560,10 @@ SyncTrayzor doit se fermer. Veuillez nous excuser.</value>
   <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
     <value>Doit être dans le format suivant : &apos;VAR=value VAR2=&quot;val1 val2&quot;&apos;</value>
   </data>
+  <data name="NewVersionInstalledView_Message" xml:space="preserve">
+    <value>SyncTrayzor version {0} was successfully installed.</value>
+  </data>
+  <data name="NewVersionInstalledView_Title" xml:space="preserve">
+    <value>SyncTrayzor Updated</value>
+  </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.it_IT.Designer.cs b/src/SyncTrayzor/Properties/Strings/Resources.it_IT.Designer.cs
new file mode 100644
index 00000000..e0eb6abc
--- /dev/null
+++ b/src/SyncTrayzor/Properties/Strings/Resources.it_IT.Designer.cs
@@ -0,0 +1,1153 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.0
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace SyncTrayzor.Properties.Strings {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources_it_IT {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources_it_IT() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SyncTrayzor.Properties.Strings.Resources.it_IT", typeof(Resources_it_IT).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Creato da Antony Male..
+        /// </summary>
+        public static string AboutView_CreatedByAuthor {
+            get {
+                return ResourceManager.GetString("AboutView_CreatedByAuthor", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Apri Pagina Download.
+        /// </summary>
+        public static string AboutView_DownloadNewVersion {
+            get {
+                return ResourceManager.GetString("AboutView_DownloadNewVersion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Nuova versione disponibile : {0}.
+        /// </summary>
+        public static string AboutView_NewAppVersionAvailable {
+            get {
+                return ResourceManager.GetString("AboutView_NewAppVersionAvailable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rilasciato sotto la licenza MIT..
+        /// </summary>
+        public static string AboutView_ReleasedLicense {
+            get {
+                return ResourceManager.GetString("AboutView_ReleasedLicense", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mostra Licenze Open Source.
+        /// </summary>
+        public static string AboutView_ShowOtherLicenses {
+            get {
+                return ResourceManager.GetString("AboutView_ShowOtherLicenses", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Versione Syncthing : {0}.
+        /// </summary>
+        public static string AboutView_SyncthingVersion {
+            get {
+                return ResourceManager.GetString("AboutView_SyncthingVersion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sconosciuto.
+        /// </summary>
+        public static string AboutView_UnknownVersion {
+            get {
+                return ResourceManager.GetString("AboutView_UnknownVersion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Versione: {0}.
+        /// </summary>
+        public static string AboutView_Version {
+            get {
+                return ResourceManager.GetString("AboutView_Version", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sei sicuro di voler terminare tutti i processi Syncthing, anche quelli non gestiti da SyncTrayzor?.
+        /// </summary>
+        public static string Dialog_ConfirmKillAllProcesses_Message {
+            get {
+                return ResourceManager.GetString("Dialog_ConfirmKillAllProcesses_Message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sei Sicuro?.
+        /// </summary>
+        public static string Dialog_ConfirmKillAllProcesses_Title {
+            get {
+                return ResourceManager.GetString("Dialog_ConfirmKillAllProcesses_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Impossibile avviare Syncthing.
+        ///
+        ///Prego leggere il log per capirne la causa.
+        ///
+        ///Se appare l&apos;errore &quot;FATAL:Cannot open database&quot;,  prego chiudere tutte le altre instanze di Syncthing. Se SyncTrayzor ha avuto un precedente crash, ci possono essere dei processi ancora attivi in background. Usare il menu &quot;Syncthing-&gt;Termina tutti i processi Syncthing&quot; per terminarli, e &quot;Syncthing-&gt;Avvia&quot; per riavviare Syncthing..
+        /// </summary>
+        public static string Dialog_FailedToStartSyncthing_Message {
+            get {
+                return ResourceManager.GetString("Dialog_FailedToStartSyncthing_Message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Impossibile avviare Syncthing.
+        /// </summary>
+        public static string Dialog_FailedToStartSyncthing_Title {
+            get {
+                return ResourceManager.GetString("Dialog_FailedToStartSyncthing_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Impossibile avviare Syncthing: {0}
+        ///
+        ///Ciò potrebbe essere perchè Windows, è impostato in modo da vietare l&apos;esecuzione di files in AppData o perchè hai installato un anti-malware (es: CryptoPrevent ) che impedisce l&apos;esecuzione di files in AppData.
+        ///
+        ///Prego modifica le tue impostazioni / whitelist &apos;{1}&apos; per consentire l&apos;esecuzione.
+        /// </summary>
+        public static string Dialog_SyncthingBlockedByGroupPolicy_Message {
+            get {
+                return ResourceManager.GetString("Dialog_SyncthingBlockedByGroupPolicy_Message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Errore nel lanciare Syncthing.
+        /// </summary>
+        public static string Dialog_SyncthingBlockedByGroupPolicy_Title {
+            get {
+                return ResourceManager.GetString("Dialog_SyncthingBlockedByGroupPolicy_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Annulla.
+        /// </summary>
+        public static string Generic_Dialog_Cancel {
+            get {
+                return ResourceManager.GetString("Generic_Dialog_Cancel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Chiudi.
+        /// </summary>
+        public static string Generic_Dialog_Close {
+            get {
+                return ResourceManager.GetString("Generic_Dialog_Close", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No.
+        /// </summary>
+        public static string Generic_Dialog_No {
+            get {
+                return ResourceManager.GetString("Generic_Dialog_No", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to OK.
+        /// </summary>
+        public static string Generic_Dialog_OK {
+            get {
+                return ResourceManager.GetString("Generic_Dialog_OK", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Salva.
+        /// </summary>
+        public static string Generic_Dialog_Save {
+            get {
+                return ResourceManager.GetString("Generic_Dialog_Save", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Si.
+        /// </summary>
+        public static string Generic_Dialog_Yes {
+            get {
+                return ResourceManager.GetString("Generic_Dialog_Yes", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Non ricordarmelo ancora.
+        /// </summary>
+        public static string NewVersionAlertView_Button_DontRemind {
+            get {
+                return ResourceManager.GetString("NewVersionAlertView_Button_DontRemind", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Apri Pagina dei Download.
+        /// </summary>
+        public static string NewVersionAlertView_Button_Download {
+            get {
+                return ResourceManager.GetString("NewVersionAlertView_Button_Download", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Installa Ora.
+        /// </summary>
+        public static string NewVersionAlertView_Button_Install {
+            get {
+                return ResourceManager.GetString("NewVersionAlertView_Button_Install", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ricordamelo Successivamente.
+        /// </summary>
+        public static string NewVersionAlertView_Button_RemindLater {
+            get {
+                return ResourceManager.GetString("NewVersionAlertView_Button_RemindLater", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Note di rilascio:.
+        /// </summary>
+        public static string NewVersionAlertView_Changelog {
+            get {
+                return ResourceManager.GetString("NewVersionAlertView_Changelog", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &quot;Non Ricordarmelo&quot; disabiliterà tutti i promemoria per questa versione. Puoi disattivare in modo permanente i nuovi avvisi nella pagina delle Impostazioni. Controlla Aiuto-&gt; Info per cercare una nuova versione manualmente..
+        /// </summary>
+        public static string NewVersionAlertView_DontRemindMeExplanation {
+            get {
+                return ResourceManager.GetString("NewVersionAlertView_DontRemindMeExplanation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to La versione {0} di SyncTrayzor è disponibile!.
+        /// </summary>
+        public static string NewVersionAlertView_NewVersionAvailable {
+            get {
+                return ResourceManager.GetString("NewVersionAlertView_NewVersionAvailable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SyncTrayzor Aggiornamento Disponibile.
+        /// </summary>
+        public static string NewVersionAlertView_Title {
+            get {
+                return ResourceManager.GetString("NewVersionAlertView_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Vedi Note di Rilascio.
+        /// </summary>
+        public static string NewVersionAlertView_ViewChangelog {
+            get {
+                return ResourceManager.GetString("NewVersionAlertView_ViewChangelog", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to La versione {0} di SyncTrayzor è stata installata correttamente..
+        /// </summary>
+        public static string NewVersionInstalledView_Message {
+            get {
+                return ResourceManager.GetString("NewVersionInstalledView_Message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SyncTrayzor Aggiornato.
+        /// </summary>
+        public static string NewVersionInstalledView_Title {
+            get {
+                return ResourceManager.GetString("NewVersionInstalledView_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Avvisa se una nuova versione di SyncTrayzor è disponibile.
+        /// </summary>
+        public static string SettingsView_AlertOnNewVersion {
+            get {
+                return ResourceManager.GetString("SettingsView_AlertOnNewVersion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Chiave API:.
+        /// </summary>
+        public static string SettingsView_ApiKey {
+            get {
+                return ResourceManager.GetString("SettingsView_ApiKey", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SyncTrayzor sovrascrive la chiave API specificata nella configurazione di Syncthing. Tuttavia, puoi impostare qualsiasi valore qua..
+        /// </summary>
+        public static string SettingsView_ApiKey_ToolTip {
+            get {
+                return ResourceManager.GetString("SettingsView_ApiKey_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Chiudi nella barra delle applicazioni.
+        /// </summary>
+        public static string SettingsView_CloseToTray {
+            get {
+                return ResourceManager.GetString("SettingsView_CloseToTray", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Minimizza nella barra delle applicazioni.
+        /// </summary>
+        public static string SettingsView_MinimizeToTray {
+            get {
+                return ResourceManager.GetString("SettingsView_MinimizeToTray", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to È necessario riavviare Syncthing affinchè le modifiche a queste impostazioni abbiano effetto.
+        /// </summary>
+        public static string SettingsView_MustRestartSyncthingWarning {
+            get {
+                return ResourceManager.GetString("SettingsView_MustRestartSyncthingWarning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Offuscare ID dei dispositivi nel log.
+        /// </summary>
+        public static string SettingsView_ObfuscateDeviceIds {
+            get {
+                return ResourceManager.GetString("SettingsView_ObfuscateDeviceIds", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mostra Icona nella barra delle applicazioni solo alla chiusura.
+        /// </summary>
+        public static string SettingsView_OnlyShowTrayIconOnClose {
+            get {
+                return ResourceManager.GetString("SettingsView_OnlyShowTrayIconOnClose", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Avanzate.
+        /// </summary>
+        public static string SettingsView_Section_Advanced {
+            get {
+                return ResourceManager.GetString("SettingsView_Section_Advanced", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Avvia al Login.
+        /// </summary>
+        public static string SettingsView_Section_StartOnLogin {
+            get {
+                return ResourceManager.GetString("SettingsView_Section_StartOnLogin", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Syncthing.
+        /// </summary>
+        public static string SettingsView_Section_Syncthing {
+            get {
+                return ResourceManager.GetString("SettingsView_Section_Syncthing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SyncTrayzor.
+        /// </summary>
+        public static string SettingsView_Section_SyncTrayzor {
+            get {
+                return ResourceManager.GetString("SettingsView_Section_SyncTrayzor", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Icona barra delle applicazioni.
+        /// </summary>
+        public static string SettingsView_Section_TrayIcon {
+            get {
+                return ResourceManager.GetString("SettingsView_Section_TrayIcon", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cartelle Monitorate.
+        /// </summary>
+        public static string SettingsView_Section_WatchedFolders {
+            get {
+                return ResourceManager.GetString("SettingsView_Section_WatchedFolders", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mostra i messaggi informativi &apos;Sincronizzato&apos;.
+        /// </summary>
+        public static string SettingsView_ShowBalloonWhenSynchronized {
+            get {
+                return ResourceManager.GetString("SettingsView_ShowBalloonWhenSynchronized", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mostra i dispositivi Connessi/Disconnessi nei messaggi informativi.
+        /// </summary>
+        public static string SettingsView_ShowDeviceConnectivityBalloons {
+            get {
+                return ResourceManager.GetString("SettingsView_ShowDeviceConnectivityBalloons", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Avvia Minimizzato.
+        /// </summary>
+        public static string SettingsView_StartMinimized {
+            get {
+                return ResourceManager.GetString("SettingsView_StartMinimized", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Avvia in automatico al login.
+        /// </summary>
+        public static string SettingsView_StartOnLogin {
+            get {
+                return ResourceManager.GetString("SettingsView_StartOnLogin", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Permesso negato. Prego avviare SyncTrayzor come Amministratore per cambiare questi parametri..
+        /// </summary>
+        public static string SettingsView_StartOnLogin_PermissionDenied {
+            get {
+                return ResourceManager.GetString("SettingsView_StartOnLogin_PermissionDenied", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Avvia Syncthing quando SyncTrayzor si sta avviando.
+        /// </summary>
+        public static string SettingsView_StartSyncthingAutomatically {
+            get {
+                return ResourceManager.GetString("SettingsView_StartSyncthingAutomatically", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indirizzo Di Ascolto GUI:.
+        /// </summary>
+        public static string SettingsView_SyncthingAddress {
+            get {
+                return ResourceManager.GetString("SettingsView_SyncthingAddress", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SyncTrayzor sovrascrive l&apos;indirizzo di ascolto GUI specificato nella configurazione di Syncthing. Tuttavia, puoi impostarlo qua..
+        /// </summary>
+        public static string SettingsView_SyncthingAddress_ToolTip {
+            get {
+                return ResourceManager.GetString("SettingsView_SyncthingAddress_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ferma l&apos;auto-aggiornamento di Syncthing.
+        /// </summary>
+        public static string SettingsView_SyncthingDenyUpgrade {
+            get {
+                return ResourceManager.GetString("SettingsView_SyncthingDenyUpgrade", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ferma l&apos;auto-aggiornamento di Syncthing. Questo è utile se una nuova versione di Syncthing non è retrocompatibile con SyncTrayzor. Dovrai effettuare il downgrade del file syncthing.exe nella cartella di configurazione di SyncTrayzor.
+        /// </summary>
+        public static string SettingsView_SyncthingDenyUpgrade_ToolTip {
+            get {
+                return ResourceManager.GetString("SettingsView_SyncthingDenyUpgrade_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Variabili Di Ambiente Synchting:.
+        /// </summary>
+        public static string SettingsView_SyncthingEnvironmentalVariables {
+            get {
+                return ResourceManager.GetString("SettingsView_SyncthingEnvironmentalVariables", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Esegui Syncthing come un processo a bassa priorità.
+        /// </summary>
+        public static string SettingsView_SyncthingRunLowPriority {
+            get {
+                return ResourceManager.GetString("SettingsView_SyncthingRunLowPriority", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Usa una cartella personalizzata come Home per Syncthing..
+        /// </summary>
+        public static string SettingsView_SyncthingUseCustomHome {
+            get {
+                return ResourceManager.GetString("SettingsView_SyncthingUseCustomHome", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ciò significa che SyncTrayzor vedrà un differente set di cartelle configurate per qualsiasi altra instanza di Syncthing sul computer..
+        /// </summary>
+        public static string SettingsView_SyncthingUseCustomHome_ToolTip {
+            get {
+                return ResourceManager.GetString("SettingsView_SyncthingUseCustomHome_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Syncthing.
+        /// </summary>
+        public static string SettingsView_Tab_Syncthing {
+            get {
+                return ResourceManager.GetString("SettingsView_Tab_Syncthing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SyncTrayzor.
+        /// </summary>
+        public static string SettingsView_Tab_SyncTrayzor {
+            get {
+                return ResourceManager.GetString("SettingsView_Tab_SyncTrayzor", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Impostazioni.
+        /// </summary>
+        public static string SettingsView_Title {
+            get {
+                return ResourceManager.GetString("SettingsView_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Usa la lingua predefinita del computer, quando disponibile. Dovrai riavviare SyncTrayzor affinchè le modifiche abbiano effetto..
+        /// </summary>
+        public static string SettingsView_UseComputerCulture {
+            get {
+                return ResourceManager.GetString("SettingsView_UseComputerCulture", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Deve essere un URL valido.
+        /// </summary>
+        public static string SettingsView_Validation_InvalidUrl {
+            get {
+                return ResourceManager.GetString("SettingsView_Validation_InvalidUrl", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Non può essere vuoto.
+        /// </summary>
+        public static string SettingsView_Validation_NotShouldBeEmpty {
+            get {
+                return ResourceManager.GetString("SettingsView_Validation_NotShouldBeEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Deve essere nel formato &apos;VAR=valore VAR2=&quot;val1 val2&quot;&apos;.
+        /// </summary>
+        public static string SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat {
+            get {
+                return ResourceManager.GetString("SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Le seguenti cartelle saranno controllate per eventuali cambiamenti, significa che puoi impostare un lungo intervallo di polling..
+        /// </summary>
+        public static string SettingsView_WatchedFolders_Explanation {
+            get {
+                return ResourceManager.GetString("SettingsView_WatchedFolders_Explanation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cartelle non disponibili. Prego avviare Synchting..
+        /// </summary>
+        public static string SettingsView_WatchedFolders_Unavailable {
+            get {
+                return ResourceManager.GetString("SettingsView_WatchedFolders_Unavailable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _File.
+        /// </summary>
+        public static string ShellView_Menu_File {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_File", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Esci.
+        /// </summary>
+        public static string ShellView_Menu_File_Exit {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_File_Exit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Impostazioni.
+        /// </summary>
+        public static string ShellView_Menu_File_Settings {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_File_Settings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ai_uto.
+        /// </summary>
+        public static string ShellView_Menu_Help {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Help", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to I_nfo.
+        /// </summary>
+        public static string ShellView_Menu_Help_About {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Help_About", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Syncthing.
+        /// </summary>
+        public static string ShellView_Menu_Syncthing {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Syncthing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Termina.
+        /// </summary>
+        public static string ShellView_Menu_Syncthing_Kill {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Syncthing_Kill", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to T_ermina tutti i processi Syncthing.
+        /// </summary>
+        public static string ShellView_Menu_Syncthing_KillAll {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Syncthing_KillAll", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A_pri nel browser esterno.
+        /// </summary>
+        public static string ShellView_Menu_Syncthing_OpenExternal {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Syncthing_OpenExternal", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A_ggiorna browser.
+        /// </summary>
+        public static string ShellView_Menu_Syncthing_Refresh {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Syncthing_Refresh", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Riavvio.
+        /// </summary>
+        public static string ShellView_Menu_Syncthing_Restart {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Syncthing_Restart", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Avvia.
+        /// </summary>
+        public static string ShellView_Menu_Syncthing_Start {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Syncthing_Start", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fer_ma.
+        /// </summary>
+        public static string ShellView_Menu_Syncthing_Stop {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Syncthing_Stop", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to M_ostra.
+        /// </summary>
+        public static string ShellView_Menu_View {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_View", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Syncthing Console.
+        /// </summary>
+        public static string ShellView_Menu_View_SyncthingConsole {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_View_SyncthingConsole", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Zoom Browser.
+        /// </summary>
+        public static string ShellView_Menu_Zoom {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Zoom", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to In_grandisci.
+        /// </summary>
+        public static string ShellView_Menu_Zoom_In {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Zoom_In", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ri_duci.
+        /// </summary>
+        public static string ShellView_Menu_Zoom_Out {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Zoom_Out", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Re_set.
+        /// </summary>
+        public static string ShellView_Menu_Zoom_Reset {
+            get {
+                return ResourceManager.GetString("ShellView_Menu_Zoom_Reset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Descrizione:.
+        /// </summary>
+        public static string ThirdPartyComponentsView_ComponentDescriptionLabel {
+            get {
+                return ResourceManager.GetString("ThirdPartyComponentsView_ComponentDescriptionLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Homepage:.
+        /// </summary>
+        public static string ThirdPartyComponentsView_ComponentHomepageLabel {
+            get {
+                return ResourceManager.GetString("ThirdPartyComponentsView_ComponentHomepageLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Licenza:.
+        /// </summary>
+        public static string ThirdPartyComponentsView_ComponentLicenseLabel {
+            get {
+                return ResourceManager.GetString("ThirdPartyComponentsView_ComponentLicenseLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Testo Licenza:.
+        /// </summary>
+        public static string ThirdPartyComponentsView_ComponentLicenseTextLabel {
+            get {
+                return ResourceManager.GetString("ThirdPartyComponentsView_ComponentLicenseTextLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Nome:.
+        /// </summary>
+        public static string ThirdPartyComponentsView_ComponentNameLabel {
+            get {
+                return ResourceManager.GetString("ThirdPartyComponentsView_ComponentNameLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Note:.
+        /// </summary>
+        public static string ThirdPartyComponentsView_ComponentNotesLabel {
+            get {
+                return ResourceManager.GetString("ThirdPartyComponentsView_ComponentNotesLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SyncTrayzor è compilato usando molti componenti open-source, e non esisterebbe senza di essi.
+        ///I dettagli di ogni componente, e le licenze sono indicati di seguito..
+        /// </summary>
+        public static string ThirdPartyComponentsView_Intro {
+            get {
+                return ResourceManager.GetString("ThirdPartyComponentsView_Intro", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Componenti Di Terze Parti.
+        /// </summary>
+        public static string ThirdPartyComponentsView_Title {
+            get {
+                return ResourceManager.GetString("ThirdPartyComponentsView_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Italian translation by stukdev.
+        /// </summary>
+        public static string TranslatorAttributation {
+            get {
+                return ResourceManager.GetString("TranslatorAttributation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0} connesso.
+        /// </summary>
+        public static string TrayIcon_Balloon_DeviceConnected_Message {
+            get {
+                return ResourceManager.GetString("TrayIcon_Balloon_DeviceConnected_Message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Dispositivo Connesso.
+        /// </summary>
+        public static string TrayIcon_Balloon_DeviceConnected_Title {
+            get {
+                return ResourceManager.GetString("TrayIcon_Balloon_DeviceConnected_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0} disconnesso.
+        /// </summary>
+        public static string TrayIcon_Balloon_DeviceDisconnected_Message {
+            get {
+                return ResourceManager.GetString("TrayIcon_Balloon_DeviceDisconnected_Message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Dispositivo Disconnesso.
+        /// </summary>
+        public static string TrayIcon_Balloon_DeviceDisconnected_Title {
+            get {
+                return ResourceManager.GetString("TrayIcon_Balloon_DeviceDisconnected_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0}: Sincronizzazione Completata.
+        /// </summary>
+        public static string TrayIcon_Balloon_FinishedSyncing_Message {
+            get {
+                return ResourceManager.GetString("TrayIcon_Balloon_FinishedSyncing_Message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sincronizzazione Completata.
+        /// </summary>
+        public static string TrayIcon_Balloon_FinishedSyncing_Title {
+            get {
+                return ResourceManager.GetString("TrayIcon_Balloon_FinishedSyncing_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Chiudi nella barra delle applicazioni.
+        /// </summary>
+        public static string TrayIcon_Menu_CloseToTray {
+            get {
+                return ResourceManager.GetString("TrayIcon_Menu_CloseToTray", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Esci.
+        /// </summary>
+        public static string TrayIcon_Menu_Exit {
+            get {
+                return ResourceManager.GetString("TrayIcon_Menu_Exit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Apri Cartella.
+        /// </summary>
+        public static string TrayIcon_Menu_OpenFolder {
+            get {
+                return ResourceManager.GetString("TrayIcon_Menu_OpenFolder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Riavvia Syncthing.
+        /// </summary>
+        public static string TrayIcon_Menu_RestartSyncthing {
+            get {
+                return ResourceManager.GetString("TrayIcon_Menu_RestartSyncthing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Ripristina.
+        /// </summary>
+        public static string TrayIcon_Menu_Restore {
+            get {
+                return ResourceManager.GetString("TrayIcon_Menu_Restore", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Impostazioni.
+        /// </summary>
+        public static string TrayIcon_Menu_Settings {
+            get {
+                return ResourceManager.GetString("TrayIcon_Menu_Settings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Avvia Syncthing.
+        /// </summary>
+        public static string TrayIcon_Menu_StartSyncthing {
+            get {
+                return ResourceManager.GetString("TrayIcon_Menu_StartSyncthing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Ferma Syncthing.
+        /// </summary>
+        public static string TrayIcon_Menu_StopSyncthing {
+            get {
+                return ResourceManager.GetString("TrayIcon_Menu_StopSyncthing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Oops! Qualcosa è andato storto.
+        ///SyncTrayzor dovrà essere terminato. Ci scusiamo..
+        /// </summary>
+        public static string UnhandledExceptionView_IntroMessage {
+            get {
+                return ResourceManager.GetString("UnhandledExceptionView_IntroMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        public static string UnhandledExceptionView_LogFileLocation_Post {
+            get {
+                return ResourceManager.GetString("UnhandledExceptionView_LogFileLocation_Post", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Potrebbe essere richiesto un file di log. Lo puoi trovare in:.
+        /// </summary>
+        public static string UnhandledExceptionView_LogFileLocation_Pre {
+            get {
+                return ResourceManager.GetString("UnhandledExceptionView_LogFileLocation_Pre", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to e aggiungi le seguenti informazioni:.
+        /// </summary>
+        public static string UnhandledExceptionView_PleaseOpenIssue_Post {
+            get {
+                return ResourceManager.GetString("UnhandledExceptionView_PleaseOpenIssue_Post", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Prego aprire un ticket a.
+        /// </summary>
+        public static string UnhandledExceptionView_PleaseOpenIssue_Pre {
+            get {
+                return ResourceManager.GetString("UnhandledExceptionView_PleaseOpenIssue_Pre", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Errore!.
+        /// </summary>
+        public static string UnhandledExceptionView_Title {
+            get {
+                return ResourceManager.GetString("UnhandledExceptionView_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Apri Cartella.
+        /// </summary>
+        public static string ViewerView_OpenFolder {
+            get {
+                return ResourceManager.GetString("ViewerView_OpenFolder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Avvia Syncthing.
+        /// </summary>
+        public static string ViewerView_StartSyncthing {
+            get {
+                return ResourceManager.GetString("ViewerView_StartSyncthing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Syncthing in avvio....
+        /// </summary>
+        public static string ViewerView_SyncthingStarting {
+            get {
+                return ResourceManager.GetString("ViewerView_SyncthingStarting", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Syncthing fermato..
+        /// </summary>
+        public static string ViewerView_SyncthingStopped {
+            get {
+                return ResourceManager.GetString("ViewerView_SyncthingStopped", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.it_IT.resx b/src/SyncTrayzor/Properties/Strings/Resources.it_IT.resx
new file mode 100644
index 00000000..fef05a33
--- /dev/null
+++ b/src/SyncTrayzor/Properties/Strings/Resources.it_IT.resx
@@ -0,0 +1,569 @@
+<?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 xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <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="AboutView_CreatedByAuthor" xml:space="preserve">
+    <value>Creato da Antony Male.</value>
+  </data>
+  <data name="AboutView_DownloadNewVersion" xml:space="preserve">
+    <value>Apri Pagina Download</value>
+    <comment>Clickable link allowing the user to download the latest version of SyncTrayzor</comment>
+  </data>
+  <data name="AboutView_NewAppVersionAvailable" xml:space="preserve">
+    <value>Nuova versione disponibile : {0}</value>
+    <comment>Prompt showing the user that a new version of SynTrayzor is available
+{0}: Latest version of SyncTrayzor </comment>
+  </data>
+  <data name="AboutView_ReleasedLicense" xml:space="preserve">
+    <value>Rilasciato sotto la licenza MIT.</value>
+  </data>
+  <data name="AboutView_ShowOtherLicenses" xml:space="preserve">
+    <value>Mostra Licenze Open Source</value>
+  </data>
+  <data name="AboutView_SyncthingVersion" xml:space="preserve">
+    <value>Versione Syncthing : {0}</value>
+    <comment>Information showing the user the current version of Syncthing
+{0}: Current Syncthing version</comment>
+  </data>
+  <data name="AboutView_Version" xml:space="preserve">
+    <value>Versione: {0}</value>
+    <comment>Information showing the user the current version of SyncTrayzor
+{0}: Current SyncTrayzor version</comment>
+  </data>
+  <data name="Generic_Dialog_Cancel" xml:space="preserve">
+    <value>Annulla</value>
+    <comment>'Cancel' button shown in various dialogs</comment>
+  </data>
+  <data name="Generic_Dialog_Close" xml:space="preserve">
+    <value>Chiudi</value>
+    <comment>'Close' button shown on various dialogs</comment>
+  </data>
+  <data name="Generic_Dialog_Save" xml:space="preserve">
+    <value>Salva</value>
+    <comment>'Save' button shown on various dialogs</comment>
+  </data>
+  <data name="ShellView_Menu_File" xml:space="preserve">
+    <value>_File</value>
+  </data>
+  <data name="ShellView_Menu_File_Exit" xml:space="preserve">
+    <value>_Esci</value>
+  </data>
+  <data name="ShellView_Menu_File_Settings" xml:space="preserve">
+    <value>_Impostazioni</value>
+  </data>
+  <data name="ShellView_Menu_Help" xml:space="preserve">
+    <value>Ai_uto</value>
+  </data>
+  <data name="ShellView_Menu_Help_About" xml:space="preserve">
+    <value>I_nfo</value>
+  </data>
+  <data name="ShellView_Menu_Syncthing" xml:space="preserve">
+    <value>_Syncthing</value>
+  </data>
+  <data name="ShellView_Menu_Syncthing_Kill" xml:space="preserve">
+    <value>_Termina</value>
+  </data>
+  <data name="ShellView_Menu_Syncthing_KillAll" xml:space="preserve">
+    <value>T_ermina tutti i processi Syncthing</value>
+  </data>
+  <data name="ShellView_Menu_Syncthing_OpenExternal" xml:space="preserve">
+    <value>A_pri nel browser esterno</value>
+  </data>
+  <data name="ShellView_Menu_Syncthing_Refresh" xml:space="preserve">
+    <value>A_ggiorna browser</value>
+  </data>
+  <data name="ShellView_Menu_Syncthing_Start" xml:space="preserve">
+    <value>_Avvia</value>
+  </data>
+  <data name="ShellView_Menu_Syncthing_Stop" xml:space="preserve">
+    <value>Fer_ma</value>
+  </data>
+  <data name="NewVersionAlertView_Button_DontRemind" xml:space="preserve">
+    <value>Non ricordarmelo ancora</value>
+    <comment>When a new version is available, the user receives a prompt. This button allows the user to say they want want to be prompted to upgrade to this particular version again</comment>
+  </data>
+  <data name="NewVersionAlertView_Button_Download" xml:space="preserve">
+    <value>Apri Pagina dei Download</value>
+    <comment>When a new version is available, the user receives a prompt. This button allows them to download the new version</comment>
+  </data>
+  <data name="NewVersionAlertView_Button_RemindLater" xml:space="preserve">
+    <value>Ricordamelo Successivamente</value>
+    <comment>When a new version is available, the user receives a prompt. This button allows them to say they want to be prompted the next time they start SyncTrayzor</comment>
+  </data>
+  <data name="NewVersionAlertView_Changelog" xml:space="preserve">
+    <value>Note di rilascio:</value>
+  </data>
+  <data name="NewVersionAlertView_DontRemindMeExplanation" xml:space="preserve">
+    <value>&quot;Non Ricordarmelo&quot; disabiliterà tutti i promemoria per questa versione. Puoi disattivare in modo permanente i nuovi avvisi nella pagina delle Impostazioni. Controlla Aiuto-&gt; Info per cercare una nuova versione manualmente.</value>
+    <comment>When a new version is available, the user receives a prompt. This message tells the user how to permanently disable new version prompts. 'The Settings page' corresponds to ShellView_Menu_File. 'Help -&gt;About' corresponds to ShellView_Menu_Help_About.</comment>
+  </data>
+  <data name="NewVersionAlertView_NewVersionAvailable" xml:space="preserve">
+    <value>La versione {0} di SyncTrayzor è disponibile!</value>
+    <comment>When a new version is available, the user receives a prompt. This text appears at the top of that prompt</comment>
+  </data>
+  <data name="NewVersionAlertView_Title" xml:space="preserve">
+    <value>SyncTrayzor Aggiornamento Disponibile</value>
+    <comment>When a new version is available, the user receives a prompt. This is the title of that prompt.</comment>
+  </data>
+  <data name="SettingsView_AlertOnNewVersion" xml:space="preserve">
+    <value>Avvisa se una nuova versione di SyncTrayzor è disponibile</value>
+  </data>
+  <data name="SettingsView_ApiKey" xml:space="preserve">
+    <value>Chiave API:</value>
+  </data>
+  <data name="SettingsView_ApiKey_ToolTip" xml:space="preserve">
+    <value>SyncTrayzor sovrascrive la chiave API specificata nella configurazione di Syncthing. Tuttavia, puoi impostare qualsiasi valore qua.</value>
+    <comment>ToolTip shown when a user hovers over the SettingsView_ApiKey text input. This shows more information on the input.</comment>
+  </data>
+  <data name="SettingsView_CloseToTray" xml:space="preserve">
+    <value>Chiudi nella barra delle applicazioni</value>
+    <comment>Setting allowing the user to indicate that the 'close' button on the top right of the window should put Syncthing down into the tray, rather than closing the application</comment>
+  </data>
+  <data name="SettingsView_MinimizeToTray" xml:space="preserve">
+    <value>Minimizza nella barra delle applicazioni</value>
+    <comment>Setting allowing the user to indicate that the 'minimize' button on the top right of the window should put Syncthing down into the tray, rather than minimizing the application</comment>
+  </data>
+  <data name="SettingsView_MustRestartSyncthingWarning" xml:space="preserve">
+    <value>È necessario riavviare Syncthing affinchè le modifiche a queste impostazioni abbiano effetto</value>
+  </data>
+  <data name="SettingsView_ObfuscateDeviceIds" xml:space="preserve">
+    <value>Offuscare ID dei dispositivi nel log</value>
+  </data>
+  <data name="SettingsView_OnlyShowTrayIconOnClose" xml:space="preserve">
+    <value>Mostra Icona nella barra delle applicazioni solo alla chiusura</value>
+  </data>
+  <data name="SettingsView_Section_Advanced" xml:space="preserve">
+    <value>Avanzate</value>
+    <comment>Section header for advanced settings</comment>
+  </data>
+  <data name="SettingsView_Section_StartOnLogin" xml:space="preserve">
+    <value>Avvia al Login</value>
+    <comment>Section header for settings to do with automatically starting SyncTrayzor when the user logs in</comment>
+  </data>
+  <data name="SettingsView_Section_Syncthing" xml:space="preserve">
+    <value>Syncthing</value>
+    <comment>Section header for settings to do with configuring Syncthing</comment>
+  </data>
+  <data name="SettingsView_Section_SyncTrayzor" xml:space="preserve">
+    <value>SyncTrayzor</value>
+    <comment>Section header for settings to do with configuring SyncTrayzor</comment>
+  </data>
+  <data name="SettingsView_Section_WatchedFolders" xml:space="preserve">
+    <value>Cartelle Monitorate</value>
+    <comment>Section header for settings to do with configuring SyncTrayzor's ability to watch folders for changes</comment>
+  </data>
+  <data name="SettingsView_ShowBalloonWhenSynchronized" xml:space="preserve">
+    <value>Mostra i messaggi informativi &apos;Sincronizzato&apos;</value>
+    <comment>Setting allowing the user to specify that a balloon message (white area down by the tray icon, linked to the tray icon) should be shown whenever a folder finishes synchronizing</comment>
+  </data>
+  <data name="SettingsView_StartMinimized" xml:space="preserve">
+    <value>Avvia Minimizzato</value>
+    <comment>Setting allowing the user to specify that, when SyncTrayzor is started automatically on login, it should start in the tray, rather than being visible to the user</comment>
+  </data>
+  <data name="SettingsView_StartOnLogin" xml:space="preserve">
+    <value>Avvia in automatico al login</value>
+    <comment>Setting allowing the user to specify that SyncTrayzor should be started when the user logs in</comment>
+  </data>
+  <data name="SettingsView_StartOnLogin_PermissionDenied" xml:space="preserve">
+    <value>Permesso negato. Prego avviare SyncTrayzor come Amministratore per cambiare questi parametri.</value>
+    <comment>Message displayed instead of SettingsView_StartOnLogin SettingsView_StartMinimized when the user doesn't have permission to edit the registry</comment>
+  </data>
+  <data name="SettingsView_StartSyncthingAutomatically" xml:space="preserve">
+    <value>Avvia Syncthing quando SyncTrayzor si sta avviando</value>
+    <comment>Setting allowing the user to specify that Syncthing should be start automatically when SyncTrayzor starts</comment>
+  </data>
+  <data name="SettingsView_SyncthingAddress" xml:space="preserve">
+    <value>Indirizzo Di Ascolto GUI:</value>
+  </data>
+  <data name="SettingsView_SyncthingAddress_ToolTip" xml:space="preserve">
+    <value>SyncTrayzor sovrascrive l&apos;indirizzo di ascolto GUI specificato nella configurazione di Syncthing. Tuttavia, puoi impostarlo qua.</value>
+    <comment>ToolTip shown when a user hovers over the SettingsView_SyncthingAddress text input. This shows more information on the input.</comment>
+  </data>
+  <data name="SettingsView_SyncthingUseCustomHome" xml:space="preserve">
+    <value>Usa una cartella personalizzata come Home per Syncthing.</value>
+  </data>
+  <data name="SettingsView_SyncthingUseCustomHome_ToolTip" xml:space="preserve">
+    <value>Ciò significa che SyncTrayzor vedrà un differente set di cartelle configurate per qualsiasi altra instanza di Syncthing sul computer.</value>
+    <comment>ToolTip shown when a user hovers over the SettingsView_SyncthingUseCustomHome text input. This shows more information on the input.</comment>
+  </data>
+  <data name="SettingsView_Title" xml:space="preserve">
+    <value>Impostazioni</value>
+    <comment>Title of the 'settings' dialog</comment>
+  </data>
+  <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
+    <value>Variabili Di Ambiente Synchting:</value>
+  </data>
+  <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
+    <value>Le seguenti cartelle saranno controllate per eventuali cambiamenti, significa che puoi impostare un lungo intervallo di polling.</value>
+  </data>
+  <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
+    <value>Cartelle non disponibili. Prego avviare Synchting.</value>
+  </data>
+  <data name="AboutView_UnknownVersion" xml:space="preserve">
+    <value>Sconosciuto</value>
+    <comment>Shown within AboutView_SyncthingVersion if Syncthing's version couldn't be determined</comment>
+  </data>
+  <data name="Dialog_ConfirmKillAllProcesses_Message" xml:space="preserve">
+    <value>Sei sicuro di voler terminare tutti i processi Syncthing, anche quelli non gestiti da SyncTrayzor?</value>
+    <comment>Body for the dialog show when the user clicks on ShellView_Menu_Syncthing_KillAll</comment>
+  </data>
+  <data name="Dialog_ConfirmKillAllProcesses_Title" xml:space="preserve">
+    <value>Sei Sicuro?</value>
+    <comment>Title for the dialog shown when the user clicks on ShellView_Menu_Syncthing_KillAll</comment>
+  </data>
+  <data name="Dialog_FailedToStartSyncthing_Message" xml:space="preserve">
+    <value>Impossibile avviare Syncthing.
+
+Prego leggere il log per capirne la causa.
+
+Se appare l&apos;errore &quot;FATAL:Cannot open database&quot;,  prego chiudere tutte le altre instanze di Syncthing. Se SyncTrayzor ha avuto un precedente crash, ci possono essere dei processi ancora attivi in background. Usare il menu &quot;Syncthing-&gt;Termina tutti i processi Syncthing&quot; per terminarli, e &quot;Syncthing-&gt;Avvia&quot; per riavviare Syncthing.</value>
+    <comment>Content of the dialog shown when Syncthing couldn't be started (and exited with an error). Instructs the user on how to proceed.
+
+"FATAL: Cannot Open Database" should remain in English
+
+The menu option "Syncthing -&gt;Kill all Syncthing processes" corresponds to ShellView_Menu_Syncthing_KillAll, while "Syncthing -&gt;Start" corresponds to ShellView_Menu_Syncthing_Start</comment>
+  </data>
+  <data name="Dialog_FailedToStartSyncthing_Title" xml:space="preserve">
+    <value>Impossibile avviare Syncthing</value>
+    <comment>Title of the dialog shown when Syncthing couldn't be started (and exited with an error)</comment>
+  </data>
+  <data name="Dialog_SyncthingBlockedByGroupPolicy_Message" xml:space="preserve">
+    <value>Impossibile avviare Syncthing: {0}
+
+Ciò potrebbe essere perchè Windows, è impostato in modo da vietare l&apos;esecuzione di files in AppData o perchè hai installato un anti-malware (es: CryptoPrevent ) che impedisce l&apos;esecuzione di files in AppData.
+
+Prego modifica le tue impostazioni / whitelist &apos;{1}&apos; per consentire l&apos;esecuzione</value>
+    <comment>Content of dialog shown when Syncthing couldn't start because of group policy settings (probably)
+{0}: Exact exception message
+{1}: Path to Syncthing executable</comment>
+  </data>
+  <data name="Dialog_SyncthingBlockedByGroupPolicy_Title" xml:space="preserve">
+    <value>Errore nel lanciare Syncthing</value>
+    <comment>Title of dialog shown when Syncthing couldn't start because of group policy settings (probably)</comment>
+  </data>
+  <data name="SettingsView_Validation_InvalidUrl" xml:space="preserve">
+    <value>Deve essere un URL valido</value>
+    <comment>Validation message (shown in red) below the SettingsView_SyncthingAddress field when the user enters a value which is not a value URL</comment>
+  </data>
+  <data name="SettingsView_Validation_NotShouldBeEmpty" xml:space="preserve">
+    <value>Non può essere vuoto</value>
+    <comment>Validation message (shown in red) below the SettingsView_SyncthingAddress or SettingsView_ApiKey fields when the user makes this field empty</comment>
+  </data>
+  <data name="ThirdPartyComponentsView_ComponentDescriptionLabel" xml:space="preserve">
+    <value>Descrizione:</value>
+  </data>
+  <data name="ThirdPartyComponentsView_ComponentHomepageLabel" xml:space="preserve">
+    <value>Homepage:</value>
+  </data>
+  <data name="ThirdPartyComponentsView_ComponentLicenseLabel" xml:space="preserve">
+    <value>Licenza:</value>
+  </data>
+  <data name="ThirdPartyComponentsView_ComponentLicenseTextLabel" xml:space="preserve">
+    <value>Testo Licenza:</value>
+  </data>
+  <data name="ThirdPartyComponentsView_ComponentNameLabel" xml:space="preserve">
+    <value>Nome:</value>
+  </data>
+  <data name="ThirdPartyComponentsView_ComponentNotesLabel" xml:space="preserve">
+    <value>Note:</value>
+  </data>
+  <data name="ThirdPartyComponentsView_Intro" xml:space="preserve">
+    <value>SyncTrayzor è compilato usando molti componenti open-source, e non esisterebbe senza di essi.
+I dettagli di ogni componente, e le licenze sono indicati di seguito.</value>
+  </data>
+  <data name="ThirdPartyComponentsView_Title" xml:space="preserve">
+    <value>Componenti Di Terze Parti</value>
+  </data>
+  <data name="TrayIcon_Balloon_FinishedSyncing_Message" xml:space="preserve">
+    <value>{0}: Sincronizzazione Completata</value>
+    <comment>Content of the balloon message shown when a folder finished synchronization
+
+{0}:The name of the folder which finished synchronizing</comment>
+  </data>
+  <data name="TrayIcon_Balloon_FinishedSyncing_Title" xml:space="preserve">
+    <value>Sincronizzazione Completata</value>
+  </data>
+  <data name="TrayIcon_Menu_CloseToTray" xml:space="preserve">
+    <value>Chiudi nella barra delle applicazioni</value>
+    <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to minimize itself to the tray</comment>
+  </data>
+  <data name="TrayIcon_Menu_Exit" xml:space="preserve">
+    <value>_Esci</value>
+    <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to exit</comment>
+  </data>
+  <data name="TrayIcon_Menu_Restore" xml:space="preserve">
+    <value>_Ripristina</value>
+    <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restore itself from the tray, and be visible to the user</comment>
+  </data>
+  <data name="TrayIcon_Menu_Settings" xml:space="preserve">
+    <value>_Impostazioni</value>
+    <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to show the Settings dialog</comment>
+  </data>
+  <data name="TrayIcon_Menu_StartSyncthing" xml:space="preserve">
+    <value>_Avvia Syncthing</value>
+    <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to start Syncthing. Only available if Syncthing isn't running</comment>
+  </data>
+  <data name="TrayIcon_Menu_StopSyncthing" xml:space="preserve">
+    <value>_Ferma Syncthing</value>
+    <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to stop Syncthing. Only available if Syncthing is running</comment>
+  </data>
+  <data name="UnhandledExceptionView_IntroMessage" xml:space="preserve">
+    <value>Oops! Qualcosa è andato storto.
+SyncTrayzor dovrà essere terminato. Ci scusiamo.</value>
+  </data>
+  <data name="UnhandledExceptionView_LogFileLocation_Post" xml:space="preserve">
+    <value/>
+    <comment>When an unhandled exception occurs, the user is informed that they may have to provide a log file, and gives the path. This text appears immediately after the log path</comment>
+  </data>
+  <data name="UnhandledExceptionView_LogFileLocation_Pre" xml:space="preserve">
+    <value>Potrebbe essere richiesto un file di log. Lo puoi trovare in:</value>
+    <comment>When an unhandled exception occurs, the user is informed that they may have to provide a log file, and gives the path. This text appears immediately before the log path</comment>
+  </data>
+  <data name="UnhandledExceptionView_PleaseOpenIssue_Post" xml:space="preserve">
+    <value>e aggiungi le seguenti informazioni:</value>
+    <comment>When an unhandled exception occurs, the user is prompted to visit the Github issues page. This text appears immediately after the link to github, and also prompts the user to include the stack trace shown directly below this text</comment>
+  </data>
+  <data name="UnhandledExceptionView_PleaseOpenIssue_Pre" xml:space="preserve">
+    <value>Prego aprire un ticket a</value>
+    <comment>When an unhandled exception occurs, the user is prompted to visit the Github issues page. This text appears immediately before the link to github</comment>
+  </data>
+  <data name="UnhandledExceptionView_Title" xml:space="preserve">
+    <value>Errore!</value>
+    <comment>Title of the dialog shown when an unhandled exception occurs</comment>
+  </data>
+  <data name="ViewerView_SyncthingStarting" xml:space="preserve">
+    <value>Syncthing in avvio...</value>
+    <comment>Text shown in the centre of the screen when Syncthing is starting, but there's no UI to display yet</comment>
+  </data>
+  <data name="ViewerView_SyncthingStopped" xml:space="preserve">
+    <value>Syncthing fermato.</value>
+    <comment>Text shown in the centre of the screen when Syncthing is stopped</comment>
+  </data>
+  <data name="Generic_Dialog_No" xml:space="preserve">
+    <value>No</value>
+    <comment>'No' button shown on various dialogs</comment>
+  </data>
+  <data name="Generic_Dialog_OK" xml:space="preserve">
+    <value>OK</value>
+    <comment>'OK' button shown on various dialogs</comment>
+  </data>
+  <data name="Generic_Dialog_Yes" xml:space="preserve">
+    <value>Si</value>
+    <comment>'Yes' button shown on various dialogs</comment>
+  </data>
+  <data name="TranslatorAttributation" xml:space="preserve">
+    <value>Italian translation by stukdev</value>
+    <comment>Shown on the 'about' page, this is space for you to attribute yourself. E.g. your local language equivalent of "Kingon translation by My Name". Add yourself to this field if you contribute to the translation for this language.</comment>
+  </data>
+  <data name="SettingsView_Section_TrayIcon" xml:space="preserve">
+    <value>Icona barra delle applicazioni</value>
+  </data>
+  <data name="SettingsView_ShowDeviceConnectivityBalloons" xml:space="preserve">
+    <value>Mostra i dispositivi Connessi/Disconnessi nei messaggi informativi</value>
+  </data>
+  <data name="TrayIcon_Balloon_DeviceConnected_Message" xml:space="preserve">
+    <value>{0} connesso</value>
+    <comment>Message of tray icon balloon show when another device connects
+{0}: device name</comment>
+  </data>
+  <data name="TrayIcon_Balloon_DeviceConnected_Title" xml:space="preserve">
+    <value>Dispositivo Connesso</value>
+    <comment>Title of tray icon balloon when another device connected</comment>
+  </data>
+  <data name="TrayIcon_Balloon_DeviceDisconnected_Message" xml:space="preserve">
+    <value>{0} disconnesso</value>
+    <comment>Message of tray icon balloon show when another device disconnects
+{0}: device name</comment>
+  </data>
+  <data name="TrayIcon_Balloon_DeviceDisconnected_Title" xml:space="preserve">
+    <value>Dispositivo Disconnesso</value>
+    <comment>Title of tray icon balloon when another device disconnected</comment>
+  </data>
+  <data name="ShellView_Menu_Syncthing_Restart" xml:space="preserve">
+    <value>_Riavvio</value>
+  </data>
+  <data name="TrayIcon_Menu_RestartSyncthing" xml:space="preserve">
+    <value>_Riavvia Syncthing</value>
+    <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restart</comment>
+  </data>
+  <data name="SettingsView_Tab_Syncthing" xml:space="preserve">
+    <value>Syncthing</value>
+    <comment>'Syncthing' settings tab</comment>
+  </data>
+  <data name="SettingsView_Tab_SyncTrayzor" xml:space="preserve">
+    <value>SyncTrayzor</value>
+    <comment>'SyncTrayzor' settings tab</comment>
+  </data>
+  <data name="SettingsView_SyncthingDenyUpgrade" xml:space="preserve">
+    <value>Ferma l&apos;auto-aggiornamento di Syncthing</value>
+  </data>
+  <data name="SettingsView_SyncthingDenyUpgrade_ToolTip" xml:space="preserve">
+    <value>Ferma l&apos;auto-aggiornamento di Syncthing. Questo è utile se una nuova versione di Syncthing non è retrocompatibile con SyncTrayzor. Dovrai effettuare il downgrade del file syncthing.exe nella cartella di configurazione di SyncTrayzor</value>
+  </data>
+  <data name="SettingsView_SyncthingRunLowPriority" xml:space="preserve">
+    <value>Esegui Syncthing come un processo a bassa priorità</value>
+  </data>
+  <data name="TrayIcon_Menu_OpenFolder" xml:space="preserve">
+    <value>_Apri Cartella</value>
+    <comment>Menu option available when right-clicking the tray icon. Is a header for a list of folders, each of which can be clicked to open it in Explorer</comment>
+  </data>
+  <data name="ViewerView_OpenFolder" xml:space="preserve">
+    <value>Apri Cartella</value>
+    <comment>Button shown in the web interface, alongside the native 'rescan' and 'edit' buttons. Allows the folder to be opened in Explorer</comment>
+  </data>
+  <data name="ViewerView_StartSyncthing" xml:space="preserve">
+    <value>Avvia Syncthing</value>
+    <comment>Link show in the centre of the screen when Syncthing is stopped, allowing the user to start syncthing</comment>
+  </data>
+  <data name="SettingsView_UseComputerCulture" xml:space="preserve">
+    <value>Usa la lingua predefinita del computer, quando disponibile. Dovrai riavviare SyncTrayzor affinchè le modifiche abbiano effetto.</value>
+  </data>
+  <data name="ShellView_Menu_View" xml:space="preserve">
+    <value>M_ostra</value>
+  </data>
+  <data name="ShellView_Menu_View_SyncthingConsole" xml:space="preserve">
+    <value>Syncthing Console</value>
+  </data>
+  <data name="NewVersionAlertView_Button_Install" xml:space="preserve">
+    <value>Installa Ora</value>
+  </data>
+  <data name="NewVersionAlertView_ViewChangelog" xml:space="preserve">
+    <value>Vedi Note di Rilascio</value>
+  </data>
+  <data name="ShellView_Menu_Zoom" xml:space="preserve">
+    <value>_Zoom Browser</value>
+  </data>
+  <data name="ShellView_Menu_Zoom_In" xml:space="preserve">
+    <value>In_grandisci</value>
+  </data>
+  <data name="ShellView_Menu_Zoom_Out" xml:space="preserve">
+    <value>Ri_duci</value>
+  </data>
+  <data name="ShellView_Menu_Zoom_Reset" xml:space="preserve">
+    <value>Re_set</value>
+  </data>
+  <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
+    <value>Deve essere nel formato &apos;VAR=valore VAR2=&quot;val1 val2&quot;&apos;</value>
+  </data>
+  <data name="NewVersionInstalledView_Message" xml:space="preserve">
+    <value>La versione {0} di SyncTrayzor è stata installata correttamente.</value>
+  </data>
+  <data name="NewVersionInstalledView_Title" xml:space="preserve">
+    <value>SyncTrayzor Aggiornato</value>
+  </data>
+</root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.nl.resx b/src/SyncTrayzor/Properties/Strings/Resources.nl.resx
index f017e9aa..dd6c31ab 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.nl.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.nl.resx
@@ -415,11 +415,11 @@ De details van elk onderdeel, incl. licentietekst, worden hieronder weergegeven.
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to show the Settings dialog</comment>
   </data>
   <data name="TrayIcon_Menu_StartSyncthing" xml:space="preserve">
-    <value>_Starten</value>
+    <value>_Start Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to start Syncthing. Only available if Syncthing isn't running</comment>
   </data>
   <data name="TrayIcon_Menu_StopSyncthing" xml:space="preserve">
-    <value>S_toppen</value>
+    <value>S_top Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to stop Syncthing. Only available if Syncthing is running</comment>
   </data>
   <data name="UnhandledExceptionView_IntroMessage" xml:space="preserve">
@@ -444,7 +444,7 @@ SyncTrayzor gaat nu afsluiten. Onze excuses.</value>
   </data>
   <data name="UnhandledExceptionView_Title" xml:space="preserve">
     <value>Fout!</value>
-    <comment>Title of the dialog shown when an unhandled excepotion occurs</comment>
+    <comment>Title of the dialog shown when an unhandled exception occurs</comment>
   </data>
   <data name="ViewerView_SyncthingStarting" xml:space="preserve">
     <value>Bezig met starten van Syncthing...</value>
@@ -498,7 +498,7 @@ SyncTrayzor gaat nu afsluiten. Onze excuses.</value>
     <value>R_estart</value>
   </data>
   <data name="TrayIcon_Menu_RestartSyncthing" xml:space="preserve">
-    <value>R_estart</value>
+    <value>R_estart Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restart</comment>
   </data>
   <data name="SettingsView_Tab_Syncthing" xml:space="preserve">
@@ -560,4 +560,10 @@ SyncTrayzor gaat nu afsluiten. Onze excuses.</value>
   <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
     <value>Must be in the format &apos;VAR=value VAR2=&quot;val1 val2&quot;&apos;</value>
   </data>
+  <data name="NewVersionInstalledView_Message" xml:space="preserve">
+    <value>SyncTrayzor version {0} was successfully installed.</value>
+  </data>
+  <data name="NewVersionInstalledView_Title" xml:space="preserve">
+    <value>SyncTrayzor Updated</value>
+  </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.ru.resx b/src/SyncTrayzor/Properties/Strings/Resources.ru.resx
index 46ccd167..02a53309 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.ru.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.ru.resx
@@ -121,7 +121,7 @@
     <value>Создано Antony Male.</value>
   </data>
   <data name="AboutView_DownloadNewVersion" xml:space="preserve">
-    <value>Open Download Page</value>
+    <value>Скачать</value>
     <comment>Clickable link allowing the user to download the latest version of SyncTrayzor</comment>
   </data>
   <data name="AboutView_NewAppVersionAvailable" xml:space="preserve">
@@ -198,7 +198,7 @@
     <comment>When a new version is available, the user receives a prompt. This button allows the user to say they want want to be prompted to upgrade to this particular version again</comment>
   </data>
   <data name="NewVersionAlertView_Button_Download" xml:space="preserve">
-    <value>Open Download Page</value>
+    <value>Скачать</value>
     <comment>When a new version is available, the user receives a prompt. This button allows them to download the new version</comment>
   </data>
   <data name="NewVersionAlertView_Button_RemindLater" xml:space="preserve">
@@ -306,10 +306,10 @@
     <comment>Title of the 'settings' dialog</comment>
   </data>
   <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
-    <value>Syncthing Environmental Variables:</value>
+    <value>Переменные окружения Syncthing</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
+    <value>Изменения будут отслеживаться в следующих папках, подразумевается что можно поставить более долгий интервал.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Папки недоступны. Запустите Syncthing</value>
@@ -415,11 +415,11 @@ The menu option "Syncthing -&gt;Kill all Syncthing processes" corresponds to She
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to show the Settings dialog</comment>
   </data>
   <data name="TrayIcon_Menu_StartSyncthing" xml:space="preserve">
-    <value>_Старт</value>
+    <value>_Запустить Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to start Syncthing. Only available if Syncthing isn't running</comment>
   </data>
   <data name="TrayIcon_Menu_StopSyncthing" xml:space="preserve">
-    <value>С_топ</value>
+    <value>_Остановить Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to stop Syncthing. Only available if Syncthing is running</comment>
   </data>
   <data name="UnhandledExceptionView_IntroMessage" xml:space="preserve">
@@ -444,7 +444,7 @@ SyncTrayzor закрывается. Извините.</value>
   </data>
   <data name="UnhandledExceptionView_Title" xml:space="preserve">
     <value>Ошибка!</value>
-    <comment>Title of the dialog shown when an unhandled excepotion occurs</comment>
+    <comment>Title of the dialog shown when an unhandled exception occurs</comment>
   </data>
   <data name="ViewerView_SyncthingStarting" xml:space="preserve">
     <value>Syncthing запускается...</value>
@@ -498,7 +498,7 @@ SyncTrayzor закрывается. Извините.</value>
     <value>_Перезапустить</value>
   </data>
   <data name="TrayIcon_Menu_RestartSyncthing" xml:space="preserve">
-    <value>_Перезапустить</value>
+    <value>_Перезапустить Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restart</comment>
   </data>
   <data name="SettingsView_Tab_Syncthing" xml:space="preserve">
@@ -546,18 +546,24 @@ SyncTrayzor закрывается. Извините.</value>
     <value>Посмотреть список изменений</value>
   </data>
   <data name="ShellView_Menu_Zoom" xml:space="preserve">
-    <value>_Zoom Browser</value>
+    <value>_Масштаб браузера</value>
   </data>
   <data name="ShellView_Menu_Zoom_In" xml:space="preserve">
-    <value>Zoom _In</value>
+    <value>У_величить</value>
   </data>
   <data name="ShellView_Menu_Zoom_Out" xml:space="preserve">
-    <value>Zoom _Out</value>
+    <value>У_меньшить</value>
   </data>
   <data name="ShellView_Menu_Zoom_Reset" xml:space="preserve">
-    <value>_Reset</value>
+    <value>_Сбросить</value>
   </data>
   <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
-    <value>Must be in the format &apos;VAR=value VAR2=&quot;val1 val2&quot;&apos;</value>
+    <value>Должно быть в формате &apos;VAR=value VAR2=&quot;val1 val2&quot;&apos;</value>
+  </data>
+  <data name="NewVersionInstalledView_Message" xml:space="preserve">
+    <value>SyncTrayzor {0} успешно установлен.</value>
+  </data>
+  <data name="NewVersionInstalledView_Title" xml:space="preserve">
+    <value>SyncTrayzor обновлен</value>
   </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.sk.resx b/src/SyncTrayzor/Properties/Strings/Resources.sk.resx
index e70e3e7c..3d32f8a1 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.sk.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.sk.resx
@@ -415,11 +415,11 @@ Detaily o každom z nich a ich text licencie sú uvedené nižšie.</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to show the Settings dialog</comment>
   </data>
   <data name="TrayIcon_Menu_StartSyncthing" xml:space="preserve">
-    <value>Š_tart</value>
+    <value>_Start Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to start Syncthing. Only available if Syncthing isn't running</comment>
   </data>
   <data name="TrayIcon_Menu_StopSyncthing" xml:space="preserve">
-    <value>Sto_p</value>
+    <value>S_top Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to stop Syncthing. Only available if Syncthing is running</comment>
   </data>
   <data name="UnhandledExceptionView_IntroMessage" xml:space="preserve">
@@ -444,7 +444,7 @@ SyncTrayzor sa musí zavrieť. Ospravedlňujeme sa</value>
   </data>
   <data name="UnhandledExceptionView_Title" xml:space="preserve">
     <value>Chyba!</value>
-    <comment>Title of the dialog shown when an unhandled excepotion occurs</comment>
+    <comment>Title of the dialog shown when an unhandled exception occurs</comment>
   </data>
   <data name="ViewerView_SyncthingStarting" xml:space="preserve">
     <value>Syncting sa spúšťa...</value>
@@ -498,7 +498,7 @@ SyncTrayzor sa musí zavrieť. Ospravedlňujeme sa</value>
     <value>R_eštart</value>
   </data>
   <data name="TrayIcon_Menu_RestartSyncthing" xml:space="preserve">
-    <value>R_eštart</value>
+    <value>R_estart Syncthing</value>
     <comment>Menu option available when right-clicking the tray icon. Instructs SyncTrayzor to restart</comment>
   </data>
   <data name="SettingsView_Tab_Syncthing" xml:space="preserve">
@@ -560,4 +560,10 @@ SyncTrayzor sa musí zavrieť. Ospravedlňujeme sa</value>
   <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
     <value>Musí byť vo formáte &apos;VAR=hodnota VAR2=&quot;premenná1 premenná2&quot;&apos;</value>
   </data>
+  <data name="NewVersionInstalledView_Message" xml:space="preserve">
+    <value>SyncTrayzor version {0} was successfully installed.</value>
+  </data>
+  <data name="NewVersionInstalledView_Title" xml:space="preserve">
+    <value>SyncTrayzor Updated</value>
+  </data>
 </root>

From 3e8b23f8e560d0cc5830ed098862bffcdea41edb Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 7 May 2015 18:35:30 +0100
Subject: [PATCH 22/24] Update changelog

---
 CHANGELOG.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9ae90f4d..ec287a3b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,17 @@
 Changelog
 =========
 
+v1.0.17
+-------
+
+ - Fix crash when renaming a file whose path exceeds the Windows path length limit (#72)
+ - Fix 'Open Folder' button in Syncthing UI (#65)
+ - Ensure that folder list in Settings does not exceed screen height (#76)
+ - Start minimized after automatic upgrade (#59)
+ - Add italian translation (thanks stukdev)
+ - Improve text in icon context menu (#71)
+ - Console will scroll to end after resize (#67)
+
 v1.0.16
 -------
 

From 57b286fa83107eb407932da34603557ea5c0e13b Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 7 May 2015 18:35:45 +0100
Subject: [PATCH 23/24] Bump version

---
 src/ProcessRunner/Properties/AssemblyInfo.cs | 4 ++--
 src/SyncTrayzor/Properties/AssemblyInfo.cs   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ProcessRunner/Properties/AssemblyInfo.cs b/src/ProcessRunner/Properties/AssemblyInfo.cs
index 5d39ad3e..d2d60323 100644
--- a/src/ProcessRunner/Properties/AssemblyInfo.cs
+++ b/src/ProcessRunner/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.16.0")]
-[assembly: AssemblyFileVersion("1.0.16.0")]
+[assembly: AssemblyVersion("1.0.17.0")]
+[assembly: AssemblyFileVersion("1.0.17.0")]
diff --git a/src/SyncTrayzor/Properties/AssemblyInfo.cs b/src/SyncTrayzor/Properties/AssemblyInfo.cs
index 28a54390..35991bbc 100644
--- a/src/SyncTrayzor/Properties/AssemblyInfo.cs
+++ b/src/SyncTrayzor/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.16.0")]
-[assembly: AssemblyFileVersion("1.0.16.0")]
+[assembly: AssemblyVersion("1.0.17.0")]
+[assembly: AssemblyFileVersion("1.0.17.0")]

From aa02d286768b7ea9174835c51f4151941fa890b2 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 7 May 2015 18:36:59 +0100
Subject: [PATCH 24/24] Update version_check.php

---
 server/version_check.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/server/version_check.php b/server/version_check.php
index 923a16d5..6f86808b 100644
--- a/server/version_check.php
+++ b/server/version_check.php
@@ -65,6 +65,16 @@ function get_with_wildcard($src, $value, $default = null)
 }
 
 $versions = [
+   '1.0.17' => [
+      'installed' => [
+         'direct_download_url' => [
+            'x64' => 'https://github.com/canton7/SyncTrayzor/releases/download/v1.0.17/SyncTrayzorSetup-x64.exe',
+            'x86' => 'https://github.com/canton7/SyncTrayzor/releases/download/v1.0.17/SyncTrayzorSetup-x86.exe',
+         ],
+      ],
+      'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v1.0.17',
+      'release_notes' => "- Fix crash when renaming a file whose path exceeds the Windows path length limit (#72)\n- Fix 'Open Folder' button in Syncthing UI (#65)\n- Ensure that folder list in Settings does not exceed screen height (#76)\n- Start minimized after automatic upgrade (#59)\n- Add italian translation (thanks stukdev)\n- Improve text in icon context menu (#71)\n- Console will scroll to end after resize (#67)",
+   ],
    '1.0.16' => [
       'installed' => [
          'direct_download_url' => [
@@ -102,6 +112,7 @@ function get_with_wildcard($src, $value, $default = null)
 ];
 
 $upgrades = [
+   '1.0.16' => ['to' => 'latest', 'formatter' => '2'],
    '1.0.15' => ['to' => 'latest', 'formatter' => '2'],
    '1.0.14' => ['to' => 'latest', 'formatter' => '2'],
    '1.0.13' => ['to' => 'latest', 'formatter' => '1'],