Remove each x:uid

src/Files.Uwp/Dialogs/AddItemDialog.xaml

@@ -1,23 +1,21 @@
 <ContentDialog
     x:Class="Files.Dialogs.AddItemDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Files.Dialogs"
-    xmlns:local2="using:Files.Helpers"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vc="using:Files.Uwp.ValueConverters"
     xmlns:vm="using:Files.Backend.ViewModels.Dialogs.AddItemDialog"
+    xmlns:helpers="using:Files.Helpers"
+    xmlns:vc="using:Files.Uwp.ValueConverters"
     x:Name="AddDialog"
-    x:Uid="AddDialog"
-    Title="Create a New Item"
+    Title="{helpers:ResourceString Name=AddDialog/Title}"
     Grid.RowSpan="4"
     BorderThickness="0"
     CornerRadius="{StaticResource OverlayCornerRadius}"
     Loaded="AddItemDialog_Loaded"
     PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
-    PrimaryButtonText="{local2:ResourceString Name=Cancel}"
-    RequestedTheme="{x:Bind local2:ThemeHelper.RootTheme}"
+    PrimaryButtonText="{helpers:ResourceString Name=Cancel}"
+    RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
@@ -31,10 +29,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid x:Name="SubtitleArea">
-            <TextBlock
-                x:Name="Description"
-                x:Uid="AddDialogDescription"
-                Text="Choose a type for this new item below" />
+            <TextBlock x:Name="Description" Text="{helpers:ResourceString Name=AddDialogDescription/Text}" />
         </Grid>
         <Grid
             x:Name="SelectionListContent"

src/Files.Uwp/Dialogs/CredentialDialog.xaml

@@ -1,23 +1,21 @@
 <ContentDialog
     x:Class="Files.Dialogs.CredentialDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Files.Dialogs"
-    xmlns:local2="using:Files.Helpers"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:helpers="using:Files.Helpers"
+    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
     x:Name="AskCredentialDialog"
-    x:Uid="AskCredentialDialog"
-    Title="Credential Required"
+    Title="{helpers:ResourceString Name=AskCredentialDialog/Title}"
     Grid.RowSpan="4"
     BorderThickness="0"
     CornerRadius="{StaticResource OverlayCornerRadius}"
     PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
     PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
-    PrimaryButtonText="OK"
-    RequestedTheme="{x:Bind local2:ThemeHelper.RootTheme}"
-    SecondaryButtonText="{local2:ResourceString Name=Cancel}"
+    PrimaryButtonText="{helpers:ResourceString Name=AskCredentialDialog/PrimaryButtonText}"
+    SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
+    RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
@@ -33,33 +31,27 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid x:Name="SubtitleArea">
-            <TextBlock
-                x:Name="Description"
-                x:Uid="CredentialDialogDescription"
-                Text="Provide your credential:" />
+            <TextBlock x:Name="Description" Text="{helpers:ResourceString Name=CredentialDialogDescription/Text}" />
         </Grid>
         <StackPanel
             x:Name="SelectionListContent"
             Grid.Row="1"
             HorizontalAlignment="Stretch">
             <TextBox
                 x:Name="UserName"
-                x:Uid="CredentialDialogUserName"
                 Margin="4"
                 IsEnabled="{x:Bind ViewModel.IsAnonymous, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
-                PlaceholderText="UserName"
+                PlaceholderText="{helpers:ResourceString Name=CredentialDialogUserName/PlaceholderText}"
                 Text="{x:Bind ViewModel.UserName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             <PasswordBox
                 x:Name="Password"
-                x:Uid="CredentialDialogPassword"
                 Margin="4"
                 IsEnabled="{x:Bind ViewModel.IsAnonymous, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
-                PlaceholderText="Password" />
+                PlaceholderText="{helpers:ResourceString Name=CredentialDialogPassword/PlaceholderText}" />
             <CheckBox
                 x:Name="Anonymous"
-                x:Uid="CredentialDialogAnonymous"
                 Margin="4"
-                Content="Anonymous" />
+                Content="{helpers:ResourceString Name=CredentialDialogAnonymous/Content}" />
         </StackPanel>
     </Grid>
 </ContentDialog>

src/Files.Uwp/Dialogs/DecompressArchiveDialog.xaml

@@ -1,18 +1,16 @@
 <ContentDialog
     x:Class="Files.Dialogs.DecompressArchiveDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:helpers="using:Files.Helpers"
-    xmlns:local="using:Files.Dialogs"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    x:Uid="DecompressArchiveDialog"
-    Title="Select a destination and extract files"
+    xmlns:helpers="using:Files.Helpers"
+    Title="{helpers:ResourceString Name=DecompressArchiveDialog/Title}"
     CornerRadius="{StaticResource OverlayCornerRadius}"
     DefaultButton="Primary"
     PrimaryButtonText="Extract"
+    SecondaryButtonText="{helpers:ResourceString Name=DecompressArchiveDialog/SecondaryButtonText}"
     RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
-    SecondaryButtonText="Cancel"
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
@@ -44,9 +42,8 @@
             Content="{helpers:ResourceString Name=Browse}" />
 
         <CheckBox
-            x:Uid="DecompressArchiveDialogOpenDestinationWhenComplete"
             Grid.Row="1"
-            Content="Open destination folder when complete"
+            Content="{helpers:ResourceString Name=DecompressArchiveDialogOpenDestinationWhenComplete/Content}"
             IsChecked="{x:Bind ViewModel.OpenDestinationFolderOnCompletion, Mode=TwoWay}" />
     </Grid>
 </ContentDialog>

src/Files.Uwp/Dialogs/ElevateConfirmDialog.xaml

@@ -1,19 +1,18 @@
 <ContentDialog
     x:Class="Files.Dialogs.ElevateConfirmDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local2="using:Files.Helpers"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:helpers="using:Files.Helpers"
     x:Name="ConfirmElevationDialog"
-    x:Uid="ElevateConfirmDialog"
-    Title="This action requires adminstrator rights"
-    CloseButtonText="{local2:ResourceString Name=No}"
-    Content="Would you like to continue as administrator?"
-    CornerRadius="{StaticResource OverlayCornerRadius}"
+    Title="{helpers:ResourceString Name=ElevateConfirmDialog/Title}"
+    Content="{helpers:ResourceString Name=ElevateConfirmDialog/Content}"
     DefaultButton="None"
-    PrimaryButtonText="{local2:ResourceString Name=Yes}"
-    RequestedTheme="{x:Bind local2:ThemeHelper.RootTheme}"
+    PrimaryButtonText="{helpers:ResourceString Name=Yes}"
+    CloseButtonText="{helpers:ResourceString Name=No}"
+    CornerRadius="{StaticResource OverlayCornerRadius}"
+    RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 

src/Files.Uwp/Dialogs/FilesystemOperationDialog.xaml

@@ -1,14 +1,13 @@
 <ContentDialog
     x:Class="Files.Dialogs.FilesystemOperationDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:helpers="using:Files.Helpers"
-    xmlns:i="using:Microsoft.Xaml.Interactivity"
-    xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:helpers="using:Files.Helpers"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:vc="using:Files.Converters"
+    xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:i="using:Microsoft.Xaml.Interactivity"
     Loaded="RootDialog_Loaded"
     x:Name="RootDialog"
     Title="{x:Bind ViewModel.Title, Mode=OneWay}"
@@ -36,21 +35,19 @@
                     Tag="0"
                     Text="{helpers:ResourceString Name=GenerateNewName}" />
                 <MenuFlyoutItem
-                    x:Uid="ConflictingItemsDialogOptionReplaceExisting"
                     Click="MenuFlyoutItem_Click"
                     Tag="1"
-                    Text="Replace existing" />
+                    Text="{helpers:ResourceString Name=ConflictingItemsDialogOptionReplaceExisting/Text}" />
                 <MenuFlyoutItem
                     Click="MenuFlyoutItem_Click"
                     Tag="2"
                     Text="{helpers:ResourceString Name=Skip}" />
                 <MenuFlyoutSeparator x:Name="ApplyToAllSeparator" />
                 <MenuFlyoutItem
                     x:Name="ApplyToAllOption"
-                    x:Uid="ConfictingItemsDialogOptionApplyToAll"
                     Click="MenuFlyoutItem_Click"
-                    Tag="All"
-                    Text="Apply to all" />
+                    Tag="{helpers:ResourceString Name=ConfictingItemsDialogOptionApplyToAll.Tag}"
+                    Text="{helpers:ResourceString Name=ConfictingItemsDialogOptionApplyToAll/Text}" />
             </MenuFlyout>
         </ResourceDictionary>
     </ContentDialog.Resources>
@@ -60,9 +57,8 @@
             <TextBlock Text="{x:Bind ViewModel.Subtitle, Mode=OneWay}" />
             <CheckBox
                 x:Name="chkPermanentlyDelete"
-                x:Uid="DeleteItemsDialogPermanentlyDeleteCheckBox"
                 x:Load="{x:Bind ViewModel.PermanentlyDeleteLoad, Mode=OneWay}"
-                Content="Permanently delete"
+                Content="{helpers:ResourceString Name=DeleteItemsDialogPermanentlyDeleteCheckBox/Content}"
                 IsChecked="{x:Bind ViewModel.PermanentlyDelete, Mode=TwoWay}"
                 IsEnabled="False" />
 
@@ -207,9 +203,8 @@
                                         <MenuFlyout>
                                             <MenuFlyoutItem Command="{Binding GenerateNewNameCommand}" Text="{helpers:ResourceString Name=GenerateNewName}" />
                                             <MenuFlyoutItem
-                                                x:Uid="ConflictingItemsDialogItemOptionReplaceExisting"
                                                 Command="{Binding ReplaceExistingCommand}"
-                                                Text="Replace" />
+                                                Text="{helpers:ResourceString Name=ConflictingItemsDialogItemOptionReplaceExisting/Text}" />
                                             <MenuFlyoutItem Command="{Binding SkipCommand}" Text="{helpers:ResourceString Name=Skip}" />
                                         </MenuFlyout>
                                     </muxc:SplitButton.Flyout>
@@ -228,7 +223,7 @@
                                         <HyperlinkButton.Content>
                                             <StackPanel Orientation="Horizontal" Spacing="8">
                                                 <FontIcon FontSize="12" Glyph="&#xE10E;" />
-                                                <TextBlock x:Uid="ConflictingItemsDialogUndoOption" Text="Undo" />
+                                                <TextBlock Text="{helpers:ResourceString Name=ConflictingItemsDialogUndoOption/Text}" />
                                             </StackPanel>
                                         </HyperlinkButton.Content>
                                         <i:Interaction.Behaviors>

src/Files.Uwp/Dialogs/SettingsDialog.xaml

@@ -1,10 +1,10 @@
 <ContentDialog
     x:Class="Files.Dialogs.SettingsDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:helpers="using:Files.Helpers"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:helpers="using:Files.Helpers"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     Closing="ContentDialog_Closing"
     CornerRadius="{StaticResource OverlayCornerRadius}"
@@ -51,32 +51,29 @@
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
                 <muxc:NavigationViewItem
-                    x:Uid="SettingsNavPreferences"
                     AccessKey="P"
                     AutomationProperties.AutomationId="SettingsItemPreferences"
-                    Content="Preferences"
+                    Content="{helpers:ResourceString Name=SettingsNavPreferences/Content}"
                     CornerRadius="0"
                     Tag="1">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF116;" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
                 <muxc:NavigationViewItem
-                    x:Uid="SettingsNavMultitasking"
                     AccessKey="M"
                     AutomationProperties.AutomationId="SettingsItemMultitasking"
-                    Content="Multitasking"
+                    Content="{helpers:ResourceString Name=SettingsNavMultitasking/Content}"
                     CornerRadius="0"
                     Tag="2">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon FontSize="16" Glyph="&#xEE40;" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
                 <muxc:NavigationViewItem
-                    x:Uid="SettingsNavExperimental"
                     AccessKey="E"
                     AutomationProperties.AutomationId="SettingsItemExperimental"
-                    Content="Experimental"
+                    Content="{helpers:ResourceString Name=SettingsNavExperimental/Content}"
                     CornerRadius="0"
                     Tag="3">
                     <muxc:NavigationViewItem.Icon>

src/Files.Uwp/ResourceDictionaries/TabView_vertical.xaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:helpers="using:Files.Helpers"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
 
@@ -86,9 +87,8 @@
                                                 FontSize="12"
                                                 Glyph="&#xE710;" />
                                             <TextBlock
-                                                x:Uid="TabViewVerticalNewTab"
                                                 VerticalAlignment="Center"
-                                                Text="New tab" />
+                                                Text="{helpers:ResourceString Name=TabViewVerticalNewTab/Text}" />
                                         </StackPanel>
                                     </Button.Content>
                                 </Button>

src/Files.Uwp/UserControls/FolderEmptyIndicator.xaml

@@ -1,10 +1,10 @@
 <UserControl
     x:Class="Files.UserControls.FolderEmptyIndicator"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Files.UserControls"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:helpers="using:Files.Helpers"
     xmlns:triggers="using:Microsoft.Toolkit.Uwp.UI.Triggers"
     d:DesignHeight="300"
     d:DesignWidth="400"
@@ -13,8 +13,7 @@
     <Grid>
         <TextBlock
             x:Name="EmptyText"
-            x:Uid="EmptyFolder"
-            Text="This folder is empty."
+            Text="{helpers:ResourceString Name=EmptyFolder/Text}"
             TextWrapping="Wrap"
             Visibility="Collapsed" />