diff --git a/DS4Windows/App.xaml b/DS4Windows/App.xaml
index a7f23add..544d967d 100644
--- a/DS4Windows/App.xaml
+++ b/DS4Windows/App.xaml
@@ -16,6 +16,9 @@
+
+ LeftToRight
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -352,7 +352,7 @@
-
+
@@ -381,17 +381,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -423,19 +423,19 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -463,18 +463,18 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -497,13 +497,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -519,17 +519,17 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -546,7 +546,7 @@
-
+
@@ -578,7 +578,7 @@
-
+
@@ -588,7 +588,7 @@
-
+
@@ -599,7 +599,7 @@
@@ -617,9 +617,9 @@
-
-
-
+
+
+
diff --git a/DS4Windows/DS4Forms/ControllerOverviewControl.xaml b/DS4Windows/DS4Forms/ControllerOverviewControl.xaml
index 10dfe6c5..1a8818d6 100644
--- a/DS4Windows/DS4Forms/ControllerOverviewControl.xaml
+++ b/DS4Windows/DS4Forms/ControllerOverviewControl.xaml
@@ -4,6 +4,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+ xmlns:lex="http://wpflocalizeextension.codeplex.com"
+ lex:ResxLocalizationProvider.DefaultAssembly="DS4Windows"
+ lex:ResxLocalizationProvider.DefaultDictionary="Strings"
mc:Ignorable="d"
d:DesignHeight="720" d:DesignWidth="940">
@@ -201,9 +204,9 @@
Foreground="{DynamicResource AccentColor}"
HorizontalAlignment="Center" VerticalAlignment="Center" />
-
-
@@ -245,7 +248,7 @@
-
+
@@ -258,7 +261,7 @@
BorderBrush="{DynamicResource BorderColor}" BorderThickness="1"
CornerRadius="3" Padding="8,4" Margin="0,0,8,0">
-
+
-
-
+
-
+ ToolTip="{lex:Loc Overview.ReportIntervalTip}" />
-
+
-
@@ -313,10 +316,10 @@
-
+
-
@@ -324,7 +327,7 @@
-
+
@@ -356,8 +359,8 @@
-
-
+
@@ -372,8 +375,8 @@
-
-
+
-
@@ -437,21 +440,21 @@
Margin="0,3,0,13" FontSize="11" TextWrapping="Wrap"
Foreground="{DynamicResource MutedForegroundColor}" />
-
-
-
+
@@ -480,7 +483,7 @@
Content=""
FontFamily="Segoe MDL2 Assets"
FontSize="15"
- ToolTip="Refresh running audio sources"
+ ToolTip="{lex:Loc Overview.RefreshAudioSourcesTip}"
Click="RefreshControllerAudioSources_Click" />
@@ -488,7 +491,7 @@
CornerRadius="4" Background="#26FFB020"
BorderBrush="#80FFB020" BorderThickness="1"
Visibility="{Binding AudioHapticsSpeakerOverrideActive, Converter={StaticResource BooleanToVisibilityConverter}}">
-
@@ -499,20 +502,20 @@
-
-
-
-
-
+
+
+
+
+ Click="OpenWindowsSoundSettings_Click" ToolTip="{lex:Loc Overview.OpenSoundSettingsTip}" />
-
+
@@ -524,7 +527,7 @@
-
-
+ ToolTip="{lex:Loc Overview.HeadsetAuxTip}" />
-
+
@@ -563,18 +566,18 @@
-
+
-
-
-
+
+
+
-
+ ToolTip="{lex:Loc Overview.BassBodyTip}" />
-
+
-
+
@@ -628,14 +631,14 @@
-
+
-
-
-
-
+
+
+
@@ -651,23 +654,23 @@
-
-
+
-
-
-
-
diff --git a/DS4Windows/DS4Forms/ControllerReadingsControl.xaml b/DS4Windows/DS4Forms/ControllerReadingsControl.xaml
index 0f9c89ab..8d454217 100644
--- a/DS4Windows/DS4Forms/ControllerReadingsControl.xaml
+++ b/DS4Windows/DS4Forms/ControllerReadingsControl.xaml
@@ -52,21 +52,21 @@
-
+
-
+
-
+
-
+
@@ -91,21 +91,21 @@
-
+
-
+
-
+
-
+
@@ -127,21 +127,21 @@
-
+
-
+
-
+
-
+
@@ -169,11 +169,11 @@
-
+
-
+
@@ -196,11 +196,11 @@
-
+
-
+
@@ -212,11 +212,11 @@
-
+
-
+
@@ -242,15 +242,15 @@
-
+
-
+
-
+
diff --git a/DS4Windows/DS4Forms/ControllerRegisterOptionsWindow.xaml b/DS4Windows/DS4Forms/ControllerRegisterOptionsWindow.xaml
index 65b7af2f..feb6eece 100644
--- a/DS4Windows/DS4Forms/ControllerRegisterOptionsWindow.xaml
+++ b/DS4Windows/DS4Forms/ControllerRegisterOptionsWindow.xaml
@@ -22,9 +22,9 @@
-
+ ToolTip="{lex:Loc ControllerRegOptWin.AcceptMoonlightTip}" />
@@ -55,13 +55,13 @@
-
+
-
+
@@ -75,7 +75,7 @@
-
+
@@ -89,7 +89,7 @@
-
+
diff --git a/DS4Windows/DS4Forms/LanguagePackControl.xaml b/DS4Windows/DS4Forms/LanguagePackControl.xaml
index 471fdae0..35c78bb8 100644
--- a/DS4Windows/DS4Forms/LanguagePackControl.xaml
+++ b/DS4Windows/DS4Forms/LanguagePackControl.xaml
@@ -12,7 +12,7 @@
d:DesignHeight="30" d:DesignWidth="340">
-
diff --git a/DS4Windows/DS4Forms/LogMessageDisplay.xaml b/DS4Windows/DS4Forms/LogMessageDisplay.xaml
index a17aafbb..3c5193c2 100644
--- a/DS4Windows/DS4Forms/LogMessageDisplay.xaml
+++ b/DS4Windows/DS4Forms/LogMessageDisplay.xaml
@@ -9,11 +9,11 @@
lex:ResxLocalizationProvider.DefaultAssembly="DS4Windows"
lex:ResxLocalizationProvider.DefaultDictionary="Strings"
mc:Ignorable="d"
- Title="Log" MinHeight="200" Height="200" Width="600" MinWidth="400" SizeToContent="Height" WindowStartupLocation="CenterScreen"
+ Title="{lex:Loc Log}" MinHeight="200" Height="200" Width="600" MinWidth="400" SizeToContent="Height" WindowStartupLocation="CenterScreen"
Style="{DynamicResource WindowStyle}">
-
+
diff --git a/DS4Windows/DS4Forms/MainWindow.xaml b/DS4Windows/DS4Forms/MainWindow.xaml
index 92c0aded..5902296e 100644
--- a/DS4Windows/DS4Forms/MainWindow.xaml
+++ b/DS4Windows/DS4Forms/MainWindow.xaml
@@ -45,7 +45,7 @@
-
+
@@ -146,7 +146,7 @@
BorderBrush="{DynamicResource BorderColor}" BorderThickness="1"
CornerRadius="3" Padding="10,5" VerticalAlignment="Top">
-
+
@@ -165,7 +165,7 @@
-
+ ToolTip="{lex:Loc MainWin.LinkProfileTip}" />
-
@@ -231,11 +231,11 @@
BorderBrush="{DynamicResource BorderColor}"
BorderThickness="1">
-
@@ -307,11 +307,11 @@
-
+
-
+
@@ -332,7 +332,7 @@
-
+
-
-
+
@@ -443,11 +443,11 @@
BorderThickness="0" Background="Transparent"
Padding="2,8" VerticalContentAlignment="Center"
TextChanged="ProfilesSearchTextBox_TextChanged"
- ToolTip="Search profiles by name" />
+ ToolTip="{lex:Loc MainWin.SearchProfilesTip}" />
@@ -513,14 +513,14 @@
-
-
-
-
-
@@ -565,9 +565,9 @@
BorderBrush="{DynamicResource BorderColor}" BorderThickness="1"
CornerRadius="6" Padding="32">
-
-
@@ -593,34 +593,34 @@
-
-
+
-
-
+ ToolTip="{lex:Loc MainWin.ConfigSwipeProfilesTip}" />
-
@@ -703,7 +703,7 @@
@@ -716,52 +716,52 @@
-
+
-
-
-
+
-
@@ -773,11 +773,11 @@
SelectionChanged="Switch2AssociationCandidatesList_SelectionChanged" />
-
-
@@ -808,7 +808,7 @@
-
+
-
+
-
+
-
-
+
-
+
@@ -875,7 +875,7 @@
-
+
@@ -909,26 +909,26 @@
-
+
-
-
-
+
-
-
+
-
+
-
@@ -1026,8 +1026,8 @@
-
-
+
@@ -1051,14 +1051,14 @@
-
+
-
+
diff --git a/DS4Windows/DS4Forms/MappingLiveInputControl.xaml b/DS4Windows/DS4Forms/MappingLiveInputControl.xaml
index eaf3999c..d8c7f617 100644
--- a/DS4Windows/DS4Forms/MappingLiveInputControl.xaml
+++ b/DS4Windows/DS4Forms/MappingLiveInputControl.xaml
@@ -1,6 +1,9 @@
-
-
+
-
@@ -31,8 +34,8 @@
-
-
+
@@ -44,8 +47,8 @@
-
-
+
@@ -64,9 +67,9 @@
-
-
diff --git a/DS4Windows/DS4Forms/MappingLiveInputControl.xaml.cs b/DS4Windows/DS4Forms/MappingLiveInputControl.xaml.cs
index 8f6c287f..65ca733a 100644
--- a/DS4Windows/DS4Forms/MappingLiveInputControl.xaml.cs
+++ b/DS4Windows/DS4Forms/MappingLiveInputControl.xaml.cs
@@ -82,7 +82,7 @@ internal void RenderSnapshot(DS4State raw, InputDeviceType type)
{
projection.Update(raw, type);
if (!projection.Valid) { RenderStatus(MappingLiveInputStatus.Waiting); return; }
- liveStatus.Text = "Live";
+ liveStatus.Text = Properties.Resources.MLLive;
RenderStick(leftStickPlot, leftStickDot, leftStickValue, projection.LeftX, projection.LeftY, projection.LeftPresent);
RenderStick(rightStickPlot, rightStickDot, rightStickValue, projection.RightX, projection.RightY, projection.RightPresent);
leftTriggerName.Text = projection.LeftTriggerName;
@@ -91,7 +91,7 @@ internal void RenderSnapshot(DS4State raw, InputDeviceType type)
rightTriggerMeter.Value = projection.RightTrigger;
leftTriggerValue.Text = $"{projection.LeftTrigger:0}%";
rightTriggerValue.Text = $"{projection.RightTrigger:0}%";
- pressedButtons.Text = projection.PressedButtons.Length == 0 ? "No buttons pressed" : projection.PressedButtons;
+ pressedButtons.Text = projection.PressedButtons.Length == 0 ? Properties.Resources.MLNoButtonsPressed : projection.PressedButtons;
pressedButtons.ToolTip = pressedButtons.Text;
}
@@ -110,21 +110,22 @@ internal void RenderStatus(MappingLiveInputStatus status)
{
liveStatus.Text = status switch
{
- MappingLiveInputStatus.Disconnected => "Disconnected",
- MappingLiveInputStatus.Replaced => "Controller changed",
- MappingLiveInputStatus.Stale => "No recent input",
- _ => "Waiting"
+ MappingLiveInputStatus.Disconnected => Properties.Resources.Disconnected,
+ MappingLiveInputStatus.Replaced => Properties.Resources.MLControllerChanged,
+ MappingLiveInputStatus.Stale => Properties.Resources.MLNoRecentInput,
+ _ => Properties.Resources.MLWaiting
};
pressedButtons.Text = status switch
{
- MappingLiveInputStatus.Replaced => "Reopen the editor to preview the new controller.",
- MappingLiveInputStatus.Disconnected => "Controller disconnected. Reconnect and reopen the editor.",
- MappingLiveInputStatus.Stale => "Waiting for fresh controller input…",
- _ => snapshot.HasBoundDevice ? "Waiting for controller input…" :
- "Open this profile from a connected controller."
+ MappingLiveInputStatus.Replaced => Properties.Resources.MLReopenForNewController,
+ MappingLiveInputStatus.Disconnected => Properties.Resources.MLControllerDisconnectedReopen,
+ MappingLiveInputStatus.Stale => Properties.Resources.MLWaitingForFreshInput,
+ _ => snapshot.HasBoundDevice ? Properties.Resources.MLWaitingForInput :
+ Properties.Resources.MLOpenFromConnectedController
};
pressedButtons.ToolTip = pressedButtons.Text;
- leftStickValue.Text = rightStickValue.Text = "X —\nY —";
+ leftStickValue.Text = rightStickValue.Text =
+ DS4WinWPF.Translations.Strings.ResourceManager.GetString("MappingLive.AxisPlaceholder", DS4WinWPF.Translations.Strings.Culture);
leftTriggerValue.Text = rightTriggerValue.Text = "—";
leftTriggerMeter.Value = rightTriggerMeter.Value = 0;
leftStickPlot.Opacity = rightStickPlot.Opacity = 0.35;
diff --git a/DS4Windows/DS4Forms/PluginOutDevWindow.xaml b/DS4Windows/DS4Forms/PluginOutDevWindow.xaml
index ee1b83a1..b77eb67e 100644
--- a/DS4Windows/DS4Forms/PluginOutDevWindow.xaml
+++ b/DS4Windows/DS4Forms/PluginOutDevWindow.xaml
@@ -19,12 +19,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/DS4Windows/DS4Forms/PresetOptionWindow.xaml b/DS4Windows/DS4Forms/PresetOptionWindow.xaml
index 52b2398b..1d1d7b95 100644
--- a/DS4Windows/DS4Forms/PresetOptionWindow.xaml
+++ b/DS4Windows/DS4Forms/PresetOptionWindow.xaml
@@ -10,7 +10,7 @@
lex:ResxLocalizationProvider.DefaultAssembly="DS4Windows"
lex:ResxLocalizationProvider.DefaultDictionary="Strings"
mc:Ignorable="d"
- Title="Select Preset" Height="250" Width="600" Padding="0"
+ Title="{lex:Loc PresetOptWin.WinTitle}" Height="250" Width="600" Padding="0"
Style="{DynamicResource WindowStyle}" Closed="Window_Closed">
@@ -20,11 +20,11 @@
-
-
+
+
-
+
diff --git a/DS4Windows/DS4Forms/ProfileEditor.xaml b/DS4Windows/DS4Forms/ProfileEditor.xaml
index 6a31f976..4e0d144d 100644
--- a/DS4Windows/DS4Forms/ProfileEditor.xaml
+++ b/DS4Windows/DS4Forms/ProfileEditor.xaml
@@ -47,14 +47,14 @@
-
+
-
+
-
+
@@ -90,8 +90,8 @@
-
-
+
@@ -103,63 +103,63 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -169,57 +169,57 @@