This commit updates Dapplo.Addons, removes automatic resolving of IniConfig and LanguageLoader configurations in favor of AddonModule wired versions.

src/Greenshot.Addon.Box/BoxAddonModule.cs

@@ -24,6 +24,8 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.Box.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -34,6 +36,16 @@ namespace Greenshot.Addon.Box
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IBoxConfiguration>())
+                .As<IBoxConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IBoxLanguage>())
+                .As<IBoxLanguage>()
+                .SingleInstance();
+
             builder
                 .RegisterType<BoxDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj

@@ -46,11 +46,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.Box/packages.config

@@ -6,8 +6,8 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.Confluence.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -34,6 +37,16 @@ namespace Greenshot.Addon.Confluence
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IConfluenceConfiguration>())
+                .As<IConfluenceConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IConfluenceLanguage>())
+                .As<IConfluenceLanguage>()
+                .SingleInstance();
+
             builder
                 .RegisterType<ConfluenceDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj

@@ -65,11 +65,11 @@
     <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.Confluence/packages.config

@@ -7,8 +7,8 @@
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
   <package id="Costura.Fody" version="3.1.0" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.Dropbox.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -34,6 +37,16 @@ namespace Greenshot.Addon.Dropbox
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IDropboxConfiguration>())
+                .As<IDropboxConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IDropboxLanguage>())
+                .As<IDropboxLanguage>()
+                .SingleInstance();
+
             builder
                 .RegisterType<DropboxDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj

@@ -58,11 +58,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.Dropbox/packages.config

@@ -6,8 +6,8 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.ExternalCommand/ExternalCommandAddonModule.cs

@@ -25,6 +25,7 @@ using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
 using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.ExternalCommand.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -35,6 +36,16 @@ namespace Greenshot.Addon.ExternalCommand
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IExternalCommandConfiguration>())
+                .As<IExternalCommandConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IExternalCommandLanguage>())
+                .As<IExternalCommandLanguage>()
+                .SingleInstance();
+
             builder
                 .RegisterType<ExternalCommandDestinationProvider>()
                 .As<IService>()

src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj

@@ -61,11 +61,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.ExternalCommand/packages.config

@@ -7,8 +7,8 @@
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CliWrap" version="1.8.5" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.Flickr/FlickrAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.Flickr.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -34,6 +37,16 @@ namespace Greenshot.Addon.Flickr
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IFlickrConfiguration>())
+                .As<IFlickrConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IFlickrLanguage>())
+                .As<IFlickrLanguage>()
+                .SingleInstance();
+
             builder
                 .RegisterType<FlickrDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj

@@ -58,11 +58,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.Flickr/packages.config

@@ -6,8 +6,8 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.GooglePhotos/GooglePhotosAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.GooglePhotos.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -34,6 +37,16 @@ namespace Greenshot.Addon.GooglePhotos
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IGooglePhotosConfiguration>())
+                .As<IGooglePhotosConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IGooglePhotosLanguage>())
+                .As<IGooglePhotosLanguage>()
+                .SingleInstance();
+
             builder
                 .RegisterType<GooglePhotosDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj

@@ -44,11 +44,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.GooglePhotos/packages.config

@@ -6,8 +6,8 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj

@@ -63,11 +63,11 @@
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.Imgur/ImgurAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.Imgur.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -34,6 +37,16 @@ namespace Greenshot.Addon.Imgur
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IImgurConfiguration>())
+                .As<IImgurConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IImgurLanguage>())
+                .As<IImgurLanguage>()
+                .SingleInstance();
+
             builder
                 .RegisterType<ImgurDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.Imgur/packages.config

@@ -7,8 +7,8 @@
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj

@@ -63,11 +63,11 @@
     <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.Jira/JiraAddonModule.cs

@@ -23,8 +23,10 @@
 
 using Autofac;
 using Dapplo.Addons;
-using Dapplo.CaliburnMicro;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.Jira.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -35,6 +37,16 @@ namespace Greenshot.Addon.Jira
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IJiraConfiguration>())
+                .As<IJiraConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IJiraLanguage>())
+                .As<IJiraLanguage>()
+                .SingleInstance();
+
             builder
                  .RegisterType<JiraDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.Jira/packages.config

@@ -7,8 +7,8 @@
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
   <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.LegacyEditor.Controls;
 using Greenshot.Addon.LegacyEditor.Drawing;
 using Greenshot.Addon.LegacyEditor.Forms;
@@ -38,6 +41,16 @@ namespace Greenshot.Addon.LegacyEditor
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IEditorConfiguration>())
+                .As<IEditorConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IEditorLanguage>())
+                .As<IEditorLanguage>()
+                .SingleInstance();
+
             builder
                 .RegisterType<EditorDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj

@@ -43,11 +43,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.LegacyEditor/packages.config

@@ -6,8 +6,8 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj

@@ -61,11 +61,11 @@
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.Lutim/LutimAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.Lutim.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -34,6 +37,16 @@ namespace Greenshot.Addon.Lutim
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<ILutimConfiguration>())
+                .As<ILutimConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<ILutimLanguage>())
+                .As<ILutimLanguage>()
+                .SingleInstance();
+
             builder
                  .RegisterType<LutimDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.Lutim/packages.config

@@ -7,8 +7,8 @@
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj

@@ -58,11 +58,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.OCR/OcrAddonModule.cs

@@ -26,6 +26,9 @@ using System.IO;
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.Addons.Bootstrapper.Resolving;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addons.Components;
 
 namespace Greenshot.Addon.OCR
@@ -60,6 +63,16 @@ namespace Greenshot.Addon.OCR
         {
             if (HasModi())
             {
+                builder
+                    .Register(context => IniConfig.Current.Get<IOCRConfiguration>())
+                    .As<IOCRConfiguration>()
+                    .SingleInstance();
+
+                builder
+                    .Register(context => LanguageLoader.Current.Get<IOcrLanguage>())
+                    .As<IOcrLanguage>()
+                    .SingleInstance();
+
                 builder
                      .RegisterType<OcrDestination>()
                     .As<IDestination>()

src/Greenshot.Addon.OCR/packages.config

@@ -6,8 +6,8 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj

@@ -45,11 +45,11 @@
     <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.Office/OfficeAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.Office.Destinations;
 using Greenshot.Addon.Office.ViewModels;
 using Greenshot.Addons.Components;
@@ -85,6 +88,17 @@ namespace Greenshot.Addon.Office
 
             if (hasDestination)
             {
+                builder
+                    .Register(context => IniConfig.Current.Get<IOfficeConfiguration>())
+                    .As<IOfficeConfiguration>()
+                    .SingleInstance();
+
+
+                builder
+                    .Register(context => LanguageLoader.Current.Get<IOfficeLanguage>())
+                    .As<IOfficeLanguage>()
+                    .SingleInstance();
+
                 builder
                     .RegisterType<OfficeConfigViewModel>()
                     .As<IConfigScreen>()

src/Greenshot.Addon.Office/packages.config

@@ -7,8 +7,8 @@
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
   <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj

@@ -57,11 +57,11 @@
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.OneDrive/OneDriveAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.OneDrive.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -34,6 +37,16 @@ namespace Greenshot.Addon.OneDrive
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IOneDriveConfiguration>())
+                .As<IOneDriveConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IOneDriveLanguage>())
+                .As<IOneDriveLanguage>()
+                .SingleInstance();
+
             builder
                 .RegisterType<OneDriveDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.OneDrive/packages.config

@@ -7,8 +7,8 @@
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj

@@ -58,11 +58,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.Photobucket/PhotobucketAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.Photobucket.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -34,6 +37,16 @@ namespace Greenshot.Addon.Photobucket
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IPhotobucketConfiguration>())
+                .As<IPhotobucketConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IPhotobucketLanguage>())
+                .As<IPhotobucketLanguage>()
+                .SingleInstance();
+
             builder
                  .RegisterType<PhotobucketDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.Photobucket/packages.config

@@ -6,8 +6,8 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj

@@ -57,11 +57,11 @@
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addon.Tfs/TfsAddonModule.cs

@@ -24,6 +24,9 @@
 using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
+using Dapplo.CaliburnMicro.Translations;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addon.Tfs.ViewModels;
 using Greenshot.Addons.Components;
 
@@ -34,6 +37,17 @@ namespace Greenshot.Addon.Tfs
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<ITfsConfiguration>())
+                .As<ITfsConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<ITfsLanguage>())
+                .As<ITfsLanguage>()
+                .SingleInstance();
+
+
             builder
                 .RegisterType<TfsDestination>()
                 .As<IDestination>()

src/Greenshot.Addon.Tfs/packages.config

@@ -7,8 +7,8 @@
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj

@@ -54,17 +54,17 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
+      <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
+      <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.54\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

src/Greenshot.Addon.Win10/packages.config

@@ -6,10 +6,10 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
+  <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
-  <package id="Dapplo.CaliburnMicro.Translations" version="1.0.47" targetFramework="net46" />
+  <package id="Dapplo.CaliburnMicro.Translations" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
   <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
   <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />

src/Greenshot.Addons/AddonsModule.cs

@@ -23,7 +23,9 @@
 
 using Autofac;
 using Dapplo.Addons;
+using Dapplo.CaliburnMicro.Configuration;
 using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addons.Components;
 using Greenshot.Addons.Controls;
 using Greenshot.Addons.Core;
@@ -36,6 +38,26 @@ namespace Greenshot.Addons
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IUiConfiguration>())
+                .As<IUiConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => IniConfig.Current.Get<ICoreConfiguration>())
+                .As<ICoreConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IGreenshotLanguage>())
+                .As<IGreenshotLanguage>()
+                .SingleInstance();
+
+            builder
+                .Register(context => IniConfig.Current.Get<INetworkConfiguration>())
+                .As<INetworkConfiguration>()
+                .SingleInstance();
+
             builder
                 .RegisterType<FileConfigPartViewModel>()
                 .AsSelf();

src/Greenshot.Addons/Greenshot.Addons.csproj

@@ -41,11 +41,11 @@
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
     <Reference Include="CustomMarshalers" />
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Addons/packages.config

@@ -6,8 +6,8 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

src/Greenshot.Gfx/Greenshot.Gfx.csproj

@@ -37,11 +37,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Gfx/packages.config

@@ -6,8 +6,8 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Translations" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />

src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj

@@ -43,11 +43,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.PerformanceTests/packages.config

@@ -9,8 +9,8 @@
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Translations" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />

src/Greenshot.Tests/Greenshot.Tests.csproj

@@ -72,11 +72,11 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot.Tests/packages.config

@@ -10,8 +10,8 @@
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
   <package id="CommandLineParser" version="2.2.1" targetFramework="net461" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Translations" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />

src/Greenshot/Greenshot.csproj

@@ -55,14 +55,14 @@
     <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.64\lib\net46\Dapplo.Addons.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.64\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Config, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapplo.Addons.Config, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Config.1.0.64\lib\net46\Dapplo.Addons.Config.dll</HintPath>
+      <HintPath>..\packages\Dapplo.Addons.Config.1.0.66\lib\net46\Dapplo.Addons.Config.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

src/Greenshot/GreenshotAutofacModule.cs

@@ -25,8 +25,11 @@ using Autofac;
 using Dapplo.Addons;
 using Dapplo.CaliburnMicro.Configuration;
 using Dapplo.CaliburnMicro.Security;
+using Dapplo.Ini;
+using Dapplo.Language;
 using Greenshot.Addons.Components;
 using Greenshot.Components;
+using Greenshot.Configuration;
 using Greenshot.Forms;
 using Greenshot.Helpers;
 using Greenshot.Ui.Configuration.ViewModels;
@@ -39,6 +42,16 @@ namespace Greenshot
     {
         protected override void Load(ContainerBuilder builder)
         {
+            builder
+                .Register(context => IniConfig.Current.Get<IMetroConfiguration>())
+                .As<IMetroConfiguration>()
+                .SingleInstance();
+
+            builder
+                .Register(context => LanguageLoader.Current.Get<IConfigTranslations>())
+                .As<IConfigTranslations>()
+                .SingleInstance();
+
             builder
                 .RegisterType<ConfigViewModel>()
                 .AsSelf();

src/Greenshot/packages.config

@@ -10,9 +10,9 @@
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
   <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
-  <package id="Dapplo.Addons" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
-  <package id="Dapplo.Addons.Config" version="1.0.64" targetFramework="net461" />
+  <package id="Dapplo.Addons.Config" version="1.0.66" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
   <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />