diff --git a/src/Atc.Wpf.Components/Atc.Wpf.Components.csproj b/src/Atc.Wpf.Components/Atc.Wpf.Components.csproj
index 4e9995d8..22b1504b 100644
--- a/src/Atc.Wpf.Components/Atc.Wpf.Components.csproj
+++ b/src/Atc.Wpf.Components/Atc.Wpf.Components.csproj
@@ -57,4 +57,78 @@
+
+
+ DualListSelector.resx
+ True
+ True
+
+
+ JsonViewer.resx
+ True
+ True
+
+
+ Miscellaneous.resx
+ True
+ True
+
+
+ TerminalViewer.resx
+ True
+ True
+
+
+
+
+
+ Designer
+ PublicResXFileCodeGenerator
+
+
+ Designer
+ PublicResXFileCodeGenerator
+
+
+ DualListSelector.Designer.cs
+ PublicResXFileCodeGenerator
+
+
+ Designer
+ PublicResXFileCodeGenerator
+
+
+ Designer
+ PublicResXFileCodeGenerator
+
+
+ JsonViewer.Designer.cs
+ PublicResXFileCodeGenerator
+
+
+ Designer
+ PublicResXFileCodeGenerator
+
+
+ Designer
+ PublicResXFileCodeGenerator
+
+
+ Miscellaneous.Designer.cs
+ PublicResXFileCodeGenerator
+
+
+ Designer
+ PublicResXFileCodeGenerator
+
+
+ Designer
+ PublicResXFileCodeGenerator
+
+
+ TerminalViewer.Designer.cs
+ PublicResXFileCodeGenerator
+
+
+
\ No newline at end of file
diff --git a/src/Atc.Wpf.Components/Dialogs/BasicApplicationSettingsDialogBox.xaml b/src/Atc.Wpf.Components/Dialogs/BasicApplicationSettingsDialogBox.xaml
index 99b24bb0..d7213213 100644
--- a/src/Atc.Wpf.Components/Dialogs/BasicApplicationSettingsDialogBox.xaml
+++ b/src/Atc.Wpf.Components/Dialogs/BasicApplicationSettingsDialogBox.xaml
@@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:atc="https://github.com/atc-net/atc-wpf/tree/main/schemas"
+ xmlns:atcTranslation="https://github.com/atc-net/atc-wpf/tree/main/schemas/translations"
xmlns:atcValueConverters="https://github.com/atc-net/atc-wpf/tree/main/schemas/value-converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dialogs="clr-namespace:Atc.Wpf.Theming.Themes.Dialogs;assembly=Atc.Wpf.Theming"
@@ -51,7 +52,7 @@
Background="{DynamicResource AtcApps.Brushes.ThemeBackground}"
Command="{Binding Path=OkCommand}"
CommandParameter="{Binding ElementName=DialogApplicationSettings}"
- Content="OK"
+ Content="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word, Key=Ok}"
Foreground="{DynamicResource AtcApps.Brushes.Text}"
IsDefault="True" />
diff --git a/src/Atc.Wpf.Components/Dialogs/BasicApplicationSettingsDialogBoxViewModel.cs b/src/Atc.Wpf.Components/Dialogs/BasicApplicationSettingsDialogBoxViewModel.cs
index e77752ba..b48bc0d9 100644
--- a/src/Atc.Wpf.Components/Dialogs/BasicApplicationSettingsDialogBoxViewModel.cs
+++ b/src/Atc.Wpf.Components/Dialogs/BasicApplicationSettingsDialogBoxViewModel.cs
@@ -1,3 +1,5 @@
+using SharedMisc = Atc.Wpf.Resources.Miscellaneous;
+
namespace Atc.Wpf.Components.Dialogs;
public class BasicApplicationSettingsDialogBoxViewModel : ViewModelBase
@@ -19,7 +21,7 @@ public BasicApplicationSettingsDialogBoxViewModel(
ApplicationSettings = basicApplicationSettingsViewModel.Clone();
applicationSettingsBackup = basicApplicationSettingsViewModel.Clone();
- TitleBarText = Miscellaneous.ApplicationSettings;
+ TitleBarText = SharedMisc.ApplicationSettings;
ThemeManager.Current.ThemeChanged += OnThemeChanged;
CultureManager.UiCultureChanged += OnUiCultureChanged;
@@ -49,7 +51,7 @@ public void SetHeaderControlInsteadOfTitleBarText()
VerticalAlignment = VerticalAlignment.Center,
Content = new TextBlock
{
- Text = Miscellaneous.ApplicationSettings,
+ Text = SharedMisc.ApplicationSettings,
FontSize = 24,
},
};
diff --git a/src/Atc.Wpf.Components/Flyouts/Flyout.xaml b/src/Atc.Wpf.Components/Flyouts/Flyout.xaml
index 9d50d33b..484dc089 100644
--- a/src/Atc.Wpf.Components/Flyouts/Flyout.xaml
+++ b/src/Atc.Wpf.Components/Flyouts/Flyout.xaml
@@ -1,6 +1,7 @@
@@ -13,7 +14,7 @@
-
+
@@ -51,7 +52,7 @@
-
+
@@ -263,7 +264,7 @@
+ ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word, Key=Close}" />
diff --git a/src/Atc.Wpf.Components/GlobalUsings.cs b/src/Atc.Wpf.Components/GlobalUsings.cs
index 23f0d233..80d31170 100644
--- a/src/Atc.Wpf.Components/GlobalUsings.cs
+++ b/src/Atc.Wpf.Components/GlobalUsings.cs
@@ -31,7 +31,6 @@
global using Atc.Wpf.Components.Settings;
global using Atc.Wpf.Components.ValueConverters;
global using Atc.Wpf.Controls.Progressing;
-global using Atc.Wpf.Controls.Resources;
global using Atc.Wpf.Controls.Zoom;
global using Atc.Wpf.Data;
global using Atc.Wpf.Dialogs;
@@ -45,6 +44,7 @@
global using Atc.Wpf.Options;
global using Atc.Wpf.Printing;
global using Atc.Wpf.Progressing;
+global using Atc.Wpf.Resources;
global using Atc.Wpf.Theming.Themes.Dialogs;
global using Atc.Wpf.Translation;
global using Atc.Wpf.Viewers.JsonTree;
diff --git a/src/Atc.Wpf.Components/Monitoring/ApplicationMonitorView.xaml b/src/Atc.Wpf.Components/Monitoring/ApplicationMonitorView.xaml
index bec00f50..191b5d87 100644
--- a/src/Atc.Wpf.Components/Monitoring/ApplicationMonitorView.xaml
+++ b/src/Atc.Wpf.Components/Monitoring/ApplicationMonitorView.xaml
@@ -24,7 +24,7 @@
Height="16"
Margin="1,1,0,0"
Source="pack://application:,,,/Atc.Wpf.Components;component/Resources/Images/eraser.png"
- ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+ ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Miscellaneous,
Key=ClearAll}" />
@@ -34,13 +34,13 @@
Height="16"
Margin="1,1,0,0"
Source="pack://application:,,,/Atc.Wpf.Components;component/Resources/Images/scrollrefresh.png"
- ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+ ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word,
Key=Auto}" />
@@ -78,7 +78,7 @@
Height="16"
Margin="1,1,0,0"
Source="pack://application:,,,/Atc.Wpf.Components;component/Resources/Images/error.png"
- ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+ ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word,
Key=Errors}" />
@@ -88,7 +88,7 @@
Height="16"
Margin="1,1,0,0"
Source="pack://application:,,,/Atc.Wpf.Components;component/Resources/Images/warning.png"
- ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+ ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word,
Key=Warnings}" />
@@ -98,7 +98,7 @@
Height="16"
Margin="1,1,0,0"
Source="pack://application:,,,/Atc.Wpf.Components;component/Resources/Images/information.png"
- ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+ ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word,
Key=Information}" />
@@ -115,7 +115,7 @@