diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 17c1934b96de7..46bef1a239d24 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,5 +1,5 @@ name: Bug Report -description: Create a bug report to help improve Files +description: Create a bug report to help improve Files. labels: [bug] body: @@ -38,7 +38,7 @@ body: id: files_version attributes: label: Files Version - description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version + description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version. placeholder: "e.g. 2.0.34.0" validations: required: true @@ -48,11 +48,21 @@ body: id: windows_version attributes: label: Windows Version - description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version + description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version. placeholder: "e.g. 10.0.22621.1848" validations: required: true + # User ID + - type: input + id: user_id + attributes: + label: User ID + description: Your User ID is a GUID that can be matched up with bug reports in Sentry. To copy your User ID, access it from Settings -> About -> Copy -> User ID. + placeholder: "74750836-5885-4eeb-964f-8177cb4babf6" + validations: + required: false + # Log File - type: textarea attributes: diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index b7a493f528aed..87f820b2c6edc 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,5 +1,5 @@ name: Feature Request -description: This project thrives from differentiation from competing apps. Suggest an idea for Files +description: This project thrives from differentiation from competing apps. Suggest an idea for Files. labels: [feature request] body: @@ -23,7 +23,7 @@ body: - type: textarea attributes: label: Requirements - description: Describe all the requirements to make your idea happen + description: Describe all the requirements to make your idea happen. value: | - This proposal will accomplish X - This proposal will accomplish Y @@ -36,7 +36,7 @@ body: id: files_version attributes: label: Files Version - description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version + description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version. placeholder: 'e.g. 2.0.36.0' validations: required: true @@ -46,7 +46,7 @@ body: id: windows_version attributes: label: Windows Version - description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version + description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version. placeholder: "e.g. 10.0.22621.1848" validations: required: true diff --git a/.github/README.md b/.github/README.md index 22eda98ccbaa3..1ec8850f41296 100644 --- a/.github/README.md +++ b/.github/README.md @@ -30,7 +30,7 @@ You can also use the preview version alongside the stable release to get early a   - + diff --git a/.github/scripts/Configure-AppxManifest.ps1 b/.github/scripts/Configure-AppxManifest.ps1 index 7f7bf132b2b17..055a3dfb0fd26 100644 --- a/.github/scripts/Configure-AppxManifest.ps1 +++ b/.github/scripts/Configure-AppxManifest.ps1 @@ -20,6 +20,7 @@ if ($Branch -eq "Preview") $xmlDoc.Package.Identity.Name="FilesPreview" $xmlDoc.Package.Properties.DisplayName="Files - Preview" $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files - Preview" + $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files - Preview" $xmlDoc.Save($PackageManifestPath) Get-ChildItem $WorkingDir -Include *.csproj, *.appxmanifest, *.wapproj, *.xaml -recurse | ForEach-Object -Process ` @@ -34,6 +35,7 @@ elseif ($Branch -eq "Stable") $xmlDoc.Package.Identity.Name="Files" $xmlDoc.Package.Properties.DisplayName="Files" $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files" + $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files" $xmlDoc.Save($PackageManifestPath) Get-ChildItem $WorkingDir -Include *.csproj, *.appxmanifest, *.wapproj, *.xaml -recurse | ForEach-Object -Process ` @@ -46,8 +48,9 @@ elseif ($Branch -eq "Store") { # Set identities $xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP" - $xmlDoc.Package.Properties.DisplayName="Files" + $xmlDoc.Package.Properties.DisplayName="Files App" $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files" + $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files" # Remove an capability that is used for the sideload $nsmgr = New-Object System.Xml.XmlNamespaceManager($xmlDoc.NameTable) diff --git a/.gitignore b/.gitignore index 60421ddadba95..30ab4950270a5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ Files.App.SaveDialog*.dll Files.App.Launcher.exe # User-specific files +*.rsuser *.suo *.user *.userosscache @@ -17,6 +18,9 @@ Files.App.Launcher.exe # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# Mono auto generated files +mono_crash.* + # Build results [Dd]ebug/ [Dd]ebugPublic/ @@ -24,10 +28,14 @@ Files.App.Launcher.exe [Rr]eleases/ x64/ x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ +[Ll]ogs/ # Visual Studio 2015/2017 cache/options directory .vs/ @@ -41,9 +49,10 @@ Generated\ Files/ [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* -# NUNIT +# NUnit *.VisualState.xml TestResult.xml +nunit-*.xml # Build Results of an ATL Project [Dd]ebugPS/ @@ -57,6 +66,10 @@ BenchmarkDotNet.Artifacts/ project.lock.json project.fragment.lock.json artifacts/ +**/Properties/launchSettings.json + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt # StyleCop StyleCopReport.xml @@ -65,6 +78,7 @@ StyleCopReport.xml *_i.c *_p.c *_i.h +*_h.h *.ilk *.meta *.obj @@ -81,7 +95,9 @@ StyleCopReport.xml *.tlh *.tmp *.tmp_proj +*_wpftmp.csproj *.log +*.tlog *.vspscc *.vssscc .builds @@ -136,6 +152,11 @@ _TeamCity* .axoCover/* !.axoCover/settings.json +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + # Visual Studio code coverage results *.coverage *.coveragexml @@ -173,6 +194,7 @@ publish/ *.azurePubxml # Note: Comment the next line if you want to checkin your web deploy settings, # but database connection strings (with potential passwords) will be unencrypted +*.pubxml *.publishproj # Microsoft Azure Web App publish settings. Comment the next line if you want to @@ -180,7 +202,8 @@ publish/ # in these scripts will be unencrypted PublishScripts/ -# NuGet Packages +# NuGet Symbol Packages +*.snupkg # The packages folder can be ignored because of Package Restore **/[Pp]ackages/* # except build/, which is used as an MSBuild target. @@ -205,12 +228,14 @@ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt *.appx +*.appxbundle +*.appxupload # Visual Studio cache files # files ending in .cache can be ignored *.[Cc]ache # but keep track of directories ending in .cache -!*.[Cc]ache/ +!?*.[Cc]ache/ # Others ClientBin/ @@ -221,10 +246,11 @@ ClientBin/ *.jfm src/**/*.pfx tests/**/*.pfx +*.pfx *.publishsettings orleans.codegen.cs -# Including strong name files can present a security risk +# Including strong name files can present a security risk # (https://github.com/github/gitignore/pull/2483#issue-259490424) #*.snk @@ -255,6 +281,9 @@ ServiceFabricBackup/ *.bim.layout *.bim_*.settings *.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl # Microsoft Fakes FakesAssemblies/ @@ -275,6 +304,17 @@ node_modules/ # Visual Studio 6 auto-generated workspace file (contains which files were open etc.) *.vbw +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -290,12 +330,9 @@ paket-files/ # FAKE - F# Make .fake/ -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush +# CodeRush personal settings .cr/ +.cr/personal # Python Tools for Visual Studio (PTVS) __pycache__/ @@ -320,7 +357,7 @@ __pycache__/ # OpenCover UI analysis results OpenCover/ -# Azure Stream Analytics local run output +# Azure Stream Analytics local run output ASALocalRun/ # MSBuild Binary and Structured Log @@ -329,6 +366,45 @@ ASALocalRun/ # NVidia Nsight GPU debugger configuration file *.nvuser -# MFractors (Xamarin productivity tool) working folder +# MFractors (Xamarin productivity tool) working folder .mfractor/ -Files.Extensions/nul + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml +.idea/ diff --git a/builds/azure-pipelines-release.yml b/builds/azure-pipelines-release.yml index 679c034fc663a..4fe0db2937381 100644 --- a/builds/azure-pipelines-release.yml +++ b/builds/azure-pipelines-release.yml @@ -60,8 +60,9 @@ jobs: [xml]$xmlDoc = Get-Content '$(Build.SourcesDirectory)\src\Files.App (Package)\Package.appxmanifest' $xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP" $xmlDoc.Package.Identity.Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" - $xmlDoc.Package.Properties.DisplayName="Files" + $xmlDoc.Package.Properties.DisplayName="Files App" $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files" + $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files" # Removes packageManagement from Store release $nsmgr = New-Object System.Xml.XmlNamespaceManager($xmlDoc.NameTable) $nsmgr.AddNamespace("pkg", "http://schemas.microsoft.com/appx/manifest/foundation/windows10") diff --git a/src/Files.App (Package)/Package.appxmanifest b/src/Files.App (Package)/Package.appxmanifest index 6b09ee33f8ae6..36a4c2852eca7 100644 --- a/src/Files.App (Package)/Package.appxmanifest +++ b/src/Files.App (Package)/Package.appxmanifest @@ -16,7 +16,7 @@ + Version="3.7.7.0" /> Files - Dev @@ -98,7 +98,7 @@ Wide310x150Logo="Assets\AppTiles\Dev\Wide310x150Logo.png" Square71x71Logo="Assets\AppTiles\Dev\Small71x71Logo.png" Square310x310Logo="Assets\AppTiles\Dev\Large310x310Logo.png" - ShortName="Files"> + ShortName="Files - Dev"> diff --git a/src/Files.App/Data/Commands/Manager/CommandManager.cs b/src/Files.App/Data/Commands/Manager/CommandManager.cs index 0fe5ca88a43d3..a217ecf33b164 100644 --- a/src/Files.App/Data/Commands/Manager/CommandManager.cs +++ b/src/Files.App/Data/Commands/Manager/CommandManager.cs @@ -483,7 +483,7 @@ ActionsSettingsService.ActionsV2 is not null .SelectMany(command => command.HotKeys, (command, hotKey) => (Command: command, HotKey: hotKey)) .ToImmutableDictionary(item => item.HotKey, item => item.Command); - App.Logger.LogWarning(ex, "The app found some keys in different commands are duplicated and are using default key bindings for those commands."); + App.Logger.LogInformation(ex, "The app found some keys in different commands are duplicated and are using default key bindings for those commands."); } catch (Exception ex) { diff --git a/src/Files.App/Data/Contracts/IInfoPaneSettingsService.cs b/src/Files.App/Data/Contracts/IInfoPaneSettingsService.cs index 9142cb8f32c91..b1aa1f8942df9 100644 --- a/src/Files.App/Data/Contracts/IInfoPaneSettingsService.cs +++ b/src/Files.App/Data/Contracts/IInfoPaneSettingsService.cs @@ -10,7 +10,7 @@ public interface IInfoPaneSettingsService : IBaseSettingsService, INotifyPropert /// /// Gets or sets a value indicating if the preview pane is enabled. /// - bool IsEnabled { get; set; } + bool IsInfoPaneEnabled { get; set; } /// /// Gets or sets a value indicating the height of the pane in a horizontal layout. diff --git a/src/Files.App/Helpers/Navigation/NavigationHelpers.cs b/src/Files.App/Helpers/Navigation/NavigationHelpers.cs index 20fcf44f09c61..e441f6688dc97 100644 --- a/src/Files.App/Helpers/Navigation/NavigationHelpers.cs +++ b/src/Files.App/Helpers/Navigation/NavigationHelpers.cs @@ -5,8 +5,11 @@ using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Imaging; +using Windows.Storage.Search; +using Microsoft.UI.Xaml.Media; using Windows.Storage; using Windows.System; +using System.IO; namespace Files.App.Helpers { @@ -586,7 +589,79 @@ private static async Task OpenFile(string path, IShellPage ass } else { - await Win32Helper.InvokeWin32ComponentAsync(path, associatedInstance, args); + var fileExtension = Path.GetExtension(path); + + // Use NeighboringFilesQuery to launch photos + // The query options no longer work with the Windows 11 Photo App but they still work for Windows 10 + if (FileExtensionHelpers.IsImageFile(fileExtension)) + { + //try using launcher first + bool launchSuccess = false; + BaseStorageFileQueryResult? fileQueryResult = null; + //Get folder to create a file query (to pass to apps like Photos, Movies & TV..., needed to scroll through the folder like what Windows Explorer does) + BaseStorageFolder currentFolder = await associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(path)); + if (currentFolder is not null) + { + QueryOptions queryOptions = new(CommonFileQuery.DefaultQuery, null); + //We can have many sort entries + SortEntry sortEntry = new() + { + AscendingOrder = associatedInstance.InstanceViewModel.FolderSettings.DirectorySortDirection == SortDirection.Ascending + }; + //Basically we tell to the launched app to follow how we sorted the files in the directory. + var sortOption = associatedInstance.InstanceViewModel.FolderSettings.DirectorySortOption; + switch (sortOption) + { + case SortOption.Name: + sortEntry.PropertyName = "System.ItemNameDisplay"; + queryOptions.SortOrder.Clear(); + queryOptions.SortOrder.Add(sortEntry); + break; + case SortOption.DateModified: + sortEntry.PropertyName = "System.DateModified"; + queryOptions.SortOrder.Clear(); + queryOptions.SortOrder.Add(sortEntry); + break; + case SortOption.DateCreated: + sortEntry.PropertyName = "System.DateCreated"; + queryOptions.SortOrder.Clear(); + queryOptions.SortOrder.Add(sortEntry); + break; + //Unfortunately this is unsupported | Remarks: https://learn.microsoft.com/uwp/api/windows.storage.search.queryoptions.sortorder?view=winrt-19041 + //case Enums.SortOption.Size: + //sortEntry.PropertyName = "System.TotalFileSize"; + //queryOptions.SortOrder.Clear(); + //queryOptions.SortOrder.Add(sortEntry); + //break; + //Unfortunately this is unsupported | Remarks: https://learn.microsoft.com/uwp/api/windows.storage.search.queryoptions.sortorder?view=winrt-19041 + //case Enums.SortOption.FileType: + //sortEntry.PropertyName = "System.FileExtension"; + //queryOptions.SortOrder.Clear(); + //queryOptions.SortOrder.Add(sortEntry); + //break; + //Handle unsupported + default: + //keep the default one in SortOrder IList + break; + } + var options = InitializeWithWindow(new LauncherOptions()); + if (currentFolder.AreQueryOptionsSupported(queryOptions)) + { + fileQueryResult = currentFolder.CreateFileQueryWithOptions(queryOptions); + options.NeighboringFilesQuery = fileQueryResult.ToStorageFileQueryResult(); + } + // Now launch file with options. + var storageItem = (StorageFile)await FilesystemTasks.Wrap(() => childFile.Item.ToStorageFileAsync().AsTask()); + if (storageItem is not null) + launchSuccess = await Launcher.LaunchFileAsync(storageItem, options); + } + if (!launchSuccess) + await Win32Helper.InvokeWin32ComponentAsync(path, associatedInstance, args); + } + else + { + await Win32Helper.InvokeWin32ComponentAsync(path, associatedInstance, args); + } } }); } diff --git a/src/Files.App/Helpers/PathNormalization.cs b/src/Files.App/Helpers/PathNormalization.cs index c91c1ab6d1e39..c1c885b555504 100644 --- a/src/Files.App/Helpers/PathNormalization.cs +++ b/src/Files.App/Helpers/PathNormalization.cs @@ -54,7 +54,7 @@ public static string NormalizePath(string path) } catch (Exception ex) when (ex is UriFormatException || ex is ArgumentException) { - App.Logger.LogWarning(ex, path); + App.Logger.LogDebug(ex, path); return path; } } diff --git a/src/Files.App/Services/App/AppThemeModeService.cs b/src/Files.App/Services/App/AppThemeModeService.cs index 85f60754a9456..404797d42b575 100644 --- a/src/Files.App/Services/App/AppThemeModeService.cs +++ b/src/Files.App/Services/App/AppThemeModeService.cs @@ -6,7 +6,7 @@ using Microsoft.UI.Windowing; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Media; -using Windows.Storage; +using System.Runtime.InteropServices; using Windows.UI; using Windows.UI.ViewManagement; @@ -111,6 +111,10 @@ public void SetAppThemeMode(Window? window = null, AppWindowTitleBar? titleBar = if (callThemeModeChangedEvent) AppThemeModeChanged?.Invoke(null, EventArgs.Empty); } + catch (COMException ex) + { + App.Logger.LogInformation(ex, "Failed to change theme mode of the app."); + } catch (Exception ex) { App.Logger.LogWarning(ex, "Failed to change theme mode of the app."); diff --git a/src/Files.App/Services/App/AppUpdateSideloadService.cs b/src/Files.App/Services/App/AppUpdateSideloadService.cs index 91316fe716841..84960c7d7077c 100644 --- a/src/Files.App/Services/App/AppUpdateSideloadService.cs +++ b/src/Files.App/Services/App/AppUpdateSideloadService.cs @@ -138,9 +138,13 @@ public async Task CheckForUpdatesAsync() Logger?.LogWarning("SIDELOAD: Update not found."); } } - catch (Exception e) + catch (HttpRequestException ex) { - Logger?.LogError(e, e.Message); + Logger?.LogDebug(ex, ex.Message); + } + catch (Exception ex) + { + Logger?.LogError(ex, ex.Message); } } @@ -171,7 +175,7 @@ public async Task CheckAndUpdateFilesLauncherAsync() await srcExeFile.CopyAsync(destFolder, "Files.App.Launcher.exe", NameCollisionOption.ReplaceExisting); await srcHashFile.CopyAsync(destFolder, "Files.App.Launcher.exe.sha256", NameCollisionOption.ReplaceExisting); - App.Logger.LogInformation("Files.App.Launcher updated."); + Logger?.LogInformation("Files.App.Launcher updated."); } } @@ -206,9 +210,13 @@ private async Task StartBackgroundDownloadAsync() IsUpdateAvailable = true; } - catch (Exception e) + catch (IOException ex) { - Logger?.LogError(e, e.Message); + Logger?.LogDebug(ex, ex.Message); + } + catch (Exception ex) + { + Logger?.LogError(ex, ex.Message); } } diff --git a/src/Files.App/Services/PreviewPopupProviders/QuickLookProvider.cs b/src/Files.App/Services/PreviewPopupProviders/QuickLookProvider.cs index bb9f74ff8ebee..c622966b4f3dc 100644 --- a/src/Files.App/Services/PreviewPopupProviders/QuickLookProvider.cs +++ b/src/Files.App/Services/PreviewPopupProviders/QuickLookProvider.cs @@ -31,18 +31,17 @@ public async Task SwitchPreviewAsync(string path) private async Task DoPreviewAsync(string path, string message) { string pipeName = $"QuickLook.App.Pipe.{WindowsIdentity.GetCurrent().User?.Value}"; - var encoding = Encoding.GetEncoding("UTF-8", new EncoderReplacementFallback("?"), new DecoderExceptionFallback()); await using var client = new NamedPipeClientStream(".", pipeName, PipeDirection.Out); try { await client.ConnectAsync(TIMEOUT); - await using var writer = new StreamWriter(client, encoding); + await using var writer = new StreamWriter(client); await writer.WriteLineAsync($"{message}|{path}"); await writer.FlushAsync(); } - catch (Exception ex) when (ex is TimeoutException or IOException) + catch (Exception ex) when (ex is TimeoutException or IOException or EncoderFallbackException) { // ignore } diff --git a/src/Files.App/Services/Settings/InfoPaneSettingsService.cs b/src/Files.App/Services/Settings/InfoPaneSettingsService.cs index 1602acb98e084..4d9e69ed611b7 100644 --- a/src/Files.App/Services/Settings/InfoPaneSettingsService.cs +++ b/src/Files.App/Services/Settings/InfoPaneSettingsService.cs @@ -5,7 +5,7 @@ namespace Files.App.Services.Settings { internal sealed class InfoPaneSettingsService : BaseObservableJsonSettings, IInfoPaneSettingsService { - public bool IsEnabled + public bool IsInfoPaneEnabled { get => Get(false); set => Set(value); diff --git a/src/Files.App/Strings/af/Resources.resw b/src/Files.App/Strings/af/Resources.resw index df8e8361fb3a9..fe044d0249a98 100644 --- a/src/Files.App/Strings/af/Resources.resw +++ b/src/Files.App/Strings/af/Resources.resw @@ -3153,7 +3153,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3882,8 +3882,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3940,6 +3940,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/ar/Resources.resw b/src/Files.App/Strings/ar/Resources.resw index c68d076a75f2e..a0da2bbcc1a20 100644 --- a/src/Files.App/Strings/ar/Resources.resw +++ b/src/Files.App/Strings/ar/Resources.resw @@ -3153,7 +3153,7 @@ Mica Alt - مادة الخلفية + Backdrop صلب @@ -3882,8 +3882,8 @@ الحالة: - عرض شريط الأدوات - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view قائمة إجراءات علامة التبويب @@ -3940,6 +3940,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/be-BY/Resources.resw b/src/Files.App/Strings/be-BY/Resources.resw index cdd34913e2a62..9976ce99d5237 100644 --- a/src/Files.App/Strings/be-BY/Resources.resw +++ b/src/Files.App/Strings/be-BY/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/bg/Resources.resw b/src/Files.App/Strings/bg/Resources.resw index dc5d422acc91d..afb41478cb426 100644 --- a/src/Files.App/Strings/bg/Resources.resw +++ b/src/Files.App/Strings/bg/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Материал на фона + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/ca/Resources.resw b/src/Files.App/Strings/ca/Resources.resw index da4c363dc3c86..7408e37cb73c5 100644 --- a/src/Files.App/Strings/ca/Resources.resw +++ b/src/Files.App/Strings/ca/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Material de fons + Teló de fons Sòlid @@ -3882,7 +3882,7 @@ Mostra la barra d'eines - Setting that controls if the Toolbar is shown in the main view + Setting that controls if the toolbar is shown in the main view Menú d'accions de la pestanya @@ -3939,6 +3939,9 @@ Aneu a la pàgina d'inici - Mostra el botó d'inici a la barra d'eines + Mostra l'Inici a la barra d'adreces + + + Barra d'eines \ No newline at end of file diff --git a/src/Files.App/Strings/cs-CZ/Resources.resw b/src/Files.App/Strings/cs-CZ/Resources.resw index 48d8135f0a377..abbefd0dae312 100644 --- a/src/Files.App/Strings/cs-CZ/Resources.resw +++ b/src/Files.App/Strings/cs-CZ/Resources.resw @@ -3152,7 +3152,7 @@ Alt. Mica - Materiál pozadí + Backdrop Plná barva @@ -3881,8 +3881,8 @@ Stav: - Zobrazit panel nástrojů - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Nabídka akcí @@ -3939,6 +3939,9 @@ Přejít na domovskou stránku - Zobrazit tlačítko Domů v panelu nástrojů + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/da/Resources.resw b/src/Files.App/Strings/da/Resources.resw index 161d4904b2e7c..b09d1583141d2 100644 --- a/src/Files.App/Strings/da/Resources.resw +++ b/src/Files.App/Strings/da/Resources.resw @@ -3152,7 +3152,7 @@ Glimmer alternativ - Baggrundsmateriale + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/de-DE/Resources.resw b/src/Files.App/Strings/de-DE/Resources.resw index 3a218f20d823e..1c998baf504e4 100644 --- a/src/Files.App/Strings/de-DE/Resources.resw +++ b/src/Files.App/Strings/de-DE/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Hintergrundmaterial + Backdrop Solide @@ -3881,8 +3881,8 @@ Status: - Symbolleiste anzeigen - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab-Aktionen-Menü @@ -3939,6 +3939,9 @@ Zur Startseite navigieren - Start-Button in der Symbolleiste anzeigen + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/el/Resources.resw b/src/Files.App/Strings/el/Resources.resw index b0ff409ade3ae..a8cbce7b26de7 100644 --- a/src/Files.App/Strings/el/Resources.resw +++ b/src/Files.App/Strings/el/Resources.resw @@ -3152,7 +3152,7 @@ Μίκα Άλτ - Υλικό Φόντου + Backdrop Συμπαγής @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/en-GB/Resources.resw b/src/Files.App/Strings/en-GB/Resources.resw index 74fa80814be31..618c0e241759c 100644 --- a/src/Files.App/Strings/en-GB/Resources.resw +++ b/src/Files.App/Strings/en-GB/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw index b309ee013f6df..c0352332b0169 100644 --- a/src/Files.App/Strings/en-US/Resources.resw +++ b/src/Files.App/Strings/en-US/Resources.resw @@ -3944,4 +3944,7 @@ Toolbars + + User ID + \ No newline at end of file diff --git a/src/Files.App/Strings/es-419/Resources.resw b/src/Files.App/Strings/es-419/Resources.resw index d5acdd7eb4cd8..2403a69db460e 100644 --- a/src/Files.App/Strings/es-419/Resources.resw +++ b/src/Files.App/Strings/es-419/Resources.resw @@ -3152,7 +3152,7 @@ Mica alternativa - Material de fondo + Fondo Sólido @@ -3882,7 +3882,7 @@ Mostrar barra de herramientas - Setting that controls if the Toolbar is shown in the main view + Setting that controls if the toolbar is shown in the main view Menú de acciones de pestaña @@ -3939,6 +3939,9 @@ Ir a la página de inicio - Mostrar botón de inicio en la barra de herramientas + Mostrar al inicio en la barra de direcciones + + + Barras de herramientas \ No newline at end of file diff --git a/src/Files.App/Strings/es-ES/Resources.resw b/src/Files.App/Strings/es-ES/Resources.resw index ef0db052ada0c..e974a77835381 100644 --- a/src/Files.App/Strings/es-ES/Resources.resw +++ b/src/Files.App/Strings/es-ES/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Material de fondo + Telón de fondo Sólido @@ -3882,7 +3882,7 @@ Mostrar barra de herramientas - Setting that controls if the Toolbar is shown in the main view + Setting that controls if the toolbar is shown in the main view Menú de acciones de pestaña @@ -3915,7 +3915,7 @@ Agregar panel - Mostrar botón de acciones de pestaña en la barra de títulos + Mostrar botón de acciones de pestaña en la barra de pestañas Organizar paneles @@ -3939,6 +3939,9 @@ Ir a la página de inicio - Mostrar botón de inicio en la barra de herramientas + Mostrar Inicio en la barra de direcciones + + + Barra de herramientas \ No newline at end of file diff --git a/src/Files.App/Strings/fa-IR/Resources.resw b/src/Files.App/Strings/fa-IR/Resources.resw index 0553c02c6f3fc..2a8154f57b24d 100644 --- a/src/Files.App/Strings/fa-IR/Resources.resw +++ b/src/Files.App/Strings/fa-IR/Resources.resw @@ -3152,7 +3152,7 @@ جایگزین میکا - مواد پس زمینه + Backdrop پیوسته @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/fi-FI/Resources.resw b/src/Files.App/Strings/fi-FI/Resources.resw index 7a6645f32cd9f..0f2c1273ba67b 100644 --- a/src/Files.App/Strings/fi-FI/Resources.resw +++ b/src/Files.App/Strings/fi-FI/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Taustamateriaali + Backdrop Yhtenäinen @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/fil-PH/Resources.resw b/src/Files.App/Strings/fil-PH/Resources.resw index 60de18fb40add..f6f926ce2cb68 100644 --- a/src/Files.App/Strings/fil-PH/Resources.resw +++ b/src/Files.App/Strings/fil-PH/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/fr-FR/Resources.resw b/src/Files.App/Strings/fr-FR/Resources.resw index 61ebc1ff14899..8d6927208a889 100644 --- a/src/Files.App/Strings/fr-FR/Resources.resw +++ b/src/Files.App/Strings/fr-FR/Resources.resw @@ -1068,19 +1068,19 @@ Nom désiré - Afficher le volet d'aperçu + Afficher/Masquer le volet d'aperçu - Afficher le volet des détails + Afficher/Masquer le volet des détails - Activer le volet des détails pour afficher les propriétés de base du fichier + Afficher/Masquer le volet des détails pour afficher les propriétés de base du fichier - Afficher le volet d'informations + Afficher/Masquer le volet d'informations - Afficher le volet d'informations pour afficher les volets de détails/aperçu + Afficher/Masquer le volet d'informations pour afficher les volets de détails/aperçu Afficher/Masquer la barre d'outils @@ -2337,7 +2337,7 @@ Augmenter la taille - Activer/désactiver la direction de tri + Activer/Désactiver la direction de tri Nom invalide @@ -2352,7 +2352,7 @@ Lancer la fenêtre d'aperçu - Activer/désactiver le mode compact + Activer/Désactiver le mode compact Ouvrir la page d'aide en ligne dans votre navigateur @@ -2367,7 +2367,7 @@ Quitter le mode compact - Activer/désactiver le mode compact + Activer/Désactiver le mode compact Accéder à la zone de recherche @@ -2382,7 +2382,7 @@ Afficher/Masquer les extensions de fichiers - Activer le volet d’aperçu pour afficher les aperçus des fichiers + Afficher/Masquer le volet d’aperçu pour afficher les aperçus des fichiers Afficher/Masquer la barre latérale @@ -2454,7 +2454,7 @@ Effacer la sélection d'éléments - Activer/désactiver la sélection d'éléments + Activer/Désactiver la sélection d'éléments Partager le(s) fichier(s) sélectionné(s) avec d'autres personnes @@ -2601,7 +2601,7 @@ Trier les éléments par ordre décroissant - Activer/désactiver la direction de tri des éléments + Activer/Désactiver la direction de tri des éléments Lister les éléments sans regroupement @@ -2643,16 +2643,16 @@ Trier les groupes en ordre décroissant - Activer/désactiver la direction de tri des groupes + Activer/Désactiver la direction de tri des groupes Ouvrir nouvel onglet - Naviguer en arrière dans l'historique de navigation + Reculer dans l'historique de navigation - Naviguer en avant dans l'historique de navigation + Avancer dans l'historique de navigation Revenir au dossier précédent @@ -2703,7 +2703,7 @@ Basculer le focus vers le volet inactif - Afficher la barre latérale + Afficher/Masquer la barre latérale Alt @@ -2893,7 +2893,7 @@ Modifier - Basculer la sélection + Activer/Désactiver la sélection Afficher un avertissement lors du changement d'extensions de fichier @@ -2986,10 +2986,10 @@ Jour - Activer/désactiver l'unité de regroupement par date + Activer/Désactiver l'unité de regroupement par date - Activer/désactiver l'unité de regroupement + Activer/Désactiver l'unité de regroupement Année @@ -3152,7 +3152,7 @@ Mica Alt - Matériau de fond + Arrière-plan Solide @@ -3882,7 +3882,7 @@ Afficher la barre d'outils - Setting that controls if the Toolbar is shown in the main view + Setting that controls if the toolbar is shown in the main view Menu des actions de l'onglet @@ -3936,9 +3936,12 @@ Threads du CPU - Navigate to the home page + Aller à la page d'accueil - Show home button in the toolbar + Afficher l'accueil dans la barre d'adresse + + + Barre d'outils \ No newline at end of file diff --git a/src/Files.App/Strings/he-IL/Resources.resw b/src/Files.App/Strings/he-IL/Resources.resw index a7d2fddb9b321..1c6640a47d6c7 100644 --- a/src/Files.App/Strings/he-IL/Resources.resw +++ b/src/Files.App/Strings/he-IL/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/hi-IN/Resources.resw b/src/Files.App/Strings/hi-IN/Resources.resw index 09b3ed4e357f9..8c826f9eda0d0 100644 --- a/src/Files.App/Strings/hi-IN/Resources.resw +++ b/src/Files.App/Strings/hi-IN/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/hr-HR/Resources.resw b/src/Files.App/Strings/hr-HR/Resources.resw index 8304a9c012c79..7131ac56794f7 100644 --- a/src/Files.App/Strings/hr-HR/Resources.resw +++ b/src/Files.App/Strings/hr-HR/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/hu-HU/Resources.resw b/src/Files.App/Strings/hu-HU/Resources.resw index 81ebaf6ed96ba..82d3c25423b5b 100644 --- a/src/Files.App/Strings/hu-HU/Resources.resw +++ b/src/Files.App/Strings/hu-HU/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Háttér típus + Backdrop Szolid @@ -3881,8 +3881,8 @@ Állapot: - Eszköztár megjelenítése - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Fülműveletek menü @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/id-ID/Resources.resw b/src/Files.App/Strings/id-ID/Resources.resw index b0cb30051ea04..19d7785d80ab7 100644 --- a/src/Files.App/Strings/id-ID/Resources.resw +++ b/src/Files.App/Strings/id-ID/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Tampilkan Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Aksi tab menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/it-IT/Resources.resw b/src/Files.App/Strings/it-IT/Resources.resw index b18d59cc6f97b..e6089e2a4289b 100644 --- a/src/Files.App/Strings/it-IT/Resources.resw +++ b/src/Files.App/Strings/it-IT/Resources.resw @@ -443,7 +443,7 @@ ICU format for plurals, more information here: https://support.crowdin.com/icu-message-syntax/#plural - {0, plural, one {item} other {items}} + {0, plural, one {elemento} other {elementi}} ICU format for plurals, more information here: https://support.crowdin.com/icu-message-syntax/#plural @@ -1242,37 +1242,37 @@ Copia - Copia {0, plural, one {item} other {items}} + Copia {0, plural, one {elemento} other {elementi}} - Elimina {0, plural, one {item} other {items}} + Elimina {0, plural, one {elemento} other {elementi}} Sposta - {0, plural, one {Un oggetto sarà spostato} other {# elementi saranno spostati}} + {0, plural, one {Un elemento sarà spostato} other {# elementi saranno spostati}} - Muovi {0, plural, one {item} other {items}} + Muovi {0, plural, one {elemento} other {elementi}} - {0, plural, one {Un oggetto sarà eliminato} other {# elementi saranno eliminati}} + {0, plural, one {Un elemento sarà eliminato} other {# elementi saranno eliminati}} Continua - {0, plural, one {C'è un nome file in conflitto} other {Ci sono # nomi file in conflitto}} + {0, plural, one {C'è un nome di file in conflitto} other {Ci sono # nomi di file in conflitto}} - {0, plural, one {C'è un nome file in conflitto} other {Ci sono # nomi file in conflitto}}, e {1, plural, one {un elemento in uscita} other {# elementi in uscita}} + {0, plural, one {C'è un nome di file in conflitto} other {Ci sono # nomi di file in conflitto}}, e {1, plural, one {un elemento in uscita} other {# elementi in uscita}} Conflitto {0, plural, one {nome del file} other {nomi dei file}} - {0, plural, one {Un oggetto verrà copiato} other {# elementi verranno copiati}} + {0, plural, one {Un elemento verrà copiato} other {# elementi verranno copiati}} Elimina definitivamente @@ -1854,7 +1854,7 @@ Questa impostazione modifica il registro di sistema e può causare effetti indesiderati sul tuo dispositivo. Continuando con questa opzione si accettano i rischi legati ad essa. - The flatten operations are permanent and not recommended. Continue at your own risk. + Le operazioni di appiattimento sono permanenti e non consigliate. Continua a tuo rischio e pericolo. Crea Raccolta @@ -2031,19 +2031,19 @@ Comprimi - Move all contents from subfolders into the selected location + Muovi tutti i contenuti delle sottocartelle nella posizione selezionata - Flatten folder + Appiattisci cartella - Flatten + Appiattisci - Flattening a folder will move all contents from its subfolders to the selected location. This operation is permanent and cannot be undone. By using this experimental feature, you acknowledge the risk and agree not to hold the Files team responsible for any data loss. + Appiattendo una cartella, tutti i contenuti delle sue sottocartelle verranno spostati nella posizione selezionata. Questa operazione è permanente e non reversibile. Usando questa funzionalità sperimentale, accetti il rischio che ne consegue e accetti di non ritenere il team di Files responsabile per qualunque perdita di dati. - Show flatten options + Mostra le opzioni di appiattimento Seleziona i file e le cartelle quando si passa con il mouse @@ -2376,7 +2376,7 @@ Attiva o disattiva la visualizzazione degli elementi nascosti - Toggle whether to show dot files + Attiva o disattiva la visualizzazione dei file nascosti Attiva o disattiva la visualizzazione delle estensioni dei file @@ -3152,7 +3152,7 @@ Mica Alt - Materiale Di Sfondo + Sfondo Pieno @@ -3294,7 +3294,7 @@ Files è in esecuzione come amministratore - A causa di una limitazione con Windows e WinAppSdk, il drag and drop non è disponibile quando si esegue FIles come amministratore. Se si desidera utilizzare il drag and drop, è possibile aggirare questa limitazione aprendo UAC (User Account Control) dal menu Start, selezionando il terzo livello e riavviando Windows. In caso contrario, è possibile continuare a utilizzare i file senza drag and drop. + A causa di una limitazione di Windows e WinAppSdk, il drag and drop non è disponibile quando si esegue FIles come amministratore. Se si desidera utilizzare il drag and drop, è possibile aggirare questa limitazione aprendo UAC (User Account Control) dal menu Start, selezionando il terzo livello e riavviando Windows. Altrimenti, è possibile continuare a usare Files senza drag and drop. Lasciare l'app in esecuzione in background quando la finestra è chiusa @@ -3882,7 +3882,7 @@ Mostra barra degli strumenti - Setting that controls if the Toolbar is shown in the main view + Setting that controls if the toolbar is shown in the main view Menu azioni scheda @@ -3936,9 +3936,12 @@ Thread CPU - Vai alla pagina home + Vai alla pagina iniziale - Mostra il pulsante Home nella barra degli strumenti + Mostra Home nella barra degli indirizzi + + + Barre degli strumenti \ No newline at end of file diff --git a/src/Files.App/Strings/ja-JP/Resources.resw b/src/Files.App/Strings/ja-JP/Resources.resw index a9bfa15f32555..9036135575d2e 100644 --- a/src/Files.App/Strings/ja-JP/Resources.resw +++ b/src/Files.App/Strings/ja-JP/Resources.resw @@ -3152,7 +3152,7 @@ マイカ Alt - 背景の素材 + 背景 ソリッド @@ -3882,7 +3882,7 @@ ツールバーを表示する - Setting that controls if the Toolbar is shown in the main view + Setting that controls if the toolbar is shown in the main view タブ操作メニュー @@ -3939,6 +3939,9 @@ ホーム ページに移動する - ツールバーにホーム ボタンを表示する + アドレス バーに [ホーム] ボタンを表示する + + + ツールバー \ No newline at end of file diff --git a/src/Files.App/Strings/ka/Resources.resw b/src/Files.App/Strings/ka/Resources.resw index f18dfe8ead254..1fe09d1fad60a 100644 --- a/src/Files.App/Strings/ka/Resources.resw +++ b/src/Files.App/Strings/ka/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/km-KH/Resources.resw b/src/Files.App/Strings/km-KH/Resources.resw index 5b42333e26485..f2fc4bfe628b1 100644 --- a/src/Files.App/Strings/km-KH/Resources.resw +++ b/src/Files.App/Strings/km-KH/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/ko-KR/Resources.resw b/src/Files.App/Strings/ko-KR/Resources.resw index 1ee310d81f51a..2b39b261098d2 100644 --- a/src/Files.App/Strings/ko-KR/Resources.resw +++ b/src/Files.App/Strings/ko-KR/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - 앱 배경 재질 + Backdrop Solid @@ -3881,8 +3881,8 @@ 상태: - 도구 모음 표시 - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view 탭 동작 메뉴 @@ -3939,6 +3939,9 @@ 홈 페이지로 이동 - 도구 바에 홈 버튼 표시 + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/lt-LT/Resources.resw b/src/Files.App/Strings/lt-LT/Resources.resw index 40e776f5548f5..30ba7cb4e3cac 100644 --- a/src/Files.App/Strings/lt-LT/Resources.resw +++ b/src/Files.App/Strings/lt-LT/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/lv-LV/Resources.resw b/src/Files.App/Strings/lv-LV/Resources.resw index 6f92091cfe071..62528f9e2f88d 100644 --- a/src/Files.App/Strings/lv-LV/Resources.resw +++ b/src/Files.App/Strings/lv-LV/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/ms-MY/Resources.resw b/src/Files.App/Strings/ms-MY/Resources.resw index c00bd170bdbb6..fd1bacf00735f 100644 --- a/src/Files.App/Strings/ms-MY/Resources.resw +++ b/src/Files.App/Strings/ms-MY/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Material Latar Belakang + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/nb-NO/Resources.resw b/src/Files.App/Strings/nb-NO/Resources.resw index 816c9ff177cf8..254d552f3f0c3 100644 --- a/src/Files.App/Strings/nb-NO/Resources.resw +++ b/src/Files.App/Strings/nb-NO/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Bakdråpe materiale + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/nl-NL/Resources.resw b/src/Files.App/Strings/nl-NL/Resources.resw index 9de3f5bdfacd1..15736078e8d71 100644 --- a/src/Files.App/Strings/nl-NL/Resources.resw +++ b/src/Files.App/Strings/nl-NL/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Achtergrond materiaal + Backdrop Effen @@ -3881,8 +3881,8 @@ Status: - Werkbalk weergeven - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tabblad acties-menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/pl-PL/Resources.resw b/src/Files.App/Strings/pl-PL/Resources.resw index 9e3c918ddc697..7fe9dc6280cce 100644 --- a/src/Files.App/Strings/pl-PL/Resources.resw +++ b/src/Files.App/Strings/pl-PL/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Tło + Backdrop Jednolity @@ -3881,8 +3881,8 @@ Stan: - Pokaż pasek narzędzi - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Menu akcji kart @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/pt-BR/Resources.resw b/src/Files.App/Strings/pt-BR/Resources.resw index 79d76ff8f1c28..084990b36bbc4 100644 --- a/src/Files.App/Strings/pt-BR/Resources.resw +++ b/src/Files.App/Strings/pt-BR/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Material de Background + Fundo Sólido @@ -3881,8 +3881,8 @@ Status: - Mostrar Barra de Ferramentas - Setting that controls if the Toolbar is shown in the main view + Mostrar barra de ferramentas + Setting that controls if the toolbar is shown in the main view Menu de ações de aba @@ -3939,6 +3939,9 @@ Navegar para a página inicial - Mostrar botão de início na barra de ferramentas + Mostrar tela inicial na barra de endereços + + + Barras de ferramentas \ No newline at end of file diff --git a/src/Files.App/Strings/pt-PT/Resources.resw b/src/Files.App/Strings/pt-PT/Resources.resw index c140868b0b7ac..ec2b33a493c28 100644 --- a/src/Files.App/Strings/pt-PT/Resources.resw +++ b/src/Files.App/Strings/pt-PT/Resources.resw @@ -1854,7 +1854,7 @@ Esta opção modifica o registo do sistema e pode ter efeitos inesperados no seu dispositivo. Continue por sua conta e risco. - The flatten operations are permanent and not recommended. Continue at your own risk. + Estas operações são permanentes e não recomendamos a sua utilização. Continue por sua conta e risco. Criar biblioteca @@ -2031,7 +2031,7 @@ Comprimir - Move all contents from subfolders into the selected location + Mover todo o conteúdo das sub-pastas para a localização especificada Flatten folder @@ -3152,7 +3152,7 @@ Mica alternativo - Backdrop Material + Tema de fundo Sólido @@ -3882,7 +3882,7 @@ Mostrar barra de ferramentas - Setting that controls if the Toolbar is shown in the main view + Setting that controls if the toolbar is shown in the main view Menu de ações em separadores @@ -3939,6 +3939,9 @@ Ir para a página inicial - Mostrar botão "Início" na barra de ferramentas + Mostrar botão Início na barra de endereços + + + Barras de ferramentas \ No newline at end of file diff --git a/src/Files.App/Strings/ro-RO/Resources.resw b/src/Files.App/Strings/ro-RO/Resources.resw index bc353754b6ab5..e25939fb30d9e 100644 --- a/src/Files.App/Strings/ro-RO/Resources.resw +++ b/src/Files.App/Strings/ro-RO/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Material Fundal + Fundal Solid @@ -3881,8 +3881,8 @@ Statut: - Arătați Bara cu Instrumente - Setting that controls if the Toolbar is shown in the main view + Afișați bara de instrumente + Setting that controls if the toolbar is shown in the main view Meniu acțiuni filă @@ -3936,9 +3936,12 @@ Fire CPU - Navigate to the home page + Navigați spre pagina principală - Show home button in the toolbar + Afișați Pagina Principală în bara de adresă + + + Bare de Instrumente \ No newline at end of file diff --git a/src/Files.App/Strings/ru-RU/Resources.resw b/src/Files.App/Strings/ru-RU/Resources.resw index 0ffd9bd521c00..09284293801ee 100644 --- a/src/Files.App/Strings/ru-RU/Resources.resw +++ b/src/Files.App/Strings/ru-RU/Resources.resw @@ -1854,7 +1854,7 @@ Этот параметр изменяет реестр Windows и может иметь неожиданные побочные эффекты на вашем устройстве. Продолжайте на свой страх и риск. - Операции с выравниванием структуры являются постоянными и не рекомендуются. Продолжайте на свой страх и риск. + Операции с выравниванием структуры являются постоянными и не рекомендуются. Активируйте на свой страх и риск. Создать Библиотеку @@ -2199,7 +2199,7 @@ Показать ещё - Показывать опцию редактирования меток + Показать опцию редактирования меток Показать опции сжатия @@ -2208,10 +2208,10 @@ Показать опцию отправить - Показывать опцию открытия папок в новой вкладке + Показать опцию открытия папок в новой вкладке - Показывать опцию открытия папок в новом окне + Показать опцию открытия папок в новом окне Быстрый доступ @@ -3152,7 +3152,7 @@ Mica Alt - Материал фона + Фон Сплошной @@ -3881,8 +3881,8 @@ Статус: - Показывать панель инструментов - Setting that controls if the Toolbar is shown in the main view + Показать панель инструментов + Setting that controls if the toolbar is shown in the main view Меню действий вкладки @@ -3936,9 +3936,12 @@ Потоки процессора - Navigate to the home page + Перейти на главную страницу - Show home button in the toolbar + Показать кнопку Главной в адресной строке + + + Панели инструментов \ No newline at end of file diff --git a/src/Files.App/Strings/sk-SK/Resources.resw b/src/Files.App/Strings/sk-SK/Resources.resw index 1e14aac34bc4d..313ac0aeb9efb 100644 --- a/src/Files.App/Strings/sk-SK/Resources.resw +++ b/src/Files.App/Strings/sk-SK/Resources.resw @@ -3154,7 +3154,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3883,8 +3883,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3941,6 +3941,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/sq-AL/Resources.resw b/src/Files.App/Strings/sq-AL/Resources.resw index c4559e4393f75..3035a0de40e67 100644 --- a/src/Files.App/Strings/sq-AL/Resources.resw +++ b/src/Files.App/Strings/sq-AL/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/sr-Cyrl/Resources.resw b/src/Files.App/Strings/sr-Cyrl/Resources.resw index b8cf35a26fdfc..b295042238144 100644 --- a/src/Files.App/Strings/sr-Cyrl/Resources.resw +++ b/src/Files.App/Strings/sr-Cyrl/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/sv-SE/Resources.resw b/src/Files.App/Strings/sv-SE/Resources.resw index 071db1da48041..6cb83a8806c7e 100644 --- a/src/Files.App/Strings/sv-SE/Resources.resw +++ b/src/Files.App/Strings/sv-SE/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Bakgrundsmaterial + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/ta/Resources.resw b/src/Files.App/Strings/ta/Resources.resw index 518623a3ef204..38c4927ea8bf5 100644 --- a/src/Files.App/Strings/ta/Resources.resw +++ b/src/Files.App/Strings/ta/Resources.resw @@ -3152,7 +3152,7 @@ மாற்று மைக்கா - Backdrop Material + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/th-TH/Resources.resw b/src/Files.App/Strings/th-TH/Resources.resw index 173c9eb67ca8f..0cb725808ee02 100644 --- a/src/Files.App/Strings/th-TH/Resources.resw +++ b/src/Files.App/Strings/th-TH/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - รูปแบบพื้นหลัง + Backdrop Solid @@ -3881,8 +3881,8 @@ Status: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Tab actions menu @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/tr-TR/Resources.resw b/src/Files.App/Strings/tr-TR/Resources.resw index 89c4df4de219b..89813351070b1 100644 --- a/src/Files.App/Strings/tr-TR/Resources.resw +++ b/src/Files.App/Strings/tr-TR/Resources.resw @@ -3152,7 +3152,7 @@ Mika Alt - Zemin Malzemesi + Backdrop Katı @@ -3881,8 +3881,8 @@ Durum: - Araç Çubuğunu Göster - Setting that controls if the Toolbar is shown in the main view + Show toolbar + Setting that controls if the toolbar is shown in the main view Sekme aksiyonları menüsü @@ -3939,6 +3939,9 @@ Navigate to the home page - Show home button in the toolbar + Show Home in address bar + + + Toolbars \ No newline at end of file diff --git a/src/Files.App/Strings/uk-UA/Resources.resw b/src/Files.App/Strings/uk-UA/Resources.resw index 674984676c592..ce23f00b3924a 100644 --- a/src/Files.App/Strings/uk-UA/Resources.resw +++ b/src/Files.App/Strings/uk-UA/Resources.resw @@ -385,40 +385,40 @@ Лише для читання - {0, plural, one {# day ago} other {# days ago}} + {0, plural, one {# день тому} few {# дні тому} many {# днів тому} other {# днів тому}} - 1 day ago + 1 день тому - {0} days ago + {0} днів тому - {0, plural, one {# hour ago} other {# hours ago}} + {0, plural, one {# годину тому} few {# години тому} many {# годин тому} other {# годин тому}} - 1 hour ago + 1 годину тому - {0} hours ago + {0} годин тому - {0, plural, one {# minute ago} other {# minutes ago}} + {0, plural, one {# хвилину тому} few {# хвилини тому} many {# хвилин тому} other {# хвилин тому}} - 1 minute ago + 1 хвилину тому - {0} minutes ago + {0} хвилин тому - {0, plural, one {# second ago} other {# seconds ago}} + {0, plural, one {# секунду тому} few {# секунди тому} many {# секунд тому} other {# секунд тому}} - 1 second ago + 1 секунду тому - {0} seconds ago + {0} секунд тому Щойно @@ -477,10 +477,10 @@ Б - {0, number} {0, plural, one {file} other {files}}, {1, number} {1, plural, one {folder} other {folders}} + {0, number} {0, plural, one {файл} few {файли} many {файлів} other {файли}}, {1, number} {1, plural, one {тека} few {теки} many {тек} other {тек}} - {0, number} {0, plural, one {file} other {files}}, {1, number} {1, plural, one {folder} other {folders}} from {2, number} {2, plural, one {location} other {locations}} + {0, number} {0, plural, one {файл} few {файли} many {файлів} other {файлів}}, {1, number} {1, plural, one {тека} few {теки} many {тек} other {тек}} від {2, number} {2, plural, one {розміщення} few {розміщень} many {розміщень} other {розміщення}} Запуск від імені іншого користувача @@ -513,7 +513,7 @@ Перемістити вкладку - Status + Стан Стандартна @@ -1083,7 +1083,7 @@ Перемкнути інформаційну панель для перегляду деталей/прев'ю панелей - Toggle the Toolbar + Перемкнути панель інструментів Попередній перегляд недоступний @@ -1242,37 +1242,37 @@ Копіювати - Copy {0, plural, one {item} other {items}} + Копіювати {0, plural, one {елемент} few {елементи} many {елементів} other {елемент}} - Delete {0, plural, one {item} other {items}} + Видалити {0, plural, one {елемент} few {елементи} many {елементів} other {елемент}} Перемістити - {0, plural, one {One item will be moved} other {# items will be moved}} + {0, plural, one {Один елемент буде переміщено} few {# елементи буде переміщено} many {# елементів буде переміщено} other {# елементів буде переміщено}} - Move {0, plural, one {item} other {items}} + Перемістити {0, plural, one {елемент} few {елементи} many {елементів} other {елемент}} - {0, plural, one {One item will be deleted} other {# items will be deleted}} + {0, plural, one {Один елемент буде видалено} few {# елементи буде видалено} many {# елементів буде видалено} other {# елементів буде видалено}} Продовжити - {0, plural, one {There is one conflicting file name} other {There are # conflicting file names}} + {0, plural, one {Є одне конфліктуюче ім'я файлу} few {Є # конфліктуючі імена файлів} many {Є # конфліктуючих імен файлів} other {Є # конфліктуючі імена файлів}} - {0, plural, one {There is one conflicting file name} other {There are # conflicting file names}}, and {1, plural, one {one outgoing item} other {# outgoing items}} + {0, plural, one {Є одне конфліктуюче ім'я файлу} few {Є # конфліктуючі імена файлів} many {Є # конфліктуючих імен файлів} other {Є # конфліктуючі імена файлів}}, і {1, plural, one {один вихідний елемент} few {# вихідні елементи} many {# вихідних елементів} other {# вихідні елементи}} - Conflicting {0, plural, one {file name} other {file names}} + Конфлікт {0, plural, one {ім'я файлу} few {імен файлів} many {імен файлів} other {ім'я файлу}} - {0, plural, one {One item will be copied} other {# items will be copied}} + {0, plural, one {Один елемент буде скопійовано} few {# елементи буде скопійовано} many {# елементів буде скопійовано} other {# елементів буде скопійовано}} Остаточно видалити @@ -1587,7 +1587,7 @@ Замінити всіх записів дозволів дочірніх об'єктів на успадковувані записи дозволів з цього об'єкта - Close active pane + Закрити активну панель Компактний режим @@ -1617,7 +1617,7 @@ Завантажує елемент з хмари і завантажує попередній перегляд - {0, plural, one {# item} other {# items}} ({1, plural, one {# file} other {# files}}, {2, plural, one {# folder} other {# folders}}) + {0, plural, one {# елемент} few {# елементи} many {# елементів} other {# елемент}} ({1, plural, one {# файл} few {# файли} many {# файлів} other {# файли}}, {2, plural, one {# тека} few {# теки} many {# тек} other {# тек}}) Нестиснутий розмір @@ -1848,13 +1848,13 @@ Немає зменшеного кольору - Third party libraries + Сторонні бібліотеки Ця опція змінює системний реєстр і може мати несподівані побічні ефекти на вашому пристрої. Продовжуйте на свій страх і ризик. - The flatten operations are permanent and not recommended. Continue at your own risk. + Операції зведення є постійними та не рекомендуються. Продовжуйте на свій страх і ризик. Створити бібліотеку @@ -2031,19 +2031,19 @@ Стиснути - Move all contents from subfolders into the selected location + Перемістити весь вміст підтек у вибране розташування - Flatten folder + Вирівняти теку - Flatten + Вирівняти - Flattening a folder will move all contents from its subfolders to the selected location. This operation is permanent and cannot be undone. By using this experimental feature, you acknowledge the risk and agree not to hold the Files team responsible for any data loss. + Вирівнювання теки перемістить увесь вміст її вкладених тек у вибране місце. Ця операція є постійною і не може бути скасована. Використовуючи цю експериментальну функцію, ви визнаєте ризик і погоджуєтеся не притягувати команду Files до відповідальності за будь-яку втрату даних. - Show flatten options + Показати параметри вирівнювання Вибрати файли та папки при наведенні на них @@ -2376,7 +2376,7 @@ Перемкнути для показу прихованих елементів - Toggle whether to show dot files + Перемкнути показ dot файлів Перемкнути для показу розширень файлів @@ -2694,13 +2694,13 @@ Закрити поточну вкладку - Close active pane + Закрити активну панель - Focus other pane + Сфокусуватися на іншій панелі - Switch focus to the non active pane + Перемкнути фокус на неактивну панель Перемкнути бічну панель @@ -3082,13 +3082,13 @@ Відкрити властивості - Open File Explorer properties + Відкрити властивості провідника файлів Відкрити вікно властивостей - Open File Explorer properties window + Відкрити вікно властивостей провідника файлів Локальні @@ -3152,7 +3152,7 @@ Mica Alt - Матеріал фону + Фон Цільний @@ -3508,7 +3508,7 @@ Shown in a StatusCenter card. - Error deleting {0} item(s) from "{1}" + Помилка видалення {0} елемента(ів) з "{1}" Shown in a StatusCenter card. @@ -3767,7 +3767,7 @@ Цей зв'язування ключів вже використовується, будь ласка, оберіть інший ключ, щоб продовжити. - The key binding you choose cannot be used, please try again using a different key binding. + Прив'язка клавіш, яку ви обираєте, не можна використати, будь ласка, спробуйте ще раз, використовуючи інше прив’язування клавіш. Модифікований @@ -3857,7 +3857,7 @@ This is the friendly name for bitmap files. - Num + Номер Мережеві розташування @@ -3875,70 +3875,73 @@ Редагування виділеного файлу в Notepad - Dimensions: + Розміри: - Status: + Стан: - Show Toolbar - Setting that controls if the Toolbar is shown in the main view + Показати панель інструментів + Setting that controls if the toolbar is shown in the main view - Tab actions menu + Меню дій вкладки - Add vertical pane + Додати вертикальну панель - Add a vertical pane + Додати вертикальну панель - Add horizontal pane + Додати горизонтальну панель - Add a horizontal pane + Додати горизонтальну панель - Arrange vertically + Розташувати вертикально - Arrange panes vertically + Розташувати панелі вертикально - Arrange horizontally + Розташувати горизонтально - Arrange panes horizontally + Розташувати панелі горизонтально - Add pane + Додати панель - Show tab actions button in the title bar + Показати кнопку дій вкладки в рядку заголовка - Arrange panes + Розташувати панелі - Default pane arrangement + Розташування панелей за замовчуванням - Horizontal + Горизонтально - Vertical + Вертикально - Show Files icon in the System Tray + Показати піктограму Files в System Tray - CPU threads + Потоки CPU - Navigate to the home page + Перейти до головної сторінки - Show home button in the toolbar + Показати головну панель в адресному рядку + + + Панелі інструментів \ No newline at end of file diff --git a/src/Files.App/Strings/vi/Resources.resw b/src/Files.App/Strings/vi/Resources.resw index e625455252f7f..b81f648b8b56f 100644 --- a/src/Files.App/Strings/vi/Resources.resw +++ b/src/Files.App/Strings/vi/Resources.resw @@ -3152,7 +3152,7 @@ Mica Alt - Kết cấu nền + Nền Màu đơn @@ -3882,7 +3882,7 @@ Hiện thanh công cụ - Setting that controls if the Toolbar is shown in the main view + Setting that controls if the toolbar is shown in the main view Menu tác vụ @@ -3939,6 +3939,9 @@ Điều hướng về trang chủ - Hiện nút trang chủ trên thanh công cụ + Hiện nút trang chủ trên thanh địa chỉ + + + Thanh công cụ \ No newline at end of file diff --git a/src/Files.App/Strings/zh-Hans/Resources.resw b/src/Files.App/Strings/zh-Hans/Resources.resw index cafa56f0805da..848aa6facd7a2 100644 --- a/src/Files.App/Strings/zh-Hans/Resources.resw +++ b/src/Files.App/Strings/zh-Hans/Resources.resw @@ -1854,7 +1854,7 @@ 此选项会修改系统注册表，并可能对你的设备产生意想不到的副作用。 继续即代表您自行承担风险。 - 合并操作是永久性的，不推荐使用。请自行承担使用风险。 + 展平 (Flatten) 操作是永久性的，不推荐使用。请自行承担使用风险。 创建库 @@ -2031,19 +2031,19 @@ 压缩 - 将所有项目从子文件夹移动到选定位置 + 将子文件夹中的全部项目移动到选定位置 - 合并文件夹 + 展平文件夹 - 合并 + 展平 - 合并文件夹将把所有项目从子文件夹移动到选定位置。此操作是永久性的，不可撤消。 使用此实验性功能表示您知晓风险且Files团队不对任何数据丢失负责。 + 展平 (Flatten) 文件夹将把该文件夹的子文件夹中的所有项目统一放置到选定目录下。此操作是永久性的，不可撤消。 使用此实验性功能，即表示您知晓风险且 Files 团队不对任何数据丢失负责。 - 显示更多选项 + 显示展平选项 鼠标悬停在项目上时自动选择 @@ -3882,7 +3882,7 @@ 显示工具栏 - Setting that controls if the Toolbar is shown in the main view + Setting that controls if the toolbar is shown in the main view 标签操作菜单 @@ -3939,6 +3939,9 @@ 返回主页 - 在工具栏中显示主页按钮 + 在地址栏中显示“主页”按钮 + + + 工具栏 \ No newline at end of file diff --git a/src/Files.App/Strings/zh-Hant/Resources.resw b/src/Files.App/Strings/zh-Hant/Resources.resw index f515eb70c99fd..06e3da8cf85d9 100644 --- a/src/Files.App/Strings/zh-Hant/Resources.resw +++ b/src/Files.App/Strings/zh-Hant/Resources.resw @@ -340,7 +340,7 @@ 設為鎖定畫面背景 - 設置為應用程式背景 + 設定為應用程式背景 無法刪除此檔案 @@ -421,7 +421,7 @@ {0} 秒前 - 立刻 + 剛剛 尚不支援此操作 @@ -1071,10 +1071,10 @@ 開啟/關閉預覽畫面 - 切換詳細資料預覽畫面 + 開啟/關閉詳細資料預覽畫面 - 切換到詳細資料視窗以查看檔案的基本內容 + 開啟/關閉詳細資料視窗以查看檔案的基本內容 切換詳細資料視窗 @@ -1371,7 +1371,7 @@ 去年 - 年 {0} + {0} 年 {0} 個項目 @@ -2172,13 +2172,13 @@ 建立捷徑 - “最近使用的檔案”已在 Windows 檔案總管中停用。 + 「最近使用的檔案」已在 Windows 檔案總管中停用。 編輯設定檔 - 什麼是新的 + 有什麼新消息？ 在此位置建立捷徑需要系統管理員權限 @@ -2265,7 +2265,7 @@ 顯示隱藏項目 - 格式... + 格式化... 幫助 @@ -2304,13 +2304,13 @@ 重新排列側邊欄項目 - 哈希值 + 雜湊值 在計算時發生錯誤 - 計算哈希值失敗，請關閉該檔案並重試。 + 計算雜湊值失敗，請關閉該檔案並重試。 無法檢視線上檔案的雜湊值 @@ -2319,7 +2319,7 @@ 演算法 - 哈希值 + 雜湊值 選擇要顯示的雜湊值 @@ -2328,7 +2328,7 @@ 計算中… - 固定項目 + 釘選項目 縮小 @@ -2382,7 +2382,7 @@ 切換是否顯示檔案副檔名 - 切換預覽視窗以查看文件預覽 + 開啟/關閉預覽視窗以查看文件預覽 切換是否顯示側邊攔 @@ -2400,7 +2400,7 @@ 剪下項目到剪貼簿 - 從剪貼簿貼上項目到目前資料夾 + 從剪貼簿貼上項目到所在資料夾 從剪貼簿貼上項目到所選資料夾 @@ -2421,7 +2421,7 @@ 清理資源回收筒 - 開啟 "格式化磁碟" 選項於選擇項目 + 開啟「格式化磁碟」選單於所選項目 從資源回收桶還原選擇項目 @@ -2454,7 +2454,7 @@ 清除選取 - 切換選取 + 選取/取消選取所選定的項目 分享選取的項目 @@ -2475,7 +2475,7 @@ 設成桌面背景 - 將選取的圖面設定為桌面幻燈片秀 + 將選取的圖片設定為桌面幻燈片秀 設成鎖定畫面背景 @@ -2493,34 +2493,34 @@ 安裝選取的憑證 - 以系統管理員身分執行選擇的應用程式 + 以系統管理員身分執行選取的應用程式 - 以不同的使用者身分執行選擇的應用程式 + 以不同的使用者身分執行選取的應用程式 - 執行PowerShell腳本 + 執行選取的 PowerShell 腳本 在跳出視窗中開啟預覽 - 使用所選的項目建立檔案 + 使用選取的項目建立壓縮檔案 - 使用所選的項目建立7z壓縮檔 + 使用選取的項目建立 7z 壓縮檔案 - 使用所選的項目建立zip壓縮檔 + 使用選取的項目建立 zip 壓縮檔案 - 將所選的壓縮文件解壓至文件夾 + 將選取的壓縮檔案解壓至任意資料夾 - 將所選的壓縮文件解壓至當前文件夾 + 將選取的壓縮檔案解壓至當前資料夾 - 將所選的壓縮文件解壓至新建文件夾 + 將選取的壓縮檔案解壓至新建資料夾 向左旋轉所選圖像 @@ -2893,7 +2893,7 @@ 變更 - 切換選擇 + 選取/取消選取 修改副檔名時顯示警告 @@ -3152,7 +3152,7 @@ Mica 替代 - 背景材質 + 背景質感 純色 @@ -3613,7 +3613,7 @@ 登入 - 標籤目前只相容 NTFS格式的磁碟機。 + 標籤目前只相容 NTFS 格式的磁碟機。 套用此標籤時發生錯誤 @@ -3882,34 +3882,34 @@ 顯示工具欄 - Setting that controls if the Toolbar is shown in the main view + Setting that controls if the toolbar is shown in the main view 索引標籤功能表 - 新增垂直分割畫面 + 新增上下分割畫面 - 將畫面垂直分割出一個視窗 + 將畫面分割成上、下視窗 - 新增水平分割畫面 + 新增左右分割畫面 - 將畫面水平分割出一個視窗 + 將畫面分割成左、右視窗 - 調整為垂直模式 + 調整為上下分割模式 - 垂直分割畫面 + 上下分割畫面 - 調整為水平模式 + 調整為左右分割模式 - 水平分割畫面 + 左右分割畫面 開啟分割畫面 @@ -3924,10 +3924,10 @@ 預設分割畫面排列方式 - 水平 + 左右排列 - 垂直 + 上下分割 在系統匣顯示 Files 圖示 @@ -3939,6 +3939,9 @@ 前往首頁 - 在工具欄顯示首頁鍵 + 在路徑欄顯示首頁鍵 + + + 工具欄 \ No newline at end of file diff --git a/src/Files.App/UserControls/Menus/FileTagsContextMenu.cs b/src/Files.App/UserControls/Menus/FileTagsContextMenu.cs index 70f632794e30f..0bac4d94b5041 100644 --- a/src/Files.App/UserControls/Menus/FileTagsContextMenu.cs +++ b/src/Files.App/UserControls/Menus/FileTagsContextMenu.cs @@ -63,6 +63,7 @@ private void Item_Opening(object? sender, object e) // go through each tag and find the common one for all files var commonFileTags = SelectedItems .Select(x => x?.FileTags ?? Enumerable.Empty()) + .DefaultIfEmpty(Enumerable.Empty()) .Aggregate((x, y) => x.Intersect(y)) .Select(x => Items.FirstOrDefault(y => x == ((TagViewModel)y.Tag)?.Uid)); diff --git a/src/Files.App/Utils/Cloud/CloudDrivesManager.cs b/src/Files.App/Utils/Cloud/CloudDrivesManager.cs index c4eec511b3d9a..cd8f4d912d190 100644 --- a/src/Files.App/Utils/Cloud/CloudDrivesManager.cs +++ b/src/Files.App/Utils/Cloud/CloudDrivesManager.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Logging; using System.Collections.Specialized; +using System.IO; using Windows.Storage; namespace Files.App.Utils.Cloud @@ -41,7 +42,7 @@ public static async Task UpdateDrivesAsync() { Text = provider.Name, Path = provider.SyncFolder, - Type = DriveType.CloudDrive, + Type = Data.Items.DriveType.CloudDrive, }; try @@ -50,6 +51,14 @@ public static async Task UpdateDrivesAsync() _ = MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => cloudProviderItem.UpdatePropertiesAsync()); } + catch (FileNotFoundException ex) + { + _logger?.LogInformation(ex, "Failed to find the cloud folder"); + } + catch (UnauthorizedAccessException ex) + { + _logger?.LogInformation(ex, " Failed to access the cloud folder"); + } catch (Exception ex) { _logger?.LogWarning(ex, "Cloud provider local folder couldn't be found"); diff --git a/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs b/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs index b6d14ecc0be61..ddd7c17ea8e4c 100644 --- a/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs +++ b/src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs @@ -759,6 +759,11 @@ public static Task CreateOrUpdateLinkAsync(string linkSavePath, string tar }); } } + catch (UnauthorizedAccessException ex) + { + // Could not create shortcut + App.Logger.LogInformation(ex, "Failed to create shortcut"); + } catch (Exception ex) { // Could not create shortcut diff --git a/src/Files.App/Utils/Storage/StorageItems/BaseQueryResults.cs b/src/Files.App/Utils/Storage/StorageItems/BaseQueryResults.cs index 5629c265f58ae..c8e466384e079 100644 --- a/src/Files.App/Utils/Storage/StorageItems/BaseQueryResults.cs +++ b/src/Files.App/Utils/Storage/StorageItems/BaseQueryResults.cs @@ -45,12 +45,12 @@ public virtual IAsyncOperation> GetItemsAsync() { if (colonSplit[0] == "System.FileName" || colonSplit[0] == "fileName" || colonSplit[0] == "name") { - items = items.Where(x => Regex.IsMatch(x.Name, colonSplit[1].Replace("\"", "", StringComparison.Ordinal).Replace("*", "(.*?)", StringComparison.Ordinal), RegexOptions.IgnoreCase)).ToList(); + items = items.Where(x => Regex.IsMatch(x.Name, Regex.Escape(colonSplit[1].Replace("\"", "", StringComparison.Ordinal)).Replace("\\*", ".*").Replace("\\?", "."), RegexOptions.IgnoreCase)).ToList(); } } else { - items = items.Where(x => Regex.IsMatch(x.Name, split.Replace("\"", "", StringComparison.Ordinal).Replace("*", "(.*?)", StringComparison.Ordinal), RegexOptions.IgnoreCase)).ToList(); + items = items.Where(x => Regex.IsMatch(x.Name, Regex.Escape(split.Replace("\"", "", StringComparison.Ordinal)).Replace("\\*", ".*").Replace("\\?", "."), RegexOptions.IgnoreCase)).ToList(); } } } diff --git a/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs b/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs index addfd024f1a38..7f93b84c0d9cd 100644 --- a/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs +++ b/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs @@ -1,9 +1,11 @@ // Copyright (c) 2024 Files Community // Licensed under the MIT License. See the LICENSE. +using Microsoft.Extensions.Logging; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Input; using System.IO; +using System.Runtime.InteropServices; using System.Windows.Input; using Windows.ApplicationModel.DataTransfer; using Windows.ApplicationModel.DataTransfer.DragDrop; @@ -18,6 +20,7 @@ namespace Files.App.ViewModels.Layouts public sealed class BaseLayoutViewModel : IDisposable { protected ICommandManager Commands { get; } = Ioc.Default.GetRequiredService(); + private ILogger? Logger { get; } = Ioc.Default.GetRequiredService>(); private readonly IShellPage _associatedInstance; @@ -119,47 +122,54 @@ public async Task DragOverAsync(DragEventArgs e) } else { - e.DragUIOverride.IsCaptionVisible = true; - if (pwd.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal)) + try { - e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName); - // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well. - e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy; + e.DragUIOverride.IsCaptionVisible = true; + if (pwd.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal)) + { + e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName); + // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well. + e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy; + } + else if (e.Modifiers.HasFlag(DragDropModifiers.Alt) || e.Modifiers.HasFlag(DragDropModifiers.Control | DragDropModifiers.Shift)) + { + e.DragUIOverride.Caption = string.Format("LinkToFolderCaptionText".GetLocalizedResource(), folderName); + e.AcceptedOperation = DataPackageOperation.Link; + } + else if (e.Modifiers.HasFlag(DragDropModifiers.Control)) + { + e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName); + e.AcceptedOperation = DataPackageOperation.Copy; + } + else if (e.Modifiers.HasFlag(DragDropModifiers.Shift)) + { + e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName); + // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well. + e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy; + } + else if (draggedItems.Any(x => + x.Item is ZipStorageFile || + x.Item is ZipStorageFolder) || + ZipStorageFolder.IsZipPath(pwd)) + { + e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName); + e.AcceptedOperation = DataPackageOperation.Copy; + } + else if (draggedItems.AreItemsInSameDrive(_associatedInstance.ShellViewModel.WorkingDirectory)) + { + e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName); + // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well. + e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy; + } + else + { + e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName); + e.AcceptedOperation = DataPackageOperation.Copy; + } } - else if (e.Modifiers.HasFlag(DragDropModifiers.Alt) || e.Modifiers.HasFlag(DragDropModifiers.Control | DragDropModifiers.Shift)) + catch (COMException ex) when (ex.Message.Contains("RPC server is unavailable")) { - e.DragUIOverride.Caption = string.Format("LinkToFolderCaptionText".GetLocalizedResource(), folderName); - e.AcceptedOperation = DataPackageOperation.Link; - } - else if (e.Modifiers.HasFlag(DragDropModifiers.Control)) - { - e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName); - e.AcceptedOperation = DataPackageOperation.Copy; - } - else if (e.Modifiers.HasFlag(DragDropModifiers.Shift)) - { - e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName); - // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well. - e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy; - } - else if (draggedItems.Any(x => - x.Item is ZipStorageFile || - x.Item is ZipStorageFolder) || - ZipStorageFolder.IsZipPath(pwd)) - { - e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName); - e.AcceptedOperation = DataPackageOperation.Copy; - } - else if (draggedItems.AreItemsInSameDrive(_associatedInstance.ShellViewModel.WorkingDirectory)) - { - e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName); - // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well. - e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy; - } - else - { - e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName); - e.AcceptedOperation = DataPackageOperation.Copy; + Logger?.LogDebug(ex, ex.Message); } } } diff --git a/src/Files.App/ViewModels/Properties/Items/CombinedFileProperties.cs b/src/Files.App/ViewModels/Properties/Items/CombinedFileProperties.cs index 836d7ef0038d2..c218f64744f87 100644 --- a/src/Files.App/ViewModels/Properties/Items/CombinedFileProperties.cs +++ b/src/Files.App/ViewModels/Properties/Items/CombinedFileProperties.cs @@ -17,7 +17,8 @@ public CombinedFileProperties( public async Task GetSystemFilePropertiesAsync() { - var queries = await Task.WhenAll(List.AsParallel().Select(async item => { + var queries = await Task.WhenAll(List.AsParallel().Select(async item => + { BaseStorageFile file = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(item.ItemPath)); if (file is null) { @@ -27,10 +28,13 @@ public async Task GetSystemFilePropertiesAsync() var list = await FileProperty.RetrieveAndInitializePropertiesAsync(file); - list.Find(x => x.ID == "address").Value = - await LocationHelpers.GetAddressFromCoordinatesAsync((double?)list.Find( - x => x.Property == "System.GPS.LatitudeDecimal").Value, - (double?)list.Find(x => x.Property == "System.GPS.LongitudeDecimal").Value); + var latitude = list.Find(x => x.Property == "System.GPS.LatitudeDecimal")?.Value as double?; + var longitude = list.Find(x => x.Property == "System.GPS.LongitudeDecimal")?.Value as double?; + var addressItem = list.Find(x => x.ID == "address"); + + if (latitude.HasValue && longitude.HasValue && addressItem != null) + addressItem.Value = await LocationHelpers.GetAddressFromCoordinatesAsync(latitude.Value, longitude.Value); + return list .Where(fileProp => !(fileProp.Value is null && fileProp.IsReadOnly)) diff --git a/src/Files.App/ViewModels/Settings/AboutViewModel.cs b/src/Files.App/ViewModels/Settings/AboutViewModel.cs index 93cc14285f39a..b5b58b6f5171c 100644 --- a/src/Files.App/ViewModels/Settings/AboutViewModel.cs +++ b/src/Files.App/ViewModels/Settings/AboutViewModel.cs @@ -16,6 +16,11 @@ namespace Files.App.ViewModels.Settings /// public sealed class AboutViewModel : ObservableObject { + // Dependency injections + + private IGeneralSettingsService GeneralSettingsService { get; } = Ioc.Default.GetRequiredService(); + + // Properties public string Version @@ -33,6 +38,7 @@ public PackageVersion AppVersion public ICommand CopyAppVersionCommand { get; } public ICommand CopyWindowsVersionCommand { get; } + public ICommand CopyUserIDCommand { get; } public ICommand SupportUsCommand { get; } public ICommand OpenLogLocationCommand { get; } public ICommand OpenDocumentationCommand { get; } @@ -76,6 +82,7 @@ public AboutViewModel() CopyAppVersionCommand = new RelayCommand(CopyAppVersion); CopyWindowsVersionCommand = new RelayCommand(CopyWindowsVersion); + CopyUserIDCommand = new RelayCommand(CopyUserID); SupportUsCommand = new AsyncRelayCommand(SupportUs); OpenDocumentationCommand = new AsyncRelayCommand(DoOpenDocumentation); OpenDiscordCommand = new AsyncRelayCommand(DoOpenDiscord); @@ -161,6 +168,17 @@ public void CopyWindowsVersion() Clipboard.SetContent(dataPackage); }); } + + public void CopyUserID() + { + SafetyExtensions.IgnoreExceptions(() => + { + DataPackage dataPackage = new DataPackage(); + dataPackage.RequestedOperation = DataPackageOperation.Copy; + dataPackage.SetText(GetUserID()); + Clipboard.SetContent(dataPackage); + }); + } public Task SupportUs() { @@ -176,12 +194,18 @@ public string GetWindowsVersion() { return SystemInformation.Instance.OperatingSystemVersion.ToString(); } + + public string GetUserID() + { + return GeneralSettingsService.UserId; + } public string GetVersionsQueryString() { var query = System.Web.HttpUtility.ParseQueryString(string.Empty); query["files_version"] = GetAppVersion(); query["windows_version"] = GetWindowsVersion(); + query["user_id"] = GetUserID(); return query.ToString() ?? string.Empty; } } diff --git a/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs b/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs index 572bf3098cf8c..22f93fe1a6995 100644 --- a/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs @@ -28,7 +28,7 @@ public bool IsEnabled get => isEnabled; set { - infoPaneSettingsService.IsEnabled = value; + infoPaneSettingsService.IsInfoPaneEnabled = value; SetProperty(ref isEnabled, value); } @@ -116,7 +116,7 @@ public InfoPaneViewModel() infoPaneSettingsService.PropertyChanged += PreviewSettingsService_OnPropertyChangedEvent; contentPageContext.PropertyChanged += ContentPageContext_PropertyChanged; - IsEnabled = infoPaneSettingsService.IsEnabled; + IsEnabled = infoPaneSettingsService.IsInfoPaneEnabled; } private async void ContentPageContext_PropertyChanged(object? sender, PropertyChangedEventArgs e) @@ -429,9 +429,9 @@ private async void PreviewSettingsService_OnPropertyChangedEvent(object? sender, // The preview will need refreshing as the file details won't be accurate await UpdateSelectedItemPreviewAsync(); } - else if (e.PropertyName is nameof(infoPaneSettingsService.IsEnabled)) + else if (e.PropertyName is nameof(infoPaneSettingsService.IsInfoPaneEnabled)) { - var newEnablingStatus = infoPaneSettingsService.IsEnabled; + var newEnablingStatus = infoPaneSettingsService.IsInfoPaneEnabled; if (isEnabled != newEnablingStatus) { isEnabled = newEnablingStatus; diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs index b6227a9d89226..55b9a425aaa80 100644 --- a/src/Files.App/Views/MainPage.xaml.cs +++ b/src/Files.App/Views/MainPage.xaml.cs @@ -118,7 +118,7 @@ private void UserSettingsService_OnSettingChangedEvent(object? sender, SettingCh { switch (e.SettingName) { - case nameof(IInfoPaneSettingsService.IsEnabled): + case nameof(IInfoPaneSettingsService.IsInfoPaneEnabled): LoadPaneChanged(); break; } @@ -438,7 +438,7 @@ private void LoadPaneChanged() (MainWindow.Instance.Bounds.Width > 450 && MainWindow.Instance.Bounds.Height > 450 || RootGrid.ActualWidth > 700 && MainWindow.Instance.Bounds.Height > 360); ViewModel.ShouldPreviewPaneBeDisplayed = (!isHomePage || isMultiPane) && isBigEnough; - ViewModel.ShouldPreviewPaneBeActive = UserSettingsService.InfoPaneSettingsService.IsEnabled && ViewModel.ShouldPreviewPaneBeDisplayed; + ViewModel.ShouldPreviewPaneBeActive = UserSettingsService.InfoPaneSettingsService.IsInfoPaneEnabled && ViewModel.ShouldPreviewPaneBeDisplayed; ViewModel.ShouldViewControlBeDisplayed = SidebarAdaptiveViewModel.PaneHolder?.ActivePane?.InstanceViewModel?.IsPageTypeNotHome ?? false; UpdatePositioning(); diff --git a/src/Files.App/Views/Settings/AboutPage.xaml b/src/Files.App/Views/Settings/AboutPage.xaml index e386a42c17e9e..79136780b3877 100644 --- a/src/Files.App/Views/Settings/AboutPage.xaml +++ b/src/Files.App/Views/Settings/AboutPage.xaml @@ -42,6 +42,7 @@ +