diff --git a/frontend/src/components/FormHelpers/ImportOptions.vue b/frontend/src/components/FormHelpers/ImportOptions.vue index 74f133edb..333f5d5fd 100644 --- a/frontend/src/components/FormHelpers/ImportOptions.vue +++ b/frontend/src/components/FormHelpers/ImportOptions.vue @@ -36,11 +36,11 @@ export default { }, users: { value: true, - text: this.$t("general.users"), + text: this.$t("user.users"), }, groups: { value: true, - text: this.$t("general.groups"), + text: this.$t("group.groups"), }, }, }; diff --git a/frontend/src/components/ImportSummaryDialog/index.vue b/frontend/src/components/ImportSummaryDialog/index.vue index 1e2dde36f..aa816aa41 100644 --- a/frontend/src/components/ImportSummaryDialog/index.vue +++ b/frontend/src/components/ImportSummaryDialog/index.vue @@ -29,8 +29,8 @@ {{ $t("general.themes") }} {{ $t("general.settings") }} {{ $t("settings.pages") }} - {{ $t("general.users") }} - {{ $t("general.groups") }} + {{ $t("user.users") }} + {{ $t("group.groups") }} @@ -92,10 +92,10 @@ export default { return this.calculateNumbers(this.$t("general.themes"), this.themeData); }, userNumbers() { - return this.calculateNumbers(this.$t("general.users"), this.userData); + return this.calculateNumbers(this.$t("user.users"), this.userData); }, groupNumbers() { - return this.calculateNumbers(this.$t("general.groups"), this.groupData); + return this.calculateNumbers(this.$t("group.groups"), this.groupData); }, pageNumbers() { return this.calculateNumbers(this.$t("settings.pages"), this.pageData); diff --git a/frontend/src/components/UI/Dialogs/BackupDialog.vue b/frontend/src/components/UI/Dialogs/BackupDialog.vue index b666129dc..a23b82713 100644 --- a/frontend/src/components/UI/Dialogs/BackupDialog.vue +++ b/frontend/src/components/UI/Dialogs/BackupDialog.vue @@ -8,7 +8,7 @@ :loading="loading" > diff --git a/frontend/src/components/UI/TheSidebar.vue b/frontend/src/components/UI/TheSidebar.vue index 797434ccf..d328de84c 100644 --- a/frontend/src/components/UI/TheSidebar.vue +++ b/frontend/src/components/UI/TheSidebar.vue @@ -155,7 +155,7 @@ export default { { icon: "mdi-account-group", to: "/admin/manage-users", - title: this.$t("settings.manage-users"), + title: this.$t("user.manage-users"), }, { icon: "mdi-database-import", diff --git a/frontend/src/locales/messages/en-US.json b/frontend/src/locales/messages/en-US.json index 4d7fde07c..7330f3846 100644 --- a/frontend/src/locales/messages/en-US.json +++ b/frontend/src/locales/messages/en-US.json @@ -28,16 +28,19 @@ "category-deletion-failed": "Category deletion failed", "category-filter": "Category Filter", "category-update-failed": "Category update failed", - "category-updated": "Category updated" + "category-updated": "Category updated", + "uncategorized-count": "Uncategorized {count}" }, "general": { "apply": "Apply", "cancel": "Cancel", + "clear": "Clear", "close": "Close", "confirm": "Confirm", "create": "Create", "created": "Created", "current-parenthesis": "(Current)", + "custom": "Custom", "dashboard": "Dashboard", "delete": "Delete", "disabled": "Disabled", @@ -53,7 +56,6 @@ "filter": "Filter", "friday": "Friday", "get": "Get", - "groups": "Groups", "image": "Image", "image-upload-failed": "Image upload failed", "import": "Import", @@ -90,7 +92,6 @@ "updated": "Updated", "upload": "Upload", "url": "URL", - "users": "Users", "wednesday": "Wednesday", "yes": "Yes" }, @@ -109,6 +110,7 @@ "group-not-found": "Group not found", "groups": "Groups", "groups-can-only-be-set-by-administrators": "Groups can only be set by administrators", + "manage-groups": "Manage Groups", "user-group": "User Group", "user-group-created": "User Group Created", "user-group-creation-failed": "User Group Creation Failed" @@ -258,6 +260,7 @@ "current": "Version:", "custom-pages": "Custom Pages", "edit-page": "Edit Page", + "events": "Events", "first-day-of-week": "First day of the week", "group-settings-updated": "Group Settings Updated", "homepage": { @@ -271,7 +274,6 @@ "latest": "Latest", "local-api": "Local API", "locale-settings": "Locale settings", - "manage-users": "Manage Users", "migrations": "Migrations", "new-page": "New Page", "page-name": "Page Name", @@ -353,7 +355,8 @@ "tag-deletion-failed": "Tag deletion failed", "tag-update-failed": "Tag update failed", "tag-updated": "Tag updated", - "tags": "Tags" + "tags": "Tags", + "untagged-count": "Untagged {count}" }, "user": { "admin": "Admin", @@ -377,6 +380,7 @@ "link-name": "Link Name", "login": "Login", "logout": "Logout", + "manage-users": "Manage Users", "new-password": "New Password", "new-user": "New User", "password": "Password", diff --git a/frontend/src/pages/Admin/Dashboard/BackupViewer.vue b/frontend/src/pages/Admin/Dashboard/BackupViewer.vue index cda4e95df..769178f90 100644 --- a/frontend/src/pages/Admin/Dashboard/BackupViewer.vue +++ b/frontend/src/pages/Admin/Dashboard/BackupViewer.vue @@ -11,7 +11,9 @@