From 94844545840f916e4fdfab3854c128b11a1f8be9 Mon Sep 17 00:00:00 2001 From: Isaak Tsalicoglou Date: Thu, 2 Nov 2023 09:43:32 +0200 Subject: [PATCH 01/15] chore: update en translation (#2776) --- frontend/src/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index d9ba48cc..2041fd2e 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -197,7 +197,7 @@ "userScopeGenerationPlaceholder": "The scope will be auto generated", "createUserHomeDirectory": "Create user home directory", "customStylesheet": "Custom Stylesheet", - "defaultUserDescription": "This are the default settings for new users.", + "defaultUserDescription": "These are the default settings for new users.", "disableExternalLinks": "Disable external links (except documentation)", "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "documentation", From d0c3aeace1a82a0aaa280246c1f4124bd8c0f8c2 Mon Sep 17 00:00:00 2001 From: Isaak Tsalicoglou Date: Thu, 2 Nov 2023 09:43:50 +0200 Subject: [PATCH 02/15] chore: update en translation (#2777) --- frontend/src/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index 2041fd2e..e74cd5aa 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -204,7 +204,7 @@ "examples": "Examples", "executeOnShell": "Execute on shell", "executeOnShellDescription": "By default, File Browser executes the commands by calling their binaries directly. If you want to run them on a shell instead (such as Bash or PowerShell), you can define it here with the required arguments and flags. If set, the command you execute will be appended as an argument. This apply to both user commands and event hooks.", - "globalRules": "This is a global set of allow and disallow rules. They apply to every user. You can define specific rules on each user's settings to override this ones.", + "globalRules": "This is a global set of allow and disallow rules. They apply to every user. You can define specific rules on each user's settings to override these ones.", "globalSettings": "Global Settings", "hideDotfiles": "Hide dotfiles", "insertPath": "Insert the path", From cdcd9a313aa50c2e6806a182b6838462d42dcafe Mon Sep 17 00:00:00 2001 From: kloon15 Date: Thu, 2 Nov 2023 08:47:55 +0100 Subject: [PATCH 03/15] fix: display file size as base 2 (KiB instead of KB) (#2779) --- frontend/src/components/files/ListingItem.vue | 2 +- frontend/src/components/prompts/Info.vue | 4 ++-- frontend/src/utils/index.js | 6 ++++++ frontend/src/views/Share.vue | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 frontend/src/utils/index.js diff --git a/frontend/src/components/files/ListingItem.vue b/frontend/src/components/files/ListingItem.vue index 677d30e9..71813bcf 100644 --- a/frontend/src/components/files/ListingItem.vue +++ b/frontend/src/components/files/ListingItem.vue @@ -37,7 +37,7 @@