Merge branch 'master' into f_vault4

Author: d2dyno1

README.md

@@ -50,7 +50,7 @@ This ensures that your data will always remain secure.
 
 > [!TIP]
 > The purpose of SecureFolderFS is to provide a professional, usable 'safe folder' experience that supports all major platforms with a consistent feature set.
-> SecureFolderFS can run on a huge range of devices (as supported by Uno Platform, MAUI and the .NET Runtime).
+> SecureFolderFS can run on a huge range of devices (as supported by Uno Platform, .NET MAUI, and the .NET Runtime).
 
 ### How to use SecureFolderFS
 
@@ -69,8 +69,8 @@ From the app's UI, you can create new vaults to store items securely.
 </p>
 
 > *Upon entering the correct password, the vault will then open.*
-> *You can press 'View vault' to open the vault's mounted file-system in your file manager of choice.*
-> *When you're done accessing your files, you can press the 'Lock vault' button and the vault file-system will close.*
+> *You can press 'View vault' to open the vault's mounted file system in your file manager of choice.*
+> *When you're done accessing your files, you can press the 'Lock vault' button, and the vault file system will close.*
 > *The vault remains on your disk and your data is encrypted in a way that cannot be accessed by any program, past, present or future.*
 
 ## Contributing
@@ -83,15 +83,17 @@ Take a look at our *[contributing guidelines](CONTRIBUTING.md)* to learn about b
 
 You can update existing localization strings by heading to our *[Crowdin project page](https://crowdin.com/project/securefolderfs)*.
 To add a new language to the list, please request it to be added *[here](https://github.com/securefolderfs-community/SecureFolderFS/issues/50)*.
-New translations will be synchronized periodically to the source code, and new releases will always contain the latest translations.
+New translations will be synchronized periodically with the source code, and new releases will always contain the latest translations.
+
+For help with translating custom-format strings with pluralization support, refer to the [Localization Playground](https://github.com/securefolderfs-community/LocalizationPlayground) repository. 
 
 ---
 
 ## Building from source
 
 > [!NOTE]
 > Below are the instructions for building SecureFolderFS for a cross-platform target.
-> For other projects, such as the SDK, libraries and CLI program, you can build as normal with the latest .NET SDK, without the prerequisites listed below.
+> For other projects, such as the SDK, libraries, and CLI program, you can build as normal with the latest .NET SDK, without the prerequisites listed below.
 
 ### 1. Prerequisites
 
@@ -104,7 +106,7 @@ New translations will be synchronized periodically to the source code, and new r
 - For iOS builds:
   - Xcode 26.2 (on macOS)
 
-### 2. Set up IDE
+### 2. Set up the IDE
 
 > [!TIP]
 > *Using Visual Studio 2026 is recommended for SecureFolderFS development.*
@@ -130,7 +132,7 @@ New translations will be synchronized periodically to the source code, and new r
 ### 3. Run `Uno.Check`
 
 > [!TIP]
-> *This step is optional, but is good practice to check you installed all the necessary dependencies to build SecureFolderFS on your computer.*
+> *This step is optional, but it is good practice to check that you installed all the necessary dependencies to build SecureFolderFS on your computer.*
 
 Run the following command and follow all of its instructions (you need to have `Uno.Check` installed!)
 
@@ -154,13 +156,13 @@ cd SecureFolderFS
 ### 5. Build the project
 
 - Open the solution `SecureFolderFS.Public.slnx`
-- Set `SecureFolderFS.Uno` as the startup project if you are building for desktop targets (i.e. macOS, Linux or Windows)
-- Set `SecureFolderFS.Maui` as the startup project if you are building for mobile targets (i.e. Android, iOS or iPadOS)
-- Select the appropriate target device / platform
+- Set `SecureFolderFS.Uno` as the startup project if you are building for desktop targets (i.e., macOS, Linux, or Windows)
+- Set `SecureFolderFS.Maui` as the startup project if you are building for mobile targets (i.e., Android, iOS, or iPadOS)
+- Select the appropriate target device/platform
 - Run with debugger
 
 ---
 
 <p align="center">
   <img src=".github/assets/SecureFolderFS_Hero.png" />
-</p>
+</p>

src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/VaultForegroundService.cs

@@ -103,8 +103,7 @@ private void UpdateNotification()
             var title = count switch
             {
                 0 => "VaultUnlocked".ToLocalized(),
-                1 => "OneVaultIsUnlocked".ToLocalized(),
-                _ => "MultipleVaultsAreUnlocked".ToLocalized(count)
+                _ => "VaultsUnlockedPlural".ToLocalized(count)
             };
 
             // Tapping the notification brings the app back to foreground

src/Platforms/SecureFolderFS.Maui/UserControls/Browser/BrowserControl.DragDrop.xaml.cs

@@ -461,7 +461,7 @@ await transferViewModel.TransferAsync(itemsToProcess, async (item, reporter, tok
                                 new FileViewModel(createdFile, browserViewModel, destinationViewModel),
                                 browserViewModel.Layouts.GetSorter());
                         }
-                    }, cts.Token);
+                    }, x => x.Name, cts.Token);
                 }
                 catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException)
                 {

src/Platforms/SecureFolderFS.Maui/UserControls/Browser/TransferControl.xaml

@@ -56,6 +56,7 @@
                     <uc:AnimatedRevealLayout.MainContent>
                         <Label
                             FontSize="16"
+                            LineBreakMode="TailTruncation"
                             Text="{Binding Title, Mode=OneWay}"
                             VerticalOptions="Center" />
                     </uc:AnimatedRevealLayout.MainContent>

src/Platforms/SecureFolderFS.Maui/Views/Vault/BrowserPage.xaml

@@ -50,7 +50,7 @@
                 FontSize="18"
                 HorizontalOptions="Center"
                 IsVisible="{Binding ViewModel.IsSelecting, Mode=OneWay}"
-                Text="{Binding ViewModel.CurrentFolder.SelectedItems.Count, Mode=OneWay, Converter={StaticResource CountToStringConverter}, ConverterParameter='(0:LOCALIZE|SelectItems)|(>0:LOCALIZE|ItemsSelected)'}"
+                Text="{Binding ViewModel.CurrentFolder.SelectedItems.Count, Mode=OneWay, Converter={StaticResource CountToStringConverter}, ConverterParameter='(0:LOCALIZE|SelectItems)|(>0:LOCALIZE|ItemsSelectedPlural)'}"
                 TextColor="#FFFFFF"
                 VerticalOptions="Center" />
             <VerticalStackLayout IsVisible="{Binding ViewModel.IsSelecting, Mode=OneWay, Converter={StaticResource BoolInvertConverter}}" VerticalOptions="Center">
@@ -62,7 +62,7 @@
                 <Label
                     FontSize="12"
                     Opacity="0.6"
-                    Text="{Binding ViewModel.CurrentFolder.Items.Count, Mode=OneWay, Converter={StaticResource CountToStringConverter}, ConverterParameter='(>=0:LOCALIZE|ElementsCount)'}"
+                    Text="{Binding ViewModel.CurrentFolder.Items.Count, Mode=OneWay, Converter={StaticResource CountToStringConverter}, ConverterParameter='(>=0:LOCALIZE|ElementsCountPlural)'}"
                     TextColor="#FFFFFF" />
             </VerticalStackLayout>
         </Grid>

src/Platforms/SecureFolderFS.UI/Assets/Licenses/SmartFormat LICENSE

@@ -0,0 +1,43 @@
+SmartFormat
+https://github.com/axuno/SmartFormat/blob/main/LICENSE.md
+MIT
+https://github.com/axuno/SmartFormat
+
+The MIT License (MIT)
+=====================
+
+Copyright © 2011-2022 SmartFormat Project maintainers and contributors.
+
+All rights reserved.
+
+* Project founder: Scott Rippey
+* Project owner: axuno gGmbH
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ìAS “IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+The bundled project *SmartFormat.ZString* is Copyright © Cysharp, Inc. [Their software](https://github.com/Cysharp/ZString)
+is licensed under [The MIT License (MIT)](src/SmartFormat.ZString/repo/LICENSE).
+Their conversion methods under the `ZString/Number` directory
+is Copyright © .NET Foundation and Contributors und is licensed
+under [The MIT License (MIT)](https://github.com/dotnet/runtime/blob/master/LICENSE.TXT).

src/Platforms/SecureFolderFS.UI/Strings/cs-CZ/Resources.resx

@@ -620,9 +620,6 @@
   <data name="DateToday" xml:space="preserve">
     <value>Today, {0}</value>
   </data>
-  <data name="DateAgo" xml:space="preserve">
-    <value>{0} ago</value>
-  </data>
   <data name="ErrorOccurred" xml:space="preserve">
     <value>An error occurred</value>
   </data>
@@ -1043,11 +1040,11 @@
   <data name="DateYesterday" xml:space="preserve">
     <value>Yesterday, {0}</value>
   </data>
-  <data name="DateWeekAgo" xml:space="preserve">
-    <value>Last week</value>
+  <data name="DateWeekAgoPlural" xml:space="preserve">
+      <value>{0:plural:Last week|{} weeks ago|{} weeks ago}</value>
   </data>
-  <data name="DateDaysAgo" xml:space="preserve">
-    <value>{0} days ago</value>
+  <data name="DateDaysAgoPlural" xml:space="preserve">
+      <value>{0:plural:{} day ago|{} days ago|{} days ago}</value>
   </data>
   <data name="VaultUnlocked" xml:space="preserve">
     <value>Vault is unlocked</value>
@@ -1085,8 +1082,8 @@
   <data name="FileHasCorruptedChunks" xml:space="preserve">
       <value>Parts of the file are corrupted and will be reset</value>
   </data>
-  <data name="CorruptedChunks" xml:space="preserve">
-      <value>{0} corrupted region(s)</value>
+  <data name="CorruptedChunksPlural" xml:space="preserve">
+      <value>{0:plural:{} corrupted region|{} corrupted regions|{} corrupted regions}</value>
   </data>
   <data name="DataLossImminent" xml:space="preserve">
       <value>Data loss unpreventable</value>
@@ -1178,26 +1175,26 @@
   <data name="ClearSelection" xml:space="preserve">
       <value>Clear selection</value>
   </data>
-  <data name="CopyingItems" xml:space="preserve">
-      <value>Copying {0} item(s)</value>
+  <data name="CopyingItemsPlural" xml:space="preserve">
+      <value>Copying {Total:choose(0):{Achieved} {Achieved:plural:item|items|items}|{Total:choose(1):{State}|{Achieved}/{Total} {Total:plural:item|items|items}}}</value>
   </data>
-  <data name="MovingItems" xml:space="preserve">
-      <value>Moving {0} item(s)</value>
+  <data name="MovingItemsPlural" xml:space="preserve">
+      <value>Moving {Total:choose(0):{Achieved} {Achieved:plural:item|items|items}|{Total:choose(1):{State}|{Achieved}/{Total} {Total:plural:item|items|items}}}</value>
   </data>
-  <data name="DeletingItems" xml:space="preserve">
-      <value>Deleting {0} item(s)</value>
+  <data name="DeletingItemsPlural" xml:space="preserve">
+      <value>Deleting {Total:choose(0):{Achieved} {Achieved:plural:item|items|items}|{Total:choose(1):{State}|{Achieved}/{Total} {Total:plural:item|items|items}}}</value>
   </data>
   <data name="NotEnoughSpace" xml:space="preserve">
       <value>Not enough space</value>
   </data>
   <data name="ItemDeletionTitle" xml:space="preserve">
       <value>Deleting item(s)</value>
   </data>
-  <data name="ItemDeletionDescription" xml:space="preserve">
-      <value>Are you sure you want to permanently delete {0} item(s)?</value>
+  <data name="ItemDeletionDescriptionPlural" xml:space="preserve">
+      <value>Are you sure you want to permanently delete {0:plural:one item|{} items|{} items}?</value>
   </data>
-  <data name="ItemsExceedRecycleBinSize" xml:space="preserve">
-      <value>The deleted items exceed the available space in the recycle bin. Do you want to permanently delete {0} item(s) instead?</value>
+  <data name="ItemsExceedRecycleBinSizePlural" xml:space="preserve">
+      <value>The deleted {0:plural:item exceeds|{} items exceed|{} items exceed} the available space in the recycle bin. Do you want to permanently delete {0:plural:this item|{} items|{} items} instead?</value>
   </data>
   <data name="IntroPrefix" xml:space="preserve">
       <value>By continuing, you agree to our </value>
@@ -1229,14 +1226,14 @@
   <data name="EnableDeviceLink" xml:space="preserve">
       <value>Enable Device Link</value>
   </data>
-  <data name="ItemsSelected" xml:space="preserve">
-      <value>{0} item(s) selected</value>
+  <data name="ItemsSelectedPlural" xml:space="preserve">
+      <value>{0:plural:One item|{} items|{} items} selected</value>
   </data>
-  <data name="ElementsCount" xml:space="preserve">
-      <value>{0} element(s)</value>
+  <data name="ElementsCountPlural" xml:space="preserve">
+      <value>{0:plural:{} element|{} elements|{} elements}</value>
   </data>
-  <data name="FoundIssuesCount" xml:space="preserve">
-      <value>Found {0} issue(s)</value>
+  <data name="FoundIssuesCountPlural" xml:space="preserve">
+      <value>Found {0:plural:one issue|{} issues|{} issues}</value>
   </data>
   <data name="AvailableWidgets" xml:space="preserve">
       <value>Available widgets</value>
@@ -1256,8 +1253,8 @@
   <data name="ArchiveFormatNotSupported" xml:space="preserve">
       <value>This archive format is not supported for extraction</value>
   </data>
-  <data name="ExtractingItems" xml:space="preserve">
-      <value>Extracting {0} items</value>
+  <data name="ExtractingItemsPlural" xml:space="preserve">
+      <value>Extracting {Total:choose(0):{Achieved} {Achieved:plural:item|items|items}|{Total:choose(1):{State}|{Achieved}/{Total} {Total:plural:item|items|items}}}</value>
   </data>
   <data name="Extracting" xml:space="preserve">
       <value>Extracting...</value>
@@ -1332,7 +1329,7 @@
       <value>Manual certificate fingerprint (SHA-256)</value>
   </data>
   <data name="SearchIn" xml:space="preserve">
-      <value>Search in: {0}</value>
+      <value>Search in: '{0}'</value>
   </data>
   <data name="RootFolder" xml:space="preserve">
       <value>Root folder</value>
@@ -1346,8 +1343,8 @@
   <data name="CollectingItemsCount" xml:space="preserve">
       <value>Collecting items ({0})</value>
   </data>
-  <data name="CollectedCountItems" xml:space="preserve">
-      <value>Collected {0} items</value>
+  <data name="CollectedItemsPlural" xml:space="preserve">
+      <value>Collected {0:plural:{} item|{} items|{} items}</value>
   </data>
   <data name="ScanCompleted" xml:space="preserve">
       <value>Scan completed</value>
@@ -1421,16 +1418,37 @@
   <data name="TapToLockAll" xml:space="preserve">
       <value>Tap to lock all vaults</value>
   </data>
-  <data name="OneVaultIsUnlocked" xml:space="preserve">
-      <value>One vault is unlocked</value>
-  </data>
-  <data name="MultipleVaultsAreUnlocked" xml:space="preserve">
-      <value>{0} vaults are unlocked</value>
+  <data name="VaultsUnlockedPlural" xml:space="preserve">
+      <value>{0:plural:One vault is|{} vaults are|{} vaults are} unlocked</value>
   </data>
   <data name="ViewInApp" xml:space="preserve">
       <value>View in app</value>
   </data>
   <data name="ExitApp" xml:space="preserve">
       <value>Exit</value>
   </data>
+  <data name="Vault" xml:space="preserve">
+      <value>Vault</value>
+  </data>
+  <data name="SaveCredentials" xml:space="preserve">
+      <value>Save credentials</value>
+  </data>
+  <data name="CharacterCount" xml:space="preserve">
+      <value>Characters: {0}</value>
+  </data>
+  <data name="CursorPosition" xml:space="preserve">
+      <value>Position: {0}</value>
+  </data>
+  <data name="FileModified" xml:space="preserve">
+      <value>Modified</value>
+  </data>
+  <data name="CredentialsHaveBeenSaved" xml:space="preserve">
+      <value>Credentials have been saved for this vault</value>
+  </data>
+  <data name="DiscardSavedCredentials" xml:space="preserve">
+      <value>Discard saved credentials</value>
+  </data>
+  <data name="OpenInExternalApp" xml:space="preserve">
+      <value>Open in external app</value>
+  </data>
 </root>