From 1b1e29cbfef543aa2411de7b9228c03900b4bfe4 Mon Sep 17 00:00:00 2001
From: FelixSe <f.seidl@me.com>
Date: Sun, 16 Jun 2019 12:39:06 +0200
Subject: [PATCH] Localize ssh profiles gui

---
 FluentTerminal.App/Dialogs/SshInfoDialog.xaml | 26 +++++-----
 FluentTerminal.App/Strings/de/Resources.resw  | 48 ++++++++++++++++---
 FluentTerminal.App/Strings/en/Resources.resw  | 31 +++++++++++-
 FluentTerminal.App/Strings/es/Resources.resw  | 39 +++++++++++++--
 .../Strings/zh-CN/Resources.resw              | 36 ++++++++++++--
 .../SettingsPages/SshProfileSettings.xaml     | 23 ++++-----
 .../Views/SettingsPages/ThemeSettings.xaml    | 43 ++++++++++-------
 7 files changed, 188 insertions(+), 58 deletions(-)

diff --git a/FluentTerminal.App/Dialogs/SshInfoDialog.xaml b/FluentTerminal.App/Dialogs/SshInfoDialog.xaml
index 0275765b..26deb62d 100644
--- a/FluentTerminal.App/Dialogs/SshInfoDialog.xaml
+++ b/FluentTerminal.App/Dialogs/SshInfoDialog.xaml
@@ -59,11 +59,11 @@
     </ContentDialog.Resources>
     <Grid Width="500">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="140" />
-            <ColumnDefinition Width="22" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="8" />
-            <ColumnDefinition Width="80" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition />
@@ -77,6 +77,7 @@
             x:Uid="UserTextBox"
             Grid.Row="0"
             Grid.Column="0"
+            Width="140"
             PlaceholderText="user"
             Text="{Binding Username, Mode=TwoWay}" />
         <TextBlock
@@ -101,7 +102,8 @@
             x:Uid="PortTextBox"
             Grid.Row="0"
             Grid.Column="4"
-            Width="76"
+            Margin="0,0,4,0"
+            HorizontalAlignment="Stretch"
             BeforeTextChanging="Port_OnBeforeTextChanging"
             PlaceholderText="port"
             Text="{Binding SshPort, Mode=TwoWay}" />
@@ -118,8 +120,8 @@
             x:Uid="BrowseButton"
             Grid.Row="1"
             Grid.Column="4"
-            Width="76"
-            Margin="0,10,0,0"
+            Margin="0,10,4,0"
+            HorizontalAlignment="Stretch"
             Click="BrowseButtonOnClick"
             Content="Browse" />
         <CheckBox
@@ -208,7 +210,7 @@
                     Visibility="{Binding UseMosh}" />
 
                 <TextBlock
-                    x:Uid="TabColor1"
+                    x:Uid="SshInfoDialog_TabColor"
                     Grid.Row="2"
                     Grid.Column="0"
                     Margin="0,8,8,0"
@@ -242,12 +244,11 @@
                     SelectedItem="{Binding SelectedTerminalTheme, Mode=TwoWay}" />
 
                 <CheckBox
-                    x:Uid="UseConPtyCheckBox"
                     Grid.Row="4"
                     Grid.Column="0"
                     Grid.ColumnSpan="4"
                     Margin="0,8,0,0"
-                    Content="Use ConPty"
+                    Content="{x:Bind Converter={StaticResource I18NConverter}, ConverterParameter=UseConPty}"
                     IsChecked="{Binding UseConPty, Mode=TwoWay}" />
 
             </Grid>
@@ -255,8 +256,7 @@
         <Grid
             Grid.Row="4"
             Grid.Column="0"
-            Grid.ColumnSpan="5"
-            Margin="0,10,0,0">
+            Grid.ColumnSpan="5">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="*" />
@@ -265,7 +265,7 @@
                 x:Uid="SaveShortcutButton"
                 Grid.Row="0"
                 Grid.Column="1"
-                Margin="0,0,2,0"
+                Margin="0,10,4,0"
                 HorizontalAlignment="Stretch"
                 Click="SaveLink_OnClick"
                 Content="Save Shortcut" />
diff --git a/FluentTerminal.App/Strings/de/Resources.resw b/FluentTerminal.App/Strings/de/Resources.resw
index 034c68ab..324be0b9 100644
--- a/FluentTerminal.App/Strings/de/Resources.resw
+++ b/FluentTerminal.App/Strings/de/Resources.resw
@@ -336,7 +336,7 @@ Fuzzy</comment>
     <comment>ThemeSettings.xaml</comment>
   </data>
   <data name="CopiedNotification.Header" xml:space="preserve">
-    <value>Text kopiert</value>
+    <value>Informieren wenn Text kopiert wurde</value>
     <comment>TerminalSettings.xaml</comment>
   </data>
   <data name="CopyOnSelect.Header" xml:space="preserve">
@@ -396,7 +396,7 @@ Fuzzy</comment>
     <comment>ThemeSettings.xaml</comment>
   </data>
   <data name="KeyboardShortcut.Header" xml:space="preserve">
-    <value>Tastaturkürzel</value>
+    <value>Tastaturbelegung</value>
     <comment>ShellProfileSettings.xaml</comment>
   </data>
   <data name="KeyboardShortcut1.Text" xml:space="preserve">
@@ -416,7 +416,7 @@ Fuzzy</comment>
     <comment>ShellProfileSettings.xaml</comment>
   </data>
   <data name="LineEndingModeOnPaste.Text" xml:space="preserve">
-    <value>Zeilenenden-Anpassung bei Einfügen</value>
+    <value>Zeilenenden-Anpassung beim Einfügen:</value>
     <comment>ShellProfileSettings.xaml</comment>
   </data>
   <data name="MiddleButtonAction.Text" xml:space="preserve">
@@ -436,7 +436,7 @@ Fuzzy</comment>
     <comment>MouseSettings.xaml</comment>
   </data>
   <data name="MousePaste.Content" xml:space="preserve">
-    <value>EInfügen</value>
+    <value>Einfügen</value>
     <comment>MouseSettings.xaml</comment>
   </data>
   <data name="NewTheme.Text" xml:space="preserve">
@@ -512,7 +512,7 @@ Fuzzy</comment>
     <comment>TerminalSettings.xaml</comment>
   </data>
   <data name="Theme.Text" xml:space="preserve">
-    <value>Theme</value>
+    <value>Theme:</value>
     <comment>ThemeSettings.xaml</comment>
   </data>
   <data name="ThemeAuthor.Header" xml:space="preserve">
@@ -637,7 +637,7 @@ Fuzzy</comment>
     <comment>Command</comment>
   </data>
   <data name="Command.Clear" xml:space="preserve">
-    <value>Leeren</value>
+    <value>Bildschirm leeren</value>
     <comment>Command</comment>
   </data>
   <data name="Command.CloseTab" xml:space="preserve">
@@ -832,4 +832,40 @@ Fuzzy</comment>
   <data name="ConfirmDeleteProfile" xml:space="preserve">
     <value>Sind Sie sicher dass Sie dieses Profil löschen wollen?</value>
   </data>
+  <data name="Command.NewSshWindow" xml:space="preserve">
+    <value>Neues SSH-Fenster</value>
+  </data>
+  <data name="Command.SavedSshNewTab" xml:space="preserve">
+    <value>Neuer Tab mit SSH-Profil</value>
+  </data>
+  <data name="Command.SavedSshNewWindow" xml:space="preserve">
+    <value>Neues Fenster mit SSH-Profil</value>
+  </data>
+  <data name="Setting_SShProfiles.Content" xml:space="preserve">
+    <value>SSH-Profile</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="SshInfoDialog_TabColor.Text" xml:space="preserve">
+    <value>Tab-Farbe:</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="UseConPty" xml:space="preserve">
+    <value>ConPty verwenden</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="Username.Header" xml:space="preserve">
+    <value>Benutzer</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="MoshPortFrom.Header" xml:space="preserve">
+    <value>Von Port</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="MoshPortTo.Header" xml:space="preserve">
+    <value>bis Port</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="MoshPortRange.Text" xml:space="preserve">
+    <value>Mosh-Ports</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/FluentTerminal.App/Strings/en/Resources.resw b/FluentTerminal.App/Strings/en/Resources.resw
index 3f74b81e..875f76c9 100644
--- a/FluentTerminal.App/Strings/en/Resources.resw
+++ b/FluentTerminal.App/Strings/en/Resources.resw
@@ -426,7 +426,7 @@ Fuzzy</comment>
     <comment>ShellProfileSettings.xaml</comment>
   </data>
   <data name="LineEndingModeOnPaste.Text" xml:space="preserve">
-    <value>Line ending translation mode on paste</value>
+    <value>Line ending translation mode on paste:</value>
     <comment>ShellProfileSettings.xaml</comment>
   </data>
   <data name="MiddleButtonAction.Text" xml:space="preserve">
@@ -522,7 +522,7 @@ Fuzzy</comment>
     <comment>TerminalSettings.xaml</comment>
   </data>
   <data name="Theme.Text" xml:space="preserve">
-    <value>Theme</value>
+    <value>Theme:</value>
     <comment>ThemeSettings.xaml</comment>
   </data>
   <data name="ThemeAuthor.Header" xml:space="preserve">
@@ -879,4 +879,31 @@ Fuzzy</comment>
   <data name="Command.SavedSshNewWindow" xml:space="preserve">
     <value>New window for SSH profile</value>
   </data>
+  <data name="Setting_SShProfiles.Content" xml:space="preserve">
+    <value>SSH Profiles</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="SshInfoDialog_TabColor.Text" xml:space="preserve">
+    <value>Tab color:</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="UseConPty" xml:space="preserve">
+    <value>Use ConPty</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="Username.Header" xml:space="preserve">
+    <value>Username</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="MoshPortFrom.Header" xml:space="preserve">
+    <value>From port</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="MoshPortTo.Header" xml:space="preserve">
+    <value>to port</value>
+    <comment>Fuzzy</comment>
+  </data>
+  <data name="MoshPortRange.Text" xml:space="preserve">
+    <value>Mosh port range</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/FluentTerminal.App/Strings/es/Resources.resw b/FluentTerminal.App/Strings/es/Resources.resw
index 23d7e940..25026e1e 100644
--- a/FluentTerminal.App/Strings/es/Resources.resw
+++ b/FluentTerminal.App/Strings/es/Resources.resw
@@ -223,8 +223,7 @@
   </data>
   <data name="RunOnStartup.Header" xml:space="preserve">
     <value>Arrancar al encender</value>
-    <comment>GeneralSettings.xaml
-Fuzzy</comment>
+    <comment>GeneralSettings.xaml</comment>
   </data>
   <data name="Setting" xml:space="preserve">
     <value>Opciones</value>
@@ -822,12 +821,42 @@ Fuzzy</comment>
     <value>Ninguno</value>
   </data>
   <data name="NewOutput.ToolTipService.ToolTip" xml:space="preserve">
-    <value>New output</value>
+    <value>Nueva entrada</value>
   </data>
   <data name="ExitedWithError.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Exited with error</value>
+    <value>Se salió con error</value>
   </data>
   <data name="ConfirmDeleteProfile" xml:space="preserve">
-    <value>Are you sure you want to delete this profile?</value>
+    <value>¿Quieres eliminar este perfil?</value>
+  </data>
+  <data name="Command.NewSshWindow" xml:space="preserve">
+    <value>New SSH window</value>
+  </data>
+  <data name="Command.SavedSshNewTab" xml:space="preserve">
+    <value>New tab for SSH profile</value>
+  </data>
+  <data name="Command.SavedSshNewWindow" xml:space="preserve">
+    <value>New window for SSH profile</value>
+  </data>
+  <data name="Setting_SShProfiles.Content" xml:space="preserve">
+    <value>SSH Profiles</value>
+  </data>
+  <data name="SshInfoDialog_TabColor.Text" xml:space="preserve">
+    <value>Tab color:</value>
+  </data>
+  <data name="UseConPty" xml:space="preserve">
+    <value>Use ConPty</value>
+  </data>
+  <data name="Username.Header" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="MoshPortFrom.Header" xml:space="preserve">
+    <value>From port</value>
+  </data>
+  <data name="MoshPortTo.Header" xml:space="preserve">
+    <value>to port</value>
+  </data>
+  <data name="MoshPortRange.Text" xml:space="preserve">
+    <value>Mosh port range</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FluentTerminal.App/Strings/zh-CN/Resources.resw b/FluentTerminal.App/Strings/zh-CN/Resources.resw
index b77d1311..7b5ed1fc 100644
--- a/FluentTerminal.App/Strings/zh-CN/Resources.resw
+++ b/FluentTerminal.App/Strings/zh-CN/Resources.resw
@@ -862,12 +862,42 @@ Fuzzy</comment>
     <value>无</value>
   </data>
   <data name="NewOutput.ToolTipService.ToolTip" xml:space="preserve">
-    <value>New output</value>
+    <value>新输出</value>
   </data>
   <data name="ExitedWithError.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Exited with error</value>
+    <value>进程退出错误</value>
   </data>
   <data name="ConfirmDeleteProfile" xml:space="preserve">
-    <value>Are you sure you want to delete this profile?</value>
+    <value>确定删除这个配置文件吗？</value>
+  </data>
+  <data name="Command.NewSshWindow" xml:space="preserve">
+    <value>New SSH window</value>
+  </data>
+  <data name="Command.SavedSshNewTab" xml:space="preserve">
+    <value>New tab for SSH profile</value>
+  </data>
+  <data name="Command.SavedSshNewWindow" xml:space="preserve">
+    <value>New window for SSH profile</value>
+  </data>
+  <data name="Setting_SShProfiles.Content" xml:space="preserve">
+    <value>SSH Profiles</value>
+  </data>
+  <data name="SshInfoDialog_TabColor.Text" xml:space="preserve">
+    <value>Tab color:</value>
+  </data>
+  <data name="UseConPty" xml:space="preserve">
+    <value>Use ConPty</value>
+  </data>
+  <data name="Username.Header" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="MoshPortFrom.Header" xml:space="preserve">
+    <value>From port</value>
+  </data>
+  <data name="MoshPortTo.Header" xml:space="preserve">
+    <value>to port</value>
+  </data>
+  <data name="MoshPortRange.Text" xml:space="preserve">
+    <value>Mosh port range</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FluentTerminal.App/Views/SettingsPages/SshProfileSettings.xaml b/FluentTerminal.App/Views/SettingsPages/SshProfileSettings.xaml
index 1e9ba295..789b2dcc 100644
--- a/FluentTerminal.App/Views/SettingsPages/SshProfileSettings.xaml
+++ b/FluentTerminal.App/Views/SettingsPages/SshProfileSettings.xaml
@@ -114,12 +114,11 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <TextBlock
-                x:Uid="SshProfiles"
                 Margin="0,10,0,0"
                 VerticalAlignment="Center"
                 FontSize="28"
                 Style="{StaticResource TitleTextBlockStyle}"
-                Text="SSH Profiles" />
+                Text="{x:Bind Converter={StaticResource I18NConverter},ConverterParameter=Setting_SShProfiles.Content}" />
             <CommandBar
                 Grid.Column="1"
                 HorizontalAlignment="Right"
@@ -293,11 +292,10 @@
                                         Text=":" />
 
                                     <TextBox
-                                        x:Uid="SshPort"
                                         Grid.Column="4"
                                         Margin="0,0,4,0"
                                         HorizontalAlignment="Stretch"
-                                        Header="SSH Port"
+                                        Header="{x:Bind Converter={StaticResource I18NConverter},ConverterParameter=PortTextBox.PlaceholderText}"
                                         IsEnabled="{x:Bind InEditMode, Mode=OneWay}"
                                         IsSpellCheckEnabled="False"
                                         Text="{x:Bind SshPort, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
@@ -305,9 +303,8 @@
 
                                 <StackPanel Margin="{StaticResource ItemMargin}" Orientation="Horizontal">
                                     <TextBox
-                                        x:Uid="IdentityLocation"
                                         Width="300"
-                                        Header="Identity file location"
+                                        Header="{x:Bind Converter={StaticResource I18NConverter}, ConverterParameter=IdentityFileTextBox.PlaceholderText}"
                                         IsSpellCheckEnabled="False"
                                         Text="{x:Bind IdentityFile, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                     <Button
@@ -320,7 +317,7 @@
 
                                 <ToggleSwitch
                                     Margin="{StaticResource ItemMargin}"
-                                    Header="Use Mosh"
+                                    Header="{x:Bind Converter={StaticResource I18NConverter}, ConverterParameter=UseMoshCheckBox.Content}"
                                     IsEnabled="{x:Bind InEditMode, Mode=OneWay}"
                                     IsOn="{x:Bind UseMosh, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
@@ -375,7 +372,7 @@
 
                                 <ToggleSwitch
                                     Margin="{StaticResource ItemMargin}"
-                                    Header="Use ConPty"
+                                    Header="{x:Bind Converter={StaticResource I18NConverter}, ConverterParameter=UseConPty}"
                                     IsEnabled="{x:Bind InEditMode, Mode=OneWay}"
                                     IsOn="{x:Bind UseConPty, Mode=TwoWay}" />
 
@@ -409,7 +406,7 @@
                                     Margin="{StaticResource ItemMargin}"
                                     Style="{StaticResource SubtitleTextBlockStyle}"
                                     Text="{x:Bind Name, Mode=OneWay}" />
-                                <TextBlock Margin="0,30,0,0" Text="Connection Info" />
+                                <TextBlock Margin="0,30,0,0" Text="{x:Bind Converter={StaticResource I18NConverter},ConverterParameter=SshInfoDialog.Title}" />
                                 <StackPanel Margin="0,-20,0,0" Orientation="Horizontal">
                                     <TextBlock
                                         Margin="{StaticResource ItemMargin}"
@@ -445,10 +442,9 @@
                                         Text="{x:Bind SshPort, Mode=OneWay}" />
                                 </StackPanel>
                                 <controls:HeaderedContentControl
-                                    x:Uid="IdentityLocation"
                                     Margin="{StaticResource ItemMargin}"
                                     HorizontalContentAlignment="Stretch"
-                                    Header="Identity file location">
+                                    Header="{x:Bind Converter={StaticResource I18NConverter}, ConverterParameter=IdentityFileTextBox.PlaceholderText}">
                                     <ContentControl
                                         Content="{x:Bind IdentityFile, Mode=OneWay}"
                                         ContentTemplateSelector="{StaticResource NoValueTemplateSelector}"
@@ -459,7 +455,7 @@
                                 <controls:HeaderedContentControl
                                     Margin="{StaticResource ItemMargin}"
                                     HorizontalContentAlignment="Stretch"
-                                    Header="Use Mosh">
+                                    Header="{x:Bind Converter={StaticResource I18NConverter}, ConverterParameter=UseMoshCheckBox.Content}">
                                     <ContentControl
                                         Margin="0,6,0,0"
                                         Content="{x:Bind UseMosh, Mode=OneWay}"
@@ -469,6 +465,7 @@
                                 </controls:HeaderedContentControl>
 
                                 <TextBlock
+                                    x:Uid="MoshPortRange"
                                     Margin="0,30,0,0"
                                     Text="Mosh Port Range"
                                     Visibility="{x:Bind UseMosh, Converter={StaticResource TrueToVisibleConverter}, Mode=OneWay}" />
@@ -525,7 +522,7 @@
                                 <controls:HeaderedContentControl
                                     Margin="{StaticResource ItemMargin}"
                                     HorizontalContentAlignment="Stretch"
-                                    Header="Use ConPty">
+                                    Header="{x:Bind Converter={StaticResource I18NConverter}, ConverterParameter=UseConPty}">
                                     <ContentControl
                                         Margin="0,6,0,0"
                                         Content="{x:Bind UseConPty, Mode=OneWay}"
diff --git a/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml b/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml
index 07d24911..dc01d2c9 100644
--- a/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml
+++ b/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml
@@ -28,7 +28,10 @@
             Grid.RowSpan="3"
             Grid.Column="0"
             Background="{ThemeResource SystemControlAcrylicWindowBrush}" />
-        <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="{StaticResource HeaderMargin}">
+        <Grid
+            Grid.Row="1"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
@@ -38,8 +41,7 @@
                 VerticalAlignment="Center"
                 FontSize="28"
                 Style="{StaticResource TitleTextBlockStyle}"
-                x:Uid="Theme"
-                Text="Themes" />
+                Text="{x:Bind Converter={StaticResource I18NConverter}, ConverterParameter=Setting_Themes.Content}" />
             <CommandBar
                 Grid.Column="1"
                 HorizontalAlignment="Right"
@@ -49,15 +51,15 @@
                 Visibility="{x:Bind ViewModel.SelectedTheme.InEditMode, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}">
                 <AppBarButton
                     Name="SetActiveButton"
+                    x:Uid="SetActiveAppBarButton"
                     Command="{x:Bind ViewModel.SelectedTheme.SetActiveCommand, Mode=OneWay}"
                     Icon="Accept"
                     IsEnabled="{Binding ViewModel.SelectedTheme.IsActive, Mode=OneWay, Converter={StaticResource NegateConverter}}"
-                    x:Uid="SetActiveAppBarButton"
                     Label="Set Active" />
                 <AppBarButton
                     Name="ExportButton"
-                    Command="{x:Bind ViewModel.SelectedTheme.ExportCommand, Mode=OneWay}"
                     x:Uid="ExportAppBarButton"
+                    Command="{x:Bind ViewModel.SelectedTheme.ExportCommand, Mode=OneWay}"
                     Label="Export">
                     <AppBarButton.Icon>
                         <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xEE71;" />
@@ -65,22 +67,22 @@
                 </AppBarButton>
                 <AppBarButton
                     Name="CloneButton"
+                    x:Uid="CloneAppBarButton"
                     Command="{x:Bind ViewModel.CloneCommand, Mode=OneWay}"
                     CommandParameter="{x:Bind ViewModel.SelectedTheme, Mode=OneWay}"
                     Icon="Copy"
-                    x:Uid="CloneAppBarButton"
                     Label="Clone" />
                 <AppBarButton
                     Name="EditButton"
+                    x:Uid="EditAppBarButton"
                     Command="{x:Bind ViewModel.SelectedTheme.EditCommand, Mode=OneWay}"
                     Icon="Edit"
-                    x:Uid="EditAppBarButton"
                     Label="Edit" />
                 <AppBarButton
                     Name="DeleteButton"
+                    x:Uid="DeleteAppBarButton"
                     Command="{x:Bind ViewModel.SelectedTheme.DeleteCommand, Mode=OneWay}"
                     Icon="Delete"
-                    x:Uid="DeleteAppBarButton"
                     Label="Delete" />
             </CommandBar>
             <CommandBar
@@ -92,15 +94,15 @@
                 Visibility="{x:Bind ViewModel.SelectedTheme.InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
                 <AppBarButton
                     Name="SaveButton"
+                    x:Uid="SaveAppBarButton"
                     Command="{x:Bind ViewModel.SelectedTheme.SaveChangesCommand, Mode=OneWay}"
                     Icon="Save"
-                    x:Uid="SaveAppBarButton"
                     Label="Save" />
                 <AppBarButton
                     Name="CancelButton"
+                    x:Uid="CancelAppBarButton"
                     Command="{x:Bind ViewModel.SelectedTheme.CancelEditCommand, Mode=OneWay}"
                     Icon="Cancel"
-                    x:Uid="CancelAppBarButton"
                     Label="Cancel" />
             </CommandBar>
         </Grid>
@@ -150,7 +152,10 @@
                                 Margin="0,0,6,0">
                                 <SymbolIcon Symbol="Add" />
                             </Viewbox>
-                            <TextBlock Style="{StaticResource CaptionTextBlockStyle}" x:Uid="NewTheme" Text="Create new" />
+                            <TextBlock
+                                x:Uid="NewTheme"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="Create new" />
                         </StackPanel>
                     </Button.Content>
                 </Button>
@@ -170,7 +175,10 @@
                                 Margin="0,0,6,0">
                                 <SymbolIcon Symbol="OpenFile" />
                             </Viewbox>
-                            <TextBlock Style="{StaticResource CaptionTextBlockStyle}" x:Uid="ImportTheme" Text="Import" />
+                            <TextBlock
+                                x:Uid="ImportTheme"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="Import" />
                         </StackPanel>
                     </Button.Content>
                 </Button>
@@ -211,19 +219,19 @@
 
                             <!--  EDIT THEME  -->
                             <TextBox
+                                x:Uid="ThemeName"
                                 Width="200"
                                 Margin="{StaticResource ItemMargin}"
                                 HorizontalAlignment="Left"
-                                x:Uid="ThemeName"
                                 Header="Name"
                                 Text="{x:Bind Name, Mode=TwoWay}"
                                 Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
 
                             <TextBox
+                                x:Uid="ThemeAuthor"
                                 Width="200"
                                 Margin="{StaticResource ItemMargin}"
                                 HorizontalAlignment="Left"
-                                x:Uid="ThemeAuthor"
                                 Header="Author"
                                 Text="{x:Bind Author, Mode=TwoWay}"
                                 Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
@@ -243,14 +251,17 @@
                                         <Setter Property="Height" Value="24" />
                                     </Style>
                                 </Grid.Resources>
-                                <TextBlock Grid.Row="0" x:Uid="ColorPalette" Text="Color palette" />
                                 <TextBlock
+                                    x:Uid="ColorPalette"
+                                    Grid.Row="0"
+                                    Text="Color palette" />
+                                <TextBlock
+                                    x:Uid="ClickColorEdit"
                                     Grid.Row="1"
                                     Margin="0,0,0,8"
                                     FontSize="14"
                                     FontStyle="Italic"
                                     Foreground="LightGray"
-                                    x:Uid="ClickColorEdit"
                                     Text="Click on a color to edit"
                                     Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
                                 <StackPanel Grid.Row="2" Orientation="Horizontal">