From d533b4040835cca6c2d785b507f5427f77cd1b3f Mon Sep 17 00:00:00 2001
From: Yannick Chiron <yannick.chiron@gmail.com>
Date: Fri, 19 Nov 2021 20:26:08 +0100
Subject: [PATCH] feat: reword organization to folder

---
 src/App/Pages/Vault/SharePage.xaml         | 10 +++++++---
 src/App/Resources/AppResources.Designer.cs | 10 +++++-----
 src/App/Resources/AppResources.fr.resx     | 14 +++++++-------
 src/App/Resources/AppResources.resx        | 10 +++++-----
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/App/Pages/Vault/SharePage.xaml b/src/App/Pages/Vault/SharePage.xaml
index b3c660bcd..3a1ea2e6e 100644
--- a/src/App/Pages/Vault/SharePage.xaml
+++ b/src/App/Pages/Vault/SharePage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@@ -30,14 +30,18 @@
             <StackLayout StyleClass="box"
                          IsVisible="{Binding HasOrganizations, Converter={StaticResource inverseBool}}">
                 <StackLayout StyleClass="box-row" Padding="10, 20">
-                    <Label Text="{u:I18n NoOrgsToList}" HorizontalTextAlignment="Center" />
+                    <!-- Cozy customization -->
+                    <!-- Rename Organization to Folder -->
+                    <Label Text="{u:I18n NoFoldersToList}" HorizontalTextAlignment="Center" />
                 </StackLayout>
             </StackLayout>
             <StackLayout StyleClass="box"
                          IsVisible="{Binding HasOrganizations}">
                 <StackLayout StyleClass="box-row, box-row-input, box-row-input-options-platform">
+                    <!-- Cozy customization -->
+                    <!-- Rename Organization to Folder -->
                     <Label
-                        Text="{u:I18n Organization}"
+                        Text="{u:I18n Folder}"
                         StyleClass="box-label" />
                     <Picker
                         x:Name="_organizationPicker"
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index f28227b08..3b8c9604e 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -3239,7 +3239,7 @@ public class AppResources {
         }
         
         /// <summary>
-        ///   Recherche une chaîne localisée semblable à Move to Organization.
+        ///   Recherche une chaîne localisée semblable à Move to folder.
         /// </summary>
         public static string MoveToOrganization {
             get {
@@ -3248,7 +3248,7 @@ public class AppResources {
         }
         
         /// <summary>
-        ///   Recherche une chaîne localisée semblable à Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved..
+        ///   Recherche une chaîne localisée semblable à Choose a folder that you wish to share this item with. Sharing transfers ownership of the item to the folder. You will no longer be the direct owner of this item once it has been shared..
         /// </summary>
         public static string MoveToOrgDesc {
             get {
@@ -3410,7 +3410,7 @@ public class AppResources {
         }
         
         /// <summary>
-        ///   Recherche une chaîne localisée semblable à There are no collections to list..
+        ///   Recherche une chaîne localisée semblable à There are no folder to list..
         /// </summary>
         public static string NoCollectionsToList {
             get {
@@ -3509,7 +3509,7 @@ public class AppResources {
         }
         
         /// <summary>
-        ///   Recherche une chaîne localisée semblable à No organizations to list..
+        ///   Recherche une chaîne localisée semblable à No folder to list..
         /// </summary>
         public static string NoOrgsToList {
             get {
@@ -4310,7 +4310,7 @@ public class AppResources {
         }
         
         /// <summary>
-        ///   Recherche une chaîne localisée semblable à You must select at least one collection..
+        ///   Recherche une chaîne localisée semblable à You must select at least one folder..
         /// </summary>
         public static string SelectOneCollection {
             get {
diff --git a/src/App/Resources/AppResources.fr.resx b/src/App/Resources/AppResources.fr.resx
index 0cd6cfc98..13bc8353e 100644
--- a/src/App/Resources/AppResources.fr.resx
+++ b/src/App/Resources/AppResources.fr.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -1401,17 +1401,17 @@
     <value>À qui appartient cet élément ?</value>
   </data>
   <data name="NoCollectionsToList" xml:space="preserve">
-    <value>Aucune collection à afficher.</value>
+    <value>Aucun dossier à afficher.</value>
   </data>
   <data name="MovedItemToOrg" xml:space="preserve">
-    <value>{0} moved to {1}.</value>
+    <value>{0} déplacé vers {1}.</value>
     <comment>ex: Item moved to Organization.</comment>
   </data>
   <data name="ItemShared" xml:space="preserve">
     <value>L'élément a été partagé.</value>
   </data>
   <data name="SelectOneCollection" xml:space="preserve">
-    <value>Vous devez sélectionner au moins une collection.</value>
+    <value>Vous devez sélectionner au moins un dossier.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Partager</value>
@@ -1420,13 +1420,13 @@
     <value>Partager l'élément</value>
   </data>
   <data name="MoveToOrganization" xml:space="preserve">
-    <value>Move to Organization</value>
+    <value>Déplacer dans un dossier</value>
   </data>
   <data name="NoOrgsToList" xml:space="preserve">
-    <value>Aucune organisation à afficher.</value>
+    <value>Aucun dossier à afficher.</value>
   </data>
   <data name="MoveToOrgDesc" xml:space="preserve">
-    <value>Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved.</value>
+    <value>Choisissez un dossier avec lequel vous voulez partager cet élément. Le partage transfère la propriété de l'élément au dossier. Vous ne serez plus le propriétaire direct de cet élément après le partage.</value>
   </data>
   <data name="NumberOfWords" xml:space="preserve">
     <value>Nombre de mots</value>
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 800089442..4a568a64f 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -1401,7 +1401,7 @@
     <value>Who owns this item?</value>
   </data>
   <data name="NoCollectionsToList" xml:space="preserve">
-    <value>There are no collections to list.</value>
+    <value>There are no folder to list.</value>
   </data>
   <data name="MovedItemToOrg" xml:space="preserve">
     <value>{0} moved to {1}.</value>
@@ -1411,7 +1411,7 @@
     <value>Item has been shared.</value>
   </data>
   <data name="SelectOneCollection" xml:space="preserve">
-    <value>You must select at least one collection.</value>
+    <value>You must select at least one folder.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Share</value>
@@ -1420,13 +1420,13 @@
     <value>Share Item</value>
   </data>
   <data name="MoveToOrganization" xml:space="preserve">
-    <value>Move to Organization</value>
+    <value>Move to folder</value>
   </data>
   <data name="NoOrgsToList" xml:space="preserve">
-    <value>No organizations to list.</value>
+    <value>No folder to list.</value>
   </data>
   <data name="MoveToOrgDesc" xml:space="preserve">
-    <value>Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved.</value>
+    <value>Choose a folder that you wish to share this item with. Sharing transfers ownership of the item to the folder. You will no longer be the direct owner of this item once it has been shared.</value>
   </data>
   <data name="NumberOfWords" xml:space="preserve">
     <value>Number of Words</value>