From 7aa342cf9c069fc1905e7a12b31d31a439408f24 Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Mon, 4 Dec 2017 12:20:05 +0100
Subject: [PATCH] French translation added

---
 .../Controls/CompositeKeyUserControl.xaml.cs  |   4 +-
 ModernKeePass/Interfaces/IPwEntity.cs         |   1 +
 ModernKeePass/ModernKeePassApp.csproj         |   2 +
 ModernKeePass/Pages/EntryDetailPage.xaml      |  12 +-
 ModernKeePass/Pages/EntryDetailPage.xaml.cs   |  20 +-
 ModernKeePass/Pages/GroupDetailPage.xaml      |  74 +---
 ModernKeePass/Pages/GroupDetailPage.xaml.cs   |  30 +-
 .../MainPageFrames/OpenDatabasePage.xaml      |   2 +-
 .../MainPageFrames/RecentDatabasesPage.xaml   |   2 +-
 ModernKeePass/Strings/en-US/CodeBehind.resw   |  48 +++
 ModernKeePass/Strings/en-US/Resources.resw    |  24 ++
 ModernKeePass/Strings/fr-FR/CodeBehind.resw   | 232 ++++++++++++
 ModernKeePass/Strings/fr-FR/Resources.resw    | 336 ++++++++++++++++++
 ModernKeePass/ViewModels/EntryVm.cs           |   2 +
 ModernKeePass/ViewModels/GroupVm.cs           |   2 +
 .../en-us/baselisting/description.txt         |   6 +-
 .../en-us/baselisting/releaseNotes.txt        |  12 +-
 .../Mock/RecentServiceMock.cs                 |   5 +
 18 files changed, 710 insertions(+), 104 deletions(-)
 create mode 100644 ModernKeePass/Strings/fr-FR/CodeBehind.resw
 create mode 100644 ModernKeePass/Strings/fr-FR/Resources.resw

diff --git a/ModernKeePass/Controls/CompositeKeyUserControl.xaml.cs b/ModernKeePass/Controls/CompositeKeyUserControl.xaml.cs
index 2f45177..18dc949 100644
--- a/ModernKeePass/Controls/CompositeKeyUserControl.xaml.cs
+++ b/ModernKeePass/Controls/CompositeKeyUserControl.xaml.cs
@@ -8,6 +8,7 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Input;
 using ModernKeePass.Events;
 using ModernKeePass.Extensions;
+using ModernKeePass.Services;
 using ModernKeePass.ViewModels;
 
 // Pour en savoir plus sur le modèle d'élément Contrôle utilisateur, consultez la page http://go.microsoft.com/fwlink/?LinkId=234236
@@ -78,8 +79,9 @@ namespace ModernKeePass.Controls
             }
             else
             {
+                var resource = new ResourcesService();
                 var oldLabel = ButtonLabel;
-                ButtonLabel = "Opening...";
+                ButtonLabel = resource.GetResourceValue("CompositeKeyOpening");
                 if (await Dispatcher.RunTaskAsync(async () => await Model.OpenDatabase(CreateNew)))
                 {
                     ValidationChecked?.Invoke(this, new PasswordEventArgs(Model.RootGroup));
diff --git a/ModernKeePass/Interfaces/IPwEntity.cs b/ModernKeePass/Interfaces/IPwEntity.cs
index ff8d634..cdd7c09 100644
--- a/ModernKeePass/Interfaces/IPwEntity.cs
+++ b/ModernKeePass/Interfaces/IPwEntity.cs
@@ -12,6 +12,7 @@ namespace ModernKeePass.Interfaces
         string Name { get; set; }
         string Path { get; }
         bool IsEditMode { get; }
+        bool IsRecycleOnDelete { get; }
 
         /// <summary>
         /// Move a entity to the destination group
diff --git a/ModernKeePass/ModernKeePassApp.csproj b/ModernKeePass/ModernKeePassApp.csproj
index 24be51e..1347c09 100644
--- a/ModernKeePass/ModernKeePassApp.csproj
+++ b/ModernKeePass/ModernKeePassApp.csproj
@@ -224,6 +224,8 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
+    <PRIResource Include="Strings\fr-FR\Resources.resw" />
+    <PRIResource Include="Strings\fr-FR\CodeBehind.resw" />
     <PRIResource Include="Strings\en-US\CodeBehind.resw" />
     <PRIResource Include="Strings\en-US\Resources.resw" />
   </ItemGroup>
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml b/ModernKeePass/Pages/EntryDetailPage.xaml
index dbd76a3..631e3e1 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml
@@ -377,14 +377,14 @@
     <Page.BottomAppBar>
         <CommandBar x:Name="CommandBar" VerticalAlignment="Center">
             <CommandBar.SecondaryCommands>
-                <AppBarButton Icon="Home" Label="Home">
+                <AppBarButton Icon="Home" x:Uid="AppBarHome">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
                             <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.MainPage" />
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </AppBarButton>
-                <AppBarButton Icon="Save" Label="Save">
+                <AppBarButton Icon="Save" x:Uid="AppBarSave">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
                             <core:CallMethodAction TargetObject="{Binding}" MethodName="Save"/>
@@ -392,7 +392,7 @@
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </AppBarButton>
-                <AppBarButton Icon="Setting" Label="Settings">
+                <AppBarButton Icon="Setting" x:Uid="AppBarSettings">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
                             <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.SettingsPage" />
@@ -400,21 +400,21 @@
                     </interactivity:Interaction.Behaviors>
                 </AppBarButton>
             </CommandBar.SecondaryCommands>
-            <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}">
+            <AppBarToggleButton Icon="Edit" x:Uid="AppBarEdit" IsChecked="{Binding IsEditMode, Mode=TwoWay}">
                 <interactivity:Interaction.Behaviors>
                     <core:EventTriggerBehavior EventName="Click">
                         <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
             </AppBarToggleButton>
-            <AppBarButton Icon="Undo" Label="Restore" Visibility="{Binding ParentGroup.IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" IsEnabled="{Binding PreviousGroup, Converter={StaticResource NullToBooleanConverter}}" Click="RestoreButton_Click">
+            <AppBarButton Icon="Undo" x:Uid="AppBarRestore" Visibility="{Binding ParentGroup.IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" IsEnabled="{Binding PreviousGroup, Converter={StaticResource NullToBooleanConverter}}" Click="RestoreButton_Click">
                 <interactivity:Interaction.Behaviors>
                     <core:EventTriggerBehavior EventName="Click">
                         <core:CallMethodAction MethodName="UndoDelete" TargetObject="{Binding}" />
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
             </AppBarButton>
-            <AppBarButton Icon="Delete" Label="Delete" Click="DeleteButton_Click" />
+            <AppBarButton Icon="Delete" x:Uid="AppBarDelete" Click="DeleteButton_Click" />
         </CommandBar>
     </Page.BottomAppBar>
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml.cs b/ModernKeePass/Pages/EntryDetailPage.xaml.cs
index 747ef7a..b033074 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml.cs
@@ -1,5 +1,4 @@
 using System;
-using Windows.ApplicationModel.DataTransfer;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
@@ -72,14 +71,16 @@ namespace ModernKeePass.Pages
         
         private void DeleteButton_Click(object sender, RoutedEventArgs e)
         {
-            var isRecycleBinEnabled = ((App)Application.Current).Database.RecycleBinEnabled && !Model.ParentGroup.IsSelected;
-            var message = isRecycleBinEnabled
-                ? "Are you sure you want to send this entry to the recycle bin?"
-                : "Are you sure you want to delete this entry?";
-            var text = isRecycleBinEnabled ? "Item moved to the Recycle bin" : "Item permanently removed";
-            MessageDialogHelper.ShowActionDialog("Warning", message, "Delete", "Cancel", a =>
+            var resource = new ResourcesService();
+            var message = Model.IsRecycleOnDelete
+                ? resource.GetResourceValue("EntryRecyclingConfirmation")
+                : resource.GetResourceValue("EntryDeletingConfirmation");
+            var text = Model.IsRecycleOnDelete ? resource.GetResourceValue("EntryRecycled") : resource.GetResourceValue("EntryDeleted");
+            MessageDialogHelper.ShowActionDialog(resource.GetResourceValue("EntityDeleteTitle"), message,
+                resource.GetResourceValue("EntityDeleteActionButton"),
+                resource.GetResourceValue("EntityDeleteCancelButton"), a =>
             {
-                ToastNotificationHelper.ShowMovedToast(Model, "Deleting", text);
+                ToastNotificationHelper.ShowMovedToast(Model, resource.GetResourceValue("EntityDeleting"), text);
                 Model.MarkForDelete();
                 if (Frame.CanGoBack) Frame.GoBack();
             });
@@ -87,7 +88,8 @@ namespace ModernKeePass.Pages
 
         private void RestoreButton_Click(object sender, RoutedEventArgs e)
         {
-            ToastNotificationHelper.ShowMovedToast(Model, "Restored", "Item returned to its original group");
+            var resource = new ResourcesService();
+            ToastNotificationHelper.ShowMovedToast(Model, resource.GetResourceValue("EntityRestoredTitle"), resource.GetResourceValue("EntryRestored"));
             if (Frame.CanGoBack) Frame.GoBack();
         }
 
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml b/ModernKeePass/Pages/GroupDetailPage.xaml
index 7bc5ebe..73b74a3 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml
@@ -8,13 +8,10 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     xmlns:actions="using:ModernKeePass.Actions" 
-    xmlns:templateSelectors="using:ModernKeePass.TemplateSelectors"
     x:Name="PageRoot"
     x:Class="ModernKeePass.Pages.GroupDetailPage"
     mc:Ignorable="d" >
     <Page.Resources>
-        <SolidColorBrush x:Key="Transparent" Color="Transparent"/>
-        <SolidColorBrush x:Key="SystemColor" Color="{StaticResource SystemColorButtonFaceColor}" />
         <converters:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
         <converters:BooleanToFontStyleConverter x:Key="BooleanToFontStyleConverter"/>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
@@ -27,14 +24,14 @@
     <Page.BottomAppBar>
         <CommandBar x:Name="CommandBar" VerticalAlignment="Center">
             <CommandBar.SecondaryCommands>
-                <AppBarButton Icon="Home" Label="Home">
+                <AppBarButton Icon="Home" x:Uid="AppBarHome">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
                             <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.MainPage" />
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </AppBarButton>
-                <AppBarButton Icon="Save" Label="Save">
+                <AppBarButton Icon="Save" x:Uid="AppBarSave">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
                             <core:CallMethodAction TargetObject="{Binding}" MethodName="Save"/>
@@ -42,7 +39,7 @@
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </AppBarButton>
-                <AppBarButton Icon="Setting" Label="Settings">
+                <AppBarButton Icon="Setting" x:Uid="AppBarSettings">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
                             <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.SettingsPage" />
@@ -50,7 +47,7 @@
                     </interactivity:Interaction.Behaviors>
                 </AppBarButton>
             </CommandBar.SecondaryCommands>
-            <AppBarButton Icon="Sort" Label="Sort" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <AppBarButton Icon="Sort" x:Uid="AppBarSort" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}">
                 <Button.Flyout>
                     <MenuFlyout>
                         <MenuFlyoutItem x:Uid="AppBarSortEntries">
@@ -70,21 +67,21 @@
                     </MenuFlyout>
                 </Button.Flyout>
             </AppBarButton>
-            <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}">
+            <AppBarToggleButton Icon="Edit" x:Uid="AppBarEdit" IsChecked="{Binding IsEditMode, Mode=TwoWay}">
                 <interactivity:Interaction.Behaviors>
                     <core:EventTriggerBehavior EventName="Click">
                         <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
             </AppBarToggleButton>
-            <AppBarButton Icon="Undo" Label="Restore" Visibility="{Binding ShowRestore, Converter={StaticResource BooleanToVisibilityConverter}}" IsEnabled="{Binding PreviousGroup, Converter={StaticResource NullToBooleanConverter}}" Click="RestoreButton_Click">
+            <AppBarButton Icon="Undo" x:Uid="AppBarRestore" Visibility="{Binding ShowRestore, Converter={StaticResource BooleanToVisibilityConverter}}" IsEnabled="{Binding PreviousGroup, Converter={StaticResource NullToBooleanConverter}}" Click="RestoreButton_Click">
                 <interactivity:Interaction.Behaviors>
                     <core:EventTriggerBehavior EventName="Click">
                         <core:CallMethodAction MethodName="UndoDelete" TargetObject="{Binding}" />
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
             </AppBarButton>
-            <AppBarButton Icon="Delete" Label="Delete" IsEnabled="{Binding IsNotRoot}" Click="DeleteButton_Click" />
+            <AppBarButton Icon="Delete" x:Uid="AppBarDelete" IsEnabled="{Binding IsNotRoot}" Click="DeleteButton_Click" />
         </CommandBar>
     </Page.BottomAppBar>
     <Grid>
@@ -148,7 +145,6 @@
                 <ListView.ItemContainerStyle>
                     <Style TargetType="ListViewItem">
                         <Setter Property="VerticalContentAlignment" Value="Stretch" />
-                        <!--<Setter Property="HorizontalContentAlignment" Value="Center" />-->
                         <Setter Property="Padding" Value="0"/>
                         <Setter Property="Margin" Value="0"/>
                         <Setter Property="AllowDrop" Value="True"/>
@@ -219,67 +215,13 @@
                                 </Grid>
                             </DataTemplate>
                         </GridView.ItemTemplate>
-                        <!--<GridView.Resources>
-                            <DataTemplate x:Name="GroupFirstItem">
-                                <Border 
-                                    BorderThickness="2" 
-                                    BorderBrush="{StaticResource SystemColor}" 
-                                    Background="{StaticResource HubSectionHeaderPressedForegroundThemeBrush}">
-                                    <Grid Height="110" Width="480">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="*"/>
-                                        </Grid.ColumnDefinitions>
-                                        <SymbolIcon Grid.Column="0" Symbol="{Binding IconSymbol}" Width="100" Height="100" RenderTransformOrigin="0.5,0.5" Foreground="{ThemeResource TextBoxBackgroundThemeBrush}" >
-                                            <SymbolIcon.RenderTransform>
-                                                <CompositeTransform ScaleX="2" TranslateX="0" TranslateY="0" ScaleY="2"/>
-                                            </SymbolIcon.RenderTransform>
-                                        </SymbolIcon>
-                                        <TextBlock Grid.Column="1" Text="{Binding Name}" FontWeight="Bold" Style="{ThemeResource TitleTextBlockStyle}" Foreground="{ThemeResource TextBoxBackgroundThemeBrush}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="13,0,0,5"/>
-                                    </Grid>
-                                </Border>
-                            </DataTemplate>
-                            <DataTemplate x:Name="GroupOtherItem">
-                                <Grid Height="110" Width="480" x:Name="EntryGrid" >
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <Border 
-                                        Grid.Column="0" 
-                                        BorderThickness="2" 
-                                        BorderBrush="{StaticResource SystemColor}"
-                                        Background="{Binding BackgroundColor, ConverterParameter={StaticResource Transparent}, Converter={StaticResource ColorToBrushConverter}}">
-                                        <SymbolIcon Symbol="{Binding IconSymbol}" Width="100" Height="100" RenderTransformOrigin="0.5,0.5" >
-                                            <SymbolIcon.RenderTransform>
-                                                <CompositeTransform ScaleX="2" TranslateX="0" TranslateY="0" ScaleY="2"/>
-                                            </SymbolIcon.RenderTransform>
-                                        </SymbolIcon>
-                                    </Border>
-                                    <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,10,0,0" >
-                                        <TextBlock x:Name="NameTextBlock" Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" Foreground="{Binding ForegroundColor, ConverterParameter={StaticResource TextBoxForegroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}"/>
-                                        <TextBlock Style="{StaticResource CaptionTextBlockStyle}" TextWrapping="NoWrap"/>
-                                        <TextBlock Text="{Binding UserName}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
-                                        <TextBlock Text="{Binding Url}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
-                                    </StackPanel>
-                                </Grid>
-                            </DataTemplate>
-                        </GridView.Resources>-->
                         <GridView.ItemsSource>
                             <Binding Source="{StaticResource EntriesViewSource}"/>
                         </GridView.ItemsSource>
                         <GridView.DataContext>
                             <viewModels:EntryVm/>
                         </GridView.DataContext>
-                        <!--<GridView.ItemTemplateSelector>
-                            <templateSelectors:FirstItemDataTemplateSelector 
-                                FirstItem="{StaticResource GroupFirstItem}" 
-                                OtherItem="{StaticResource GroupOtherItem}" />
-                        </GridView.ItemTemplateSelector>-->
                         <GridView.ItemContainerStyle>
-                            <!--<Style TargetType="FrameworkElement">
-                                <Setter Property="Margin" Value="52,0,0,2"/>
-                            </Style>-->
                             <Style TargetType = "GridViewItem" >
                                 <Setter Property = "Template" >
                                     <Setter.Value>
@@ -314,7 +256,6 @@
 
                 <SemanticZoom.ZoomedOutView>
                     <ListView
-                        x:Name="SemanticListView"
                         ItemsSource="{Binding Source={StaticResource EntriesZoomedOutViewSource}}"
                         IsSwipeEnabled="false" 
                         SelectionChanged="groups_SelectionChanged"
@@ -354,7 +295,6 @@
                 <ColumnDefinition Width="400"/>
             </Grid.ColumnDefinitions>
             <Button Grid.Column="0" 
-                    x:Name="BackButton"
                     Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
                     Height="50"
                     Width="50"
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml.cs b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
index 1308503..71006f3 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
@@ -110,22 +110,26 @@ namespace ModernKeePass.Pages
 
         private void DeleteButton_Click(object sender, RoutedEventArgs e)
         {
-            var isRecycleBinEnabled = ((App)Application.Current).Database.RecycleBinEnabled && !Model.IsSelected && !Model.ParentGroup.IsSelected;
-            var message = isRecycleBinEnabled
-                ? "Are you sure you want to send the whole group and all its entries to the recycle bin?"
-                : "Are you sure you want to delete the whole group and all its entries?";
-            var text = isRecycleBinEnabled ? "Item moved to the Recycle bin" : "Item permanently removed";
-            MessageDialogHelper.ShowActionDialog("Warning", message, "Delete", "Cancel", a =>
-            {
-                ToastNotificationHelper.ShowMovedToast(Model, "Deleting", text);
-                Model.MarkForDelete();
-                if (Frame.CanGoBack) Frame.GoBack();
-            });
+            var resource = new ResourcesService();
+            var message = Model.IsRecycleOnDelete
+                ? resource.GetResourceValue("GroupRecyclingConfirmation")
+                : resource.GetResourceValue("GroupDeletingConfirmation");
+            var text = Model.IsRecycleOnDelete ? resource.GetResourceValue("GroupRecycled") : resource.GetResourceValue("GroupDeleted");
+            MessageDialogHelper.ShowActionDialog(resource.GetResourceValue("EntityDeleteTitle"), message,
+                resource.GetResourceValue("EntityDeleteActionButton"),
+                resource.GetResourceValue("EntityDeleteCancelButton"), a =>
+                {
+                    ToastNotificationHelper.ShowMovedToast(Model, resource.GetResourceValue("EntityDeleting"), text);
+                    Model.MarkForDelete();
+                    if (Frame.CanGoBack) Frame.GoBack();
+                });
         }
 
         private void RestoreButton_Click(object sender, RoutedEventArgs e)
         {
-            ToastNotificationHelper.ShowMovedToast(Model, "Restored", "Item returned to its original group");
+            var resource = new ResourcesService();
+            ToastNotificationHelper.ShowMovedToast(Model, resource.GetResourceValue("EntityRestoredTitle"),
+                resource.GetResourceValue("GroupRestored"));
             if (Frame.CanGoBack) Frame.GoBack();
         }
 
@@ -140,7 +144,7 @@ namespace ModernKeePass.Pages
 
         private void SearchBox_OnSuggestionsRequested(SearchBox sender, SearchBoxSuggestionsRequestedEventArgs args)
         {
-            var imageUri = RandomAccessStreamReference.CreateFromUri(new Uri("ms-appx://Assets/Logo.scale-80.png"));
+            var imageUri = RandomAccessStreamReference.CreateFromUri(new Uri("ms-appx://Assets/ModernKeePass-SmallLogo.scale-80.png"));
             var results = Model.Entries.Skip(1).Where(e => e.Name.IndexOf(args.QueryText, StringComparison.OrdinalIgnoreCase) >= 0).Take(5);
             foreach (var result in results)
             {
diff --git a/ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml b/ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml
index c1265bd..37ab9f6 100644
--- a/ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml
+++ b/ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml
@@ -24,7 +24,7 @@
         <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
             <StackPanel Margin="25,0,25,0">
                 <TextBlock Text="{Binding Name}" />
-                <local:CompositeKeyUserControl ButtonLabel="Open">
+                <local:CompositeKeyUserControl x:Uid="CompositeKeyOpenButton">
                     <interactivity:Interaction.Behaviors>
                         <Core:EventTriggerBehavior EventName="ValidationChecked">
                             <Core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
diff --git a/ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml b/ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml
index d4d0192..e380a57 100644
--- a/ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml
+++ b/ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml
@@ -50,7 +50,7 @@
                         </Grid.ColumnDefinitions>
                         <TextBlock Grid.Row="0" Text="{Binding Name}" Padding="5,0,0,0" />
                         <TextBlock Grid.Row="1" Text="{Binding Path}" Padding="5,0,0,0" FontSize="10" />
-                        <local:CompositeKeyUserControl Grid.Row="2" x:Name="DatabaseUserControl" HorizontalAlignment="Stretch" MinWidth="400" Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" ButtonLabel="Open">
+                        <local:CompositeKeyUserControl Grid.Row="2" x:Name="DatabaseUserControl" x:Uid="CompositeKeyOpenButton" HorizontalAlignment="Stretch" MinWidth="400" Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}">
                             <interactivity:Interaction.Behaviors>
                                 <core:EventTriggerBehavior EventName="ValidationChecking">
                                     <core:CallMethodAction TargetObject="{Binding}" MethodName="OpenDatabaseFile" />
diff --git a/ModernKeePass/Strings/en-US/CodeBehind.resw b/ModernKeePass/Strings/en-US/CodeBehind.resw
index afe912a..0fe0600 100644
--- a/ModernKeePass/Strings/en-US/CodeBehind.resw
+++ b/ModernKeePass/Strings/en-US/CodeBehind.resw
@@ -135,15 +135,63 @@
   <data name="CompositeKeyErrorUserStart" xml:space="preserve">
     <value>Error: wrong </value>
   </data>
+  <data name="CompositeKeyOpening" xml:space="preserve">
+    <value>Opening...</value>
+  </data>
   <data name="CompositeKeyUpdated" xml:space="preserve">
     <value>Database composite key updated.</value>
   </data>
+  <data name="EntityDeleteActionButton" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="EntityDeleteCancelButton" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="EntityDeleteTitle" xml:space="preserve">
+    <value>Warning</value>
+  </data>
+  <data name="EntityDeleting" xml:space="preserve">
+    <value>Deleting</value>
+  </data>
+  <data name="EntityRestoredTitle" xml:space="preserve">
+    <value>Restored</value>
+  </data>
+  <data name="EntryDeleted" xml:space="preserve">
+    <value>Entry permanently removed</value>
+  </data>
+  <data name="EntryDeletingConfirmation" xml:space="preserve">
+    <value>Are you sure you want to delete this entry?</value>
+  </data>
   <data name="EntryNew" xml:space="preserve">
     <value>&lt; New entry &gt;</value>
   </data>
+  <data name="EntryRecycled" xml:space="preserve">
+    <value>Entry moved to the Recycle bin</value>
+  </data>
+  <data name="EntryRecyclingConfirmation" xml:space="preserve">
+    <value>Are you sure you want to send this entry to the recycle bin?</value>
+  </data>
+  <data name="EntryRestored" xml:space="preserve">
+    <value>Entry returned to its original group</value>
+  </data>
+  <data name="GroupDeleted" xml:space="preserve">
+    <value>Group permanently removed</value>
+  </data>
+  <data name="GroupDeletingConfirmation" xml:space="preserve">
+    <value>Are you sure you want to delete the whole group and all its entries?</value>
+  </data>
   <data name="GroupNew" xml:space="preserve">
     <value>&lt; New group &gt;</value>
   </data>
+  <data name="GroupRecycled" xml:space="preserve">
+    <value>Group moved to the Recycle bin</value>
+  </data>
+  <data name="GroupRecyclingConfirmation" xml:space="preserve">
+    <value>Are you sure you want to send the whole group and all its entries to the recycle bin?</value>
+  </data>
+  <data name="GroupRestored" xml:space="preserve">
+    <value>Group returned to its original group</value>
+  </data>
   <data name="MainMenuItemAbout" xml:space="preserve">
     <value>About</value>
   </data>
diff --git a/ModernKeePass/Strings/en-US/Resources.resw b/ModernKeePass/Strings/en-US/Resources.resw
index 114fb48..f56d913 100644
--- a/ModernKeePass/Strings/en-US/Resources.resw
+++ b/ModernKeePass/Strings/en-US/Resources.resw
@@ -132,6 +132,27 @@
   <data name="AboutHomepage.Text" xml:space="preserve">
     <value>Homepage:</value>
   </data>
+  <data name="AppBarDelete.Label" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="AppBarEdit.Label" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="AppBarHome.Label" xml:space="preserve">
+    <value>Home</value>
+  </data>
+  <data name="AppBarRestore.Label" xml:space="preserve">
+    <value>Restore</value>
+  </data>
+  <data name="AppBarSave.Label" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="AppBarSettings.Label" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="AppBarSort.Label" xml:space="preserve">
+    <value>Sort</value>
+  </data>
   <data name="AppBarSortEntries.Text" xml:space="preserve">
     <value>Entries</value>
   </data>
@@ -141,6 +162,9 @@
   <data name="CompositeKeyNewKeyFileTooltip.Content" xml:space="preserve">
     <value>Create new key file</value>
   </data>
+  <data name="CompositeKeyOpenButton.ButtonLabel" xml:space="preserve">
+    <value>Open</value>
+  </data>
   <data name="CompositeKeyPassword.PlaceholderText" xml:space="preserve">
     <value>Password</value>
   </data>
diff --git a/ModernKeePass/Strings/fr-FR/CodeBehind.resw b/ModernKeePass/Strings/fr-FR/CodeBehind.resw
new file mode 100644
index 0000000..8363d82
--- /dev/null
+++ b/ModernKeePass/Strings/fr-FR/CodeBehind.resw
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CompositeKeyDefaultKeyFile" xml:space="preserve">
+    <value>Choisissez un fichier...</value>
+  </data>
+  <data name="CompositeKeyErrorOpen" xml:space="preserve">
+    <value>Erreur</value>
+  </data>
+  <data name="CompositeKeyErrorUserKeyFile" xml:space="preserve">
+    <value>fichier de clé</value>
+  </data>
+  <data name="CompositeKeyErrorUserOr" xml:space="preserve">
+    <value> ou </value>
+  </data>
+  <data name="CompositeKeyErrorUserPassword" xml:space="preserve">
+    <value>mot de passe</value>
+  </data>
+  <data name="CompositeKeyErrorUserStart" xml:space="preserve">
+    <value>Erreur: mauvais </value>
+  </data>
+  <data name="CompositeKeyOpening" xml:space="preserve">
+    <value>Ouverture...</value>
+  </data>
+  <data name="CompositeKeyUpdated" xml:space="preserve">
+    <value>Clé composite de la base de données mise à jour.</value>
+  </data>
+  <data name="EntityDeleteActionButton" xml:space="preserve">
+    <value>Supprimer</value>
+  </data>
+  <data name="EntityDeleteCancelButton" xml:space="preserve">
+    <value>Annuler</value>
+  </data>
+  <data name="EntityDeleteTitle" xml:space="preserve">
+    <value>Attention</value>
+  </data>
+  <data name="EntityDeleting" xml:space="preserve">
+    <value>Suprression</value>
+  </data>
+  <data name="EntityRestoredTitle" xml:space="preserve">
+    <value>Restauré</value>
+  </data>
+  <data name="EntryDeleted" xml:space="preserve">
+    <value>Entrée supprimée définitivement</value>
+  </data>
+  <data name="EntryDeletingConfirmation" xml:space="preserve">
+    <value>Êtes-vous sûr de vouloir supprimer cette entrée ?</value>
+  </data>
+  <data name="EntryNew" xml:space="preserve">
+    <value>&lt; Nouvelle entrée &gt;</value>
+    <comment>Unused</comment>
+  </data>
+  <data name="EntryRecycled" xml:space="preserve">
+    <value>Entrée placée dans la Corbeille</value>
+  </data>
+  <data name="EntryRecyclingConfirmation" xml:space="preserve">
+    <value>Êtes-vous sûr de vouloir placer cette entrée dans la Corbeille ?</value>
+  </data>
+  <data name="EntryRestored" xml:space="preserve">
+    <value>Entrée replacée dans son groupe d'origine</value>
+  </data>
+  <data name="GroupDeleted" xml:space="preserve">
+    <value>Groupe supprimé défnitivement</value>
+  </data>
+  <data name="GroupDeletingConfirmation" xml:space="preserve">
+    <value>Êtes-vous sûr de vouloir supprimer ce group et toutes ses entrées ?</value>
+  </data>
+  <data name="GroupNew" xml:space="preserve">
+    <value>&lt; Nouveau groupe &gt;</value>
+  </data>
+  <data name="GroupRecycled" xml:space="preserve">
+    <value>Groupe placé dans la Corbeille</value>
+  </data>
+  <data name="GroupRecyclingConfirmation" xml:space="preserve">
+    <value>Êtes-vous sûr de vouloir envoyer ce groupe et toutes ses entrées vers la Corbeille ?</value>
+  </data>
+  <data name="GroupRestored" xml:space="preserve">
+    <value>Groupe replacé à sa place originelle</value>
+  </data>
+  <data name="MainMenuItemAbout" xml:space="preserve">
+    <value>A propos</value>
+  </data>
+  <data name="MainMenuItemDonate" xml:space="preserve">
+    <value>Donation</value>
+  </data>
+  <data name="MainMenuItemNew" xml:space="preserve">
+    <value>Nouveau</value>
+  </data>
+  <data name="MainMenuItemOpen" xml:space="preserve">
+    <value>Ouvrir</value>
+  </data>
+  <data name="MainMenuItemRecent" xml:space="preserve">
+    <value>Récents</value>
+  </data>
+  <data name="MainMenuItemSave" xml:space="preserve">
+    <value>Sauvegarder</value>
+  </data>
+  <data name="MainMenuItemSettings" xml:space="preserve">
+    <value>Paramètres</value>
+  </data>
+  <data name="SettingsMenuGroupApplication" xml:space="preserve">
+    <value>Application</value>
+  </data>
+  <data name="SettingsMenuGroupDatabase" xml:space="preserve">
+    <value>Base de données</value>
+  </data>
+  <data name="SettingsMenuItemGeneral" xml:space="preserve">
+    <value>Général</value>
+  </data>
+  <data name="SettingsMenuItemNew" xml:space="preserve">
+    <value>Nouveau</value>
+  </data>
+  <data name="SettingsMenuItemSecurity" xml:space="preserve">
+    <value>Securité</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ModernKeePass/Strings/fr-FR/Resources.resw b/ModernKeePass/Strings/fr-FR/Resources.resw
new file mode 100644
index 0000000..d5b7a67
--- /dev/null
+++ b/ModernKeePass/Strings/fr-FR/Resources.resw
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AboutCredits1.Text" xml:space="preserve">
+    <value>Dominik Reichl pour l'application KeePass et le format de fichier</value>
+  </data>
+  <data name="AboutCredits2.Text" xml:space="preserve">
+    <value>David Lechner pour son adaptation PCL de la blibliothèque KeePass et ses tests associés</value>
+  </data>
+  <data name="AboutCreditsLabel.Text" xml:space="preserve">
+    <value>Crédits</value>
+  </data>
+  <data name="AboutDesc.Text" xml:space="preserve">
+    <value>Un gestionnaire de mot de passes moderne pour le Windows Store</value>
+  </data>
+  <data name="AboutHomepage.Text" xml:space="preserve">
+    <value>Page d'accueil :</value>
+  </data>
+  <data name="AppBarDelete.Label" xml:space="preserve">
+    <value>Supprimer</value>
+  </data>
+  <data name="AppBarEdit.Label" xml:space="preserve">
+    <value>Editer</value>
+  </data>
+  <data name="AppBarHome.Label" xml:space="preserve">
+    <value>Accueil</value>
+  </data>
+  <data name="AppBarRestore.Label" xml:space="preserve">
+    <value>Restorer</value>
+  </data>
+  <data name="AppBarSave.Label" xml:space="preserve">
+    <value>Sauvegarder</value>
+  </data>
+  <data name="AppBarSettings.Label" xml:space="preserve">
+    <value>Paramètres</value>
+  </data>
+  <data name="AppBarSort.Label" xml:space="preserve">
+    <value>Trier</value>
+  </data>
+  <data name="AppBarSortEntries.Text" xml:space="preserve">
+    <value>Entrées</value>
+  </data>
+  <data name="AppBarSortGroups.Text" xml:space="preserve">
+    <value>Groupes</value>
+  </data>
+  <data name="CompositeKeyNewKeyFileTooltip.Content" xml:space="preserve">
+    <value>Créer un nouveau fichier de clé</value>
+  </data>
+  <data name="CompositeKeyOpenButton.ButtonLabel" xml:space="preserve">
+    <value>Ouvrir</value>
+  </data>
+  <data name="CompositeKeyPassword.PlaceholderText" xml:space="preserve">
+    <value>Mot de passe</value>
+  </data>
+  <data name="DonateDesc.Text" xml:space="preserve">
+    <value>Vous aimez cette app? Pourquoi ne pas faire un petit don afin de m'encourager et d'éviter le recours aux publicités :) ?</value>
+  </data>
+  <data name="EntryExpirationDate.Content" xml:space="preserve">
+    <value>Date d'expiration</value>
+  </data>
+  <data name="EntryExpirationTooltip.Content" xml:space="preserve">
+    <value>Le mot de passe a expiré</value>
+  </data>
+  <data name="EntryLogin.Text" xml:space="preserve">
+    <value>Nom d'utilisateur ou login</value>
+  </data>
+  <data name="EntryNotes.Text" xml:space="preserve">
+    <value>Notes</value>
+  </data>
+  <data name="EntryPassword.Text" xml:space="preserve">
+    <value>Mot de passe</value>
+  </data>
+  <data name="EntryShowPassword.Content" xml:space="preserve">
+    <value>Afficher le mot de passe</value>
+  </data>
+  <data name="GroupCreateEntry.Text" xml:space="preserve">
+    <value>Créer une nouvelle entrée</value>
+  </data>
+  <data name="GroupSearch.PlaceholderText" xml:space="preserve">
+    <value>Rechercher...</value>
+  </data>
+  <data name="GroupTitle.PlaceholderText" xml:space="preserve">
+    <value>Nom du nouveau groupe...</value>
+  </data>
+  <data name="NewCreateButton.Content" xml:space="preserve">
+    <value>Créer une nouvelle...</value>
+  </data>
+  <data name="NewCreateDesc.Text" xml:space="preserve">
+    <value>Créer une nouvelle base de données de mots de passe à l'endroit de votre choix.</value>
+  </data>
+  <data name="OpenBrowseButton.Content" xml:space="preserve">
+    <value>Parcourir les fichiers...</value>
+  </data>
+  <data name="OpenBrowseDesc.Text" xml:space="preserve">
+    <value>Ouvrir une base de données de mots de passe existante sur votre PC.</value>
+  </data>
+  <data name="OpenUrlButton.Content" xml:space="preserve">
+    <value>Depuis une URL...</value>
+  </data>
+  <data name="OpenUrlDesc.Text" xml:space="preserve">
+    <value>Ouvrir une base de données de mots de passe depuis Internet (pas encore implementé).</value>
+  </data>
+  <data name="PasswordGeneratorAlso.Text" xml:space="preserve">
+    <value>Ajouter aussi ces caractères :</value>
+  </data>
+  <data name="PasswordGeneratorBrackets.Content" xml:space="preserve">
+    <value>Parenthèses ([], {}, (), ...)</value>
+  </data>
+  <data name="PasswordGeneratorButton.Content" xml:space="preserve">
+    <value>Générer</value>
+  </data>
+  <data name="PasswordGeneratorDigits.Content" xml:space="preserve">
+    <value>Chiffres (0, 1, 2, ...)</value>
+  </data>
+  <data name="PasswordGeneratorLength.Text" xml:space="preserve">
+    <value>Longueur de mot de passe :</value>
+  </data>
+  <data name="PasswordGeneratorLower.Content" xml:space="preserve">
+    <value>Minuscules (a, b, c, ...)</value>
+  </data>
+  <data name="PasswordGeneratorMinus.Content" xml:space="preserve">
+    <value>Moins (-)</value>
+  </data>
+  <data name="PasswordGeneratorSpace.Content" xml:space="preserve">
+    <value>Espace ( )</value>
+  </data>
+  <data name="PasswordGeneratorSpecial.Content" xml:space="preserve">
+    <value>Spéciaux (!, $, %, ...)</value>
+  </data>
+  <data name="PasswordGeneratorTooltip.Content" xml:space="preserve">
+    <value>Générer le mot de passe</value>
+  </data>
+  <data name="PasswordGeneratorUnderscore.Content" xml:space="preserve">
+    <value>Underscore (_)</value>
+  </data>
+  <data name="PasswordGeneratorUpper.Content" xml:space="preserve">
+    <value>Majuscules (A, B, C, ...)</value>
+  </data>
+  <data name="RecentClear.Text" xml:space="preserve">
+    <value>Supprimer tout</value>
+  </data>
+  <data name="SaveAsButton.Content" xml:space="preserve">
+    <value>Sauvegarder sous...</value>
+  </data>
+  <data name="SaveAsDesc.Text" xml:space="preserve">
+    <value>Cela va sauvegarder la base de données dans un nouveau fichier et l'ouvrir.</value>
+  </data>
+  <data name="SaveButton.Content" xml:space="preserve">
+    <value>Sauvegarder et fermer</value>
+  </data>
+  <data name="SaveDesc.Text" xml:space="preserve">
+    <value>Cela va sauvegarder et fermer la base de données.</value>
+  </data>
+  <data name="SettingsDatabaseCompression.Text" xml:space="preserve">
+    <value>Algorithme de compression</value>
+  </data>
+  <data name="SettingsDatabaseEncryption.Text" xml:space="preserve">
+    <value>Algorithme de chiffrement</value>
+  </data>
+  <data name="SettingsDatabaseKdf.Text" xml:space="preserve">
+    <value>Algorithme de dérivation de clé</value>
+  </data>
+  <data name="SettingsDatabaseRecycleBin.Header" xml:space="preserve">
+    <value>Corbeille</value>
+  </data>
+  <data name="SettingsDatabaseRecycleBin.OffContent" xml:space="preserve">
+    <value>Désactivé</value>
+  </data>
+  <data name="SettingsDatabaseRecycleBin.OnContent" xml:space="preserve">
+    <value>Activé</value>
+  </data>
+  <data name="SettingsNewDatabaseDesc.Text" xml:space="preserve">
+    <value>Ici, vous pouvez changer certains options lors de la création d'une nouvelle base de données</value>
+  </data>
+  <data name="SettingsNewDatabaseKdf.Text" xml:space="preserve">
+    <value>Version de fichier KDBX</value>
+  </data>
+  <data name="SettingsNewDatabaseKdfMoreInfo.Text" xml:space="preserve">
+    <value>Le plus élévé est le mieux, mais vous pourriez rencontrer des problèmes de compatibilité avec des application plus anciennes</value>
+  </data>
+  <data name="SettingsNewDatabaseSample.Header" xml:space="preserve">
+    <value>Créer des données d'exemple</value>
+  </data>
+  <data name="SettingsNewDatabaseSample.OffContent" xml:space="preserve">
+    <value>Non</value>
+  </data>
+  <data name="SettingsNewDatabaseSample.OnContent" xml:space="preserve">
+    <value>Oui</value>
+  </data>
+  <data name="SettingsSecurityDesc1.Text" xml:space="preserve">
+    <value>Ici, vous pouvez changer le mot de passe maître, le fichier de clé, ou les deux. Cliquez simplement sur</value>
+  </data>
+  <data name="SettingsSecurityDesc2.Text" xml:space="preserve">
+    <value>Mettre à jour la clé maître</value>
+  </data>
+  <data name="SettingsSecurityDesc3.Text" xml:space="preserve">
+    <value>quand vous avez fini. Retenez bien le mot de passe que vous utilisez !</value>
+  </data>
+  <data name="SettingsSecurityTitle.Text" xml:space="preserve">
+    <value>Changer les options de sécurité de la base de données</value>
+  </data>
+  <data name="SettingsSecurityUpdateButton.ButtonLabel" xml:space="preserve">
+    <value>Mettre à jour la clé maître</value>
+  </data>
+  <data name="SettingsWelcomeDesc.Text" xml:space="preserve">
+    <value>Ici, vous pouvez changer les options de l'application ou de la base de données.</value>
+  </data>
+  <data name="SettingsWelcomeHowto.Text" xml:space="preserve">
+    <value>Choisissez un élément dans le menu de gauche.</value>
+  </data>
+  <data name="SettingsWelcomeTitle.Text" xml:space="preserve">
+    <value>Paramètres</value>
+  </data>
+  <data name="WelcomeNew.Text" xml:space="preserve">
+    <value>Pour créer une nouvelle base de données de mots de passe, c'est ici.</value>
+  </data>
+  <data name="WelcomeOpen.Text" xml:space="preserve">
+    <value>Pour ouvrir une base de données existante, c'est ici.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ModernKeePass/ViewModels/EntryVm.cs b/ModernKeePass/ViewModels/EntryVm.cs
index c6a7f7f..8f056db 100644
--- a/ModernKeePass/ViewModels/EntryVm.cs
+++ b/ModernKeePass/ViewModels/EntryVm.cs
@@ -117,6 +117,8 @@ namespace ModernKeePass.ViewModels
             }
         }
 
+        public bool IsRecycleOnDelete => _database.RecycleBinEnabled && !ParentGroup.IsSelected;
+
         public bool IsRevealPassword
         {
             get { return _isRevealPassword; }
diff --git a/ModernKeePass/ViewModels/GroupVm.cs b/ModernKeePass/ViewModels/GroupVm.cs
index 04ad7cd..d88876c 100644
--- a/ModernKeePass/ViewModels/GroupVm.cs
+++ b/ModernKeePass/ViewModels/GroupVm.cs
@@ -30,6 +30,8 @@ namespace ModernKeePass.ViewModels
         public bool IsNotRoot => ParentGroup != null;
 
         public bool ShowRestore => IsNotRoot && ParentGroup.IsSelected;
+
+        public bool IsRecycleOnDelete => _database.RecycleBinEnabled && !IsSelected && !ParentGroup.IsSelected;
         /// <summary>
         /// Is the Group the database Recycle Bin?
         /// </summary>
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/description.txt b/ModernKeePass/appMetadata/en-us/baselisting/description.txt
index e88bb75..f296fb2 100644
--- a/ModernKeePass/appMetadata/en-us/baselisting/description.txt
+++ b/ModernKeePass/appMetadata/en-us/baselisting/description.txt
@@ -1,5 +1,5 @@
-ModernKeePass is free, open-source and user friendly yet secure password manager, based on proven and certified technology from KeePass 2.x.
-You can create, open and edit Keepass 2.x password databases.
+ModernKeePass is free, open-source and user friendly yet secure password manager, based on proven and certified technology from KeePass 2.x and fully compatible with it.
+You can safely store all your passwords in an encrypted, secure database that you can store anywhere (local, cloud, USB key...)
 
-It is not intended to replicate all features of the original application, but aims at being simple to use. Suggestions welcome!
+Even though security is an important matter, this app aims at being simple to use. Suggestions welcome!
 Works in Windows 10, 8.1 and RT.
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
index 4e7edaa..b1e3e84 100644
--- a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
+++ b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
@@ -1,3 +1,9 @@
-Improve assets (IMO)
-Adds the ability to create key files
-Hopefully correct a bug while opening databases with key files
\ No newline at end of file
+You can now reorder entries
+Entries and groups are sortable
+New Home button that allows returning to the main menu from anywhere
+Change default database creation settings
+Settings is accessible from main menu
+Clear Recent databases
+New French translation
+Design and usability improvements
+Bugs correction
\ No newline at end of file
diff --git a/ModernKeePassApp.Test/Mock/RecentServiceMock.cs b/ModernKeePassApp.Test/Mock/RecentServiceMock.cs
index ace365a..b3aea54 100644
--- a/ModernKeePassApp.Test/Mock/RecentServiceMock.cs
+++ b/ModernKeePassApp.Test/Mock/RecentServiceMock.cs
@@ -15,6 +15,11 @@ namespace ModernKeePassApp.Test.Mock
             throw new NotImplementedException();
         }
 
+        public void ClearAll()
+        {
+            throw new NotImplementedException();
+        }
+
         public ObservableCollection<IRecentItem> GetAllFiles(bool removeIfNonExistant = true)
         {
             throw new NotImplementedException();