From 60ccf1ec185d65479bc20af77844a4c73c9a28e0 Mon Sep 17 00:00:00 2001
From: Yair Aichenbaum <explortec@outlook.com>
Date: Tue, 14 Apr 2020 12:09:47 -0400
Subject: [PATCH 1/2] Fixed selection options in list view layout mode

---
 Files/Interacts/Interaction.cs           | 4 ++--
 Files/UserControls/StatusBarControl.xaml | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Files/Interacts/Interaction.cs b/Files/Interacts/Interaction.cs
index a0cf78345320..f3471fbf544c 100644
--- a/Files/Interacts/Interaction.cs
+++ b/Files/Interacts/Interaction.cs
@@ -1094,7 +1094,7 @@ public void SelectAllItems()
                 {
                     if (!(CurrentInstance.ContentPage as BaseLayout).SelectedItems.Contains(li))
                     {
-                        (CurrentInstance.ContentPage as BaseLayout).SelectedItems.Add(li);
+                        (CurrentInstance.ContentPage as GenericFileBrowser).AllView.SelectedItems.Add(li);
                     }
                 }
             }
@@ -1109,7 +1109,7 @@ public void ClearAllItems()
             if (App.CurrentInstance.CurrentPageType == typeof(GenericFileBrowser))
             {
                 var CurrentInstance = App.CurrentInstance;
-                (CurrentInstance.ContentPage as BaseLayout).SelectedItems.Clear();
+                (CurrentInstance.ContentPage as GenericFileBrowser).AllView.SelectedItems.Clear();
             }
             else if (App.CurrentInstance.CurrentPageType == typeof(PhotoAlbum))
             {
diff --git a/Files/UserControls/StatusBarControl.xaml b/Files/UserControls/StatusBarControl.xaml
index 17c73345b658..620dca0c49b4 100644
--- a/Files/UserControls/StatusBarControl.xaml
+++ b/Files/UserControls/StatusBarControl.xaml
@@ -14,7 +14,10 @@
         Height="40"
         HorizontalAlignment="Stretch"
         Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <TextBlock HorizontalAlignment="Left" Text="{x:Bind SelectedItemPropertiesViewModel.ItemSize, Mode=OneWay}" Padding="8"/>
+        <TextBlock
+            Padding="8"
+            HorizontalAlignment="Left"
+            Text="{x:Bind SelectedItemPropertiesViewModel.ItemSize, Mode=OneWay}" />
         <StackPanel
             Grid.Row="1"
             Padding="2"

From 4daef4363b10ab1a482c7d1c4e50f1ee7538dd9a Mon Sep 17 00:00:00 2001
From: Yair Aichenbaum <explortec@outlook.com>
Date: Tue, 14 Apr 2020 12:27:41 -0400
Subject: [PATCH 2/2] Fixed selection options in grid view layout

---
 Files/Interacts/Interaction.cs     | 4 ++--
 Files/Strings/es-ES/Resources.resw | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Files/Interacts/Interaction.cs b/Files/Interacts/Interaction.cs
index f3471fbf544c..c2331e38253b 100644
--- a/Files/Interacts/Interaction.cs
+++ b/Files/Interacts/Interaction.cs
@@ -1092,7 +1092,7 @@ public void SelectAllItems()
                 var CurrentInstance = App.CurrentInstance;
                 foreach (ListedItem li in (CurrentInstance.ContentPage as GenericFileBrowser).AllView.ItemsSource)
                 {
-                    if (!(CurrentInstance.ContentPage as BaseLayout).SelectedItems.Contains(li))
+                    if (!(CurrentInstance.ContentPage as GenericFileBrowser).SelectedItems.Contains(li))
                     {
                         (CurrentInstance.ContentPage as GenericFileBrowser).AllView.SelectedItems.Add(li);
                     }
@@ -1113,7 +1113,7 @@ public void ClearAllItems()
             }
             else if (App.CurrentInstance.CurrentPageType == typeof(PhotoAlbum))
             {
-                (CurrentInstance.ContentPage as BaseLayout).SelectedItems.Clear();
+                (CurrentInstance.ContentPage as PhotoAlbum).FileList.SelectedItems.Clear();
             }
         }
 
diff --git a/Files/Strings/es-ES/Resources.resw b/Files/Strings/es-ES/Resources.resw
index e7dea123948c..e6d2fb9faed0 100644
--- a/Files/Strings/es-ES/Resources.resw
+++ b/Files/Strings/es-ES/Resources.resw
@@ -58,7 +58,7 @@
     <value>Envíar opiniones</value>
   </data>
   <data name="SettingsAboutSubmitFeedbackDescription.Text" xml:space="preserve">
-    <value>Envía un informe de fallos a los desarrolladores</value>
+    <value>Envía un informe de fallos a los desarrolladores con más información</value>
   </data>
   <data name="SettingsAboutThirdPartyLicenses.Text" xml:space="preserve">
     <value>Licencias de terceros</value>
@@ -76,7 +76,7 @@
     <value>Formato de fecha</value>
   </data>
   <data name="SettingsAppearanceTheme.Text" xml:space="preserve">
-    <value>Tema</value>
+    <value>Tema de la Aplicación</value>
   </data>
   <data name="SettingsAppearanceTitle.Text" xml:space="preserve">
     <value>Apariencia</value>
@@ -361,7 +361,7 @@
     <value>Nueva pestaña</value>
   </data>
   <data name="SystemTheme" xml:space="preserve">
-    <value>Sistema</value>
+    <value>Predeterminado de Windows</value>
   </data>
   <data name="LightTheme" xml:space="preserve">
     <value>Claro</value>
@@ -432,4 +432,7 @@
   <data name="ErrorDialogCancel" xml:space="preserve">
     <value>Cancelar</value>
   </data>
+  <data name="SettingsPageHeader.Text" xml:space="preserve">
+    <value>Ajustes</value>
+  </data>
 </root>
\ No newline at end of file