CityOfZion · justingaffney · Dec 23, 2017 · Dec 23, 2017
diff --git a/Neo.Gui.Base/Controllers/WalletController.cs b/Neo.Gui.Base/Controllers/WalletController.cs
@@ -16,7 +16,7 @@
 using Neo.Gui.Base.Certificates;
 using Neo.Gui.Base.Data;
 using Neo.Gui.Base.Exceptions;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Helpers;
 using Neo.Gui.Base.Managers;
 using Neo.Gui.Base.Messages;

diff --git a/Neo.Gui.Base/Data/AccountType.cs b/Neo.Gui.Base/Data/AccountType.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Neo.Gui.Base.Converters;
-using Neo.Gui.Base.Globalization;
-using Neo.Gui.Base.Localization;
+using Neo.Gui.Globalization.Resources;
+using Neo.Gui.Globalization.Localization;
 
 namespace Neo.Gui.Base.Data
 {

diff --git a/Neo.Gui.Base/Data/FirstClassAssetItem.cs b/Neo.Gui.Base/Data/FirstClassAssetItem.cs
@@ -1,6 +1,6 @@
 using Neo.Core;
 using Neo.Gui.Base.Certificates;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 
 namespace Neo.Gui.Base.Data
 {

diff --git a/Neo.Gui.Base/Data/TransactionItem.cs b/Neo.Gui.Base/Data/TransactionItem.cs
@@ -1,6 +1,6 @@
 using System;
 using Neo.Core;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.MVVM;
 
 namespace Neo.Gui.Base.Data

diff --git a/Neo.Gui.Base/Neo.Gui.Base.csproj b/Neo.Gui.Base/Neo.Gui.Base.csproj
@@ -11,6 +11,10 @@
     <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Neo.Gui.Globalization\Neo.Gui.Globalization.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Globalization\Strings.Designer.cs">
       <DependentUpon>Strings.resx</DependentUpon>

diff --git a/Neo.Gui.Base/Theming/Style.cs b/Neo.Gui.Base/Theming/Style.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Neo.Gui.Base.Converters;
-using Neo.Gui.Base.Globalization;
-using Neo.Gui.Base.Localization;
+using Neo.Gui.Globalization.Resources;
+using Neo.Gui.Globalization.Localization;
 
 namespace Neo.Gui.Base.Theming
 {

diff --git a/...lization/LocalizedDescriptionAttribute.cs → ...lization/LocalizedDescriptionAttribute.cs b/...lization/LocalizedDescriptionAttribute.cs → ...lization/LocalizedDescriptionAttribute.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Resources;
 
-namespace Neo.Gui.Base.Localization
+namespace Neo.Gui.Globalization.Localization
 {
     public class LocalizedDescriptionAttribute : DescriptionAttribute
     {

diff --git a/Neo.Gui.Globalization/Neo.Gui.Globalization.csproj b/Neo.Gui.Globalization/Neo.Gui.Globalization.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Update="Resources\Strings.Designer.cs">
+      <DependentUpon>Strings.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources\Strings.resx">
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/...ui.Base/Globalization/Strings.Designer.cs → ...obalization/Resources/Strings.Designer.cs b/...ui.Base/Globalization/Strings.Designer.cs → ...obalization/Resources/Strings.Designer.cs
diff --git a/...Gui.Base/Globalization/Strings.es-Es.resx → ...lobalization/Resources/Strings.es-Es.resx b/...Gui.Base/Globalization/Strings.es-Es.resx → ...lobalization/Resources/Strings.es-Es.resx
diff --git a/Neo.Gui.Base/Globalization/Strings.resx → Neo.Gui.Globalization/Resources/Strings.resx b/Neo.Gui.Base/Globalization/Strings.resx → Neo.Gui.Globalization/Resources/Strings.resx
diff --git a/...i.Base/Globalization/Strings.zh-Hans.resx → ...balization/Resources/Strings.zh-Hans.resx b/...i.Base/Globalization/Strings.zh-Hans.resx → ...balization/Resources/Strings.zh-Hans.resx
diff --git a/Neo.Gui.ViewModels.Tests/Home/AssetsViewModelTests.cs b/Neo.Gui.ViewModels.Tests/Home/AssetsViewModelTests.cs
@@ -4,7 +4,7 @@
 using Neo.Core;
 using Neo.Gui.Base.Controllers;
 using Neo.Gui.Base.Data;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Helpers;
 using Neo.Gui.Base.Managers;
 using Neo.Gui.Base.Messages;

diff --git a/Neo.Gui.ViewModels.Tests/Home/HomeViewModelTests.cs b/Neo.Gui.ViewModels.Tests/Home/HomeViewModelTests.cs
@@ -3,7 +3,7 @@
 using Neo.Gui.Base.Messaging.Interfaces;
 using Neo.Gui.Base.Messages;
 using Neo.Gui.Base.Controllers;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Moq;
 using Neo.Gui.Base.Dialogs.LoadParameters.Contracts;
 using Neo.Gui.Base.Managers;

diff --git a/Neo.Gui.ViewModels/Accounts/CreateLockAccountViewModel.cs b/Neo.Gui.ViewModels/Accounts/CreateLockAccountViewModel.cs
@@ -14,7 +14,7 @@
 using Neo.Gui.Base.Controllers;
 using Neo.Gui.Base.Messages;
 using Neo.Gui.Base.Messaging.Interfaces;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Dialogs.Interfaces;
 using Neo.Gui.Base.Dialogs.Results.Wallets;
 using Neo.Gui.Base.Managers;

diff --git a/Neo.Gui.ViewModels/Accounts/CreateMultiSigContractViewModel.cs b/Neo.Gui.ViewModels/Accounts/CreateMultiSigContractViewModel.cs
@@ -11,7 +11,7 @@
 
 using Neo.Gui.Base.Messages;
 using Neo.Gui.Base.Messaging.Interfaces;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Services;
 using Neo.Gui.Base.Dialogs.Results.Wallets;
 using Neo.Gui.Base.Dialogs.Interfaces;

diff --git a/Neo.Gui.ViewModels/Contracts/InvokeContractViewModel.cs b/Neo.Gui.ViewModels/Contracts/InvokeContractViewModel.cs
@@ -20,7 +20,7 @@
 using Neo.Gui.Base.Dialogs.LoadParameters.Contracts;
 using Neo.Gui.Base.Messages;
 using Neo.Gui.Base.Messaging.Interfaces;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 
 namespace Neo.Gui.ViewModels.Contracts
 {

diff --git a/Neo.Gui.ViewModels/Development/ContractParametersViewModel.cs b/Neo.Gui.ViewModels/Development/ContractParametersViewModel.cs
@@ -11,7 +11,7 @@
 
 using Neo.Gui.Base.Controllers;
 using Neo.Gui.Base.Extensions;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Managers;
 using Neo.Gui.Base.Services;
 

diff --git a/Neo.Gui.ViewModels/Home/AccountsViewModel.cs b/Neo.Gui.ViewModels/Home/AccountsViewModel.cs
@@ -11,7 +11,7 @@
 using Neo.Gui.Base.Messages;
 using Neo.Gui.Base.Messaging.Interfaces;
 using Neo.Gui.Base.MVVM;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Managers;
 using Neo.Gui.Base.Dialogs.LoadParameters.Voting;
 using Neo.Gui.Base.Dialogs.Results.Wallets;

diff --git a/Neo.Gui.ViewModels/Home/AssetsViewModel.cs b/Neo.Gui.ViewModels/Home/AssetsViewModel.cs
@@ -10,7 +10,7 @@
 using Neo.Gui.Base.Messages;
 using Neo.Gui.Base.Messaging.Interfaces;
 using Neo.Gui.Base.MVVM;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Helpers;
 using Neo.Gui.Base.Managers;
 

diff --git a/Neo.Gui.ViewModels/Home/HomeViewModel.cs b/Neo.Gui.ViewModels/Home/HomeViewModel.cs
@@ -19,7 +19,7 @@
 using Neo.Gui.Base.Messages;
 using Neo.Gui.Base.Messaging.Interfaces;
 using Neo.Gui.Base.MVVM;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Helpers;
 using Neo.Gui.Base.Managers;
 

diff --git a/Neo.Gui.ViewModels/Neo.Gui.ViewModels.csproj b/Neo.Gui.ViewModels/Neo.Gui.ViewModels.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Neo.Gui.Base\Neo.Gui.Base.csproj" />
+    <ProjectReference Include="..\Neo.Gui.Globalization\Neo.Gui.Globalization.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Neo.Gui.ViewModels/Transactions/SigningViewModel.cs b/Neo.Gui.ViewModels/Transactions/SigningViewModel.cs
@@ -10,7 +10,7 @@
 using Neo.Gui.Base.Dialogs.Interfaces;
 using Neo.Gui.Base.Dialogs.Results;
 using Neo.Gui.Base.Dialogs.Results.Transactions;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Managers;
 using Neo.Gui.Base.Services;
 

diff --git a/Neo.Gui.ViewModels/Wallets/ChangePasswordViewModel.cs b/Neo.Gui.ViewModels/Wallets/ChangePasswordViewModel.cs
@@ -8,7 +8,7 @@
 using Neo.Gui.Base.Dialogs.Interfaces;
 using Neo.Gui.Base.Dialogs.Results;
 using Neo.Gui.Base.Dialogs.Results.Wallets;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Services;
 
 namespace Neo.Gui.ViewModels.Wallets

diff --git a/Neo.Gui.ViewModels/Wallets/TradeViewModel.cs b/Neo.Gui.ViewModels/Wallets/TradeViewModel.cs
@@ -16,7 +16,7 @@
 using Neo.Gui.Base.Dialogs.Interfaces;
 using Neo.Gui.Base.Dialogs.LoadParameters.Wallets;
 using Neo.Gui.Base.Dialogs.Results;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Services;
 using Neo.Gui.Base.MVVM;
 using Neo.Gui.Base.Dialogs.Results.Wallets;

diff --git a/Neo.Gui.ViewModels/Wallets/TransferViewModel.cs b/Neo.Gui.ViewModels/Wallets/TransferViewModel.cs
@@ -20,7 +20,7 @@
 using Neo.Gui.Base.Dialogs.Results.Wallets;
 using Neo.Gui.Base.Messages;
 using Neo.Gui.Base.Messaging.Interfaces;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Managers;
 
 namespace Neo.Gui.ViewModels.Wallets

diff --git a/Neo.Gui.Wpf/App.xaml.cs b/Neo.Gui.Wpf/App.xaml.cs
@@ -15,7 +15,7 @@
 using Neo.Gui.Base.Messages;
 using Neo.Gui.Base.Messaging.Interfaces;
 using Neo.Gui.Base.MVVM;
-using Neo.Gui.Base.Globalization;
+using Neo.Gui.Globalization.Resources;
 using Neo.Gui.Base.Helpers;
 using Neo.Gui.Base.Managers;
 using Neo.Gui.Base.Services;

diff --git a/Neo.Gui.Wpf/Controls/TransactionOutputListBox.xaml b/Neo.Gui.Wpf/Controls/TransactionOutputListBox.xaml
@@ -1,7 +1,7 @@
 <Grid x:Class="Neo.Gui.Wpf.Controls.TransactionOutputListBox"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base">
+        xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization">
     <Grid.Resources>
         <SolidColorBrush x:Key="BackgroundBrush" Color="{DynamicResource WhiteColor}" />
     </Grid.Resources>

diff --git a/Neo.Gui.Wpf/Neo.Gui.Wpf.csproj b/Neo.Gui.Wpf/Neo.Gui.Wpf.csproj
@@ -715,9 +715,6 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="MVVM\" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\logo_72.png" />
   </ItemGroup>
@@ -726,6 +723,10 @@
       <Project>{929FDF79-F89D-4B4F-BB56-DBD1D31528B4}</Project>
       <Name>Neo.Gui.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Neo.Gui.Globalization\Neo.Gui.Globalization.csproj">
+      <Project>{34501d6d-410c-4e1e-8c47-1a2ebbfbe611}</Project>
+      <Name>Neo.Gui.Globalization</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Neo.Gui.ViewModels\Neo.Gui.ViewModels.csproj">
       <Project>{e7116c94-ca06-4045-9517-b4332c47fd4c}</Project>
       <Name>Neo.Gui.ViewModels</Name>

diff --git a/Neo.Gui.Wpf/Views/AboutView.xaml b/Neo.Gui.Wpf/Views/AboutView.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
     xmlns:local="clr-namespace:Neo.Gui.ViewModels;assembly=Neo.Gui.ViewModels"
-    xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+    xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
     xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"
     DataContext="{markupExtensions:DataContextBinding ViewModel=local:AboutViewModel}"
     Width="420"

diff --git a/Neo.Gui.Wpf/Views/Accounts/CreateLockAccountView.xaml b/Neo.Gui.Wpf/Views/Accounts/CreateLockAccountView.xaml
@@ -1,7 +1,7 @@
 <controls:NeoWindow x:Class="Neo.Gui.Wpf.Views.Accounts.CreateLockAccountView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+        xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
         xmlns:accounts="clr-namespace:Neo.Gui.ViewModels.Accounts;assembly=Neo.Gui.ViewModels"
         xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
         xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Accounts/CreateMultiSigContractView.xaml b/Neo.Gui.Wpf/Views/Accounts/CreateMultiSigContractView.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-        xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+        xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
         xmlns:accounts="clr-namespace:Neo.Gui.ViewModels.Accounts;assembly=Neo.Gui.ViewModels"
         xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
         xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Accounts/ImportCertificateView.xaml b/Neo.Gui.Wpf/Views/Accounts/ImportCertificateView.xaml
@@ -1,7 +1,7 @@
 <controls:NeoWindow x:Class="Neo.Gui.Wpf.Views.Accounts.ImportCertificateView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+        xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
         xmlns:accounts="clr-namespace:Neo.Gui.ViewModels.Accounts;assembly=Neo.Gui.ViewModels"
         xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
         xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Accounts/ImportCustomContractView.xaml b/Neo.Gui.Wpf/Views/Accounts/ImportCustomContractView.xaml
@@ -1,7 +1,7 @@
 <controls:NeoWindow x:Class="Neo.Gui.Wpf.Views.Accounts.ImportCustomContractView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+        xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
         xmlns:accounts="clr-namespace:Neo.Gui.ViewModels.Accounts;assembly=Neo.Gui.ViewModels"
         xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
         xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Accounts/ImportPrivateKeyView.xaml b/Neo.Gui.Wpf/Views/Accounts/ImportPrivateKeyView.xaml
@@ -1,7 +1,7 @@
 <controls:NeoWindow x:Class="Neo.Gui.Wpf.Views.Accounts.ImportPrivateKeyView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+        xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
         xmlns:accounts="clr-namespace:Neo.Gui.ViewModels.Accounts;assembly=Neo.Gui.ViewModels"
         xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
         xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Accounts/ViewContractView.xaml b/Neo.Gui.Wpf/Views/Accounts/ViewContractView.xaml
@@ -1,7 +1,7 @@
 <controls:NeoWindow x:Class="Neo.Gui.Wpf.Views.Accounts.ViewContractView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+        xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
         xmlns:accounts="clr-namespace:Neo.Gui.ViewModels.Accounts;assembly=Neo.Gui.ViewModels"
         xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
         xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Accounts/ViewPrivateKeyView.xaml b/Neo.Gui.Wpf/Views/Accounts/ViewPrivateKeyView.xaml
@@ -1,7 +1,7 @@
 <controls:NeoWindow x:Class="Neo.Gui.Wpf.Views.Accounts.ViewPrivateKeyView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+        xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
         xmlns:accounts="clr-namespace:Neo.Gui.ViewModels.Accounts;assembly=Neo.Gui.ViewModels"
         xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
         xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Assets/AssetDistributionView.xaml b/Neo.Gui.Wpf/Views/Assets/AssetDistributionView.xaml
@@ -1,7 +1,7 @@
 <controls:NeoWindow x:Class="Neo.Gui.Wpf.Views.Assets.AssetDistributionView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+        xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
         xmlns:assets="clr-namespace:Neo.Gui.ViewModels.Assets;assembly=Neo.Gui.ViewModels"
         xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
         xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Assets/AssetRegistrationView.xaml b/Neo.Gui.Wpf/Views/Assets/AssetRegistrationView.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-        xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+        xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
         xmlns:assets="clr-namespace:Neo.Gui.ViewModels.Assets;assembly=Neo.Gui.ViewModels"
         xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
         xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Contracts/ContractParametersEditorView.xaml b/Neo.Gui.Wpf/Views/Contracts/ContractParametersEditorView.xaml
@@ -1,7 +1,7 @@
 <controls:NeoWindow x:Class="Neo.Gui.Wpf.Views.Contracts.ContractParametersEditorView"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+            xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
             xmlns:contracts="clr-namespace:Neo.Gui.ViewModels.Contracts;assembly=Neo.Gui.ViewModels"
             xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
             xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Contracts/DeployContractView.xaml b/Neo.Gui.Wpf/Views/Contracts/DeployContractView.xaml
@@ -1,7 +1,7 @@
 <controls:NeoWindow x:Class="Neo.Gui.Wpf.Views.Contracts.DeployContractView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+             xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
              xmlns:contracts="clr-namespace:Neo.Gui.ViewModels.Contracts;assembly=Neo.Gui.ViewModels"
              xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
              xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Contracts/InvokeContractView.xaml b/Neo.Gui.Wpf/Views/Contracts/InvokeContractView.xaml
@@ -1,7 +1,7 @@
 <controls:NeoWindow x:Class="Neo.Gui.Wpf.Views.Contracts.InvokeContractView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+             xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
              xmlns:contracts="clr-namespace:Neo.Gui.ViewModels.Contracts;assembly=Neo.Gui.ViewModels"
              xmlns:controls="clr-namespace:Neo.Gui.Wpf.Controls"
              xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"

diff --git a/Neo.Gui.Wpf/Views/Development/ContractParametersView.xaml b/Neo.Gui.Wpf/Views/Development/ContractParametersView.xaml
@@ -1,7 +1,7 @@
 <Grid x:Class="Neo.Gui.Wpf.Views.Development.ContractParametersView"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:globalization="clr-namespace:Neo.Gui.Base.Globalization;assembly=Neo.Gui.Base"
+            xmlns:globalization="clr-namespace:Neo.Gui.Globalization.Resources;assembly=Neo.Gui.Globalization"
             xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
             xmlns:development="clr-namespace:Neo.Gui.ViewModels.Development;assembly=Neo.Gui.ViewModels"
             xmlns:markupExtensions="clr-namespace:Neo.Gui.Wpf.MarkupExtensions"