From bb9586f8708f60d5f1b8cf753402453bb9d009e4 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 20 Apr 2015 10:03:48 +0100
Subject: [PATCH 01/23] Fix typos on v1.0.15 changelog

---
 CHANGELOG.txt            | 6 +++---
 server/version_check.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d59b8bd7..71d90692 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,9 +5,9 @@ v1.0.15
 -------
 
  - Fix crash on startup if Syncthing is slow to start (#55)
- - Remember window size-position (#51)
- - Zoom built-in borwser (#52)
- - Add support for aribtrary environmental variables for Syncthing
+ - Remember window size/position (#51)
+ - Zoom built-in browser (#52)
+ - Add support for arbitrary environmental variables for Syncthing
 
 v1.0.14
 -------
diff --git a/server/version_check.php b/server/version_check.php
index 3c433519..56693919 100644
--- a/server/version_check.php
+++ b/server/version_check.php
@@ -73,7 +73,7 @@ function get_with_wildcard($src, $value, $default = null)
          ],
       ],
       'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v1.0.15',
-      'release_notes' => "- Fix crash on startup if Syncthing is slow to start (#55)\n- Remember window size-position (#51)\n- Zoom built-in borwser (#52)\n- Add support for aribtrary environmental variables for Syncthing\n",
+      'release_notes' => "- Fix crash on startup if Syncthing is slow to start (#55)\n- Remember window size/position (#51)\n- Zoom built-in browser (#52)\n- Add support for arbitrary environmental variables for Syncthing\n",
    ],
    '1.0.14' => [
       'installed' => [

From fcb74bde5e882adb066d7c13978f2d38b0b5c58b Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 20 Apr 2015 11:46:05 +0100
Subject: [PATCH 02/23] Update to CefSharp 39

---
 src/SyncTrayzor/Pages/ViewerViewModel.cs | 10 +++++-----
 src/SyncTrayzor/SyncTrayzor.csproj       | 22 +++++++++++-----------
 src/SyncTrayzor/packages.config          |  8 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/SyncTrayzor/Pages/ViewerViewModel.cs b/src/SyncTrayzor/Pages/ViewerViewModel.cs
index 4d0aac60..b1b55dcf 100644
--- a/src/SyncTrayzor/Pages/ViewerViewModel.cs
+++ b/src/SyncTrayzor/Pages/ViewerViewModel.cs
@@ -173,17 +173,17 @@ bool IRequestHandler.GetAuthCredentials(IWebBrowser browser, bool isProxy, strin
             return false;
         }
 
-        bool IRequestHandler.OnBeforeBrowse(IWebBrowser browser, IRequest request, bool isRedirect)
+        bool IRequestHandler.OnBeforeBrowse(IWebBrowser browser, IRequest request, bool isRedirect, bool isMainFrame)
         {
             return false;
         }
 
-        bool IRequestHandler.OnBeforePluginLoad(IWebBrowser browser, string url, string policyUrl, IWebPluginInfo info)
+        bool IRequestHandler.OnBeforePluginLoad(IWebBrowser browser, string url, string policyUrl, WebPluginInfo info)
         {
             return false;
         }
 
-        bool IRequestHandler.OnBeforeResourceLoad(IWebBrowser browser, IRequest request, IResponse response)
+        bool IRequestHandler.OnBeforeResourceLoad(IWebBrowser browser, IRequest request, bool isMainFrame)
         {
             var uri = new Uri(request.Url);
             if ((uri.Scheme == "http" || uri.Scheme == "https") && uri.Host != this.syncThingManager.Address.NormalizeZeroHost().Host)
@@ -224,9 +224,9 @@ void ILifeSpanHandler.OnBeforeClose(IWebBrowser browser)
         {
         }
 
-        bool ILifeSpanHandler.OnBeforePopup(IWebBrowser browser, string url, ref int x, ref int y, ref int width, ref int height)
+        bool ILifeSpanHandler.OnBeforePopup(IWebBrowser browser, string sourceUrl, string targetUrl, ref int x, ref int y, ref int width, ref int height)
         {
-            this.processStartProvider.StartDetached(url);
+            this.processStartProvider.StartDetached(targetUrl);
             return true;
         }
 
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 2a9d8148..3cb12f8b 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\CefSharp.Wpf.37.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.37.0.0\build\CefSharp.Wpf.props')" />
-  <Import Project="..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props')" />
+  <Import Project="..\packages\CefSharp.Wpf.39.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.39.0.0\build\CefSharp.Wpf.props')" />
+  <Import Project="..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,7 +15,7 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
-    <NuGetPackageImportStamp>332867c0</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>b679e5f7</NuGetPackageImportStamp>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -459,16 +459,13 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.4\build\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\refit.2.2.0\build\refit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\refit.2.2.0\build\refit.targets'))" />
-    <Error Condition="!Exists('..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets'))" />
-    <Error Condition="!Exists('..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Wpf.37.0.0\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.37.0.0\build\CefSharp.Wpf.props'))" />
+    <Error Condition="!Exists('..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets'))" />
+    <Error Condition="!Exists('..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Wpf.39.0.0\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.39.0.0\build\CefSharp.Wpf.props'))" />
   </Target>
   <Import Project="..\packages\refit.2.2.0\build\refit.targets" Condition="Exists('..\packages\refit.2.2.0\build\refit.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets')" />
-  <Import Project="..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets')" />
   <Target Name="Configs">
     <XslTransformation XmlInputPaths="App.config" XslInputPath="App.Installer.config.xslt" OutputPaths="$(OutputPath)$(RootNamespace).exe.Installer.config" />
   </Target>
@@ -479,4 +476,7 @@
   <Target Name="AfterBuild">
     <CallTarget Targets="Configs" />
   </Target>
+  <Import Project="..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/SyncTrayzor/packages.config b/src/SyncTrayzor/packages.config
index 9dde970c..39070f8c 100644
--- a/src/SyncTrayzor/packages.config
+++ b/src/SyncTrayzor/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.2062.1898" targetFramework="net45" />
-  <package id="cef.redist.x86" version="3.2062.1898" targetFramework="net45" />
-  <package id="CefSharp.Common" version="37.0.0" targetFramework="net45" />
-  <package id="CefSharp.Wpf" version="37.0.0" targetFramework="net45" />
+  <package id="cef.redist.x64" version="3.2171.2069" targetFramework="net45" />
+  <package id="cef.redist.x86" version="3.2171.2069" targetFramework="net45" />
+  <package id="CefSharp.Common" version="39.0.0" targetFramework="net45" />
+  <package id="CefSharp.Wpf" version="39.0.0" targetFramework="net45" />
   <package id="FluentValidation" version="5.5.0.0" targetFramework="net45" />
   <package id="Fody" version="1.26.4" targetFramework="net45" developmentDependency="true" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net45" />

From f2c763f8158112cea979107bf498b6e18f5c0185 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 20 Apr 2015 11:47:05 +0100
Subject: [PATCH 03/23] Work around issue where CefSharp ignores ZoomLevel if
 set too early

Fixes #57
---
 src/SyncTrayzor/Pages/ViewerViewModel.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/Pages/ViewerViewModel.cs b/src/SyncTrayzor/Pages/ViewerViewModel.cs
index b1b55dcf..c54a4b38 100644
--- a/src/SyncTrayzor/Pages/ViewerViewModel.cs
+++ b/src/SyncTrayzor/Pages/ViewerViewModel.cs
@@ -90,10 +90,18 @@ private void InitializeBrowser(IWpfWebBrowser webBrowser)
             webBrowser.RequestHandler = this;
             webBrowser.LifeSpanHandler = this;
             webBrowser.RegisterJsObject("callbackObject", this.callback);
+
             webBrowser.FrameLoadEnd += (o, e) =>
             {
                 if (e.IsMainFrame && e.Url != "about:blank")
                 {
+                    Execute.OnUIThread(() =>
+                    {
+                        // See https://github.com/cefsharp/CefSharp/issues/738#issuecomment-91099199
+                        // ... Except that FrameLoadStart doesn't appear to work for me. FrameLoadEnd does though
+                        webBrowser.ZoomLevel = this.configurationProvider.Load().SyncthingWebBrowserZoomLevel;
+                    });
+
                     var script = @"$('#folders .panel-footer .pull-right').prepend(" +
                     @"'<button class=""btn btn-sm btn-default"" onclick=""callbackObject.openFolder(angular.element(this).scope().folder.ID)"">" +
                     @"<span class=""glyphicon glyphicon-folder-open""></span>" +
@@ -103,7 +111,6 @@ private void InitializeBrowser(IWpfWebBrowser webBrowser)
                     webBrowser.ExecuteScriptAsync(script);
                 }
             };
-            WebBrowser.ZoomLevel = this.configurationProvider.Load().SyncthingWebBrowserZoomLevel;
         }
 
         public void RefreshBrowser()

From 2475b102f8051c64483031f9e5254b175bc15774 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 20 Apr 2015 12:01:23 +0100
Subject: [PATCH 04/23] Escape underscores in folders in icon context menu

Fixes #58
---
 .../NotifyIcon/TaskbarIconResources.xaml      |  5 +--
 src/SyncTrayzor/SyncTrayzor.csproj            |  1 +
 .../Xaml/RemoveMnemonicsConverter.cs          | 32 +++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 src/SyncTrayzor/Xaml/RemoveMnemonicsConverter.cs

diff --git a/src/SyncTrayzor/NotifyIcon/TaskbarIconResources.xaml b/src/SyncTrayzor/NotifyIcon/TaskbarIconResources.xaml
index 82e8ed8d..fe27e759 100644
--- a/src/SyncTrayzor/NotifyIcon/TaskbarIconResources.xaml
+++ b/src/SyncTrayzor/NotifyIcon/TaskbarIconResources.xaml
@@ -3,7 +3,8 @@
                     xmlns:s="https://github.com/canton7/Stylet"
                     xmlns:l="clr-namespace:SyncTrayzor.Localization"
                     xmlns:ni="clr-namespace:SyncTrayzor.NotifyIcon"
-                    xmlns:tb="http://www.hardcodet.net/taskbar">
+                    xmlns:tb="http://www.hardcodet.net/taskbar"
+                    xmlns:xaml="clr-namespace:SyncTrayzor.Xaml">
 
     <BitmapImage x:Key="TaskbarStoppedIcon" UriSource="pack://application:,,,/Icons/stopped.ico"/>
     <BitmapImage x:Key="TaskbarSyncing1Icon" UriSource="pack://application:,,,/Icons/default_tray.ico"/>
@@ -79,7 +80,7 @@
                           Visibility="{Binding Folders, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
                     <MenuItem.ItemContainerStyle>
                         <Style TargetType="MenuItem">
-                            <Setter Property="Header" Value="{Binding FolderId}"/>
+                            <Setter Property="Header" Value="{Binding FolderId, Converter={x:Static xaml:RemoveMnemonicsConverter.Instance}}"/>
                             <Setter Property="Command" Value="{Binding}"/>
                         </Style>
                     </MenuItem.ItemContainerStyle>
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 3cb12f8b..3496baf6 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -274,6 +274,7 @@
     <Compile Include="Utils\StreamExtensions.cs" />
     <Compile Include="Utils\SynchronizedEventDispatcher.cs" />
     <Compile Include="Xaml\MouseWheelGesture.cs" />
+    <Compile Include="Xaml\RemoveMnemonicsConverter.cs" />
     <Compile Include="Xaml\UacImageSource.cs" />
     <Compile Include="Utils\UriExtensions.cs" />
     <Compile Include="Xaml\CollapsingRowDefinitionBehaviour.cs" />
diff --git a/src/SyncTrayzor/Xaml/RemoveMnemonicsConverter.cs b/src/SyncTrayzor/Xaml/RemoveMnemonicsConverter.cs
new file mode 100644
index 00000000..2cd388d8
--- /dev/null
+++ b/src/SyncTrayzor/Xaml/RemoveMnemonicsConverter.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace SyncTrayzor.Xaml
+{
+    public class RemoveMnemonicsConverter : IValueConverter
+    {
+        public static RemoveMnemonicsConverter Instance = new RemoveMnemonicsConverter();
+
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            var val = value as string;
+            if (val == null)
+                return null;
+
+            return val.Replace("_", "__");
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            var val = value as string;
+            if (val == null)
+                return null;
+
+            return val.Replace("__", "_");
+        }
+    }
+}

From 41c30a73aeedd22003bd2771540d6dedc8454457 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 20 Apr 2015 13:00:22 +0100
Subject: [PATCH 05/23] Save position of splitter between Console and Viewer

Fixes #56
---
 src/SyncTrayzor/App.config                    |  4 +-
 src/SyncTrayzor/Pages/ShellView.xaml          |  9 +++--
 src/SyncTrayzor/Pages/ShellViewModel.cs       | 11 +++++-
 .../Properties/Settings.Designer.cs           |  4 +-
 src/SyncTrayzor/Properties/Settings.settings  |  4 +-
 .../Services/Config/Configuration.cs          | 13 ++++---
 .../Services/Config/ConfigurationProvider.cs  | 10 ++++-
 src/SyncTrayzor/SyncTrayzor.csproj            |  1 +
 .../Xaml/CollapsingRowDefinitionBehaviour.cs  | 16 +++++++-
 .../Xaml/GridLengthToAbsoluteConverter.cs     | 38 +++++++++++++++++++
 10 files changed, 90 insertions(+), 20 deletions(-)
 create mode 100644 src/SyncTrayzor/Xaml/GridLengthToAbsoluteConverter.cs

diff --git a/src/SyncTrayzor/App.config b/src/SyncTrayzor/App.config
index 16a10987..4708df11 100644
--- a/src/SyncTrayzor/App.config
+++ b/src/SyncTrayzor/App.config
@@ -46,7 +46,7 @@
             <setting name="DefaultUserConfiguration" serializeAs="Xml">
                 <value>
                     <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                        xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="2">
+                        xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="3">
                         <ShowTrayIconOnlyOnClose>false</ShowTrayIconOnlyOnClose>
                         <MinimizeToTray>false</MinimizeToTray>
                         <CloseToTray>true</CloseToTray>
@@ -62,7 +62,7 @@
                         <NotifyOfNewVersions>true</NotifyOfNewVersions>
                         <ObfuscateDeviceIDs>true</ObfuscateDeviceIDs>
                         <UseComputerCulture>true</UseComputerCulture>
-                        <ShowSyncthingConsole>true</ShowSyncthingConsole>
+                        <SyncthingConsoleHeight>100</SyncthingConsoleHeight>
                         <SyncthingWebBrowserZoomLevel>0</SyncthingWebBrowserZoomLevel>
                     </Configuration>
                 </value>
diff --git a/src/SyncTrayzor/Pages/ShellView.xaml b/src/SyncTrayzor/Pages/ShellView.xaml
index 96fd9ce2..1b318d3a 100644
--- a/src/SyncTrayzor/Pages/ShellView.xaml
+++ b/src/SyncTrayzor/Pages/ShellView.xaml
@@ -53,22 +53,23 @@
 
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="5*"/>
+                <RowDefinition/>
                 <RowDefinition>
                     <i:Interaction.Behaviors>
-                        <xaml:CollapsingRowDefinitionBehaviour Height="5" RowVisibility="{Binding ShowConsole, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"/>
+                        <xaml:CollapsingRowDefinitionBehaviour Height="Auto" RowVisibility="{Binding ShowConsole, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"/>
                     </i:Interaction.Behaviors>
                 </RowDefinition>
                 <RowDefinition>
                     <i:Interaction.Behaviors>
-                        <xaml:CollapsingRowDefinitionBehaviour Height="*" MinHeight="100" RowVisibility="{Binding ShowConsole, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"/>
+                        <xaml:CollapsingRowDefinitionBehaviour Height="{Binding ConsoleHeight, Mode=TwoWay, Converter={x:Static xaml:GridLengthToAbsoluteConverter.Instance}}"
+                                                               MinHeight="100" RowVisibility="{Binding ShowConsole, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"/>
                     </i:Interaction.Behaviors>
                 </RowDefinition>
             </Grid.RowDefinitions>
 
             <ContentControl Grid.Row="0" s:View.Model="{Binding Viewer}"/>
 
-            <GridSplitter Grid.Row="1" Height="5" HorizontalAlignment="Stretch" ShowsPreview="True"/>
+            <GridSplitter Grid.Row="1" Height="5" VerticalAlignment="Center" HorizontalAlignment="Stretch" ShowsPreview="True" ResizeDirection="Rows"/>
 
             <ContentControl Grid.Row="2" s:View.Model="{Binding Console}"/>
         </Grid>
diff --git a/src/SyncTrayzor/Pages/ShellViewModel.cs b/src/SyncTrayzor/Pages/ShellViewModel.cs
index bec55f82..5db48bee 100644
--- a/src/SyncTrayzor/Pages/ShellViewModel.cs
+++ b/src/SyncTrayzor/Pages/ShellViewModel.cs
@@ -27,6 +27,7 @@ public class ShellViewModel : Screen
 
         public bool WindowActivated { get; set; }
         public bool ShowConsole { get; set; }
+        public double ConsoleHeight { get; set; }
         public WindowPlacement Placement { get; set; }
         public ConsoleViewModel Console { get; private set; }
         public ViewerViewModel Viewer { get; private set; }
@@ -62,8 +63,14 @@ public ShellViewModel(
             this.syncThingManager.StateChanged += (o, e) => this.SyncThingState = e.NewState;
             this.syncThingManager.ProcessExitedWithError += (o, e) => this.ShowExitedWithError();
 
-            this.ShowConsole = configuration.ShowSyncthingConsole;
-            this.Bind(s => s.ShowConsole, (o, e) => this.configurationProvider.AtomicLoadAndSave(c => c.ShowSyncthingConsole = e.NewValue));
+            this.ConsoleHeight = configuration.SyncthingConsoleHeight;
+            this.Bind(s => s.ConsoleHeight, (o, e) => this.configurationProvider.AtomicLoadAndSave(c => c.SyncthingConsoleHeight = e.NewValue));
+
+            this.ShowConsole = configuration.SyncthingConsoleHeight > 0;
+            this.Bind(s => s.ShowConsole, (o, e) =>
+            {
+                this.ConsoleHeight = e.NewValue ? Configuration.DefaultSyncthingConsoleHeight : 0.0;
+            });
 
             this.Placement = configuration.WindowPlacement;
             this.Bind(s => s.Placement, (o, e) => this.configurationProvider.AtomicLoadAndSave(c => c.WindowPlacement = e.NewValue));
diff --git a/src/SyncTrayzor/Properties/Settings.Designer.cs b/src/SyncTrayzor/Properties/Settings.Designer.cs
index 972455ff..35c5a724 100644
--- a/src/SyncTrayzor/Properties/Settings.Designer.cs
+++ b/src/SyncTrayzor/Properties/Settings.Designer.cs
@@ -116,7 +116,7 @@ public int SyncthingConnectTimeoutSeconds {
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute(@"<?xml version=""1.0"" encoding=""utf-16""?>
-<Configuration xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" Version=""2"">
+<Configuration xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" Version=""3"">
   <ShowTrayIconOnlyOnClose>false</ShowTrayIconOnlyOnClose>
   <MinimizeToTray>false</MinimizeToTray>
   <CloseToTray>true</CloseToTray>
@@ -132,7 +132,7 @@ public int SyncthingConnectTimeoutSeconds {
   <NotifyOfNewVersions>true</NotifyOfNewVersions>
   <ObfuscateDeviceIDs>true</ObfuscateDeviceIDs>
   <UseComputerCulture>true</UseComputerCulture>
-  <ShowSyncthingConsole>true</ShowSyncthingConsole>
+  <SyncthingConsoleHeight>100</SyncthingConsoleHeight>
   <SyncthingWebBrowserZoomLevel>0</SyncthingWebBrowserZoomLevel>
 </Configuration>")]
         public global::SyncTrayzor.Services.Config.Configuration DefaultUserConfiguration {
diff --git a/src/SyncTrayzor/Properties/Settings.settings b/src/SyncTrayzor/Properties/Settings.settings
index c90e592e..d3cb27e0 100644
--- a/src/SyncTrayzor/Properties/Settings.settings
+++ b/src/SyncTrayzor/Properties/Settings.settings
@@ -34,7 +34,7 @@
     </Setting>
     <Setting Name="DefaultUserConfiguration" Type="SyncTrayzor.Services.Config.Configuration" Scope="Application">
       <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="2"&gt;
+&lt;Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="3"&gt;
   &lt;ShowTrayIconOnlyOnClose&gt;false&lt;/ShowTrayIconOnlyOnClose&gt;
   &lt;MinimizeToTray&gt;false&lt;/MinimizeToTray&gt;
   &lt;CloseToTray&gt;true&lt;/CloseToTray&gt;
@@ -50,7 +50,7 @@
   &lt;NotifyOfNewVersions&gt;true&lt;/NotifyOfNewVersions&gt;
   &lt;ObfuscateDeviceIDs&gt;true&lt;/ObfuscateDeviceIDs&gt;
   &lt;UseComputerCulture&gt;true&lt;/UseComputerCulture&gt;
-  &lt;ShowSyncthingConsole&gt;true&lt;/ShowSyncthingConsole&gt;
+  &lt;SyncthingConsoleHeight&gt;100&lt;/SyncthingConsoleHeight&gt;
   &lt;SyncthingWebBrowserZoomLevel&gt;0&lt;/SyncthingWebBrowserZoomLevel&gt;
 &lt;/Configuration&gt;</Value>
     </Setting>
diff --git a/src/SyncTrayzor/Services/Config/Configuration.cs b/src/SyncTrayzor/Services/Config/Configuration.cs
index a750b870..c50906a1 100644
--- a/src/SyncTrayzor/Services/Config/Configuration.cs
+++ b/src/SyncTrayzor/Services/Config/Configuration.cs
@@ -74,7 +74,8 @@ public void WriteXml(XmlWriter writer)
     [XmlRoot("Configuration")]
     public class Configuration
     {
-        public const int CurrentVersion = 2;
+        public const int CurrentVersion = 3;
+        public const double DefaultSyncthingConsoleHeight = 100;
 
         [XmlAttribute("Version")]
         public int Version
@@ -116,7 +117,7 @@ public string LatestNotifiedVersionRaw
         }
 
         public bool UseComputerCulture { get; set; }
-        public bool ShowSyncthingConsole { get; set; }
+        public double SyncthingConsoleHeight { get; set; }
         public WindowPlacement WindowPlacement { get; set; }
         public double SyncthingWebBrowserZoomLevel { get; set; }
 
@@ -141,7 +142,7 @@ public Configuration()
             this.ObfuscateDeviceIDs = true;
             this.LatestNotifiedVersion = null;
             this.UseComputerCulture = true;
-            this.ShowSyncthingConsole = true;
+            this.SyncthingConsoleHeight = Configuration.DefaultSyncthingConsoleHeight;
             this.WindowPlacement = null;
             this.SyncthingWebBrowserZoomLevel = 0;
         }
@@ -165,7 +166,7 @@ public Configuration(Configuration other)
             this.ObfuscateDeviceIDs = other.ObfuscateDeviceIDs;
             this.LatestNotifiedVersion = other.LatestNotifiedVersion;
             this.UseComputerCulture = other.UseComputerCulture;
-            this.ShowSyncthingConsole = other.ShowSyncthingConsole;
+            this.SyncthingConsoleHeight = other.SyncthingConsoleHeight;
             this.WindowPlacement = other.WindowPlacement;
             this.SyncthingWebBrowserZoomLevel = other.SyncthingWebBrowserZoomLevel;
         }
@@ -175,12 +176,12 @@ public override string ToString()
             return String.Format("<Configuration ShowTrayIconOnlyOnClose={0} MinimizeToTray={1} CloseToTray={2} ShowSynchronizedBalloon={3} " +
                 "ShowDeviceConnectivityBalloons={4} SyncthingAddress={5} StartSyncthingAutomatically={6} SyncthingApiKey={7} SyncthingEnvironmentalVariables=[{8}] " +
                 "SyncthingUseCustomHome={9} SyncthingDenyUpgrade={10} SyncthingRunLowPriority={11} Folders=[{12}] NotifyOfNewVersions={13} " +
-                "LastNotifiedVersion={14} ObfuscateDeviceIDs={15} UseComputerCulture={16} ShowSyncthingConsole={17} WindowPlacement={18} " +
+                "LastNotifiedVersion={14} ObfuscateDeviceIDs={15} UseComputerCulture={16} SyncthingConsoleHeight={17} WindowPlacement={18} " +
                 "SyncthingWebBrowserZoomLevel={19}>",
                 this.ShowTrayIconOnlyOnClose, this.MinimizeToTray, this.CloseToTray, this.ShowSynchronizedBalloon, this.ShowDeviceConnectivityBalloons,
                 this.SyncthingAddress, this.StartSyncthingAutomatically, this.SyncthingApiKey, String.Join(" ", this.SyncthingEnvironmentalVariables.Select(x => String.Format("{0}={1}", x.Key, x.Value))),
                 this.SyncthingUseCustomHome, this.SyncthingDenyUpgrade, this.SyncthingRunLowPriority, String.Join(", ", this.Folders), this.NotifyOfNewVersions,
-                this.LatestNotifiedVersion, this.ObfuscateDeviceIDs, this.UseComputerCulture, this.ShowSyncthingConsole, this.WindowPlacement,
+                this.LatestNotifiedVersion, this.ObfuscateDeviceIDs, this.UseComputerCulture, this.SyncthingConsoleHeight, this.WindowPlacement,
                 this.SyncthingWebBrowserZoomLevel);
         }
     }
diff --git a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
index 8efaa234..b8bf27c8 100644
--- a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
+++ b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
@@ -67,7 +67,8 @@ public ConfigurationProvider(IApplicationPathsProvider paths)
 
             this.migrations = new Func<XDocument, XDocument>[]
             {
-                this.MigrateV1ToV2
+                this.MigrateV1ToV2,
+                this.MigrateV2ToV3,
             };
         }
 
@@ -189,6 +190,13 @@ private XDocument MigrateV1ToV2(XDocument configuration)
             return configuration;
         }
 
+        private XDocument MigrateV2ToV3(XDocument configuration)
+        {
+            bool? visible = (bool?)configuration.Root.Element("ShowSyncthingConsole");
+            configuration.Root.Add(new XElement("SyncthingConsoleHeight", visible == true ? Configuration.DefaultSyncthingConsoleHeight : 0.0));
+            return configuration;
+        }
+
         private XDocument LegacyMigrationConfiguration(XDocument configuration)
         {
             var address = configuration.Root.Element("SyncthingAddress").Value;
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 3496baf6..98d2dc00 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -273,6 +273,7 @@
     <Compile Include="Utils\SemaphoreSlimExtensions.cs" />
     <Compile Include="Utils\StreamExtensions.cs" />
     <Compile Include="Utils\SynchronizedEventDispatcher.cs" />
+    <Compile Include="Xaml\GridLengthToAbsoluteConverter.cs" />
     <Compile Include="Xaml\MouseWheelGesture.cs" />
     <Compile Include="Xaml\RemoveMnemonicsConverter.cs" />
     <Compile Include="Xaml\UacImageSource.cs" />
diff --git a/src/SyncTrayzor/Xaml/CollapsingRowDefinitionBehaviour.cs b/src/SyncTrayzor/Xaml/CollapsingRowDefinitionBehaviour.cs
index 1b865114..e6a4ff0e 100644
--- a/src/SyncTrayzor/Xaml/CollapsingRowDefinitionBehaviour.cs
+++ b/src/SyncTrayzor/Xaml/CollapsingRowDefinitionBehaviour.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Interactivity;
 
 namespace SyncTrayzor.Xaml
@@ -43,8 +44,15 @@ protected override void OnAttached()
             this.Refresh();
         }
 
+        protected override void OnDetaching()
+        {
+            BindingOperations.ClearBinding(this.AssociatedObject, RowDefinition.HeightProperty);
+        }
+
         private void Refresh()
         {
+            BindingOperations.ClearBinding(this.AssociatedObject, RowDefinition.HeightProperty);
+
             if (this.RowVisibility == Visibility.Collapsed)
             {
                 this.AssociatedObject.Height = new GridLength(0);
@@ -52,7 +60,13 @@ private void Refresh()
             }
             else
             {
-                this.AssociatedObject.Height = this.Height;
+                var heightBinding = new Binding("Height")
+                {
+                    Source = this,
+                    Mode = BindingMode.TwoWay,
+                };
+                BindingOperations.SetBinding(this.AssociatedObject, RowDefinition.HeightProperty, heightBinding);
+
                 this.AssociatedObject.MinHeight = this.MinHeight;
             }
         }
diff --git a/src/SyncTrayzor/Xaml/GridLengthToAbsoluteConverter.cs b/src/SyncTrayzor/Xaml/GridLengthToAbsoluteConverter.cs
new file mode 100644
index 00000000..1fdafecf
--- /dev/null
+++ b/src/SyncTrayzor/Xaml/GridLengthToAbsoluteConverter.cs
@@ -0,0 +1,38 @@
+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 GridLengthToAbsoluteConverter : IValueConverter
+    {
+        public static readonly GridLengthToAbsoluteConverter Instance = new GridLengthToAbsoluteConverter();
+
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            if (value == null)
+                return null;
+
+            try
+            {
+                return new GridLength(System.Convert.ToDouble(value));
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            if (!(value is GridLength))
+                return null;
+
+            return ((GridLength)value).Value;
+        }
+    }
+}

From 1f7f616ecc4140d86680bcef86f92159fd8c79a4 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Mon, 20 Apr 2015 22:04:47 +0100
Subject: [PATCH 06/23] Fix typo

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

diff --git a/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs b/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
index 68cd8f6f..7b6da093 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
+++ b/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
@@ -636,7 +636,7 @@ public static string SettingsView_Validation_NotShouldBeEmpty {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Must be in the format &apos;VAR=value VAR2=&quot;val1 vla2&quot;&apos;.
+        ///   Looks up a localized string similar to Must be in the format &apos;VAR=value VAR2=&quot;val1 val2&quot;&apos;.
         /// </summary>
         public static string SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat {
             get {
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.resx b/src/SyncTrayzor/Properties/Strings/Resources.resx
index d619aa7f..54971665 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.resx
@@ -558,6 +558,6 @@ SyncTrayzor is going to have to close. Sorry about that</value>
     <value>_Reset</value>
   </data>
   <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
-    <value>Must be in the format 'VAR=value VAR2="val1 vla2"'</value>
+    <value>Must be in the format 'VAR=value VAR2="val1 val2"'</value>
   </data>
 </root>
\ No newline at end of file

From 20f006480b0aeebcf8e9e1813b92c3e88caab272 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 21 Apr 2015 08:22:17 +0100
Subject: [PATCH 07/23] Escape underscores in folder names in settings dialog

Relates to #58
---
 src/SyncTrayzor/Pages/SettingsView.xaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/Pages/SettingsView.xaml b/src/SyncTrayzor/Pages/SettingsView.xaml
index 68695d4b..74cea72d 100644
--- a/src/SyncTrayzor/Pages/SettingsView.xaml
+++ b/src/SyncTrayzor/Pages/SettingsView.xaml
@@ -119,7 +119,10 @@
                             <ItemsControl ItemsSource="{Binding WatchedFolders}">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
-                                        <CheckBox Content="{Binding Folder}" IsChecked="{Binding IsSelected}"/>
+                                        <CheckBox IsChecked="{Binding IsSelected}">
+                                            <!-- TextBlock needed so that underscores aren't turned into mnemonics -->
+                                            <TextBlock Text="{Binding Folder}"/>
+                                        </CheckBox>
                                     </DataTemplate>
                                 </ItemsControl.ItemTemplate>
                             </ItemsControl>

From 0cc5659d425e920543b905d9c240de8b1b9a81b9 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 21 Apr 2015 11:19:33 +0100
Subject: [PATCH 08/23] Clarify wording around poller config

---
 src/SyncTrayzor/Properties/Strings/Resources.Designer.cs | 4 ++--
 src/SyncTrayzor/Properties/Strings/Resources.resx        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs b/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
index 7b6da093..67e85a9f 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
+++ b/src/SyncTrayzor/Properties/Strings/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -645,7 +645,7 @@ public static string SettingsView_Validation_SyncthingEnvironmentalVariablesMust
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The following folders will be watched for changes, which avoids polling..
+        ///   Looks up a localized string similar to The following folders will be watched for changes, which means you can set a longer polling interval..
         /// </summary>
         public static string SettingsView_WatchedFolders_Explanation {
             get {
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.resx b/src/SyncTrayzor/Properties/Strings/Resources.resx
index 54971665..29ead54e 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.resx
@@ -309,7 +309,7 @@
     <value>Syncthing Environmental Variables:</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>The following folders will be watched for changes, which avoids polling.</value>
+    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Folders unavailable. Please start Syncthing</value>

From 7e10a151d2b2aca2a74c641e6b8230e03c689b12 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 21 Apr 2015 11:38:02 +0100
Subject: [PATCH 09/23] Fix order of title/message in dialog

---
 src/SyncTrayzor/Utils/SafeSyncthingExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SyncTrayzor/Utils/SafeSyncthingExtensions.cs b/src/SyncTrayzor/Utils/SafeSyncthingExtensions.cs
index a921fcee..55e31e0e 100644
--- a/src/SyncTrayzor/Utils/SafeSyncthingExtensions.cs
+++ b/src/SyncTrayzor/Utils/SafeSyncthingExtensions.cs
@@ -35,8 +35,8 @@ public static async Task StartWithErrorDialogAsync(this ISyncThingManager syncTh
             {
                 // Haven't translated yet - still debugging
                 windowManager.ShowMessageBox(
-                    "Syncthing didn't start correctly",
                     "Syncthing started running, but we were enable to connect to it. Please report this as a bug",
+                    "Syncthing didn't start correctly",
                     MessageBoxButton.OK, icon: MessageBoxImage.Error);
             }
         }

From ee086e75b5bcb13615e1097c4384b838b5670544 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 21 Apr 2015 11:49:10 +0100
Subject: [PATCH 10/23] Try setting Syncthing console encoding to UTF-8

---
 src/SyncTrayzor/SyncThing/SyncThingProcessRunner.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/SyncTrayzor/SyncThing/SyncThingProcessRunner.cs b/src/SyncTrayzor/SyncThing/SyncThingProcessRunner.cs
index b371dd0d..4f0686f0 100644
--- a/src/SyncTrayzor/SyncThing/SyncThingProcessRunner.cs
+++ b/src/SyncTrayzor/SyncThing/SyncThingProcessRunner.cs
@@ -102,6 +102,8 @@ public void Start()
                 RedirectStandardInput = true,
                 RedirectStandardError = true,
                 RedirectStandardOutput = true,
+                StandardOutputEncoding = Encoding.UTF8,
+                StandardErrorEncoding = Encoding.UTF8,
             };
 
             foreach (var kvp in this.EnvironmentalVariables)

From eb17d64cdcc624b8cdc2cb65834174dfa270f18c Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 21 Apr 2015 13:18:27 +0100
Subject: [PATCH 11/23] Handle duplicate folders and devices in config

Not particularly well mind you - we just ignore the duplicates. But it's
better than crashing.

See #61
---
 src/SyncTrayzor/SyncThing/ApiClient/Config.cs |  6 +++-
 src/SyncTrayzor/SyncThing/SyncThingManager.cs | 31 ++++++++++++-------
 src/SyncTrayzor/SyncTrayzor.csproj            |  1 +
 src/SyncTrayzor/Utils/EnumerableExtensions.cs | 21 +++++++++++++
 4 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 src/SyncTrayzor/Utils/EnumerableExtensions.cs

diff --git a/src/SyncTrayzor/SyncThing/ApiClient/Config.cs b/src/SyncTrayzor/SyncThing/ApiClient/Config.cs
index 5ec1b791..9568e4b6 100644
--- a/src/SyncTrayzor/SyncThing/ApiClient/Config.cs
+++ b/src/SyncTrayzor/SyncThing/ApiClient/Config.cs
@@ -41,9 +41,13 @@ public TimeSpan RescanInterval
             set { this.RescanIntervalSeconds = (long)value.TotalSeconds; }
         }
 
+        [JsonProperty("invalid")]
+        public string Invalid { get; set; }
+
         public override string ToString()
         {
-            return String.Format("<Folder id={0} path={1} devices=[{2}] readonly={3} rescalinterval={4}>", this.ID, this.Path, String.Join(", ", this.Devices), this.ReadOnly, this.RescanInterval);
+            return String.Format("<Folder id={0} path={1} devices=[{2}] readonly={3} rescalinterval={4} invalid={5}>",
+                this.ID, this.Path, String.Join(", ", this.Devices), this.ReadOnly, this.RescanInterval, this.Invalid);
         }
     }
 
diff --git a/src/SyncTrayzor/SyncThing/SyncThingManager.cs b/src/SyncTrayzor/SyncThing/SyncThingManager.cs
index 56082d17..9506b1bd 100644
--- a/src/SyncTrayzor/SyncThing/SyncThingManager.cs
+++ b/src/SyncTrayzor/SyncThing/SyncThingManager.cs
@@ -423,27 +423,36 @@ private async Task LoadStartupDataAsync(CancellationToken cancellationToken)
             cancellationToken.ThrowIfCancellationRequested();
             await Task.WhenAll(configTask, systemTask, versionTask, connectionsTask);
 
-            this.devices = new ConcurrentDictionary<string, Device>(configTask.Result.Devices.Select(device =>
+            // We can potentially see duplicate devices (if the user set their config file that way). Ignore them.
+            var devices = configTask.Result.Devices.DistinctBy(x => x.DeviceID).Select(device =>
             {
                 var deviceObj = new Device(device.DeviceID, device.Name);
                 ItemConnectionData connectionData;
                 if (connectionsTask.Result.DeviceConnections.TryGetValue(device.DeviceID, out connectionData))
                     deviceObj.SetConnected(connectionData.Address);
-                return new KeyValuePair<string, Device>(device.DeviceID, deviceObj);
-            }));
+                return deviceObj;
+            });
+            this.devices = new ConcurrentDictionary<string, Device>(devices.Select(x => new KeyValuePair<string, Device>(x.DeviceId, x)));
 
             var tilde = systemTask.Result.Tilde;
 
-            var folderConstructionTasks = configTask.Result.Folders.Select(async folder =>
-            {
-                var ignores = await this.FetchFolderIgnoresAsync(folder.ID, cancellationToken);
-                var path = folder.Path;
-                if (path.StartsWith("~"))
-                    path = Path.Combine(tilde, path.Substring(1).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar));
-                return new Folder(folder.ID, path, new FolderIgnores(ignores.IgnorePatterns, ignores.RegexPatterns));
-            });
+            // If the folder is invalid for any reason, we'll ignore it.
+            // Again, there's the potential for duplicate folder IDs (if the user's been fiddling their config). 
+            // In this case, there's nothing really sensible we can do. Just pick one of them :)
+            var folderConstructionTasks = configTask.Result.Folders
+                .Where(x => String.IsNullOrWhiteSpace(x.Invalid))
+                .DistinctBy(x => x.ID)
+                .Select(async folder =>
+                {
+                    var ignores = await this.FetchFolderIgnoresAsync(folder.ID, cancellationToken);
+                    var path = folder.Path;
+                    if (path.StartsWith("~"))
+                        path = Path.Combine(tilde, path.Substring(1).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar));
+                    return new Folder(folder.ID, path, new FolderIgnores(ignores.IgnorePatterns, ignores.RegexPatterns));
+                });
 
             cancellationToken.ThrowIfCancellationRequested();
+
             var folders = await Task.WhenAll(folderConstructionTasks);
             this.folders = new ConcurrentDictionary<string, Folder>(folders.Select(x => new KeyValuePair<string, Folder>(x.FolderId, x)));
 
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 98d2dc00..dbbc7e2a 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -265,6 +265,7 @@
     <Compile Include="SyncThing\SyncThingStateChangedEventArgs.cs" />
     <Compile Include="Utils\AuthenticodeTools.cs" />
     <Compile Include="Utils\Buffer.cs" />
+    <Compile Include="Utils\EnumerableExtensions.cs" />
     <Compile Include="Utils\EnvVarTransformer.cs" />
     <Compile Include="Utils\FluentModelValidator.cs" />
     <Compile Include="Utils\FormatUtils.cs" />
diff --git a/src/SyncTrayzor/Utils/EnumerableExtensions.cs b/src/SyncTrayzor/Utils/EnumerableExtensions.cs
new file mode 100644
index 00000000..6b31c960
--- /dev/null
+++ b/src/SyncTrayzor/Utils/EnumerableExtensions.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyncTrayzor.Utils
+{
+    public static class EnumerableExtensions
+    {
+        public static IEnumerable<TSource> DistinctBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector)
+        {
+            var knownKeys = new HashSet<TKey>();
+            foreach (var element in source)
+            {
+                if (knownKeys.Add(keySelector(element)))
+                    yield return element;
+            }
+        }
+    }
+}

From 5f613618d6f06795fe2c41121271b3492cc0ab1b Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 21 Apr 2015 14:09:59 +0100
Subject: [PATCH 12/23] Fix threading issues with CefSharp and ZoomLevel

See #62, #57
---
 src/SyncTrayzor/Pages/ViewerViewModel.cs | 49 ++++++++++++++----------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/SyncTrayzor/Pages/ViewerViewModel.cs b/src/SyncTrayzor/Pages/ViewerViewModel.cs
index c54a4b38..07cda256 100644
--- a/src/SyncTrayzor/Pages/ViewerViewModel.cs
+++ b/src/SyncTrayzor/Pages/ViewerViewModel.cs
@@ -29,6 +29,7 @@ public class ViewerViewModel : Screen, IRequestHandler, ILifeSpanHandler
 
         private readonly object cultureLock = new object(); // This can be read from many threads
         private CultureInfo culture;
+        private double zoomLevel;
 
         public string Location { get; private set; }
         
@@ -36,7 +37,7 @@ public class ViewerViewModel : Screen, IRequestHandler, ILifeSpanHandler
         public bool ShowSyncThingStarting { get { return this.syncThingState == SyncThingState.Starting; } }
         public bool ShowSyncThingStopped { get { return this.syncThingState == SyncThingState.Stopped; ; } }
 
-        public IWpfWebBrowser WebBrowser { get; set; }
+        public ChromiumWebBrowser WebBrowser { get; set; }
 
         private JavascriptCallbackObject callback;
 
@@ -51,6 +52,9 @@ public ViewerViewModel(
             this.processStartProvider = processStartProvider;
             this.configurationProvider = configurationProvider;
 
+            var configuration = this.configurationProvider.Load();
+            this.zoomLevel = configuration.SyncthingWebBrowserZoomLevel;
+
             this.syncThingManager.StateChanged += (o, e) =>
             {
                 this.syncThingState = e.NewState;
@@ -65,7 +69,7 @@ public ViewerViewModel(
                     this.InitializeBrowser(e.NewValue);
             });
 
-            this.SetCulture(configurationProvider.Load());
+            this.SetCulture(configuration);
             configurationProvider.ConfigurationChanged += (o, e) => this.SetCulture(e.NewConfiguration);
         }
 
@@ -85,23 +89,29 @@ protected override void OnInitialActivate()
             });
         }
 
-        private void InitializeBrowser(IWpfWebBrowser webBrowser)
+        private void InitializeBrowser(ChromiumWebBrowser webBrowser)
         {
             webBrowser.RequestHandler = this;
             webBrowser.LifeSpanHandler = this;
             webBrowser.RegisterJsObject("callbackObject", this.callback);
 
+            // So. Fun story. From https://github.com/cefsharp/CefSharp/issues/738#issuecomment-91099199, we need to set the zoom level
+            // in the FrameLoadStart event. However, the IWpfWebBrowser's ZoomLevel is a DependencyProperty, and it wraps
+            // the SetZoomLevel method on the unmanaged browser (which is exposed directly by ChromiumWebBrowser, but not by IWpfWebBrowser).
+            // Now, FrameLoadState and FrameLoadEnd are called on a background thread, and since ZoomLevel is a DP, it can only be changed
+            // from the UI thread (it's "helpful" and does a dispatcher check for us). But, if we dispatch back to the UI thread to call
+            // ZoomLevel = xxx, then CEF seems to hit threading issues, and can sometimes render things entirely badly (massive icons, no
+            // localization, bad spacing, no JavaScript at all, etc).
+            // So, in this case, we need to call SetZoomLevel directly, as we can do that from the thread on which FrameLoadStart is called,
+            // and everything's happy.
+            // However, this means that the DP value isn't updated... Which means we can't use the DP at all. We have to call SetZoomLevel
+            // *everywhere*, and that means keeping a local field zoomLevel to track the current zoom level. Such is life
+
+            webBrowser.FrameLoadStart += (o, e) => webBrowser.SetZoomLevel(this.zoomLevel);
             webBrowser.FrameLoadEnd += (o, e) =>
             {
                 if (e.IsMainFrame && e.Url != "about:blank")
                 {
-                    Execute.OnUIThread(() =>
-                    {
-                        // See https://github.com/cefsharp/CefSharp/issues/738#issuecomment-91099199
-                        // ... Except that FrameLoadStart doesn't appear to work for me. FrameLoadEnd does though
-                        webBrowser.ZoomLevel = this.configurationProvider.Load().SyncthingWebBrowserZoomLevel;
-                    });
-
                     var script = @"$('#folders .panel-footer .pull-right').prepend(" +
                     @"'<button class=""btn btn-sm btn-default"" onclick=""callbackObject.openFolder(angular.element(this).scope().folder.ID)"">" +
                     @"<span class=""glyphicon glyphicon-folder-open""></span>" +
@@ -122,30 +132,27 @@ public void RefreshBrowser()
 
         public void ZoomIn()
         {
-            this.ZoomBy(0.2);
+            this.ZoomTo(this.zoomLevel + 0.2);
         }
 
         public void ZoomOut()
         {
-            this.ZoomBy(-0.2);
+            this.ZoomTo(this.zoomLevel - 0.2);
         }
 
-        private void ZoomBy(double amount)
+        public void ZoomReset()
         {
-            if (this.WebBrowser == null || this.syncThingState != SyncThingState.Running)
-                return;
-
-            this.WebBrowser.ZoomLevel += amount;
-            this.configurationProvider.AtomicLoadAndSave(c => c.SyncthingWebBrowserZoomLevel = this.WebBrowser.ZoomLevel);
+            this.ZoomTo(0.0);
         }
 
-        public void ZoomReset()
+        private void ZoomTo(double zoomLevel)
         {
             if (this.WebBrowser == null || this.syncThingState != SyncThingState.Running)
                 return;
 
-            this.WebBrowser.ZoomLevel = 0;
-            this.configurationProvider.AtomicLoadAndSave(c => c.SyncthingWebBrowserZoomLevel = this.WebBrowser.ZoomLevel);
+            this.zoomLevel = zoomLevel;
+            this.WebBrowser.SetZoomLevel(zoomLevel);
+            this.configurationProvider.AtomicLoadAndSave(c => c.SyncthingWebBrowserZoomLevel = zoomLevel);
         }
 
         private void OpenFolder(string folderId)

From 64af5a7dcc699fa7400b406d2d59a7559a4bcf47 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 21 Apr 2015 16:02:34 +0100
Subject: [PATCH 13/23] So, apparently Refit does not support a
 CancellationToken parameter...

---
 .../SyncThing/ApiClient/ISyncThingApiClient.cs            | 4 ++--
 src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiV0p10.cs | 4 ++--
 src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiV0p11.cs | 4 ++--
 .../SyncThing/ApiClient/SyncThingApiClientV0p10.cs        | 8 ++++----
 .../SyncThing/ApiClient/SyncThingApiClientV0p11.cs        | 8 ++++----
 .../SyncThing/EventWatcher/SyncThingEventWatcher.cs       | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiClient.cs b/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiClient.cs
index 1ae5bd0f..bd9e1f65 100644
--- a/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiClient.cs
+++ b/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiClient.cs
@@ -10,8 +10,8 @@ namespace SyncTrayzor.SyncThing.ApiClient
     public interface ISyncThingApiClient
     {
         Task ShutdownAsync();
-        Task<List<Event>> FetchEventsAsync(int since, int limit, CancellationToken cancellationToken);
-        Task<List<Event>> FetchEventsAsync(int since, CancellationToken cancellationToken);
+        Task<List<Event>> FetchEventsAsync(int since, int limit);
+        Task<List<Event>> FetchEventsAsync(int since);
         Task<Config> FetchConfigAsync();
         Task ScanAsync(string folderId, string subPath);
         Task<SystemInfo> FetchSystemInfoAsync();
diff --git a/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiV0p10.cs b/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiV0p10.cs
index b3ffe5c4..5f0e5955 100644
--- a/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiV0p10.cs
+++ b/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiV0p10.cs
@@ -11,10 +11,10 @@ namespace SyncTrayzor.SyncThing.ApiClient
     public interface ISyncThingApiV0p10
     {
         [Get("/rest/events")]
-        Task<List<Event>> FetchEventsAsync(int since, CancellationToken cancellationToken);
+        Task<List<Event>> FetchEventsAsync(int since);
 
         [Get("/rest/events")]
-        Task<List<Event>> FetchEventsLimitAsync(int since, int limit, CancellationToken cancellationToken);
+        Task<List<Event>> FetchEventsLimitAsync(int since, int limit);
 
         [Get("/rest/config")]
         Task<Config> FetchConfigAsync();
diff --git a/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiV0p11.cs b/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiV0p11.cs
index 01cbffaa..2a432148 100644
--- a/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiV0p11.cs
+++ b/src/SyncTrayzor/SyncThing/ApiClient/ISyncThingApiV0p11.cs
@@ -11,10 +11,10 @@ namespace SyncTrayzor.SyncThing.ApiClient
     public interface ISyncThingApiV0p11
     {
         [Get("/rest/events")]
-        Task<List<Event>> FetchEventsAsync(int since, CancellationToken cancellationToken);
+        Task<List<Event>> FetchEventsAsync(int since);
 
         [Get("/rest/events")]
-        Task<List<Event>> FetchEventsLimitAsync(int since, int limit, CancellationToken cancellationToken);
+        Task<List<Event>> FetchEventsLimitAsync(int since, int limit);
 
         [Get("/rest/system/config")]
         Task<Config> FetchConfigAsync();
diff --git a/src/SyncTrayzor/SyncThing/ApiClient/SyncThingApiClientV0p10.cs b/src/SyncTrayzor/SyncThing/ApiClient/SyncThingApiClientV0p10.cs
index c84255e8..bd200986 100644
--- a/src/SyncTrayzor/SyncThing/ApiClient/SyncThingApiClientV0p10.cs
+++ b/src/SyncTrayzor/SyncThing/ApiClient/SyncThingApiClientV0p10.cs
@@ -40,14 +40,14 @@ public Task ShutdownAsync()
             return this.api.ShutdownAsync();
         }
 
-        public Task<List<Event>> FetchEventsAsync(int since, int limit, CancellationToken cancellationToken)
+        public Task<List<Event>> FetchEventsAsync(int since, int limit)
         {
-            return this.api.FetchEventsLimitAsync(since, limit, cancellationToken);
+            return this.api.FetchEventsLimitAsync(since, limit);
         }
 
-        public Task<List<Event>> FetchEventsAsync(int since, CancellationToken cancellationToken)
+        public Task<List<Event>> FetchEventsAsync(int since)
         {
-            return this.api.FetchEventsAsync(since, cancellationToken);
+            return this.api.FetchEventsAsync(since);
         }
 
         public async Task<Config> FetchConfigAsync()
diff --git a/src/SyncTrayzor/SyncThing/ApiClient/SyncThingApiClientV0p11.cs b/src/SyncTrayzor/SyncThing/ApiClient/SyncThingApiClientV0p11.cs
index b420b1a2..f7dd6669 100644
--- a/src/SyncTrayzor/SyncThing/ApiClient/SyncThingApiClientV0p11.cs
+++ b/src/SyncTrayzor/SyncThing/ApiClient/SyncThingApiClientV0p11.cs
@@ -40,14 +40,14 @@ public Task ShutdownAsync()
             return this.api.ShutdownAsync();
         }
 
-        public Task<List<Event>> FetchEventsAsync(int since, int limit, CancellationToken cancellationToken)
+        public Task<List<Event>> FetchEventsAsync(int since, int limit)
         {
-            return this.api.FetchEventsLimitAsync(since, limit, cancellationToken);
+            return this.api.FetchEventsLimitAsync(since, limit);
         }
 
-        public Task<List<Event>> FetchEventsAsync(int since, CancellationToken cancellationToken)
+        public Task<List<Event>> FetchEventsAsync(int since)
         {
-            return this.api.FetchEventsAsync(since, cancellationToken);
+            return this.api.FetchEventsAsync(since);
         }
 
         public async Task<Config> FetchConfigAsync()
diff --git a/src/SyncTrayzor/SyncThing/EventWatcher/SyncThingEventWatcher.cs b/src/SyncTrayzor/SyncThing/EventWatcher/SyncThingEventWatcher.cs
index d0647893..fe18c94f 100644
--- a/src/SyncTrayzor/SyncThing/EventWatcher/SyncThingEventWatcher.cs
+++ b/src/SyncTrayzor/SyncThing/EventWatcher/SyncThingEventWatcher.cs
@@ -52,9 +52,9 @@ protected override async Task PollAsync(CancellationToken cancellationToken)
             List<Event> events;
             // If this is the first poll, don't fetch the history
             if (this.lastEventId == 0)
-                events = await this.apiClient.FetchEventsAsync(0, 1, cancellationToken);
+                events = await this.apiClient.FetchEventsAsync(0, 1);
             else
-                events = await this.apiClient.FetchEventsAsync(this.lastEventId, cancellationToken);
+                events = await this.apiClient.FetchEventsAsync(this.lastEventId);
 
             // We can be aborted in the time it takes to fetch the events
             cancellationToken.ThrowIfCancellationRequested();

From 6db558d97b9223ae78f5049a122f220fa18dfd1e Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 21 Apr 2015 16:57:54 +0100
Subject: [PATCH 14/23] Revert "Update to CefSharp 39"

This reverts commit fcb74bde5e882adb066d7c13978f2d38b0b5c58b.

It turns out CefSharp breaks a lot of stuff, mainly reported in #62
---
 src/SyncTrayzor/Pages/ViewerViewModel.cs | 10 +++++-----
 src/SyncTrayzor/SyncTrayzor.csproj       | 22 +++++++++++-----------
 src/SyncTrayzor/packages.config          |  8 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/SyncTrayzor/Pages/ViewerViewModel.cs b/src/SyncTrayzor/Pages/ViewerViewModel.cs
index 07cda256..39e49711 100644
--- a/src/SyncTrayzor/Pages/ViewerViewModel.cs
+++ b/src/SyncTrayzor/Pages/ViewerViewModel.cs
@@ -187,17 +187,17 @@ bool IRequestHandler.GetAuthCredentials(IWebBrowser browser, bool isProxy, strin
             return false;
         }
 
-        bool IRequestHandler.OnBeforeBrowse(IWebBrowser browser, IRequest request, bool isRedirect, bool isMainFrame)
+        bool IRequestHandler.OnBeforeBrowse(IWebBrowser browser, IRequest request, bool isRedirect)
         {
             return false;
         }
 
-        bool IRequestHandler.OnBeforePluginLoad(IWebBrowser browser, string url, string policyUrl, WebPluginInfo info)
+        bool IRequestHandler.OnBeforePluginLoad(IWebBrowser browser, string url, string policyUrl, IWebPluginInfo info)
         {
             return false;
         }
 
-        bool IRequestHandler.OnBeforeResourceLoad(IWebBrowser browser, IRequest request, bool isMainFrame)
+        bool IRequestHandler.OnBeforeResourceLoad(IWebBrowser browser, IRequest request, IResponse response)
         {
             var uri = new Uri(request.Url);
             if ((uri.Scheme == "http" || uri.Scheme == "https") && uri.Host != this.syncThingManager.Address.NormalizeZeroHost().Host)
@@ -238,9 +238,9 @@ void ILifeSpanHandler.OnBeforeClose(IWebBrowser browser)
         {
         }
 
-        bool ILifeSpanHandler.OnBeforePopup(IWebBrowser browser, string sourceUrl, string targetUrl, ref int x, ref int y, ref int width, ref int height)
+        bool ILifeSpanHandler.OnBeforePopup(IWebBrowser browser, string url, ref int x, ref int y, ref int width, ref int height)
         {
-            this.processStartProvider.StartDetached(targetUrl);
+            this.processStartProvider.StartDetached(url);
             return true;
         }
 
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index dbbc7e2a..00b06583 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\CefSharp.Wpf.39.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.39.0.0\build\CefSharp.Wpf.props')" />
-  <Import Project="..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props')" />
+  <Import Project="..\packages\CefSharp.Wpf.37.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.37.0.0\build\CefSharp.Wpf.props')" />
+  <Import Project="..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,7 +15,7 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
-    <NuGetPackageImportStamp>b679e5f7</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>332867c0</NuGetPackageImportStamp>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -462,13 +462,16 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.4\build\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\refit.2.2.0\build\refit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\refit.2.2.0\build\refit.targets'))" />
-    <Error Condition="!Exists('..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets'))" />
-    <Error Condition="!Exists('..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Wpf.39.0.0\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.39.0.0\build\CefSharp.Wpf.props'))" />
+    <Error Condition="!Exists('..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets'))" />
+    <Error Condition="!Exists('..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Wpf.37.0.0\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.37.0.0\build\CefSharp.Wpf.props'))" />
   </Target>
   <Import Project="..\packages\refit.2.2.0\build\refit.targets" Condition="Exists('..\packages\refit.2.2.0\build\refit.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets')" />
   <Target Name="Configs">
     <XslTransformation XmlInputPaths="App.config" XslInputPath="App.Installer.config.xslt" OutputPaths="$(OutputPath)$(RootNamespace).exe.Installer.config" />
   </Target>
@@ -479,7 +482,4 @@
   <Target Name="AfterBuild">
     <CallTarget Targets="Configs" />
   </Target>
-  <Import Project="..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets')" />
-  <Import Project="..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/SyncTrayzor/packages.config b/src/SyncTrayzor/packages.config
index 39070f8c..9dde970c 100644
--- a/src/SyncTrayzor/packages.config
+++ b/src/SyncTrayzor/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.2171.2069" targetFramework="net45" />
-  <package id="cef.redist.x86" version="3.2171.2069" targetFramework="net45" />
-  <package id="CefSharp.Common" version="39.0.0" targetFramework="net45" />
-  <package id="CefSharp.Wpf" version="39.0.0" targetFramework="net45" />
+  <package id="cef.redist.x64" version="3.2062.1898" targetFramework="net45" />
+  <package id="cef.redist.x86" version="3.2062.1898" targetFramework="net45" />
+  <package id="CefSharp.Common" version="37.0.0" targetFramework="net45" />
+  <package id="CefSharp.Wpf" version="37.0.0" targetFramework="net45" />
   <package id="FluentValidation" version="5.5.0.0" targetFramework="net45" />
   <package id="Fody" version="1.26.4" targetFramework="net45" developmentDependency="true" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net45" />

From b74f8b090b12bd4977b38e55a9bcc8e07ca5989b Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Tue, 21 Apr 2015 17:04:07 +0100
Subject: [PATCH 15/23] Hack CefSharp (the older version) to support
 SetZoomLevel directly

---
 src/SyncTrayzor/SyncTrayzor.csproj            |  1 +
 .../Utils/ChromiumWebBrowserExtensions.cs     | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 src/SyncTrayzor/Utils/ChromiumWebBrowserExtensions.cs

diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 00b06583..f83b72d4 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -265,6 +265,7 @@
     <Compile Include="SyncThing\SyncThingStateChangedEventArgs.cs" />
     <Compile Include="Utils\AuthenticodeTools.cs" />
     <Compile Include="Utils\Buffer.cs" />
+    <Compile Include="Utils\ChromiumWebBrowserExtensions.cs" />
     <Compile Include="Utils\EnumerableExtensions.cs" />
     <Compile Include="Utils\EnvVarTransformer.cs" />
     <Compile Include="Utils\FluentModelValidator.cs" />
diff --git a/src/SyncTrayzor/Utils/ChromiumWebBrowserExtensions.cs b/src/SyncTrayzor/Utils/ChromiumWebBrowserExtensions.cs
new file mode 100644
index 00000000..b6d6192b
--- /dev/null
+++ b/src/SyncTrayzor/Utils/ChromiumWebBrowserExtensions.cs
@@ -0,0 +1,22 @@
+using CefSharp.Wpf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyncTrayzor.Utils
+{
+    public static class ChromiumWebBrowserExtensions
+    {
+        private static MethodInfo setZoomLevelMethod = typeof(ChromiumWebBrowser).GetMethod("OnZoomLevelChanged", BindingFlags.Instance | BindingFlags.NonPublic, Type.DefaultBinder, new[] { typeof(double), typeof(double) }, null);
+
+        public static void SetZoomLevel(this ChromiumWebBrowser browser, double zoomLevel)
+        {
+            // Yuck yuck yuck. This is fixed in CefSharp 39, but that breaks other things (I'm not entirely sure what, but things like
+            // the device ID become broken).
+            setZoomLevelMethod.Invoke(browser, new object[] { 0.0, zoomLevel });
+        }
+    }
+}

From cc4c6a68a3775e17ef2d61d07de8ba4c0829b22d Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 10:05:47 +0100
Subject: [PATCH 16/23] Use an 'install count' to determine whether to update
 Syncthing

When the installer runs, it will increment a number in 'InstallCount.txt'.
SyncTrayzor keeps a record of the last number it saw, and uses this to determine
whether to update the Syncthing.exe copy in AppData. This is more robust than trying
to use file mtimes.

Fixes #63
---
 installer/x64/installer-x64.iss               | 21 +++++++
 installer/x86/installer-x86.iss               | 21 +++++++
 src/SyncTrayzor/App.config                    |  1 +
 .../Properties/Settings.Designer.cs           |  1 +
 src/SyncTrayzor/Properties/Settings.settings  |  1 +
 .../Config/ApplicationPathsProvider.cs        |  6 ++
 .../Services/Config/Configuration.cs          |  7 ++-
 .../Services/Config/ConfigurationProvider.cs  | 58 +++++++++++++++----
 8 files changed, 102 insertions(+), 14 deletions(-)

diff --git a/installer/x64/installer-x64.iss b/installer/x64/installer-x64.iss
index dbb63a3c..e67219e8 100644
--- a/installer/x64/installer-x64.iss
+++ b/installer/x64/installer-x64.iss
@@ -86,12 +86,32 @@ begin
   result := not exists or (release < 378758);
 end;
 
+procedure BumpInstallCount;
+var
+  fileContents: AnsiString;
+  installCount: integer;
+begin
+  { Increment the install count in InstallCount.txt if it exists, or create it with the contents '1' if it doesn't }
+  if LoadStringFromFile(ExpandConstant('{app}\InstallCount.txt'), fileContents) then
+  begin
+    installCount := StrTointDef(Trim(string(fileContents)), 0) + 1;
+  end
+  else
+  begin
+    installCount := 1;
+  end;
+
+  SaveStringToFile(ExpandConstant('{app}\InstallCount.txt'), IntToStr(installCount), False);
+end;
+
 procedure CurStepChanged(CurStep: TSetupStep);
 var
   ResultCode: integer;
 begin
   if CurStep = ssInstall then
   begin
+    BumpInstallCount();
+
     { We might be being run from ProcessRunner.exe, *and* we might be trying to update it. Funsies. Let's rename it (which Windows lets us do) }
     DeleteFile(ExpandConstant('{app}\ProcessRunner.exe.old'));
     RenameFile(ExpandConstant('{app}\ProcessRunner.exe'), ExpandConstant('{app}\ProcessRunner.exe.old'));
@@ -114,5 +134,6 @@ end;
 
 [UninstallDelete]
 Type: files; Name: "{app}\ProcessRunner.exe.old"
+Type: files; Name: "{app}\InstallCount.txt"
 Type: filesandordirs; Name: "{userappdata}\{#AppDataFolder}"
 Type: filesandordirs; Name: "{userappdata}\{#AppDataFolder}"
\ No newline at end of file
diff --git a/installer/x86/installer-x86.iss b/installer/x86/installer-x86.iss
index f1859c78..19b98dcb 100644
--- a/installer/x86/installer-x86.iss
+++ b/installer/x86/installer-x86.iss
@@ -84,12 +84,32 @@ begin
   result := not exists or (release < 378758);
 end;
 
+procedure BumpInstallCount;
+var
+  fileContents: AnsiString;
+  installCount: integer;
+begin
+  { Increment the install count in InstallCount.txt if it exists, or create it with the contents '1' if it doesn't }
+  if LoadStringFromFile(ExpandConstant('{app}\InstallCount.txt'), fileContents) then
+  begin
+    installCount := StrTointDef(Trim(string(fileContents)), 0) + 1;
+  end
+  else
+  begin
+    installCount := 1;
+  end;
+
+  SaveStringToFile(ExpandConstant('{app}\InstallCount.txt'), IntToStr(installCount), False);
+end;
+
 procedure CurStepChanged(CurStep: TSetupStep);
 var
   ResultCode: integer;
 begin
   if CurStep = ssInstall then
   begin
+    BumpInstallCount();
+
     { We might be being run from ProcessRunner.exe, *and* we might be trying to update it. Funsies. Let's rename it (which Windows lets us do) }
     DeleteFile(ExpandConstant('{app}\ProcessRunner.exe.old'));
     RenameFile(ExpandConstant('{app}\ProcessRunner.exe'), ExpandConstant('{app}\ProcessRunner.exe.old'));
@@ -112,5 +132,6 @@ end;
 
 [UninstallDelete]
 Type: files; Name: "{app}\ProcessRunner.exe.old"
+Type: files; Name: "{app}\InstallCount.txt"
 Type: filesandordirs; Name: "{userappdata}\{#AppDataFolder}"
 Type: filesandordirs; Name: "{userappdata}\{#AppDataFolder}"
\ No newline at end of file
diff --git a/src/SyncTrayzor/App.config b/src/SyncTrayzor/App.config
index 4708df11..a5adc2eb 100644
--- a/src/SyncTrayzor/App.config
+++ b/src/SyncTrayzor/App.config
@@ -64,6 +64,7 @@
                         <UseComputerCulture>true</UseComputerCulture>
                         <SyncthingConsoleHeight>100</SyncthingConsoleHeight>
                         <SyncthingWebBrowserZoomLevel>0</SyncthingWebBrowserZoomLevel>
+                        <LastSeenInstallCount>0</LastSeenInstallCount>
                     </Configuration>
                 </value>
             </setting>
diff --git a/src/SyncTrayzor/Properties/Settings.Designer.cs b/src/SyncTrayzor/Properties/Settings.Designer.cs
index 35c5a724..0bf7d81e 100644
--- a/src/SyncTrayzor/Properties/Settings.Designer.cs
+++ b/src/SyncTrayzor/Properties/Settings.Designer.cs
@@ -134,6 +134,7 @@ public int SyncthingConnectTimeoutSeconds {
   <UseComputerCulture>true</UseComputerCulture>
   <SyncthingConsoleHeight>100</SyncthingConsoleHeight>
   <SyncthingWebBrowserZoomLevel>0</SyncthingWebBrowserZoomLevel>
+  <LastSeenInstallCount>0</LastSeenInstallCount>
 </Configuration>")]
         public global::SyncTrayzor.Services.Config.Configuration DefaultUserConfiguration {
             get {
diff --git a/src/SyncTrayzor/Properties/Settings.settings b/src/SyncTrayzor/Properties/Settings.settings
index d3cb27e0..bacafcd3 100644
--- a/src/SyncTrayzor/Properties/Settings.settings
+++ b/src/SyncTrayzor/Properties/Settings.settings
@@ -52,6 +52,7 @@
   &lt;UseComputerCulture&gt;true&lt;/UseComputerCulture&gt;
   &lt;SyncthingConsoleHeight&gt;100&lt;/SyncthingConsoleHeight&gt;
   &lt;SyncthingWebBrowserZoomLevel&gt;0&lt;/SyncthingWebBrowserZoomLevel&gt;
+  &lt;LastSeenInstallCount&gt;0&lt;/LastSeenInstallCount&gt;
 &lt;/Configuration&gt;</Value>
     </Setting>
     <Setting Name="PathConfiguration" Type="SyncTrayzor.Services.Config.PathConfiguration" Scope="Application">
diff --git a/src/SyncTrayzor/Services/Config/ApplicationPathsProvider.cs b/src/SyncTrayzor/Services/Config/ApplicationPathsProvider.cs
index a5c30a89..02501ed8 100644
--- a/src/SyncTrayzor/Services/Config/ApplicationPathsProvider.cs
+++ b/src/SyncTrayzor/Services/Config/ApplicationPathsProvider.cs
@@ -17,6 +17,7 @@ public interface IApplicationPathsProvider
         string ConfigurationFilePath { get; }
         string ConfigurationFileBackupPath { get; }
         string UpdatesDownloadPath { get; }
+        string InstallCountFilePath { get; }
 
         void Initialize(PathConfiguration pathConfiguration);
     }
@@ -84,5 +85,10 @@ public string UpdatesDownloadPath
         {
             get { return Path.Combine(Path.GetTempPath(), "SyncTrayzor"); }
         }
+
+        public string InstallCountFilePath
+        {
+            get { return Path.Combine(this.ExePath, "InstallCount.txt"); }
+        }
     }
 }
diff --git a/src/SyncTrayzor/Services/Config/Configuration.cs b/src/SyncTrayzor/Services/Config/Configuration.cs
index c50906a1..1815a999 100644
--- a/src/SyncTrayzor/Services/Config/Configuration.cs
+++ b/src/SyncTrayzor/Services/Config/Configuration.cs
@@ -120,6 +120,7 @@ public string LatestNotifiedVersionRaw
         public double SyncthingConsoleHeight { get; set; }
         public WindowPlacement WindowPlacement { get; set; }
         public double SyncthingWebBrowserZoomLevel { get; set; }
+        public int LastSeenInstallCount { get; set; }
 
         public Configuration()
         {
@@ -145,6 +146,7 @@ public Configuration()
             this.SyncthingConsoleHeight = Configuration.DefaultSyncthingConsoleHeight;
             this.WindowPlacement = null;
             this.SyncthingWebBrowserZoomLevel = 0;
+            this.LastSeenInstallCount = 0;
         }
 
         public Configuration(Configuration other)
@@ -169,6 +171,7 @@ public Configuration(Configuration other)
             this.SyncthingConsoleHeight = other.SyncthingConsoleHeight;
             this.WindowPlacement = other.WindowPlacement;
             this.SyncthingWebBrowserZoomLevel = other.SyncthingWebBrowserZoomLevel;
+            this.LastSeenInstallCount = other.LastSeenInstallCount;
         }
 
         public override string ToString()
@@ -177,12 +180,12 @@ public override string ToString()
                 "ShowDeviceConnectivityBalloons={4} SyncthingAddress={5} StartSyncthingAutomatically={6} SyncthingApiKey={7} SyncthingEnvironmentalVariables=[{8}] " +
                 "SyncthingUseCustomHome={9} SyncthingDenyUpgrade={10} SyncthingRunLowPriority={11} Folders=[{12}] NotifyOfNewVersions={13} " +
                 "LastNotifiedVersion={14} ObfuscateDeviceIDs={15} UseComputerCulture={16} SyncthingConsoleHeight={17} WindowPlacement={18} " +
-                "SyncthingWebBrowserZoomLevel={19}>",
+                "SyncthingWebBrowserZoomLevel={19} LastSeenInstallCount={20}>",
                 this.ShowTrayIconOnlyOnClose, this.MinimizeToTray, this.CloseToTray, this.ShowSynchronizedBalloon, this.ShowDeviceConnectivityBalloons,
                 this.SyncthingAddress, this.StartSyncthingAutomatically, this.SyncthingApiKey, String.Join(" ", this.SyncthingEnvironmentalVariables.Select(x => String.Format("{0}={1}", x.Key, x.Value))),
                 this.SyncthingUseCustomHome, this.SyncthingDenyUpgrade, this.SyncthingRunLowPriority, String.Join(", ", this.Folders), this.NotifyOfNewVersions,
                 this.LatestNotifiedVersion, this.ObfuscateDeviceIDs, this.UseComputerCulture, this.SyncthingConsoleHeight, this.WindowPlacement,
-                this.SyncthingWebBrowserZoomLevel);
+                this.SyncthingWebBrowserZoomLevel, this.LastSeenInstallCount);
         }
     }
 }
diff --git a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
index b8bf27c8..d2130560 100644
--- a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
+++ b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
@@ -80,25 +80,59 @@ public void Initialize(Configuration defaultConfiguration)
             if (!File.Exists(Path.GetDirectoryName(this.paths.ConfigurationFilePath)))
                 Directory.CreateDirectory(Path.GetDirectoryName(this.paths.ConfigurationFilePath));
 
-            if (!File.Exists(this.paths.SyncthingPath))
+            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
+            if (File.Exists(this.paths.InstallCountFilePath))
             {
-                if (File.Exists(this.paths.SyncthingBackupPath))
+                latestInstallCount = Int32.Parse(File.ReadAllText(this.paths.InstallCountFilePath).Trim());
+                if (latestInstallCount != this.currentConfig.LastSeenInstallCount)
                 {
-                    logger.Info("Syncthing doesn't exist at {0}, so copying from {1}", this.paths.SyncthingPath, this.paths.SyncthingBackupPath);
-                    File.Copy(this.paths.SyncthingBackupPath, this.paths.SyncthingPath);
+                    installCountChanged = true;
+                    updateConfigInstallCount = true;
                 }
-                else
-                    throw new Exception(String.Format("Unable to find Syncthing at {0} or {1}", this.paths.SyncthingPath, this.paths.SyncthingBackupPath));
             }
-            else if (this.paths.SyncthingPath != this.paths.SyncthingBackupPath && File.Exists(this.paths.SyncthingBackupPath) &&
-                File.GetLastWriteTimeUtc(this.paths.SyncthingPath) < File.GetLastWriteTimeUtc(this.paths.SyncthingBackupPath))
+
+            // They're the same if we're portable, in which case, nothing to do
+            if (this.paths.SyncthingPath != this.paths.SyncthingBackupPath)
             {
-                logger.Info("Syncthing at {0} is older ({1}) than at {2} ({3}, so overwriting from backup",
-                    this.paths.SyncthingPath, File.GetLastWriteTimeUtc(this.paths.SyncthingPath), this.paths.SyncthingBackupPath, File.GetLastWriteTimeUtc(this.paths.SyncthingBackupPath));
-                File.Copy(this.paths.SyncthingBackupPath, this.paths.SyncthingPath, true);
+                if (!File.Exists(this.paths.SyncthingPath))
+                {
+                    if (File.Exists(this.paths.SyncthingBackupPath))
+                    {
+                        logger.Info("Syncthing doesn't exist at {0}, so copying from {1}", this.paths.SyncthingPath, this.paths.SyncthingBackupPath);
+                        File.Copy(this.paths.SyncthingBackupPath, this.paths.SyncthingPath);
+                    }
+                    else
+                    {
+                        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);
+                    }
+                }
             }
 
-            this.currentConfig = this.LoadFromDisk(defaultConfiguration);
+            if (updateConfigInstallCount)
+            {
+                this.currentConfig.LastSeenInstallCount = latestInstallCount;
+                this.SaveToFile(this.currentConfig);
+            }
         }
 
         private Configuration LoadFromDisk(Configuration defaultConfiguration)

From e0ccc53d923c5f798906672dfc6f8c454f9f2ec5 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 10:09:14 +0100
Subject: [PATCH 17/23] Update installer to reflect the fact that 0.11 is now
 released

Fixes #64
---
 installer/x64/installer-x64.iss | 7 ++++---
 installer/x86/installer-x86.iss | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/installer/x64/installer-x64.iss b/installer/x64/installer-x64.iss
index e67219e8..627eabc8 100644
--- a/installer/x64/installer-x64.iss
+++ b/installer/x64/installer-x64.iss
@@ -43,12 +43,13 @@ TouchDate=current
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [CustomMessages]
-SyncthingVersion=%nPlease select the Syncthing version.%n%n!! IMPORTANT !!%n%nv0.10 and v0.11 (beta) are incompatible. All of your devices must either use v0.10 or v0.11 (beta).
+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: "syncthing0p10"; Description: "Syncthing v0.10 (recommended)"; GroupDescription: "{cm:SyncthingVersion}"; Flags: exclusive
-Name: "syncthing0p11"; Description: "Syncthing v0.11 (beta)"; GroupDescription: "{cm:SyncthingVersion}"; Flags: exclusive 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}"
diff --git a/installer/x86/installer-x86.iss b/installer/x86/installer-x86.iss
index 19b98dcb..99755da6 100644
--- a/installer/x86/installer-x86.iss
+++ b/installer/x86/installer-x86.iss
@@ -41,12 +41,12 @@ TouchDate=current
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [CustomMessages]
-SyncthingVersion=%nPlease select the Syncthing version.%n%n!! IMPORTANT !!%n%nv0.10 and v0.11 (beta) are incompatible. All of your devices must either use v0.10 or v0.11 (beta).
+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: "syncthing0p10"; Description: "Syncthing v0.10 (recommended)"; GroupDescription: "{cm:SyncthingVersion}"; Flags: exclusive
-Name: "syncthing0p11"; Description: "Syncthing v0.11 (beta)"; GroupDescription: "{cm:SyncthingVersion}"; Flags: exclusive 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}"

From b48fe4258ecde5808389630079bcd08a901059dc Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 10:16:34 +0100
Subject: [PATCH 18/23] Slightly more logging to ConfigurationProvider

---
 src/SyncTrayzor/Services/Config/ConfigurationProvider.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
index d2130560..144e8c0b 100644
--- a/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
+++ b/src/SyncTrayzor/Services/Config/ConfigurationProvider.cs
@@ -91,6 +91,7 @@ public void Initialize(Configuration defaultConfiguration)
                 latestInstallCount = Int32.Parse(File.ReadAllText(this.paths.InstallCountFilePath).Trim());
                 if (latestInstallCount != this.currentConfig.LastSeenInstallCount)
                 {
+                    logger.Debug("InstallCount changed from {0} to {1}", this.currentConfig.LastSeenInstallCount, latestInstallCount);
                     installCountChanged = true;
                     updateConfigInstallCount = true;
                 }

From 98a960503a4b0e00510c8153ff79f17de153ee94 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 10:16:59 +0100
Subject: [PATCH 19/23] Don't try and auto-update 0.10, as it will skip to 0.11

---
 Rakefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index f6d20bfb..763838a3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -43,6 +43,8 @@ class ArchDirConfig
   end
 end
 
+SYNCTHING_VERSIONS_TO_UPDATE = ['0.11']
+
 ARCH_CONFIG = [ArchDirConfig.new('x64'), ArchDirConfig.new('x86')]
 ASSEMBLY_INFOS = FileList['**/AssemblyInfo.cs']
 
@@ -166,7 +168,7 @@ namespace :"update-syncthing" do
   ARCH_CONFIG.each do |arch_config|
     desc "Update syncthing binaries (#{arch_config.arch}"
     task arch_config.arch do
-      arch_config.syncthing_binaries.values.each do |bin|
+      arch_config.syncthing_binaries.values_at(*SYNCTHING_VERSIONS_TO_UPDATE).each do |bin|
         path = File.join(arch_config.installer_dir, bin)
         raise "Could not find #{path}" unless File.exist?(path)
         sh path, '-upgrade' do; end

From 873803ce62474f353d233dbfc2499eb7342e88df Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 10:23:45 +0100
Subject: [PATCH 20/23] Update translations

---
 .../Properties/Strings/Resources.cs.resx      | 11 +++--
 .../Properties/Strings/Resources.de.resx      | 25 ++++++++---
 .../Properties/Strings/Resources.el.resx      | 25 ++++++++---
 .../Properties/Strings/Resources.es.resx      | 43 ++++++++++---------
 .../Properties/Strings/Resources.fr.resx      | 21 +++++----
 .../Properties/Strings/Resources.nl.resx      |  9 ++--
 .../Properties/Strings/Resources.ru.resx      | 25 ++++++++---
 .../Properties/Strings/Resources.sk.resx      | 19 ++++----
 8 files changed, 119 insertions(+), 59 deletions(-)

diff --git a/src/SyncTrayzor/Properties/Strings/Resources.cs.resx b/src/SyncTrayzor/Properties/Strings/Resources.cs.resx
index 8b3a016b..e9357053 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.cs.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.cs.resx
@@ -167,7 +167,7 @@
     <value>_Nastavení</value>
   </data>
   <data name="ShellView_Menu_Help" xml:space="preserve">
-    <value>P_omoc</value>
+    <value>_Pomoc</value>
   </data>
   <data name="ShellView_Menu_Help_About" xml:space="preserve">
     <value>_O programu</value>
@@ -305,11 +305,11 @@
     <value>Nastavení</value>
     <comment>Title of the 'settings' dialog</comment>
   </data>
-  <data name="SettingsView_TraceVariables" xml:space="preserve">
-    <value>Proměnné sledování Syncthing:</value>
+  <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
+    <value>Proměnné prostředí Syncthing:</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>V následujících adresářích budou sledovány změny, což zabrání opakovanému skenování.</value>
+    <value>V následujících adresářích budou sledovány změny, tudíž pro ně můžete nastavit delší interval opakování skenování.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Adresáře nejsou dostupné. Spusťte prosím Syncthing</value>
@@ -557,4 +557,7 @@ Je nám líto, ale SyncTrayzor se musí ukončit.</value>
   <data name="ShellView_Menu_Zoom_Reset" xml:space="preserve">
     <value>_Resetovat</value>
   </data>
+  <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>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.de.resx b/src/SyncTrayzor/Properties/Strings/Resources.de.resx
index 0df903ea..2fac1059 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</value>
+    <value>Herunterladen Seite öffnen</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>Jetzt herunterladen</value>
+    <value>Herunterladen Seite ö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">
@@ -305,11 +305,11 @@
     <value>Einstellungen</value>
     <comment>Title of the 'settings' dialog</comment>
   </data>
-  <data name="SettingsView_TraceVariables" xml:space="preserve">
-    <value>Syncthing Trace-Variablen:</value>
+  <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
+    <value>Syncthing Umgebungsvariablen:</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>Die folgenden Ordner werden auf Änderungen überwacht. Dies wiederum verhindert unnötige Abfragen.</value>
+    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Ordner nicht verfügbar, bitte Syncthing starten.</value>
@@ -545,4 +545,19 @@ SyncTrayzor wird nun geschlossen.</value>
   <data name="NewVersionAlertView_ViewChangelog" xml:space="preserve">
     <value>Änderungshistorie anzeigen</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>Hineinzoomen</value>
+  </data>
+  <data name="ShellView_Menu_Zoom_Out" xml:space="preserve">
+    <value>Herauszoomen</value>
+  </data>
+  <data name="ShellView_Menu_Zoom_Reset" xml:space="preserve">
+    <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>
+  </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.el.resx b/src/SyncTrayzor/Properties/Strings/Resources.el.resx
index d709a8ad..2f7c1c91 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.el.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.el.resx
@@ -121,7 +121,7 @@
     <value>Δημιουργήθηκε από τον Antony Male.</value>
   </data>
   <data name="AboutView_DownloadNewVersion" xml:space="preserve">
-    <value>Λήψη</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>Λήψη τώρα</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">
@@ -305,11 +305,11 @@
     <value>Ρυθμίσεις</value>
     <comment>Title of the 'settings' dialog</comment>
   </data>
-  <data name="SettingsView_TraceVariables" xml:space="preserve">
-    <value>Syncthing ανίχνευση μεταβλητών:</value>
+  <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
+    <value>Syncthing περιβαλλοντικές μεταβλητές:</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>Οι ακόλουθοι φάκελοι θα πρέπει να παρακολουθούνται για αλλαγές, πράγμα που αποτρέπει την ψηφοφορία.</value>
+    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Φάκελοι μη διαθέσιμη. Παρακαλούμε ξεκινήστε το Syncthing</value>
@@ -545,4 +545,19 @@ The menu option "Syncthing -&gt;Kill all Syncthing processes" corresponds to She
   <data name="NewVersionAlertView_ViewChangelog" xml:space="preserve">
     <value>Εμφάνιση αρχείου καταγραφής αλλαγών</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>Μεγέθυνση</value>
+  </data>
+  <data name="ShellView_Menu_Zoom_Out" xml:space="preserve">
+    <value>Σμίκρυνση</value>
+  </data>
+  <data name="ShellView_Menu_Zoom_Reset" xml:space="preserve">
+    <value>Eπαναφορά</value>
+  </data>
+  <data name="SettingsView_Validation_SyncthingEnvironmentalVariablesMustHaveFormat" xml:space="preserve">
+    <value>Πρέπει να είναι στη μορφή &apos;VAR=value VAR2=&quot;val1 val2&quot;&apos;</value>
+  </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.es.resx b/src/SyncTrayzor/Properties/Strings/Resources.es.resx
index a0992408..1ec58bb7 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.es.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.es.resx
@@ -121,7 +121,7 @@
     <value>Creado por Antony Male.</value>
   </data>
   <data name="AboutView_DownloadNewVersion" xml:space="preserve">
-    <value>Open Download Page</value>
+    <value>Abrir la página de descargas</value>
     <comment>Clickable link allowing the user to download the latest version of SyncTrayzor</comment>
   </data>
   <data name="AboutView_NewAppVersionAvailable" xml:space="preserve">
@@ -185,7 +185,7 @@
     <value>_Abrir en navegador externo</value>
   </data>
   <data name="ShellView_Menu_Syncthing_Refresh" xml:space="preserve">
-    <value>_Refrescar navegador</value>
+    <value>Re_frescar navegador</value>
   </data>
   <data name="ShellView_Menu_Syncthing_Start" xml:space="preserve">
     <value>_Comenzar</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>Abrir la página  de descargas</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,7 +213,7 @@
     <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>SyncTrayzor version {0} is available!</value>
+    <value>¡La versión {0} de SyncTrayzor está disponible!</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">
@@ -239,7 +239,7 @@
     <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>Debes reiniciar Syncthing para que los nuevos cambios surtan efecto.</value>
+    <value>Debes reiniciar Syncthing para que los nuevos cambios surtan efecto</value>
   </data>
   <data name="SettingsView_ObfuscateDeviceIds" xml:space="preserve">
     <value>Ofuscar el ID de dispositivo en la ventana de log</value>
@@ -252,7 +252,7 @@
     <comment>Section header for advanced settings</comment>
   </data>
   <data name="SettingsView_Section_StartOnLogin" xml:space="preserve">
-    <value>iniciar al hacer login</value>
+    <value>Iniciar al hacer 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">
@@ -264,7 +264,7 @@
     <comment>Section header for settings to do with configuring SyncTrayzor</comment>
   </data>
   <data name="SettingsView_Section_WatchedFolders" xml:space="preserve">
-    <value>Carpetas Vigiladas</value>
+    <value>Carpetas Supervisadas</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">
@@ -295,7 +295,7 @@
     <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>Usar el directorio principal para Syncthing.</value>
+    <value>Usar el directorio principal para Syncthing</value>
   </data>
   <data name="SettingsView_SyncthingUseCustomHome_ToolTip" xml:space="preserve">
     <value>Esto significa que SyncTrayzor verá un conjunto diferente de carpetas configuradas con respecto a cualquier otra instancia de Syncthing en tu ordenador.</value>
@@ -305,11 +305,11 @@
     <value>Preferencias</value>
     <comment>Title of the 'settings' dialog</comment>
   </data>
-  <data name="SettingsView_TraceVariables" xml:space="preserve">
-    <value>Variables de trazado de Syncthing:</value>
+  <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
+    <value>Variables de Entorno de Syncthing:</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>Las siguiente carpetas estarán vigiladas durante los cambios, lo cual evita el muestreo.</value>
+    <value>Las siguientes carpetas estarán supervisadas por si cambian, lo que significa que puedes configurar un intervalo de consulta más largo.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Carpetas no disponibles. Por favor inicia Syncthing</value>
@@ -531,30 +531,33 @@ SyncTrayzor se va a cerrar. Lo sentimos.</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>Usar el idioma de mi ordenador, si está disponible. Es necesario reiniciar SyncTrayzor para que el cambio surta efecto.</value>
+    <value>Usar el idioma de mi ordenador si está disponible. Es necesario reiniciar SyncTrayzor para que el cambio surta efecto</value>
   </data>
   <data name="ShellView_Menu_View" xml:space="preserve">
-    <value>_View</value>
+    <value>_Ver</value>
   </data>
   <data name="ShellView_Menu_View_SyncthingConsole" xml:space="preserve">
-    <value>Syncthing Console</value>
+    <value>_Mostrar la consola de Syncthing</value>
   </data>
   <data name="NewVersionAlertView_Button_Install" xml:space="preserve">
-    <value>Install Now</value>
+    <value>Instalar ahora</value>
   </data>
   <data name="NewVersionAlertView_ViewChangelog" xml:space="preserve">
-    <value>View Changelog</value>
+    <value>Ver lista de cambios</value>
   </data>
   <data name="ShellView_Menu_Zoom" xml:space="preserve">
-    <value>_Zoom Browser</value>
+    <value>_Zoom del navegador</value>
   </data>
   <data name="ShellView_Menu_Zoom_In" xml:space="preserve">
-    <value>Zoom _In</value>
+    <value>_Acercar</value>
   </data>
   <data name="ShellView_Menu_Zoom_Out" xml:space="preserve">
-    <value>Zoom _Out</value>
+    <value>Al_ejar</value>
   </data>
   <data name="ShellView_Menu_Zoom_Reset" xml:space="preserve">
-    <value>_Reset</value>
+    <value>_Restaurar</value>
+  </data>
+  <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>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.fr.resx b/src/SyncTrayzor/Properties/Strings/Resources.fr.resx
index 6dbcab3b..61468788 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.fr.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.fr.resx
@@ -179,7 +179,7 @@
     <value>_Arrêter</value>
   </data>
   <data name="ShellView_Menu_Syncthing_KillAll" xml:space="preserve">
-    <value>Arrêter _tous les processus  Syncthing</value>
+    <value>Arrêter _tous les processus Syncthing</value>
   </data>
   <data name="ShellView_Menu_Syncthing_OpenExternal" xml:space="preserve">
     <value>_Ouvrir dans le navigateur externe</value>
@@ -305,11 +305,11 @@
     <value>Paramètres</value>
     <comment>Title of the 'settings' dialog</comment>
   </data>
-  <data name="SettingsView_TraceVariables" xml:space="preserve">
-    <value>Syncthing Trace Variables:</value>
+  <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
+    <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 avoids polling.</value>
+    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Dossiers indisponibles. Veuillez démarrer Syncthing</value>
@@ -537,7 +537,7 @@ SyncTrayzor doit se fermer. Veuillez nous excuser.</value>
     <value>_Vue</value>
   </data>
   <data name="ShellView_Menu_View_SyncthingConsole" xml:space="preserve">
-    <value>Syncthing Console</value>
+    <value>Afficher la console de Syncthing</value>
   </data>
   <data name="NewVersionAlertView_Button_Install" xml:space="preserve">
     <value>Installer maintenant</value>
@@ -546,15 +546,18 @@ SyncTrayzor doit se fermer. Veuillez nous excuser.</value>
     <value>View Changelog</value>
   </data>
   <data name="ShellView_Menu_Zoom" xml:space="preserve">
-    <value>_Zoom Browser</value>
+    <value>Zoom</value>
   </data>
   <data name="ShellView_Menu_Zoom_In" xml:space="preserve">
-    <value>Zoom _In</value>
+    <value>Zoom _avant</value>
   </data>
   <data name="ShellView_Menu_Zoom_Out" xml:space="preserve">
-    <value>Zoom _Out</value>
+    <value>Zoom _arrière</value>
   </data>
   <data name="ShellView_Menu_Zoom_Reset" xml:space="preserve">
-    <value>_Reset</value>
+    <value>_Normal</value>
+  </data>
+  <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>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.nl.resx b/src/SyncTrayzor/Properties/Strings/Resources.nl.resx
index 0e67914d..f017e9aa 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.nl.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.nl.resx
@@ -305,11 +305,11 @@
     <value>Instellingen</value>
     <comment>Title of the 'settings' dialog</comment>
   </data>
-  <data name="SettingsView_TraceVariables" xml:space="preserve">
-    <value>Syncthing-opsporingsvariabelen:</value>
+  <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
+    <value>Syncthing Environmental Variables:</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>De volgende mappen zullen in de gaten worden gehouden op wijzigingen:</value>
+    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Geen mappen beschikbaar. Start Syncthing.</value>
@@ -557,4 +557,7 @@ SyncTrayzor gaat nu afsluiten. Onze excuses.</value>
   <data name="ShellView_Menu_Zoom_Reset" xml:space="preserve">
     <value>_Reset</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>
+  </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.ru.resx b/src/SyncTrayzor/Properties/Strings/Resources.ru.resx
index 03f7e27c..46ccd167 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>Загрузить</value>
+    <value>Open Download Page</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>Загрузить сейчас</value>
+    <value>Open Download Page</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">
@@ -305,11 +305,11 @@
     <value>Настройки</value>
     <comment>Title of the 'settings' dialog</comment>
   </data>
-  <data name="SettingsView_TraceVariables" xml:space="preserve">
-    <value>Отслеживаемые переменные Syncthing:</value>
+  <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
+    <value>Syncthing Environmental Variables:</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>Изменения будут отслеживаться в следующих папках.</value>
+    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Папки недоступны. Запустите Syncthing</value>
@@ -545,4 +545,19 @@ SyncTrayzor закрывается. Извините.</value>
   <data name="NewVersionAlertView_ViewChangelog" xml:space="preserve">
     <value>Посмотреть список изменений</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>Zoom _In</value>
+  </data>
+  <data name="ShellView_Menu_Zoom_Out" xml:space="preserve">
+    <value>Zoom _Out</value>
+  </data>
+  <data name="ShellView_Menu_Zoom_Reset" xml:space="preserve">
+    <value>_Reset</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>
+  </data>
 </root>
diff --git a/src/SyncTrayzor/Properties/Strings/Resources.sk.resx b/src/SyncTrayzor/Properties/Strings/Resources.sk.resx
index 3876063e..e70e3e7c 100644
--- a/src/SyncTrayzor/Properties/Strings/Resources.sk.resx
+++ b/src/SyncTrayzor/Properties/Strings/Resources.sk.resx
@@ -121,7 +121,7 @@
     <value>Vytvoril Anthony Male.</value>
   </data>
   <data name="AboutView_DownloadNewVersion" xml:space="preserve">
-    <value>Open Download Page</value>
+    <value>Otvoriť stránku na stiahnutie</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>Otvoriť stránku na stiahnutie</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">
@@ -305,11 +305,11 @@
     <value>Nastavenia</value>
     <comment>Title of the 'settings' dialog</comment>
   </data>
-  <data name="SettingsView_TraceVariables" xml:space="preserve">
-    <value>Stopové premenné Syncthing:</value>
+  <data name="SettingsView_SyncthingEnvironmentalVariables" xml:space="preserve">
+    <value>Premenné prostredia Syncthing:</value>
   </data>
   <data name="SettingsView_WatchedFolders_Explanation" xml:space="preserve">
-    <value>Nasledovné priečinky budú sledované kvôli zmenám, čo predchádza dopytovaniu.</value>
+    <value>The following folders will be watched for changes, which means you can set a longer polling interval.</value>
   </data>
   <data name="SettingsView_WatchedFolders_Unavailable" xml:space="preserve">
     <value>Priečinky nie sú dostupné. Prosím zapnite Syncthing</value>
@@ -546,15 +546,18 @@ SyncTrayzor sa musí zavrieť. Ospravedlňujeme sa</value>
     <value>Zobraziť zoznam zmien</value>
   </data>
   <data name="ShellView_Menu_Zoom" xml:space="preserve">
-    <value>_Zoom Browser</value>
+    <value>_Priblížiť prehliadač</value>
   </data>
   <data name="ShellView_Menu_Zoom_In" xml:space="preserve">
-    <value>Zoom _In</value>
+    <value>Pr_iblížiť</value>
   </data>
   <data name="ShellView_Menu_Zoom_Out" xml:space="preserve">
-    <value>Zoom _Out</value>
+    <value>_Oddialiť</value>
   </data>
   <data name="ShellView_Menu_Zoom_Reset" xml:space="preserve">
     <value>_Reset</value>
   </data>
+  <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>
 </root>

From c53c088cc74892f6c4062fd33986f40216060f2e Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 10:27:06 +0100
Subject: [PATCH 21/23] Update changelog

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 71d90692..f2323521 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,19 @@
 Changelog
 =========
 
+v1.0.16
+-------
+
+ - Installer recommends Syncthing 0.11 (#64)
+ - Fix bad browser zoom after restart (#57)
+ - Fix display of folders which contain an underscore (#58)
+ - Handle duplicate devices/folders in Syncthing config (#61)
+ - Fix bad character encoding in Syncthing console (#62)
+ - Fix installer's handling of Syncthing version changes (#63)
+ - Clarify some UI wording/typos (#60, others)
+ - Remember size of Syncthing console (#56)
+ - Updated translations
+
 v1.0.15
 -------
 

From ba544b48a12e1092a56a267dea750a58e8b89ac2 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 10:27:20 +0100
Subject: [PATCH 22/23] 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 acc6002f..5d39ad3e 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.15.0")]
-[assembly: AssemblyFileVersion("1.0.15.0")]
+[assembly: AssemblyVersion("1.0.16.0")]
+[assembly: AssemblyFileVersion("1.0.16.0")]
diff --git a/src/SyncTrayzor/Properties/AssemblyInfo.cs b/src/SyncTrayzor/Properties/AssemblyInfo.cs
index e47065ae..28a54390 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.15.0")]
-[assembly: AssemblyFileVersion("1.0.15.0")]
+[assembly: AssemblyVersion("1.0.16.0")]
+[assembly: AssemblyFileVersion("1.0.16.0")]

From 175289714a4451a35baa5e2c385a8c9e803d8a93 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Wed, 22 Apr 2015 10:28:45 +0100
Subject: [PATCH 23/23] Update version_check.php

---
 server/version_check.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/server/version_check.php b/server/version_check.php
index 56693919..73da4fdf 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.16' => [
+      'installed' => [
+         'direct_download_url' => [
+            'x64' => 'https://github.com/canton7/SyncTrayzor/releases/download/v1.0.16/SyncTrayzorSetup-x64.exe',
+            'x86' => 'https://github.com/canton7/SyncTrayzor/releases/download/v1.0.16/SyncTrayzorSetup-x86.exe',
+         ],
+      ],
+      'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v1.0.16',
+      'release_notes' => "- Installer recommends Syncthing 0.11 (#64)\n- Fix bad browser zoom after restart (#57)\n- Fix display of folders which contain an underscore (#58)\n- Handle duplicate devices/folders in Syncthing config (#61)\n- Fix bad character encoding in Syncthing console (#62)\n- Fix installer's handling of Syncthing version changes (#63)\n- Clarify some UI wording/typos (#60, others)\n- Remember size of Syncthing console (#56)\n- Updated translations",
+   ],
    '1.0.15' => [
       'installed' => [
          'direct_download_url' => [
@@ -73,14 +83,14 @@ function get_with_wildcard($src, $value, $default = null)
          ],
       ],
       'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v1.0.15',
-      'release_notes' => "- Fix crash on startup if Syncthing is slow to start (#55)\n- Remember window size/position (#51)\n- Zoom built-in browser (#52)\n- Add support for arbitrary environmental variables for Syncthing\n",
+      'release_notes' => "- Fix crash on startup if Syncthing is slow to start (#55)\n- Remember window size/position (#51)\n- Zoom built-in browser (#52)\n- Add support for arbitrary environmental variables for Syncthing",
    ],
    '1.0.14' => [
       'installed' => [
          'direct_download_url' => []
       ],
       'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v1.0.14',
-      'release_notes' => "- Give Syncthing more than 10 seconds to start, fixing crash (#47, #48, #50)\n- Better Syncthing API management in general\n- Add support for 150% and 200% DPI to tray icon\n- Slightly improve UI\n",
+      'release_notes' => "- Give Syncthing more than 10 seconds to start, fixing crash (#47, #48, #50)\n- Better Syncthing API management in general\n- Add support for 150% and 200% DPI to tray icon\n- Slightly improve UI",
    ],
    '1.0.13' => [
       'installed' => [
@@ -92,6 +102,7 @@ function get_with_wildcard($src, $value, $default = null)
 ];
 
 $upgrades = [
+   '1.0.15' => ['to' => 'latest', 'formatter' => '2'],
    '1.0.14' => ['to' => 'latest', 'formatter' => '2'],
    '1.0.13' => ['to' => 'latest', 'formatter' => '1'],
    '1.0.12' => ['to' => 'latest', 'formatter' => '1'],