From 2724a9fdcfe9f5c03176bf3a73759cb237550c07 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomascamlong@gmail.com>
Date: Mon, 24 Oct 2022 20:16:11 +0900
Subject: [PATCH 01/12] add support for da and he languages

---
 next-i18next.config.js |  2 ++
 src/pages/_app.tsx     |  5 +++--
 src/tools/language.ts  | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/next-i18next.config.js b/next-i18next.config.js
index c0d83f7a5..eb842c73a 100644
--- a/next-i18next.config.js
+++ b/next-i18next.config.js
@@ -4,6 +4,8 @@ module.exports = {
     defaultLocale: 'en',
     locales: [
       'en',
+      'da',
+      'he',
       'de',
       'es',
       'fr',
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index d57b7d782..7525d0bf6 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -5,7 +5,7 @@ import { getCookie, setCookie } from 'cookies-next';
 import Head from 'next/head';
 import { MantineProvider, ColorScheme, ColorSchemeProvider, MantineTheme } from '@mantine/core';
 import { NotificationsProvider } from '@mantine/notifications';
-import { useHotkeys } from '@mantine/hooks';
+import { useColorScheme, useHotkeys } from '@mantine/hooks';
 import { ModalsProvider } from '@mantine/modals';
 import { appWithTranslation } from 'next-i18next';
 import { QueryClientProvider } from '@tanstack/react-query';
@@ -16,7 +16,8 @@ import { queryClient } from '../tools/queryClient';
 
 function App(this: any, props: AppProps & { colorScheme: ColorScheme }) {
   const { Component, pageProps } = props;
-  const [colorScheme, setColorScheme] = useState<ColorScheme>(props.colorScheme);
+  const preferredColorScheme = useColorScheme();
+  const [colorScheme, setColorScheme] = useState<ColorScheme>(preferredColorScheme);
 
   const [primaryColor, setPrimaryColor] = useState<MantineTheme['primaryColor']>('red');
   const [secondaryColor, setSecondaryColor] = useState<MantineTheme['primaryColor']>('orange');
diff --git a/src/tools/language.ts b/src/tools/language.ts
index 9110caecd..e03f79a82 100644
--- a/src/tools/language.ts
+++ b/src/tools/language.ts
@@ -25,6 +25,20 @@ export const languages: Language[] = [
     translatedName: 'English',
     emoji: '🇬🇧',
   },
+  // Danish
+  {
+    shortName: 'da',
+    originalName: 'Dansk',
+    translatedName: 'Danish',
+    emoji: '🇩🇰',
+  },
+  // Hebrew
+  {
+    shortName: 'he',
+    originalName: 'עברית',
+    translatedName: 'Hebrew',
+    emoji: '🇮🇱',
+  },
   {
     shortName: 'es',
     originalName: 'Español',

From 14920d4b57b3eb3bc6a216265e7afd01add7ec43 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomascamlong@gmail.com>
Date: Tue, 25 Oct 2022 09:14:19 +0900
Subject: [PATCH 02/12] =?UTF-8?q?=F0=9F=94=A7=20fix=20logo=20in=20README?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3bc575f6a..3331187db 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@
 ---
 
 <!-- Homarr Description -->
-<img align="right" width=150 src="public/imgs/logo-color.svg" />
+<img align="right" width=150 src="public/imgs/logo/logo-color.svg" />
 
 Homarr is a simple and lightweight homepage for your server, that helps you easily access all of your services in one place.
 

From c6474923b04f63efa7121d199c317b4c65aa4a46 Mon Sep 17 00:00:00 2001
From: SR3u <wnmsr3u@gmail.com>
Date: Thu, 27 Oct 2022 17:20:02 +0300
Subject: [PATCH 03/12] :arrow_up: Updated: Next.js 12.1.6 -> 12.2.0

---
 next.config.js                        |   3 -
 package.json                          |   2 +-
 src/middleware.ts                     |  23 ++++
 src/pages/_middleware.ts              |  16 ---
 src/pages/api/configs/tryPassword.tsx |   2 +-
 yarn.lock                             | 146 ++++++++++++++++----------
 6 files changed, 113 insertions(+), 79 deletions(-)
 create mode 100644 src/middleware.ts
 delete mode 100644 src/pages/_middleware.ts

diff --git a/next.config.js b/next.config.js
index 17decd099..b9989cfa8 100644
--- a/next.config.js
+++ b/next.config.js
@@ -11,9 +11,6 @@ module.exports = withBundleAnalyzer({
     domains: ['cdn.jsdelivr.net'],
   },
   reactStrictMode: false,
-  experimental: {
-    outputStandalone: true,
-  },
   output: 'standalone',
   i18n,
 });
diff --git a/package.json b/package.json
index 1e00d62f2..650453385 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "i18next-browser-languagedetector": "^6.1.5",
     "i18next-http-backend": "^1.4.1",
     "js-file-download": "^0.4.12",
-    "next": "12.1.6",
+    "next": "12.2.0",
     "next-i18next": "^11.3.0",
     "prism-react-renderer": "^1.3.5",
     "react": "^18.2.0",
diff --git a/src/middleware.ts b/src/middleware.ts
new file mode 100644
index 000000000..3fb5b88d8
--- /dev/null
+++ b/src/middleware.ts
@@ -0,0 +1,23 @@
+import { NextFetchEvent, NextRequest, NextResponse } from 'next/server';
+
+// eslint-disable-next-line consistent-return
+export function middleware(req: NextRequest, ev: NextFetchEvent) {
+  const isCorrectPassword = req.cookies.get('password') === process.env.PASSWORD;
+  const url = req.nextUrl.clone();
+  const skipURL = url.pathname && (
+    url.pathname.includes('login') || url.pathname === ('/api/configs/tryPassword') || (
+        url.pathname.includes('/_next/') && !url.pathname.includes('/pages/')
+      ) ||
+      url.pathname === '/favicon.ico' ||
+      url.pathname === '/404' ||
+      url.pathname.includes('pages/_app')
+  );
+  if (
+    !skipURL &&
+    !isCorrectPassword &&
+    process.env.PASSWORD
+  ) {
+    url.pathname = '/login';
+    return NextResponse.rewrite(url);
+  }
+}
diff --git a/src/pages/_middleware.ts b/src/pages/_middleware.ts
deleted file mode 100644
index 5b01cbe38..000000000
--- a/src/pages/_middleware.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NextFetchEvent, NextRequest, NextResponse } from 'next/server';
-
-// eslint-disable-next-line consistent-return
-export function middleware(req: NextRequest, ev: NextFetchEvent) {
-  const isCorrectPassword = req.cookies.password === process.env.PASSWORD;
-  const url = req.nextUrl.clone();
-  if (
-    !isCorrectPassword &&
-    url.pathname !== '/login' &&
-    process.env.PASSWORD &&
-    url.pathname !== '/api/configs/tryPassword'
-  ) {
-    url.pathname = '/login';
-    return NextResponse.rewrite(url);
-  }
-}
diff --git a/src/pages/api/configs/tryPassword.tsx b/src/pages/api/configs/tryPassword.tsx
index 18432739b..8f3848b9d 100644
--- a/src/pages/api/configs/tryPassword.tsx
+++ b/src/pages/api/configs/tryPassword.tsx
@@ -14,7 +14,7 @@ function Post(req: NextApiRequest, res: NextApiResponse) {
 }
 
 export default async (req: NextApiRequest, res: NextApiResponse) => {
-  // Filter out if the reuqest is a POST or a GET
+  // Filter out if the request is a POST or a GET
   if (req.method === 'POST') {
     return Post(req, res);
   }
diff --git a/yarn.lock b/yarn.lock
index 6c5c4b6ed..d9158d62d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1353,10 +1353,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/env@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/env@npm:12.1.6"
-  checksum: e6a4f189f0d653d13dc7ad510f6c9d2cf690bfd9e07c554bd501b840f8dabc3da5adcab874b0bc01aab86c3647cff4fb84692e3c3b28125af26f0b05cd4c7fcf
+"@next/env@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/env@npm:12.2.0"
+  checksum: 5fb317bdb5eb2d5df12ff55e335368792dba21874c5ece3cabf8cd312cec911a1d54ecf368e69dc08640b0244669b8a98c86cd035c7874b17640602e67c1b9d9
   languageName: node
   linkType: hard
 
@@ -1369,86 +1369,93 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-android-arm-eabi@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-android-arm-eabi@npm:12.1.6"
+"@next/swc-android-arm-eabi@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-android-arm-eabi@npm:12.2.0"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@next/swc-android-arm64@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-android-arm64@npm:12.1.6"
+"@next/swc-android-arm64@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-android-arm64@npm:12.2.0"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@next/swc-darwin-arm64@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-darwin-arm64@npm:12.1.6"
+"@next/swc-darwin-arm64@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-darwin-arm64@npm:12.2.0"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@next/swc-darwin-x64@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-darwin-x64@npm:12.1.6"
+"@next/swc-darwin-x64@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-darwin-x64@npm:12.2.0"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm-gnueabihf@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-linux-arm-gnueabihf@npm:12.1.6"
+"@next/swc-freebsd-x64@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-freebsd-x64@npm:12.2.0"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@next/swc-linux-arm-gnueabihf@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-linux-arm-gnueabihf@npm:12.2.0"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm64-gnu@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-linux-arm64-gnu@npm:12.1.6"
+"@next/swc-linux-arm64-gnu@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-linux-arm64-gnu@npm:12.2.0"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm64-musl@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-linux-arm64-musl@npm:12.1.6"
+"@next/swc-linux-arm64-musl@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-linux-arm64-musl@npm:12.2.0"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@next/swc-linux-x64-gnu@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-linux-x64-gnu@npm:12.1.6"
+"@next/swc-linux-x64-gnu@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-linux-x64-gnu@npm:12.2.0"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@next/swc-linux-x64-musl@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-linux-x64-musl@npm:12.1.6"
+"@next/swc-linux-x64-musl@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-linux-x64-musl@npm:12.2.0"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@next/swc-win32-arm64-msvc@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-win32-arm64-msvc@npm:12.1.6"
+"@next/swc-win32-arm64-msvc@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-win32-arm64-msvc@npm:12.2.0"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@next/swc-win32-ia32-msvc@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-win32-ia32-msvc@npm:12.1.6"
+"@next/swc-win32-ia32-msvc@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-win32-ia32-msvc@npm:12.2.0"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@next/swc-win32-x64-msvc@npm:12.1.6":
-  version: 12.1.6
-  resolution: "@next/swc-win32-x64-msvc@npm:12.1.6"
+"@next/swc-win32-x64-msvc@npm:12.2.0":
+  version: 12.2.0
+  resolution: "@next/swc-win32-x64-msvc@npm:12.2.0"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -1885,6 +1892,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/helpers@npm:0.4.2":
+  version: 0.4.2
+  resolution: "@swc/helpers@npm:0.4.2"
+  dependencies:
+    tslib: ^2.4.0
+  checksum: 0b8c86ad03b17b8fe57dc4498e25dc294ea6bc42558a6b92d8fcd789351dac80199409bef38a2e3ac06aae0fedddfc0ab9c34409acbf74e55d1bbbd74f68b6b7
+  languageName: node
+  linkType: hard
+
 "@szmarczak/http-timer@npm:^4.0.5":
   version: 4.0.6
   resolution: "@szmarczak/http-timer@npm:4.0.6"
@@ -4833,7 +4849,7 @@ __metadata:
     i18next-http-backend: ^1.4.1
     jest: ^28.1.3
     js-file-download: ^0.4.12
-    next: 12.1.6
+    next: 12.2.0
     next-i18next: ^11.3.0
     prettier: ^2.7.1
     prism-react-renderer: ^1.3.5
@@ -6369,26 +6385,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"next@npm:12.1.6":
-  version: 12.1.6
-  resolution: "next@npm:12.1.6"
+"next@npm:12.2.0":
+  version: 12.2.0
+  resolution: "next@npm:12.2.0"
   dependencies:
-    "@next/env": 12.1.6
-    "@next/swc-android-arm-eabi": 12.1.6
-    "@next/swc-android-arm64": 12.1.6
-    "@next/swc-darwin-arm64": 12.1.6
-    "@next/swc-darwin-x64": 12.1.6
-    "@next/swc-linux-arm-gnueabihf": 12.1.6
-    "@next/swc-linux-arm64-gnu": 12.1.6
-    "@next/swc-linux-arm64-musl": 12.1.6
-    "@next/swc-linux-x64-gnu": 12.1.6
-    "@next/swc-linux-x64-musl": 12.1.6
-    "@next/swc-win32-arm64-msvc": 12.1.6
-    "@next/swc-win32-ia32-msvc": 12.1.6
-    "@next/swc-win32-x64-msvc": 12.1.6
+    "@next/env": 12.2.0
+    "@next/swc-android-arm-eabi": 12.2.0
+    "@next/swc-android-arm64": 12.2.0
+    "@next/swc-darwin-arm64": 12.2.0
+    "@next/swc-darwin-x64": 12.2.0
+    "@next/swc-freebsd-x64": 12.2.0
+    "@next/swc-linux-arm-gnueabihf": 12.2.0
+    "@next/swc-linux-arm64-gnu": 12.2.0
+    "@next/swc-linux-arm64-musl": 12.2.0
+    "@next/swc-linux-x64-gnu": 12.2.0
+    "@next/swc-linux-x64-musl": 12.2.0
+    "@next/swc-win32-arm64-msvc": 12.2.0
+    "@next/swc-win32-ia32-msvc": 12.2.0
+    "@next/swc-win32-x64-msvc": 12.2.0
+    "@swc/helpers": 0.4.2
     caniuse-lite: ^1.0.30001332
     postcss: 8.4.5
     styled-jsx: 5.0.2
+    use-sync-external-store: 1.1.0
   peerDependencies:
     fibers: ">= 3.1.0"
     node-sass: ^6.0.0 || ^7.0.0
@@ -6404,6 +6423,8 @@ __metadata:
       optional: true
     "@next/swc-darwin-x64":
       optional: true
+    "@next/swc-freebsd-x64":
+      optional: true
     "@next/swc-linux-arm-gnueabihf":
       optional: true
     "@next/swc-linux-arm64-gnu":
@@ -6429,7 +6450,7 @@ __metadata:
       optional: true
   bin:
     next: dist/bin/next
-  checksum: 670d544fd47670c29681d10824e6da625e9d4a048e564c8d9cb80d37f33c9ff9b5ca0a53e6d84d8d618b1fe7c9bb4e6b45040cb7e57a5c46b232a8f914425dc1
+  checksum: 38456c33935122ac1581367e4982034be23269039a8470a66443d710334336f8f3fb587f25d172d138d84cf18c01d3a76627fb610c2e2e57bd1692277c23fa2b
   languageName: node
   linkType: hard
 
@@ -8191,6 +8212,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"use-sync-external-store@npm:1.1.0":
+  version: 1.1.0
+  resolution: "use-sync-external-store@npm:1.1.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 8993a0b642f91d7fcdbb02b7b3ac984bd3af4769686f38291fe7fcfe73dfb73d6c64d20dfb7e5e7fbf5a6da8f5392d6f8e5b00c243a04975595946e82c02b883
+  languageName: node
+  linkType: hard
+
 "use-sync-external-store@npm:^1.2.0":
   version: 1.2.0
   resolution: "use-sync-external-store@npm:1.2.0"

From 3cfeac4678059b791581ffe89ee04c4b7cdff4d7 Mon Sep 17 00:00:00 2001
From: Manuel <30572287+manuel-rw@users.noreply.github.com>
Date: Mon, 31 Oct 2022 17:36:45 +0100
Subject: [PATCH 04/12] =?UTF-8?q?=F0=9F=90=9B=20fix=20default=20favicon=20?=
 =?UTF-8?q?path=20(#492)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/locales/da/settings/customization/page-appearance.json  | 2 +-
 public/locales/de/settings/customization/page-appearance.json  | 2 +-
 public/locales/en/settings/customization/page-appearance.json  | 2 +-
 public/locales/es/settings/customization/page-appearance.json  | 2 +-
 public/locales/fr/settings/customization/page-appearance.json  | 2 +-
 public/locales/he/settings/customization/page-appearance.json  | 2 +-
 public/locales/it/settings/customization/page-appearance.json  | 2 +-
 public/locales/ja/settings/customization/page-appearance.json  | 2 +-
 public/locales/ko/settings/customization/page-appearance.json  | 2 +-
 public/locales/lol/settings/customization/page-appearance.json | 2 +-
 public/locales/nl/settings/customization/page-appearance.json  | 2 +-
 public/locales/pl/settings/customization/page-appearance.json  | 2 +-
 public/locales/sl/settings/customization/page-appearance.json  | 2 +-
 public/locales/sv/settings/customization/page-appearance.json  | 2 +-
 public/locales/uk/settings/customization/page-appearance.json  | 2 +-
 public/locales/zh/settings/customization/page-appearance.json  | 2 +-
 src/components/AppShelf/AddAppShelfItem.tsx                    | 2 +-
 src/tools/addToHomarr.ts                                       | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/public/locales/da/settings/customization/page-appearance.json b/public/locales/da/settings/customization/page-appearance.json
index 41d8ff74f..dd70de077 100644
--- a/public/locales/da/settings/customization/page-appearance.json
+++ b/public/locales/da/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Baggrund",
diff --git a/public/locales/de/settings/customization/page-appearance.json b/public/locales/de/settings/customization/page-appearance.json
index 8c195e6a1..c494a8857 100644
--- a/public/locales/de/settings/customization/page-appearance.json
+++ b/public/locales/de/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Hintergrund",
diff --git a/public/locales/en/settings/customization/page-appearance.json b/public/locales/en/settings/customization/page-appearance.json
index 3c9d62888..52781b5b9 100644
--- a/public/locales/en/settings/customization/page-appearance.json
+++ b/public/locales/en/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Background",
diff --git a/public/locales/es/settings/customization/page-appearance.json b/public/locales/es/settings/customization/page-appearance.json
index e53877fa5..db65c7b47 100644
--- a/public/locales/es/settings/customization/page-appearance.json
+++ b/public/locales/es/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Fondo",
diff --git a/public/locales/fr/settings/customization/page-appearance.json b/public/locales/fr/settings/customization/page-appearance.json
index e04992fcb..d13ef87e0 100644
--- a/public/locales/fr/settings/customization/page-appearance.json
+++ b/public/locales/fr/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Contexte",
diff --git a/public/locales/he/settings/customization/page-appearance.json b/public/locales/he/settings/customization/page-appearance.json
index f8ef9cb30..86c38ae12 100644
--- a/public/locales/he/settings/customization/page-appearance.json
+++ b/public/locales/he/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "אייקון לצד שם העמוד",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "רקע",
diff --git a/public/locales/it/settings/customization/page-appearance.json b/public/locales/it/settings/customization/page-appearance.json
index 68c35eeb3..ba17a50a7 100644
--- a/public/locales/it/settings/customization/page-appearance.json
+++ b/public/locales/it/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Sfondo",
diff --git a/public/locales/ja/settings/customization/page-appearance.json b/public/locales/ja/settings/customization/page-appearance.json
index 4a6550f87..cb8b61145 100644
--- a/public/locales/ja/settings/customization/page-appearance.json
+++ b/public/locales/ja/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "ファビコン",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "背景",
diff --git a/public/locales/ko/settings/customization/page-appearance.json b/public/locales/ko/settings/customization/page-appearance.json
index 670fe998d..1466fe4a2 100644
--- a/public/locales/ko/settings/customization/page-appearance.json
+++ b/public/locales/ko/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "파비콘",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "배경",
diff --git a/public/locales/lol/settings/customization/page-appearance.json b/public/locales/lol/settings/customization/page-appearance.json
index d7cd7a138..ed5b4985f 100644
--- a/public/locales/lol/settings/customization/page-appearance.json
+++ b/public/locales/lol/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Bakground",
diff --git a/public/locales/nl/settings/customization/page-appearance.json b/public/locales/nl/settings/customization/page-appearance.json
index 3d4ab79e9..003923550 100644
--- a/public/locales/nl/settings/customization/page-appearance.json
+++ b/public/locales/nl/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Achtergrond",
diff --git a/public/locales/pl/settings/customization/page-appearance.json b/public/locales/pl/settings/customization/page-appearance.json
index 6ce08a2ec..05a6982b4 100644
--- a/public/locales/pl/settings/customization/page-appearance.json
+++ b/public/locales/pl/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Ikona",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Tło",
diff --git a/public/locales/sl/settings/customization/page-appearance.json b/public/locales/sl/settings/customization/page-appearance.json
index 530958dad..5acc19596 100644
--- a/public/locales/sl/settings/customization/page-appearance.json
+++ b/public/locales/sl/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Ozadje",
diff --git a/public/locales/sv/settings/customization/page-appearance.json b/public/locales/sv/settings/customization/page-appearance.json
index 5248c390c..d810fc6a7 100644
--- a/public/locales/sv/settings/customization/page-appearance.json
+++ b/public/locales/sv/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Bakgrund",
diff --git a/public/locales/uk/settings/customization/page-appearance.json b/public/locales/uk/settings/customization/page-appearance.json
index 7f305b92b..3687a9551 100644
--- a/public/locales/uk/settings/customization/page-appearance.json
+++ b/public/locales/uk/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "Іконка",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Фон",
diff --git a/public/locales/zh/settings/customization/page-appearance.json b/public/locales/zh/settings/customization/page-appearance.json
index c810c2bfe..9a78e8bec 100644
--- a/public/locales/zh/settings/customization/page-appearance.json
+++ b/public/locales/zh/settings/customization/page-appearance.json
@@ -9,7 +9,7 @@
   },
   "favicon": {
     "label": "网站图标",
-    "placeholder": "/favicon.png"
+    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "背景",
diff --git a/src/components/AppShelf/AddAppShelfItem.tsx b/src/components/AppShelf/AddAppShelfItem.tsx
index e447f1dc0..33e35dbe1 100644
--- a/src/components/AppShelf/AddAppShelfItem.tsx
+++ b/src/components/AppShelf/AddAppShelfItem.tsx
@@ -83,7 +83,7 @@ function MatchService(name: string, form: any) {
   }
 }
 
-const DEFAULT_ICON = '/favicon.png';
+const DEFAULT_ICON = '/imgs/favicon/favicon.png';
 
 interface AddAppShelfItemFormProps {
   setOpened: (b: boolean) => void;
diff --git a/src/tools/addToHomarr.ts b/src/tools/addToHomarr.ts
index bb1945014..bd3cc24dc 100644
--- a/src/tools/addToHomarr.ts
+++ b/src/tools/addToHomarr.ts
@@ -7,7 +7,7 @@ async function MatchIcon(name: string) {
       .replace(/\s+/g, '-')
       .toLowerCase()}.png`
   );
-  return res.ok ? res.url : '/favicon.png';
+  return res.ok ? res.url : '/imgs/favicon/favicon.png';
 }
 
 function tryMatchType(imageName: string): ServiceType {

From 69298142b74b344ba20a30ad59b39455c8278037 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <49837342+ajnart@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:56:50 +0900
Subject: [PATCH 05/12] Remove useless translations

---
 src/components/Settings/AdvancedSettings.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Settings/AdvancedSettings.tsx b/src/components/Settings/AdvancedSettings.tsx
index 17fcdcd25..d560c0dbf 100644
--- a/src/components/Settings/AdvancedSettings.tsx
+++ b/src/components/Settings/AdvancedSettings.tsx
@@ -47,22 +47,22 @@ export default function TitleChanger() {
         <Stack>
           <TextInput
             label={t('pageTitle.label')}
-            placeholder={t('pageTitle.placeholder')}
+            placeholder={'Homarr 🦞'}
             {...form.getInputProps('title')}
           />
           <TextInput
             label={t('logo.label')}
-            placeholder={t('logo.placeholder')}
+            placeholder={'/imgs/logo.png}
             {...form.getInputProps('logo')}
           />
           <TextInput
             label={t('favicon.label')}
-            placeholder={t('favicon.placeholder')}
+            placeholder={'/imgs/favicon/favicon.png'}
             {...form.getInputProps('favicon')}
           />
           <TextInput
             label={t('background.label')}
-            placeholder={t('background.placeholder')}
+            placeholder={'/img/background.png'}
             {...form.getInputProps('background')}
           />
           <Textarea

From a99a4eed03f44bfe4fbbf8d1c9ec13bb238b0d80 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <49837342+ajnart@users.noreply.github.com>
Date: Wed, 2 Nov 2022 16:57:56 +0900
Subject: [PATCH 06/12] Remove useless translations

---
 public/locales/en/settings/customization/page-appearance.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/locales/en/settings/customization/page-appearance.json b/public/locales/en/settings/customization/page-appearance.json
index 52781b5b9..d88abfd27 100644
--- a/public/locales/en/settings/customization/page-appearance.json
+++ b/public/locales/en/settings/customization/page-appearance.json
@@ -5,15 +5,12 @@
   },
   "logo": {
     "label": "Logo",
-    "placeholder": "/img/logo.png"
   },
   "favicon": {
     "label": "Favicon",
-    "placeholder": "/imgs/favicon/favicon.png"
   },
   "background": {
     "label": "Background",
-    "placeholder": "/img/background.png"
   },
   "customCSS": {
     "label": "Custom CSS",

From 9e72639a9fdbcba2bd49b578a2734d190be0c3c7 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomascamlong@gmail.com>
Date: Wed, 2 Nov 2022 17:03:57 +0900
Subject: [PATCH 07/12] =?UTF-8?q?:globe=5Fwith=5Fmeridians:=20Add=20Vietna?=
 =?UTF-8?q?mese=20=F0=9F=87=BB=F0=9F=87=B3=20language=20support?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 next-i18next.config.js | 1 +
 src/tools/language.ts  | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/next-i18next.config.js b/next-i18next.config.js
index eb842c73a..b1b50ec42 100644
--- a/next-i18next.config.js
+++ b/next-i18next.config.js
@@ -19,6 +19,7 @@ module.exports = {
       'ru',
       'sl',
       'sv',
+      'vi',
       'uk',
       'zh',
     ],
diff --git a/src/tools/language.ts b/src/tools/language.ts
index e03f79a82..521a67c23 100644
--- a/src/tools/language.ts
+++ b/src/tools/language.ts
@@ -118,6 +118,13 @@ export const languages: Language[] = [
     translatedName: 'Ukrainian',
     emoji: '🇺🇦',
   },
+  // Vietnamese
+  {
+    shortName: 'vi',
+    originalName: 'Tiếng Việt',
+    translatedName: 'Vietnamese',
+    emoji: '🇻🇳',
+  },
   {
     shortName: 'zh',
     originalName: '中文',

From b2f5b0f3fc5ad95bbb564b6d04c51babd37e968f Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomascamlong@gmail.com>
Date: Wed, 2 Nov 2022 17:06:41 +0900
Subject: [PATCH 08/12] =?UTF-8?q?=F0=9F=94=A7=20fix=20JSON=20errors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../locales/en/settings/customization/page-appearance.json  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/locales/en/settings/customization/page-appearance.json b/public/locales/en/settings/customization/page-appearance.json
index d88abfd27..63fa96886 100644
--- a/public/locales/en/settings/customization/page-appearance.json
+++ b/public/locales/en/settings/customization/page-appearance.json
@@ -4,13 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logo",
+    "label": "Logo"
   },
   "favicon": {
-    "label": "Favicon",
+    "label": "Favicon"
   },
   "background": {
-    "label": "Background",
+    "label": "Background"
   },
   "customCSS": {
     "label": "Custom CSS",

From 92c09207f66615dba41de3b8198b7982eae924b6 Mon Sep 17 00:00:00 2001
From: Jon Terry <jonathan.terry@rsa.com>
Date: Sun, 6 Nov 2022 10:05:35 -0600
Subject: [PATCH 09/12] =?UTF-8?q?=E2=9C=A8=20Add=20NZBGet=20download=20cli?=
 =?UTF-8?q?ent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/locales/da/modules/usenet.json         |   4 +-
 public/locales/de/modules/usenet.json         |   4 +-
 .../en/layout/add-service-app-shelf.json      |  16 +++
 public/locales/en/modules/usenet.json         |   4 +-
 public/locales/es/modules/usenet.json         |   4 +-
 public/locales/fr/modules/usenet.json         |   4 +-
 public/locales/he/modules/usenet.json         |   2 +-
 public/locales/it/modules/usenet.json         |   4 +-
 public/locales/ja/modules/usenet.json         |   4 +-
 public/locales/ko/modules/usenet.json         |   4 +-
 public/locales/lol/modules/usenet.json        |   4 +-
 public/locales/nl/modules/usenet.json         |   4 +-
 public/locales/pl/modules/usenet.json         |   4 +-
 public/locales/pt/modules/usenet.json         |   4 +-
 public/locales/ru/modules/usenet.json         |   4 +-
 public/locales/sl/modules/usenet.json         |   4 +-
 public/locales/sv/modules/usenet.json         |   4 +-
 public/locales/uk/modules/usenet.json         |   2 +-
 public/locales/zh/modules/usenet.json         |   4 +-
 src/components/AppShelf/AddAppShelfItem.tsx   |  36 +++++
 src/modules/usenet/UsenetModule.tsx           |   2 +-
 src/pages/api/modules/usenet/history.ts       |  83 ++++++++---
 src/pages/api/modules/usenet/index.ts         |  85 ++++++++---
 .../api/modules/usenet/nzbget/nzbget-api.d.ts |   1 +
 .../modules/usenet/nzbget/nzbget-client.ts    |  22 +++
 src/pages/api/modules/usenet/nzbget/types.ts  | 135 ++++++++++++++++++
 src/pages/api/modules/usenet/pause.ts         |  43 +++++-
 src/pages/api/modules/usenet/queue.ts         | 132 +++++++++++++----
 src/pages/api/modules/usenet/resume.ts        |  43 +++++-
 src/tools/types.ts                            |   5 +-
 30 files changed, 559 insertions(+), 112 deletions(-)
 create mode 100644 src/pages/api/modules/usenet/nzbget/nzbget-api.d.ts
 create mode 100644 src/pages/api/modules/usenet/nzbget/nzbget-client.ts
 create mode 100644 src/pages/api/modules/usenet/nzbget/types.ts

diff --git a/public/locales/da/modules/usenet.json b/public/locales/da/modules/usenet.json
index 3783e29df..9c481990d 100644
--- a/public/locales/da/modules/usenet.json
+++ b/public/locales/da/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Tillader dig at se din Sabnzbd kø og historie, pause og genoptage downloads"
+    "name": "Usenet",
+    "description": "Giver dig mulighed for at se din usenet (Sabnzbd eller NZBGet) kø og historik, pause og genoptage downloads"
   },
   "card": {
     "errors": {
diff --git a/public/locales/de/modules/usenet.json b/public/locales/de/modules/usenet.json
index 79749c56c..c9be61eff 100644
--- a/public/locales/de/modules/usenet.json
+++ b/public/locales/de/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Ermöglicht es Ihnen, Ihre Sabnzbd-Warteschlange und den Verlauf zu sehen, Downloads anzuhalten und fortzusetzen"
+    "name": "Usenet",
+    "description": "Ermöglicht es Ihnen, Ihre Usenet-Warteschlange (Sabnzbd oder NZBGet) und den Verlauf anzuzeigen, Downloads anzuhalten und fortzusetzen"
   },
   "card": {
     "errors": {
diff --git a/public/locales/en/layout/add-service-app-shelf.json b/public/locales/en/layout/add-service-app-shelf.json
index ca88e1f31..735110906 100644
--- a/public/locales/en/layout/add-service-app-shelf.json
+++ b/public/locales/en/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Invalid password"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Username",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Invalid username"
+                                }
+                            },
+                            "password": {
+                                "label": "Password",
+                                "placeholder": "password",
+                                "validation": {
+                                    "invalidPassword": "Invalid password"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/en/modules/usenet.json b/public/locales/en/modules/usenet.json
index 1aeec250b..f9df705a3 100644
--- a/public/locales/en/modules/usenet.json
+++ b/public/locales/en/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Allows you to see your Sabnzbd queue and history, pause and resume downloads"
+    "name": "Usenet",
+    "description": "Allows you to see your usenet (Sabnzbd or NZBGet) queue and history, pause and resume downloads"
   },
   "card": {
     "errors": {
diff --git a/public/locales/es/modules/usenet.json b/public/locales/es/modules/usenet.json
index 5f818dfd9..2e830c001 100644
--- a/public/locales/es/modules/usenet.json
+++ b/public/locales/es/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Te permite ver tu cola e historial de Sabnzbd, pausar y resumir descargas"
+    "name": "Usenet",
+    "description": "Le permite ver la cola y el historial de usenet (Sabnzbd o NZBGet), pausar y reanudar las descargas"
   },
   "card": {
     "errors": {
diff --git a/public/locales/fr/modules/usenet.json b/public/locales/fr/modules/usenet.json
index fd9061c24..6a4c0b70c 100644
--- a/public/locales/fr/modules/usenet.json
+++ b/public/locales/fr/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Permet de voir votre file d'attente et votre historique Sabnzbd, de mettre en pause et de reprendre les téléchargements"
+    "name": "Usenet",
+    "description": "Vous permet de voir votre file d'attente et votre historique Usenet (Sabnzbd ou NZBGet), de mettre en pause et de reprendre les téléchargements"
   },
   "card": {
     "errors": {
diff --git a/public/locales/he/modules/usenet.json b/public/locales/he/modules/usenet.json
index e5b26b24f..57a36590c 100644
--- a/public/locales/he/modules/usenet.json
+++ b/public/locales/he/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
     "name": "Sabnzbd",
-    "description": "מאפשר צפייה בהיסטוריה ותור ההורדות, עצירה וחידוש הורדות"
+    "description": "מאמאפשר לך לראות את התור וההיסטוריה של usenet (Sabnzbd או NZBGet), להשהות ולחדש הורדות"
   },
   "card": {
     "errors": {
diff --git a/public/locales/it/modules/usenet.json b/public/locales/it/modules/usenet.json
index 728091b8c..27eee650b 100644
--- a/public/locales/it/modules/usenet.json
+++ b/public/locales/it/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Permette di vedere la coda e la cronologia di Sabnzbd, di mettere in pausa e di riprendere i download."
+    "name": "Usenet",
+    "description": "Ti consente di vedere la coda e la cronologia di usenet (Sabnzbd o NZBGet), mettere in pausa e riprendere i download."
   },
   "card": {
     "errors": {
diff --git a/public/locales/ja/modules/usenet.json b/public/locales/ja/modules/usenet.json
index 7d8467731..7f5c81b93 100644
--- a/public/locales/ja/modules/usenet.json
+++ b/public/locales/ja/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Sabnzbdのキューと履歴の確認、ダウンロードの一時停止と再開が可能です。"
+    "name": "ユースネット",
+    "description": "Usenet (Sabnzbd または NZBGet) のキューと履歴を表示し、ダウンロードを一時停止および再開できます。"
   },
   "card": {
     "errors": {
diff --git a/public/locales/ko/modules/usenet.json b/public/locales/ko/modules/usenet.json
index 96e6d6251..d5ca9b14d 100644
--- a/public/locales/ko/modules/usenet.json
+++ b/public/locales/ko/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Sabnzbd의 대기열 및 기록을 확인하고 다운로드를 일시 중지 및 재개할 수 있습니다"
+    "name": "ユースネット",
+    "description": "유즈넷(Sabnzbd 또는 NZBGet) 대기열 및 기록을 보고 다운로드를 일시 중지 및 재개할 수 있습니다."
   },
   "card": {
     "errors": {
diff --git a/public/locales/lol/modules/usenet.json b/public/locales/lol/modules/usenet.json
index 9139a27e6..cd126d151 100644
--- a/public/locales/lol/modules/usenet.json
+++ b/public/locales/lol/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Allowz u 2 c ur Sabnzbd queue an histowee, paues an resuem downloadz"
+    "name": "Usenet",
+    "description": "Allowz u 2 c ur usenet (Sabnzbd & NZBGet) queue an histowee, paues an resuem downloadz"
   },
   "card": {
     "errors": {
diff --git a/public/locales/nl/modules/usenet.json b/public/locales/nl/modules/usenet.json
index ec91a50c6..e9a981b14 100644
--- a/public/locales/nl/modules/usenet.json
+++ b/public/locales/nl/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Hiermee kunt u uw Sabnzbd wachtrij en geschiedenis weergeven, downloads pauzeren en hervatten"
+    "name": "Usenet",
+    "description": "Hiermee kunt u uw usenet (Sabnzbd of NZBGet) wachtrij en geschiedenis bekijken, downloads pauzeren en hervatten."
   },
   "card": {
     "errors": {
diff --git a/public/locales/pl/modules/usenet.json b/public/locales/pl/modules/usenet.json
index 5d9224cc7..67cdd5eef 100644
--- a/public/locales/pl/modules/usenet.json
+++ b/public/locales/pl/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Pozwala zobaczyć kolejkę i historię Sabnzbd, wstrzymywać i wznawiać pobieranie"
+    "name": "Usenet",
+    "description": "Pozwala zobaczyć kolejkę i historię usenetu (Sabnzbd lub NZBGet), wstrzymywać i wznawiać pobieranie."
   },
   "card": {
     "errors": {
diff --git a/public/locales/pt/modules/usenet.json b/public/locales/pt/modules/usenet.json
index c975cb4e0..e55578f80 100644
--- a/public/locales/pt/modules/usenet.json
+++ b/public/locales/pt/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "",
-    "description": ""
+    "name": "Usenet",
+    "description": "Permite que você veja sua fila e histórico de usenet (Sabnzbd ou NZBGet), pausar e retomar downloads."
   },
   "card": {
     "errors": {
diff --git a/public/locales/ru/modules/usenet.json b/public/locales/ru/modules/usenet.json
index b223d452d..f0a923346 100644
--- a/public/locales/ru/modules/usenet.json
+++ b/public/locales/ru/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "",
-    "description": ""
+    "name": "Юнет",
+    "description": "Позволяет просматривать очередь и историю Usenet (Sabnzbd или NZBGet), приостанавливать и возобновлять загрузки."
   },
   "card": {
     "errors": {
diff --git a/public/locales/sl/modules/usenet.json b/public/locales/sl/modules/usenet.json
index dc7c76ff0..1bae3d448 100644
--- a/public/locales/sl/modules/usenet.json
+++ b/public/locales/sl/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Omogoča ogled čakalne vrste in zgodovine v Sabnzbd ter prekinitev in nadaljevanje prenosov"
+    "name": "Usenet",
+    "description": "Omogoča ogled vaše čakalne vrste in zgodovine usenet (Sabnzbd ali NZBGet), zaustavitev in nadaljevanje prenosov."
   },
   "card": {
     "errors": {
diff --git a/public/locales/sv/modules/usenet.json b/public/locales/sv/modules/usenet.json
index c03ee1e6a..776c42fde 100644
--- a/public/locales/sv/modules/usenet.json
+++ b/public/locales/sv/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "Låter dig se din Sabnzbd kö och historik, pausa och återuppta nedladdningar"
+    "name": "Usenet",
+    "description": "Låter dig se din usenet (Sabnzbd eller NZBGet) kö och historik, pausa och återuppta nedladdningar."
   },
   "card": {
     "errors": {
diff --git a/public/locales/uk/modules/usenet.json b/public/locales/uk/modules/usenet.json
index 6bd901f0c..4cf378f3a 100644
--- a/public/locales/uk/modules/usenet.json
+++ b/public/locales/uk/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
     "name": "Sabnzbd",
-    "description": "Дозволяє вам бачити вашу чергу в Sabnzbd і історію, призупинення і відновлення завантажень"
+    "description": "Дозволяє переглядати чергу та історію usenet (Sabnzbd або NZBGet), призупиняти та відновлювати завантаження."
   },
   "card": {
     "errors": {
diff --git a/public/locales/zh/modules/usenet.json b/public/locales/zh/modules/usenet.json
index 901d18f94..d59137333 100644
--- a/public/locales/zh/modules/usenet.json
+++ b/public/locales/zh/modules/usenet.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
-    "name": "Sabnzbd",
-    "description": "允许您查看您的Sabnzbd队列和历史，进行暂停和恢复下载操作"
+    "name": "用户网",
+    "description": "允许您查看您的用户网（Sabnzbd 或 NZBGet）队列和历史记录，暂停和恢复下载。"
   },
   "card": {
     "errors": {
diff --git a/src/components/AppShelf/AddAppShelfItem.tsx b/src/components/AppShelf/AddAppShelfItem.tsx
index e447f1dc0..80f7642b6 100644
--- a/src/components/AppShelf/AddAppShelfItem.tsx
+++ b/src/components/AppShelf/AddAppShelfItem.tsx
@@ -407,6 +407,42 @@ export function AddAppShelfItemForm(props: AddAppShelfItemFormProps) {
                   />
                 </>
               )}
+              {form.values.type === 'NZBGet' && (
+                <>
+                  <TextInput
+                    label={t('modal.tabs.options.form.integrations.nzbget.username.label')}
+                    placeholder={t(
+                      'modal.tabs.options.form.integrations.nzbget.username.placeholder'
+                    )}
+                    value={form.values.username}
+                    onChange={(event) => {
+                      form.setFieldValue('username', event.currentTarget.value);
+                    }}
+                    error={
+                      form.errors.username &&
+                      t(
+                        'modal.tabs.options.form.integrations.nzbget.username.validation.invalidUsername'
+                      )
+                    }
+                  />
+                  <PasswordInput
+                    label={t('modal.tabs.options.form.integrations.nzbget.password.label')}
+                    placeholder={t(
+                      'modal.tabs.options.form.integrations.nzbget.password.placeholder'
+                    )}
+                    value={form.values.password}
+                    onChange={(event) => {
+                      form.setFieldValue('password', event.currentTarget.value);
+                    }}
+                    error={
+                      form.errors.password &&
+                      t(
+                        'modal.tabs.options.form.integrations.nzbget.password.validation.invalidPassword'
+                      )
+                    }
+                  />
+                </>
+              )}
             </Stack>
           </Tabs.Panel>
           <Tabs.Panel value="Advanced Options">
diff --git a/src/modules/usenet/UsenetModule.tsx b/src/modules/usenet/UsenetModule.tsx
index f03084e69..081be509f 100644
--- a/src/modules/usenet/UsenetModule.tsx
+++ b/src/modules/usenet/UsenetModule.tsx
@@ -16,7 +16,7 @@ import { AddItemShelfButton } from '../../components/AppShelf/AddAppShelfItem';
 dayjs.extend(duration);
 
 export const UsenetComponent: FunctionComponent = () => {
-  const downloadServices = useGetServiceByType('Sabnzbd');
+  const downloadServices = useGetServiceByType('Sabnzbd', 'NZBGet');
 
   const { t } = useTranslation('modules/usenet');
 
diff --git a/src/pages/api/modules/usenet/history.ts b/src/pages/api/modules/usenet/history.ts
index 4143428f4..67f4ececd 100644
--- a/src/pages/api/modules/usenet/history.ts
+++ b/src/pages/api/modules/usenet/history.ts
@@ -7,6 +7,8 @@ import { UsenetHistoryItem } from '../../../../modules';
 import { getConfig } from '../../../../tools/getConfig';
 import { getServiceById } from '../../../../tools/hooks/useGetServiceByType';
 import { Config } from '../../../../tools/types';
+import { NzbgetHistoryItem } from './nzbget/types';
+import { NzbgetClient } from './nzbget/nzbget-client';
 
 dayjs.extend(duration);
 
@@ -33,23 +35,72 @@ async function Get(req: NextApiRequest, res: NextApiResponse) {
       throw new Error(`Service with ID "${req.query.serviceId}" could not be found.`);
     }
 
-    if (!service.apiKey) {
-      throw new Error(`API Key for service "${service.name}" is missing`);
+    let response: UsenetHistoryResponse;
+    switch (service.type) {
+      case 'NZBGet': {
+        const url = new URL(service.url);
+        const options = {
+          host: url.hostname,
+          port: url.port,
+          login: service.username,
+          hash: service.password,
+        };
+
+        const nzbGet = NzbgetClient(options);
+
+        const nzbgetHistory:NzbgetHistoryItem[] = await new Promise((resolve, reject) => {
+          nzbGet.history(false, (err: any, result: NzbgetHistoryItem[]) => {
+            if (!err) {
+              resolve(result);
+            } else {
+              reject(err);
+            }
+          });
+        });
+
+        if (!nzbgetHistory) {
+          throw new Error('Error while getting NZBGet history');
+        }
+
+        const nzbgetItems: UsenetHistoryItem[] = nzbgetHistory.map((item: NzbgetHistoryItem) => ({
+          id: item.NZBID.toString(),
+          name: item.Name,
+          // Convert from MB to bytes
+          size: item.DownloadedSizeMB * 1000000,
+          time: item.DownloadTimeSec,
+        }));
+
+        response = {
+          items: nzbgetItems,
+          total: nzbgetItems.length,
+        };
+        break;
+      }
+      case 'Sabnzbd': {
+        const { origin } = new URL(service.url);
+
+        if (!service.apiKey) {
+          throw new Error(`API Key for service "${service.name}" is missing`);
+        }
+
+        const history = await new Client(origin, service.apiKey).history(offset, limit);
+
+        const items: UsenetHistoryItem[] = history.slots.map((slot) => ({
+          id: slot.nzo_id,
+          name: slot.name,
+          size: slot.bytes,
+          time: slot.download_time,
+        }));
+
+        response = {
+          items,
+          total: history.noofslots,
+        };
+        break;
+      }
+      default:
+        throw new Error(`Service type "${service.type}" unrecognized.`);
     }
-    const { origin } = new URL(service.url);
-
-    const history = await new Client(origin, service.apiKey).history(offset, limit);
-
-    const items: UsenetHistoryItem[] = history.slots.map((slot) => ({
-      id: slot.nzo_id,
-      name: slot.name,
-      size: slot.bytes,
-      time: slot.download_time,
-    }));
-    const response: UsenetHistoryResponse = {
-      items,
-      total: history.noofslots,
-    };
 
     return res.status(200).json(response);
   } catch (err) {
diff --git a/src/pages/api/modules/usenet/index.ts b/src/pages/api/modules/usenet/index.ts
index f40d2c11a..bf0cffc1a 100644
--- a/src/pages/api/modules/usenet/index.ts
+++ b/src/pages/api/modules/usenet/index.ts
@@ -6,6 +6,8 @@ import { Client } from 'sabnzbd-api';
 import { getConfig } from '../../../../tools/getConfig';
 import { getServiceById } from '../../../../tools/hooks/useGetServiceByType';
 import { Config } from '../../../../tools/types';
+import { NzbgetStatus } from './nzbget/types';
+import { NzbgetClient } from './nzbget/nzbget-client';
 
 dayjs.extend(duration);
 
@@ -32,28 +34,71 @@ async function Get(req: NextApiRequest, res: NextApiResponse) {
       throw new Error(`Service with ID "${req.query.serviceId}" could not be found.`);
     }
 
-    if (!service.apiKey) {
-      throw new Error(`API Key for service "${service.name}" is missing`);
+    let response: UsenetInfoResponse;
+    switch (service.type) {
+      case 'NZBGet': {
+        const url = new URL(service.url);
+        const options = {
+          host: url.hostname,
+          port: url.port,
+          login: service.username,
+          hash: service.password,
+        };
+
+        const nzbGet = NzbgetClient(options);
+
+        const nzbgetStatus:NzbgetStatus = await new Promise((resolve, reject) => {
+          nzbGet.status((err: any, result: NzbgetStatus) => {
+            if (!err) {
+              resolve(result);
+            } else {
+              reject(err);
+            }
+          });
+        });
+
+        if (!nzbgetStatus) {
+          throw new Error('Error while getting NZBGet status');
+        }
+
+        const bytesRemaining = nzbgetStatus.RemainingSizeMB * 1000000;
+        const eta = bytesRemaining / nzbgetStatus.DownloadRate;
+        response = {
+          paused: nzbgetStatus.DownloadPaused,
+          sizeLeft: bytesRemaining,
+          speed: nzbgetStatus.DownloadRate,
+          eta,
+        };
+        break;
+      }
+      case 'Sabnzbd': {
+        if (!service.apiKey) {
+          throw new Error(`API Key for service "${service.name}" is missing`);
+        }
+
+        const { origin } = new URL(service.url);
+
+        const queue = await new Client(origin, service.apiKey).queue(0, -1);
+
+        const [hours, minutes, seconds] = queue.timeleft.split(':');
+        const eta = dayjs.duration({
+          hour: parseInt(hours, 10),
+          minutes: parseInt(minutes, 10),
+          seconds: parseInt(seconds, 10),
+        } as any);
+
+        response = {
+          paused: queue.paused,
+          sizeLeft: parseFloat(queue.mbleft) * 1024 * 1024,
+          speed: parseFloat(queue.kbpersec) * 1000,
+          eta: eta.asSeconds(),
+        };
+        break;
+      }
+      default:
+        throw new Error(`Service type "${service.type}" unrecognized.`);
     }
 
-    const { origin } = new URL(service.url);
-
-    const queue = await new Client(origin, service.apiKey).queue(0, -1);
-
-    const [hours, minutes, seconds] = queue.timeleft.split(':');
-    const eta = dayjs.duration({
-      hour: parseInt(hours, 10),
-      minutes: parseInt(minutes, 10),
-      seconds: parseInt(seconds, 10),
-    } as any);
-
-    const response: UsenetInfoResponse = {
-      paused: queue.paused,
-      sizeLeft: parseFloat(queue.mbleft) * 1024 * 1024,
-      speed: parseFloat(queue.kbpersec) * 1000,
-      eta: eta.asSeconds(),
-    };
-
     return res.status(200).json(response);
   } catch (err) {
     return res.status(500).send((err as any).message);
diff --git a/src/pages/api/modules/usenet/nzbget/nzbget-api.d.ts b/src/pages/api/modules/usenet/nzbget/nzbget-api.d.ts
new file mode 100644
index 000000000..9c77b63dc
--- /dev/null
+++ b/src/pages/api/modules/usenet/nzbget/nzbget-api.d.ts
@@ -0,0 +1 @@
+declare module 'nzbget-api';
diff --git a/src/pages/api/modules/usenet/nzbget/nzbget-client.ts b/src/pages/api/modules/usenet/nzbget/nzbget-client.ts
new file mode 100644
index 000000000..80fe82295
--- /dev/null
+++ b/src/pages/api/modules/usenet/nzbget/nzbget-client.ts
@@ -0,0 +1,22 @@
+import NZBGet from 'nzbget-api';
+import { NzbgetClientOptions } from './types';
+
+export function NzbgetClient(options: NzbgetClientOptions) {
+    if (!options?.host) {
+        throw new Error('Cannot connect to NZBGet. Missing host in service config.');
+    }
+
+    if (!options?.port) {
+        throw new Error('Cannot connect to NZBGet. Missing port in service config.');
+    }
+
+    if (!options?.login) {
+        throw new Error('Cannot connect to NZBGet. Missing username in service config.');
+    }
+
+    if (!options?.hash) {
+        throw new Error('Cannot connect to NZBGet. Missing password in service config.');
+    }
+
+    return new NZBGet(options);
+}
diff --git a/src/pages/api/modules/usenet/nzbget/types.ts b/src/pages/api/modules/usenet/nzbget/types.ts
new file mode 100644
index 000000000..d2bc53ad7
--- /dev/null
+++ b/src/pages/api/modules/usenet/nzbget/types.ts
@@ -0,0 +1,135 @@
+export interface NzbgetHistoryItem {
+  NZBID: number;
+  Kind: 'NZB' | 'URL' | 'DUP';
+  NZBFilename: string;
+  Name: string;
+  URL: string;
+  HistoryTime: number;
+  DestDir: string;
+  FinalDir: string;
+  Category: string;
+  FileSizeLo: number;
+  FileSizeHi: number;
+  FileSizeMB: number;
+  FileCount: number;
+  RemainingFileCount: number;
+  MinPostTime: number;
+  MaxPostTime: number;
+  TotalArticles: number;
+  SuccessArticles: number;
+  FailedArticles: number;
+  Health: number;
+  DownloadedSizeLo: number;
+  DownloadedSizeHi: number;
+  DownloadedSizeMB: number;
+  DownloadTimeSec: number;
+  PostTotalTimeSec: number;
+  ParTimeSec: number;
+  RepairTimeSec: number
+  UnpackTimeSec: number;
+  MessageCount:number;
+  DupeKey: string;
+  DupeScore: number;
+  DupeMode: 'SCORE' | 'ALL' | 'FORCE';
+  Status: string;
+  ParStatus: 'NONE' | 'FAILURE' | 'REPAIR_POSSIBLE' | 'SUCCESS' | 'MANUAL';
+  ExParStatus: 'RECIPIENT' | 'DONOR';
+  UnpackStatus: 'NONE' | 'FAILURE' | 'SPACE' | 'PASSWORD' | 'SUCCESS';
+  UrlStatus: 'NONE' | 'SUCCESS' | 'FAILURE' | 'SCAN_SKIPPED' | 'SCAN_FAILURE';
+  ScriptStatus: 'NONE' | 'FAILURE' | 'SUCCESS';
+  ScriptStatuses: [];
+  MoveStatus: 'NONE' | 'SUCCESS' | 'FAILURE';
+  DeleteStatus: 'NONE' | 'MANUAL' | 'HEALTH' | 'DUPE' | 'BAD' | 'SCAN' | 'COPY';
+  MarkStatus: 'NONE' | 'GOOD' | 'BAD';
+  ExtraParBlocks: number;
+  Parameters: [];
+  ServerStats: [];
+}
+
+export interface NzbgetQueueItem {
+  NZBID: number;
+  NZBFilename: string;
+  NZBName: string;
+  Kind: 'NZB' | 'URL';
+  URL: string;
+  DestDir: string;
+  FinalDir: string;
+  Category: string;
+  FileSizeLo: number;
+  FileSizeHi: number;
+  FileSizeMB: number;
+  RemainingSizeLo: number;
+  RemainingSizeHi: number;
+  RemainingSizeMB: number;
+  PausedSizeLo: number;
+  PausedSizeHi: number;
+  PausedSizeMB: number;
+  FileCount: number;
+  RemainingFileCount: number;
+  RemainingParCount: number;
+  MinPostTime: number;
+  MaxPostTime: number;
+  MaxPriority: number;
+  ActiveDownloads: number;
+  Status: 'QUEUED' | 'PAUSED' | 'DOWNLOADING' | 'FETCHING' | 'PP_QUEUED' | 'LOADING_PARS' | 'VERIFYING_SOURCES' | 'REPAIRING' | 'VERIFYING_REPAIRED' | 'RENAMING' | 'UNPACKING' | 'MOVING' | 'EXECUTING_SCRIPT' | 'PP_FINISHED';
+  TotalArticles: number;
+  SuccessArticles: number;
+  FailedArticles: number;
+  Health: number;
+  CriticalHealth: number;
+  DownloadedSizeLo: number;
+  DownloadedSizeHi: number;
+  DownloadedSizeMB: number;
+  DownloadTimeSec: number;
+  MessageCount: number;
+  DupeKey: string;
+  DupeScore: number;
+  DupeMode: string;
+  Parameters: [];
+  ServerStats: [];
+  PostInfoText: string;
+  PostStageProgress: number;
+  PostTotalTimeSec: number;
+  PostStageTimeSec: number;
+}
+
+export interface NzbgetStatus {
+  RemainingSizeLo: number;
+  RemainingSizeHi: number;
+  RemainingSizeMB: number;
+  ForcedSizeLo: number;
+  ForcedSizeHi: number;
+  ForcedSizeMB: number;
+  DownloadedSizeLo: number;
+  DownloadedSizeHi: number;
+  DownloadedSizeMB: number;
+  ArticleCacheLo: number;
+  ArticleCacheHi: number;
+  ArticleCacheMB: number;
+  DownloadRate: number;
+  AverageDownloadRate: number;
+  DownloadLimit: number;
+  ThreadCount: number;
+  PostJobCount: number;
+  UrlCount: number;
+  UpTimeSec: number;
+  DownloadTimeSec: number;
+  ServerStandBy: boolean;
+  DownloadPaused: boolean;
+  PostPaused: boolean;
+  ScanPaused: boolean;
+  ServerTime: number;
+  ResumeTime: number;
+  FeedActive: boolean;
+  FreeDiskSpaceLo: number;
+  FreeDiskSpaceHi: number;
+  FreeDiskSpaceMB: number;
+  NewsServers: [];
+}
+
+export interface NzbgetClientOptions {
+  host: string,
+  port: string,
+  login: string | undefined,
+  hash: string | undefined,
+}
diff --git a/src/pages/api/modules/usenet/pause.ts b/src/pages/api/modules/usenet/pause.ts
index 53270d6be..9ce84015d 100644
--- a/src/pages/api/modules/usenet/pause.ts
+++ b/src/pages/api/modules/usenet/pause.ts
@@ -6,6 +6,7 @@ import { Client } from 'sabnzbd-api';
 import { getConfig } from '../../../../tools/getConfig';
 import { getServiceById } from '../../../../tools/hooks/useGetServiceByType';
 import { Config } from '../../../../tools/types';
+import { NzbgetClient } from './nzbget/nzbget-client';
 
 dayjs.extend(duration);
 
@@ -25,14 +26,44 @@ async function Post(req: NextApiRequest, res: NextApiResponse) {
       throw new Error(`Service with ID "${req.query.serviceId}" could not be found.`);
     }
 
-    if (!service.apiKey) {
-      throw new Error(`API Key for service "${service.name}" is missing`);
+    let result;
+    switch (service.type) {
+      case 'NZBGet': {
+        const url = new URL(service.url);
+        const options = {
+          host: url.hostname,
+          port: url.port,
+          login: service.username,
+          hash: service.password,
+        };
+
+        const nzbGet = NzbgetClient(options);
+
+        result = await new Promise((resolve, reject) => {
+          nzbGet.pauseDownload(false, (err: any, result: any) => {
+            if (!err) {
+              resolve(result);
+            } else {
+              reject(err);
+            }
+          });
+        });
+        break;
+      }
+      case 'Sabnzbd': {
+        if (!service.apiKey) {
+          throw new Error(`API Key for service "${service.name}" is missing`);
+        }
+
+        const { origin } = new URL(service.url);
+
+        result = await new Client(origin, service.apiKey).queuePause();
+        break;
+      }
+      default:
+        throw new Error(`Service type "${service.type}" unrecognized.`);
     }
 
-    const { origin } = new URL(service.url);
-
-    const result = await new Client(origin, service.apiKey).queuePause();
-
     return res.status(200).json(result);
   } catch (err) {
     return res.status(500).send((err as any).message);
diff --git a/src/pages/api/modules/usenet/queue.ts b/src/pages/api/modules/usenet/queue.ts
index d1fc07d1d..5ae73436e 100644
--- a/src/pages/api/modules/usenet/queue.ts
+++ b/src/pages/api/modules/usenet/queue.ts
@@ -7,6 +7,8 @@ import { UsenetQueueItem } from '../../../../modules';
 import { getConfig } from '../../../../tools/getConfig';
 import { getServiceById } from '../../../../tools/hooks/useGetServiceByType';
 import { Config } from '../../../../tools/types';
+import { NzbgetClient } from './nzbget/nzbget-client';
+import { NzbgetQueueItem, NzbgetStatus } from './nzbget/types';
 
 dayjs.extend(duration);
 
@@ -33,42 +35,116 @@ async function Get(req: NextApiRequest, res: NextApiResponse) {
       throw new Error(`Service with ID "${req.query.serviceId}" could not be found.`);
     }
 
-    if (!service.apiKey) {
-      throw new Error(`API Key for service "${service.name}" is missing`);
+    let response: UsenetQueueResponse;
+    switch (service.type) {
+      case 'NZBGet': {
+        const url = new URL(service.url);
+        const options = {
+          host: url.hostname,
+          port: url.port,
+          login: service.username,
+          hash: service.password,
+        };
+
+        const nzbGet = NzbgetClient(options);
+
+        const nzbgetQueue:NzbgetQueueItem[] = await new Promise((resolve, reject) => {
+          nzbGet.listGroups((err: any, result: NzbgetQueueItem[]) => {
+            if (!err) {
+              resolve(result);
+            } else {
+              reject(err);
+            }
+          });
+        });
+
+        if (!nzbgetQueue) {
+          throw new Error('Error while getting NZBGet queue');
+        }
+
+        const nzbgetStatus:NzbgetStatus = await new Promise((resolve, reject) => {
+          nzbGet.status((err: any, result: NzbgetStatus) => {
+            if (!err) {
+              resolve(result);
+            } else {
+              reject(err);
+            }
+          });
+        });
+
+        if (!nzbgetStatus) {
+          throw new Error('Error while getting NZBGet status');
+        }
+
+        const nzbgetItems: UsenetQueueItem[] = nzbgetQueue.map((item: NzbgetQueueItem) => ({
+          id: item.NZBID.toString(),
+          name: item.NZBName,
+          progress: (item.DownloadedSizeMB / item.FileSizeMB) * 100,
+          eta: (item.RemainingSizeMB * 1000000) / nzbgetStatus.DownloadRate,
+          // Multiple MB to get bytes
+          size: item.FileSizeMB * 1000 * 1000,
+          state: getNzbgetState(item.Status),
+        }));
+
+        response = {
+          items: nzbgetItems,
+          total: nzbgetItems.length,
+        };
+        break;
+      }
+      case 'Sabnzbd': {
+        if (!service.apiKey) {
+          throw new Error(`API Key for service "${service.name}" is missing`);
+        }
+
+        const { origin } = new URL(service.url);
+        const queue = await new Client(origin, service.apiKey).queue(offset, limit);
+
+        const items: UsenetQueueItem[] = queue.slots.map((slot) => {
+          const [hours, minutes, seconds] = slot.timeleft.split(':');
+          const eta = dayjs.duration({
+            hour: parseInt(hours, 10),
+            minutes: parseInt(minutes, 10),
+            seconds: parseInt(seconds, 10),
+          } as any);
+
+          return {
+            id: slot.nzo_id,
+            eta: eta.asSeconds(),
+            name: slot.filename,
+            progress: parseFloat(slot.percentage),
+            size: parseFloat(slot.mb) * 1000 * 1000,
+            state: slot.status.toLowerCase() as any,
+          };
+        });
+
+        response = {
+          items,
+          total: queue.noofslots,
+        };
+        break;
+      }
+      default:
+        throw new Error(`Service type "${service.type}" unrecognized.`);
     }
 
-    const { origin } = new URL(service.url);
-    const queue = await new Client(origin, service.apiKey).queue(offset, limit);
-
-    const items: UsenetQueueItem[] = queue.slots.map((slot) => {
-      const [hours, minutes, seconds] = slot.timeleft.split(':');
-      const eta = dayjs.duration({
-        hour: parseInt(hours, 10),
-        minutes: parseInt(minutes, 10),
-        seconds: parseInt(seconds, 10),
-      } as any);
-
-      return {
-        id: slot.nzo_id,
-        eta: eta.asSeconds(),
-        name: slot.filename,
-        progress: parseFloat(slot.percentage),
-        size: parseFloat(slot.mb) * 1000 * 1000,
-        state: slot.status.toLowerCase() as any,
-      };
-    });
-
-    const response: UsenetQueueResponse = {
-      items,
-      total: queue.noofslots,
-    };
-
     return res.status(200).json(response);
   } catch (err) {
     return res.status(500).send((err as any).message);
   }
 }
 
+function getNzbgetState(status: string) {
+  switch (status) {
+    case 'QUEUED':
+      return 'queued';
+    case 'PAUSED ':
+        return 'paused';
+    default:
+      return 'downloading';
+  }
+}
+
 export default async (req: NextApiRequest, res: NextApiResponse) => {
   // Filter out if the reuqest is a POST or a GET
   if (req.method === 'GET') {
diff --git a/src/pages/api/modules/usenet/resume.ts b/src/pages/api/modules/usenet/resume.ts
index f3b155f06..444f00d34 100644
--- a/src/pages/api/modules/usenet/resume.ts
+++ b/src/pages/api/modules/usenet/resume.ts
@@ -6,6 +6,7 @@ import { Client } from 'sabnzbd-api';
 import { getConfig } from '../../../../tools/getConfig';
 import { getServiceById } from '../../../../tools/hooks/useGetServiceByType';
 import { Config } from '../../../../tools/types';
+import { NzbgetClient } from './nzbget/nzbget-client';
 
 dayjs.extend(duration);
 
@@ -26,14 +27,44 @@ async function Post(req: NextApiRequest, res: NextApiResponse) {
       throw new Error(`Service with ID "${req.query.serviceId}" could not be found.`);
     }
 
-    if (!service.apiKey) {
-      throw new Error(`API Key for service "${service.name}" is missing`);
+    let result;
+    switch (service.type) {
+      case 'NZBGet': {
+        const url = new URL(service.url);
+        const options = {
+          host: url.hostname,
+          port: url.port,
+          login: service.username,
+          hash: service.password,
+        };
+
+        const nzbGet = NzbgetClient(options);
+
+        result = await new Promise((resolve, reject) => {
+          nzbGet.resumeDownload(false, (err: any, result: any) => {
+            if (!err) {
+              resolve(result);
+            } else {
+              reject(err);
+            }
+          });
+        });
+        break;
+      }
+      case 'Sabnzbd': {
+        if (!service.apiKey) {
+          throw new Error(`API Key for service "${service.name}" is missing`);
+        }
+
+        const { origin } = new URL(service.url);
+
+        result = await new Client(origin, service.apiKey).queueResume();
+        break;
+      }
+      default:
+        throw new Error(`Service type "${service.type}" unrecognized.`);
     }
 
-    const { origin } = new URL(service.url);
-
-    const result = await new Client(origin, service.apiKey).queueResume();
-
     return res.status(200).json(result);
   } catch (err) {
     return res.status(500).send((err as any).message);
diff --git a/src/tools/types.ts b/src/tools/types.ts
index da2116a6e..7c5ac923b 100644
--- a/src/tools/types.ts
+++ b/src/tools/types.ts
@@ -76,6 +76,7 @@ export const ServiceTypeList = [
   'Overseerr',
   'Jellyseerr',
   'Sabnzbd',
+  'NZBGet'
 ];
 export type ServiceType =
   | 'Other'
@@ -91,7 +92,8 @@ export type ServiceType =
   | 'Overseerr'
   | 'Jellyseerr'
   | 'Transmission'
-  | 'Sabnzbd';
+  | 'Sabnzbd'
+  | 'NZBGet';
 
 export function tryMatchPort(name: string | undefined, form?: any) {
   if (!name) {
@@ -118,6 +120,7 @@ export const portmap = [
   { name: 'overseerr', value: '5055' },
   { name: 'dash.', value: '3001' },
   { name: 'sabnzbd', value: '8080' },
+  { name: 'nzbget', value: '6789' }
 ];
 
 export const MatchingImages: {

From dfdb8678b728e1ac5a5ff5aa539bd0d7c23d757b Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomascamlong@gmail.com>
Date: Sat, 12 Nov 2022 08:12:54 +0900
Subject: [PATCH 10/12] =?UTF-8?q?=F0=9F=94=A7=20fix=20lint=20errors=20and?=
 =?UTF-8?q?=20bumb=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/constants.ts                             |  2 +-
 package.json                                  |  2 +-
 src/components/AppShelf/AddAppShelfItem.tsx   |  4 ++-
 src/components/AppShelf/AppShelf.tsx          | 13 ++-------
 .../SearchNewTabSwitch/SearchNewTabSwitch.tsx |  6 +---
 src/components/Settings/AdvancedSettings.tsx  |  8 +++---
 src/components/layout/Layout.tsx              |  4 +--
 src/middleware.ts                             | 18 +++++-------
 src/modules/ModuleTypes.d.ts                  |  2 +-
 src/modules/calendar/CalendarModule.tsx       |  6 ++--
 src/modules/dashdot/DashdotModule.tsx         |  2 +-
 src/modules/docker/DockerTable.tsx            | 10 +------
 src/modules/search/SearchModule.tsx           | 14 ++++++++--
 src/pages/api/modules/usenet/history.ts       |  2 +-
 src/pages/api/modules/usenet/index.ts         |  2 +-
 .../modules/usenet/nzbget/nzbget-client.ts    | 26 ++++++++---------
 src/pages/api/modules/usenet/nzbget/types.ts  | 28 ++++++++++++++-----
 src/pages/api/modules/usenet/queue.ts         |  6 ++--
 src/pages/login.tsx                           |  4 +--
 src/tools/translation-namespaces.ts           |  4 +--
 src/tools/types.ts                            |  6 ++--
 21 files changed, 82 insertions(+), 87 deletions(-)

diff --git a/data/constants.ts b/data/constants.ts
index 5cd84638c..6d9a0a462 100644
--- a/data/constants.ts
+++ b/data/constants.ts
@@ -1,2 +1,2 @@
 export const REPO_URL = 'ajnart/homarr';
-export const CURRENT_VERSION = 'v0.10.3';
+export const CURRENT_VERSION = 'v0.10.4';
diff --git a/package.json b/package.json
index 650453385..5f5ef0f17 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homarr",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Homarr - A homepage for your server.",
   "license": "MIT",
   "repository": {
diff --git a/src/components/AppShelf/AddAppShelfItem.tsx b/src/components/AppShelf/AddAppShelfItem.tsx
index 046955740..01dd3da81 100644
--- a/src/components/AppShelf/AddAppShelfItem.tsx
+++ b/src/components/AppShelf/AddAppShelfItem.tsx
@@ -308,7 +308,9 @@ export function AddAppShelfItemForm(props: AddAppShelfItemFormProps) {
                       target="_blank"
                       weight="bold"
                       style={{ fontStyle: 'inherit', fontSize: 'inherit' }}
-                      href={`${hostname}/${apiKeyPaths[form.values.type as keyof typeof apiKeyPaths]}`}
+                      href={`${hostname}/${
+                        apiKeyPaths[form.values.type as keyof typeof apiKeyPaths]
+                      }`}
                     >
                       {t('modal.tabs.options.form.integrations.apiKey.tip.link')}
                     </Anchor>
diff --git a/src/components/AppShelf/AppShelf.tsx b/src/components/AppShelf/AppShelf.tsx
index 114d98ec4..85a204f0c 100644
--- a/src/components/AppShelf/AppShelf.tsx
+++ b/src/components/AppShelf/AppShelf.tsx
@@ -1,14 +1,5 @@
 import React, { useState } from 'react';
-import {
-  Accordion,
-  Divider,
-  Grid,
-  Paper,
-  Stack,
-  Text,
-  Title,
-  useMantineColorScheme,
-} from '@mantine/core';
+import { Accordion, Grid, Paper, Stack, Text, useMantineColorScheme } from '@mantine/core';
 import {
   closestCenter,
   DndContext,
@@ -202,7 +193,7 @@ const AppShelf = (props: any) => {
               <Accordion.Control>{t('accordions.downloads.text')}</Accordion.Control>
               <Accordion.Panel>
                 <Paper radius="lg" style={{ position: 'relative' }}>
-                      {torrentEnabled && (
+                  {torrentEnabled && (
                     <>
                       <Text>{t('accordions.downloads.torrents')}</Text>
                       <ModuleMenu module={TorrentsModule} hovered />
diff --git a/src/components/SearchNewTabSwitch/SearchNewTabSwitch.tsx b/src/components/SearchNewTabSwitch/SearchNewTabSwitch.tsx
index ca759f411..00ebb88f4 100644
--- a/src/components/SearchNewTabSwitch/SearchNewTabSwitch.tsx
+++ b/src/components/SearchNewTabSwitch/SearchNewTabSwitch.tsx
@@ -49,11 +49,7 @@ export function SearchNewTabSwitch() {
   return (
     <Group>
       <div className={classes.root}>
-        <Switch
-          checked={openInNewTab}
-          onChange={() => toggleOpenInNewTab()}
-          size="md"
-        />
+        <Switch checked={openInNewTab} onChange={() => toggleOpenInNewTab()} size="md" />
       </div>
       {t('searchNewTab.label')}
     </Group>
diff --git a/src/components/Settings/AdvancedSettings.tsx b/src/components/Settings/AdvancedSettings.tsx
index d560c0dbf..a3b54cd77 100644
--- a/src/components/Settings/AdvancedSettings.tsx
+++ b/src/components/Settings/AdvancedSettings.tsx
@@ -47,22 +47,22 @@ export default function TitleChanger() {
         <Stack>
           <TextInput
             label={t('pageTitle.label')}
-            placeholder={'Homarr 🦞'}
+            placeholder="Homarr 🦞"
             {...form.getInputProps('title')}
           />
           <TextInput
             label={t('logo.label')}
-            placeholder={'/imgs/logo.png}
+            placeholder="/imgs/logo.png"
             {...form.getInputProps('logo')}
           />
           <TextInput
             label={t('favicon.label')}
-            placeholder={'/imgs/favicon/favicon.png'}
+            placeholder="/imgs/favicon/favicon.png"
             {...form.getInputProps('favicon')}
           />
           <TextInput
             label={t('background.label')}
-            placeholder={'/img/background.png'}
+            placeholder="/img/background.png"
             {...form.getInputProps('background')}
           />
           <Textarea
diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx
index f010f5724..5e8f074e0 100644
--- a/src/components/layout/Layout.tsx
+++ b/src/components/layout/Layout.tsx
@@ -42,9 +42,7 @@ export default function Layout({ children, style }: any) {
       >
         {children}
       </main>
-      <style>
-        {cx(config.settings.customCSS)}
-      </style>
+      <style>{cx(config.settings.customCSS)}</style>
     </AppShell>
   );
 }
diff --git a/src/middleware.ts b/src/middleware.ts
index 3fb5b88d8..9c45b2840 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -4,19 +4,15 @@ import { NextFetchEvent, NextRequest, NextResponse } from 'next/server';
 export function middleware(req: NextRequest, ev: NextFetchEvent) {
   const isCorrectPassword = req.cookies.get('password') === process.env.PASSWORD;
   const url = req.nextUrl.clone();
-  const skipURL = url.pathname && (
-    url.pathname.includes('login') || url.pathname === ('/api/configs/tryPassword') || (
-        url.pathname.includes('/_next/') && !url.pathname.includes('/pages/')
-      ) ||
+  const skipURL =
+    url.pathname &&
+    (url.pathname.includes('login') ||
+      url.pathname === '/api/configs/tryPassword' ||
+      (url.pathname.includes('/_next/') && !url.pathname.includes('/pages/')) ||
       url.pathname === '/favicon.ico' ||
       url.pathname === '/404' ||
-      url.pathname.includes('pages/_app')
-  );
-  if (
-    !skipURL &&
-    !isCorrectPassword &&
-    process.env.PASSWORD
-  ) {
+      url.pathname.includes('pages/_app'));
+  if (!skipURL && !isCorrectPassword && process.env.PASSWORD) {
     url.pathname = '/login';
     return NextResponse.rewrite(url);
   }
diff --git a/src/modules/ModuleTypes.d.ts b/src/modules/ModuleTypes.d.ts
index 177ce5ae7..937afc5a5 100644
--- a/src/modules/ModuleTypes.d.ts
+++ b/src/modules/ModuleTypes.d.ts
@@ -14,7 +14,7 @@ export interface IModule {
   padding?: PaddingOptions = {
     right: 15,
     top: 15,
-  },
+  };
 }
 
 interface PaddingOptions {
diff --git a/src/modules/calendar/CalendarModule.tsx b/src/modules/calendar/CalendarModule.tsx
index ce55779b0..e3a6ceaff 100644
--- a/src/modules/calendar/CalendarModule.tsx
+++ b/src/modules/calendar/CalendarModule.tsx
@@ -136,12 +136,12 @@ export default function CalendarComponent(props: any) {
         date.getDay() === today.getDay() && date.getDate() === today.getDate()
           ? {
               backgroundColor:
-              theme.colorScheme === 'dark' ? theme.colors.dark[5] : theme.colors.gray[0],
+                theme.colorScheme === 'dark' ? theme.colors.dark[5] : theme.colors.gray[0],
               margin: 1,
             }
           : {
-            margin: 1,
-          }
+              margin: 1,
+            }
       }
       styles={{
         calendarHeader: {
diff --git a/src/modules/dashdot/DashdotModule.tsx b/src/modules/dashdot/DashdotModule.tsx
index 5ab7446f6..aae0901e7 100644
--- a/src/modules/dashdot/DashdotModule.tsx
+++ b/src/modules/dashdot/DashdotModule.tsx
@@ -98,7 +98,7 @@ const useJson = (targetUrl: string, url: string) => {
 
   const doRequest = async () => {
     try {
-      const resp = await axios.get('/api/modules/dashdot',{ params: { url, base: targetUrl } });
+      const resp = await axios.get('/api/modules/dashdot', { params: { url, base: targetUrl } });
 
       setData(resp.data);
       // eslint-disable-next-line no-empty
diff --git a/src/modules/docker/DockerTable.tsx b/src/modules/docker/DockerTable.tsx
index 08f0bba7f..1e263360e 100644
--- a/src/modules/docker/DockerTable.tsx
+++ b/src/modules/docker/DockerTable.tsx
@@ -1,12 +1,4 @@
-import {
-  Table,
-  Checkbox,
-  Group,
-  Badge,
-  createStyles,
-  ScrollArea,
-  TextInput,
-} from '@mantine/core';
+import { Table, Checkbox, Group, Badge, createStyles, ScrollArea, TextInput } from '@mantine/core';
 import { IconSearch } from '@tabler/icons';
 import Dockerode from 'dockerode';
 import { useTranslation } from 'next-i18next';
diff --git a/src/modules/search/SearchModule.tsx b/src/modules/search/SearchModule.tsx
index 2363b4e7e..6540178c3 100644
--- a/src/modules/search/SearchModule.tsx
+++ b/src/modules/search/SearchModule.tsx
@@ -158,16 +158,24 @@ export default function SearchBar(props: any) {
           form.setValues({ query: '' });
           switch (query.substring(0, 3)) {
             case '!yt':
-              window.open(`https://www.youtube.com/results?search_query=${query.substring(3)}`, open_in);
+              window.open(
+                `https://www.youtube.com/results?search_query=${query.substring(3)}`,
+                open_in
+              );
               break;
             case '!t ':
-              window.open(`https://www.torrentdownloads.me/search/?search=${query.substring(3)}`, open_in);
+              window.open(
+                `https://www.torrentdownloads.me/search/?search=${query.substring(3)}`,
+                open_in
+              );
               break;
             case '!os':
               break;
             default:
               window.open(
-                `${queryUrl.includes('%s') ? queryUrl.replace('%s', query) : `${queryUrl}${query}`}`,
+                `${
+                  queryUrl.includes('%s') ? queryUrl.replace('%s', query) : `${queryUrl}${query}`
+                }`,
                 open_in
               );
               break;
diff --git a/src/pages/api/modules/usenet/history.ts b/src/pages/api/modules/usenet/history.ts
index 67f4ececd..16a24f30f 100644
--- a/src/pages/api/modules/usenet/history.ts
+++ b/src/pages/api/modules/usenet/history.ts
@@ -48,7 +48,7 @@ async function Get(req: NextApiRequest, res: NextApiResponse) {
 
         const nzbGet = NzbgetClient(options);
 
-        const nzbgetHistory:NzbgetHistoryItem[] = await new Promise((resolve, reject) => {
+        const nzbgetHistory: NzbgetHistoryItem[] = await new Promise((resolve, reject) => {
           nzbGet.history(false, (err: any, result: NzbgetHistoryItem[]) => {
             if (!err) {
               resolve(result);
diff --git a/src/pages/api/modules/usenet/index.ts b/src/pages/api/modules/usenet/index.ts
index bf0cffc1a..0945ab86d 100644
--- a/src/pages/api/modules/usenet/index.ts
+++ b/src/pages/api/modules/usenet/index.ts
@@ -47,7 +47,7 @@ async function Get(req: NextApiRequest, res: NextApiResponse) {
 
         const nzbGet = NzbgetClient(options);
 
-        const nzbgetStatus:NzbgetStatus = await new Promise((resolve, reject) => {
+        const nzbgetStatus: NzbgetStatus = await new Promise((resolve, reject) => {
           nzbGet.status((err: any, result: NzbgetStatus) => {
             if (!err) {
               resolve(result);
diff --git a/src/pages/api/modules/usenet/nzbget/nzbget-client.ts b/src/pages/api/modules/usenet/nzbget/nzbget-client.ts
index 80fe82295..1fd068dc4 100644
--- a/src/pages/api/modules/usenet/nzbget/nzbget-client.ts
+++ b/src/pages/api/modules/usenet/nzbget/nzbget-client.ts
@@ -2,21 +2,21 @@ import NZBGet from 'nzbget-api';
 import { NzbgetClientOptions } from './types';
 
 export function NzbgetClient(options: NzbgetClientOptions) {
-    if (!options?.host) {
-        throw new Error('Cannot connect to NZBGet. Missing host in service config.');
-    }
+  if (!options?.host) {
+    throw new Error('Cannot connect to NZBGet. Missing host in service config.');
+  }
 
-    if (!options?.port) {
-        throw new Error('Cannot connect to NZBGet. Missing port in service config.');
-    }
+  if (!options?.port) {
+    throw new Error('Cannot connect to NZBGet. Missing port in service config.');
+  }
 
-    if (!options?.login) {
-        throw new Error('Cannot connect to NZBGet. Missing username in service config.');
-    }
+  if (!options?.login) {
+    throw new Error('Cannot connect to NZBGet. Missing username in service config.');
+  }
 
-    if (!options?.hash) {
-        throw new Error('Cannot connect to NZBGet. Missing password in service config.');
-    }
+  if (!options?.hash) {
+    throw new Error('Cannot connect to NZBGet. Missing password in service config.');
+  }
 
-    return new NZBGet(options);
+  return new NZBGet(options);
 }
diff --git a/src/pages/api/modules/usenet/nzbget/types.ts b/src/pages/api/modules/usenet/nzbget/types.ts
index d2bc53ad7..e51f5861a 100644
--- a/src/pages/api/modules/usenet/nzbget/types.ts
+++ b/src/pages/api/modules/usenet/nzbget/types.ts
@@ -25,9 +25,9 @@ export interface NzbgetHistoryItem {
   DownloadTimeSec: number;
   PostTotalTimeSec: number;
   ParTimeSec: number;
-  RepairTimeSec: number
+  RepairTimeSec: number;
   UnpackTimeSec: number;
-  MessageCount:number;
+  MessageCount: number;
   DupeKey: string;
   DupeScore: number;
   DupeMode: 'SCORE' | 'ALL' | 'FORCE';
@@ -71,7 +71,21 @@ export interface NzbgetQueueItem {
   MaxPostTime: number;
   MaxPriority: number;
   ActiveDownloads: number;
-  Status: 'QUEUED' | 'PAUSED' | 'DOWNLOADING' | 'FETCHING' | 'PP_QUEUED' | 'LOADING_PARS' | 'VERIFYING_SOURCES' | 'REPAIRING' | 'VERIFYING_REPAIRED' | 'RENAMING' | 'UNPACKING' | 'MOVING' | 'EXECUTING_SCRIPT' | 'PP_FINISHED';
+  Status:
+    | 'QUEUED'
+    | 'PAUSED'
+    | 'DOWNLOADING'
+    | 'FETCHING'
+    | 'PP_QUEUED'
+    | 'LOADING_PARS'
+    | 'VERIFYING_SOURCES'
+    | 'REPAIRING'
+    | 'VERIFYING_REPAIRED'
+    | 'RENAMING'
+    | 'UNPACKING'
+    | 'MOVING'
+    | 'EXECUTING_SCRIPT'
+    | 'PP_FINISHED';
   TotalArticles: number;
   SuccessArticles: number;
   FailedArticles: number;
@@ -128,8 +142,8 @@ export interface NzbgetStatus {
 }
 
 export interface NzbgetClientOptions {
-  host: string,
-  port: string,
-  login: string | undefined,
-  hash: string | undefined,
+  host: string;
+  port: string;
+  login: string | undefined;
+  hash: string | undefined;
 }
diff --git a/src/pages/api/modules/usenet/queue.ts b/src/pages/api/modules/usenet/queue.ts
index 5ae73436e..7d6041e14 100644
--- a/src/pages/api/modules/usenet/queue.ts
+++ b/src/pages/api/modules/usenet/queue.ts
@@ -48,7 +48,7 @@ async function Get(req: NextApiRequest, res: NextApiResponse) {
 
         const nzbGet = NzbgetClient(options);
 
-        const nzbgetQueue:NzbgetQueueItem[] = await new Promise((resolve, reject) => {
+        const nzbgetQueue: NzbgetQueueItem[] = await new Promise((resolve, reject) => {
           nzbGet.listGroups((err: any, result: NzbgetQueueItem[]) => {
             if (!err) {
               resolve(result);
@@ -62,7 +62,7 @@ async function Get(req: NextApiRequest, res: NextApiResponse) {
           throw new Error('Error while getting NZBGet queue');
         }
 
-        const nzbgetStatus:NzbgetStatus = await new Promise((resolve, reject) => {
+        const nzbgetStatus: NzbgetStatus = await new Promise((resolve, reject) => {
           nzbGet.status((err: any, result: NzbgetStatus) => {
             if (!err) {
               resolve(result);
@@ -139,7 +139,7 @@ function getNzbgetState(status: string) {
     case 'QUEUED':
       return 'queued';
     case 'PAUSED ':
-        return 'paused';
+      return 'paused';
     default:
       return 'downloading';
   }
diff --git a/src/pages/login.tsx b/src/pages/login.tsx
index b831acb06..ef3eda1bd 100644
--- a/src/pages/login.tsx
+++ b/src/pages/login.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { PasswordInput, Anchor, Paper, Title, Text, Container, Group, Button } from '@mantine/core';
+import { PasswordInput, Paper, Title, Text, Container, Group, Button } from '@mantine/core';
 import { setCookie } from 'cookies-next';
 import { showNotification, updateNotification } from '@mantine/notifications';
 import axios from 'axios';
 import { IconCheck, IconX } from '@tabler/icons';
 import { useRouter } from 'next/router';
-import { Trans, useTranslation } from 'next-i18next';
+import { useTranslation } from 'next-i18next';
 import { useForm } from '@mantine/form';
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 import { loginNamespaces } from '../tools/translation-namespaces';
diff --git a/src/tools/translation-namespaces.ts b/src/tools/translation-namespaces.ts
index 37587bd6d..e4f6c540a 100644
--- a/src/tools/translation-namespaces.ts
+++ b/src/tools/translation-namespaces.ts
@@ -30,6 +30,4 @@ export const dashboardNamespaces = [
   'modules/common-media-cards',
 ];
 
-export const loginNamespaces = [
-  'authentication/login',
-];
+export const loginNamespaces = ['authentication/login'];
diff --git a/src/tools/types.ts b/src/tools/types.ts
index 7c5ac923b..7e2220110 100644
--- a/src/tools/types.ts
+++ b/src/tools/types.ts
@@ -11,7 +11,7 @@ export interface Settings {
   secondaryColor?: MantineTheme['primaryColor'];
   primaryShade?: MantineTheme['primaryShade'];
   background?: string;
-  customCSS?: string,
+  customCSS?: string;
   appOpacity?: number;
   widgetPosition?: string;
   appCardWidth?: number;
@@ -76,7 +76,7 @@ export const ServiceTypeList = [
   'Overseerr',
   'Jellyseerr',
   'Sabnzbd',
-  'NZBGet'
+  'NZBGet',
 ];
 export type ServiceType =
   | 'Other'
@@ -120,7 +120,7 @@ export const portmap = [
   { name: 'overseerr', value: '5055' },
   { name: 'dash.', value: '3001' },
   { name: 'sabnzbd', value: '8080' },
-  { name: 'nzbget', value: '6789' }
+  { name: 'nzbget', value: '6789' },
 ];
 
 export const MatchingImages: {

From 05ac5dbcd38063dcda818394e0fbc2ca9b0969ef Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomascamlong@gmail.com>
Date: Sat, 12 Nov 2022 09:05:19 +0900
Subject: [PATCH 11/12] Add dependencies

---
 package.json |  1 +
 yarn.lock    | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/package.json b/package.json
index 5f5ef0f17..2ed67121f 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "js-file-download": "^0.4.12",
     "next": "12.2.0",
     "next-i18next": "^11.3.0",
+    "nzbget-api": "^0.0.3",
     "prism-react-renderer": "^1.3.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/yarn.lock b/yarn.lock
index d9158d62d..801d7e7ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4851,6 +4851,7 @@ __metadata:
     js-file-download: ^0.4.12
     next: 12.2.0
     next-i18next: ^11.3.0
+    nzbget-api: ^0.0.3
     prettier: ^2.7.1
     prism-react-renderer: ^1.3.5
     react: ^18.2.0
@@ -6520,6 +6521,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-json-rpc@npm:0.0.1":
+  version: 0.0.1
+  resolution: "node-json-rpc@npm:0.0.1"
+  checksum: cb11296393cd73918bc9a2dd7a98bc45d530924b5753ef127c764f7c84c939d034d739271e9de7fc34432be9d29a4fe93a7ddd95d1d9716039dbb42c216a2b66
+  languageName: node
+  linkType: hard
+
 "node-releases@npm:^2.0.6":
   version: 2.0.6
   resolution: "node-releases@npm:2.0.6"
@@ -6573,6 +6581,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nzbget-api@npm:^0.0.3":
+  version: 0.0.3
+  resolution: "nzbget-api@npm:0.0.3"
+  dependencies:
+    node-json-rpc: 0.0.1
+    q: ^1.4.1
+    xtend: ^4.0.0
+  checksum: 2f46e4193a1966192177a2f5aee9692cb978fe61d2ec57e5c127a5a7812c6029e2003769db51643324b663096627cb32c5a84a682af11fd586a01bba80e58dae
+  languageName: node
+  linkType: hard
+
 "object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
@@ -7023,6 +7042,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"q@npm:^1.4.1":
+  version: 1.5.1
+  resolution: "q@npm:1.5.1"
+  checksum: 147baa93c805bc1200ed698bdf9c72e9e42c05f96d007e33a558b5fdfd63e5ea130e99313f28efc1783e90e6bdb4e48b67a36fcc026b7b09202437ae88a1fb12
+  languageName: node
+  linkType: hard
+
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
@@ -8406,6 +8432,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xtend@npm:^4.0.0":
+  version: 4.0.2
+  resolution: "xtend@npm:4.0.2"
+  checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
+  languageName: node
+  linkType: hard
+
 "xtend@npm:~2.1.1":
   version: 2.1.2
   resolution: "xtend@npm:2.1.2"

From 8ac0af23246503e6d1808043dc6563eaf6100d30 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <49837342+ajnart@users.noreply.github.com>
Date: Sat, 12 Nov 2022 21:51:55 +0900
Subject: [PATCH 12/12] New Crowdin updates (#485)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* New translations docker.json (Russian)

* New translations app-shelf.json (Russian)

* New translations search-engine.json (Russian)

* New translations dlspeed.json (French)

* New translations dlspeed.json (Korean)

* New translations torrents-status.json (Korean)

* New translations common.json (Russian)

* New translations add-service-app-shelf.json (Russian)

* New translations common-media-cards.json (Russian)

* New translations dashdot.json (Russian)

* New translations date.json (Russian)

* New translations dlspeed.json (Russian)

* New translations overseerr.json (Russian)

* New translations ping.json (Russian)

* New translations search.json (Russian)

* New translations torrents-status.json (Russian)

* New translations weather.json (Russian)

* New translations common.json (Russian)

* New translations app-width.json (Russian)

* New translations color-selector.json (Russian)

* New translations login.json (Russian)

* New translations opacity-selector.json (Russian)

* New translations page-appearance.json (Russian)

* New translations shade-selector.json (Russian)

* New translations config-changer.json (Russian)

* New translations internationalization.json (Russian)

* New translations module-enabler.json (Russian)

* New translations theme-selector.json (Russian)

* New translations widget-positions.json (Russian)

* New translations usenet.json (Russian)

* New translations dlspeed.json (Chinese Simplified)

* New translations app-shelf.json (Italian)

* New translations common.json (Vietnamese)

* New translations common.json (Vietnamese)

* New translations usenet.json (Vietnamese)

* New translations widget-positions.json (Vietnamese)

* New translations theme-selector.json (Vietnamese)

* New translations search-engine.json (Vietnamese)

* New translations module-enabler.json (Vietnamese)

* New translations internationalization.json (Vietnamese)

* New translations config-changer.json (Vietnamese)

* New translations color-schema.json (Vietnamese)

* New translations shade-selector.json (Vietnamese)

* New translations page-appearance.json (Vietnamese)

* New translations opacity-selector.json (Vietnamese)

* New translations color-selector.json (Vietnamese)

* New translations app-width.json (Vietnamese)

* New translations weather.json (Vietnamese)

* New translations add-service-app-shelf.json (Vietnamese)

* New translations torrents-status.json (Vietnamese)

* New translations search.json (Vietnamese)

* New translations ping.json (Vietnamese)

* New translations overseerr.json (Vietnamese)

* New translations docker.json (Vietnamese)

* New translations dlspeed.json (Vietnamese)

* New translations date.json (Vietnamese)

* New translations dashdot.json (Vietnamese)

* New translations common.json (Vietnamese)

* New translations common-media-cards.json (Vietnamese)

* New translations calendar.json (Vietnamese)

* New translations app-shelf.json (Vietnamese)

* New translations app-shelf-menu.json (Vietnamese)

* New translations login.json (Vietnamese)

* New translations common.json (Vietnamese)

* New translations app-width.json (Vietnamese)

* New translations widget-positions.json (Vietnamese)

* New translations theme-selector.json (Vietnamese)

* New translations search-engine.json (Vietnamese)

* New translations internationalization.json (Vietnamese)

* New translations shade-selector.json (Vietnamese)

* New translations opacity-selector.json (Vietnamese)

* New translations color-selector.json (Vietnamese)

* New translations common.json (Vietnamese)

* New translations common-media-cards.json (Vietnamese)

* New translations weather.json (Vietnamese)

* New translations torrents-status.json (Vietnamese)

* New translations search.json (Vietnamese)

* New translations overseerr.json (Vietnamese)

* New translations dlspeed.json (Vietnamese)

* New translations date.json (Vietnamese)

* New translations dashdot.json (Vietnamese)

* New translations usenet.json (Vietnamese)

* New translations app-shelf-menu.json (Vietnamese)

* New translations add-service-app-shelf.json (Vietnamese)

* New translations app-shelf-menu.json (Vietnamese)

* New translations calendar.json (Vietnamese)

* New translations common.json (Vietnamese)

* New translations dlspeed.json (Vietnamese)

* New translations docker.json (Vietnamese)

* New translations overseerr.json (Vietnamese)

* New translations ping.json (Vietnamese)

* New translations torrents-status.json (Vietnamese)

* New translations page-appearance.json (Vietnamese)

* New translations color-schema.json (Vietnamese)

* New translations config-changer.json (Vietnamese)

* New translations module-enabler.json (Vietnamese)

* New translations search-engine.json (Vietnamese)

* New translations usenet.json (Vietnamese)

* New translations login.json (Vietnamese)

* New translations docker.json (Spanish)

* New translations page-appearance.json (Russian)

* New translations page-appearance.json (LOLCAT)

* New translations page-appearance.json (English)

* New translations page-appearance.json (Chinese Simplified)

* New translations page-appearance.json (Ukrainian)

* New translations page-appearance.json (Swedish)

* New translations page-appearance.json (Slovenian)

* New translations page-appearance.json (Polish)

* New translations page-appearance.json (Danish)

* New translations page-appearance.json (Dutch)

* New translations page-appearance.json (Korean)

* New translations page-appearance.json (Japanese)

* New translations page-appearance.json (Italian)

* New translations page-appearance.json (French)

* New translations page-appearance.json (Spanish)

* New translations page-appearance.json (Hebrew)

* New translations page-appearance.json (German)

* New translations page-appearance.json (Vietnamese)

* New translations page-appearance.json (Swedish)

* New translations page-appearance.json (Portuguese, Brazilian)

* New translations page-appearance.json (LOLCAT)

* New translations page-appearance.json (English)

* New translations page-appearance.json (Vietnamese)

* New translations page-appearance.json (Chinese Simplified)

* New translations page-appearance.json (Spanish)

* New translations page-appearance.json (French)

* New translations page-appearance.json (Danish)

* New translations page-appearance.json (Ukrainian)

* New translations page-appearance.json (German)

* New translations page-appearance.json (Hebrew)

* New translations page-appearance.json (Italian)

* New translations page-appearance.json (Japanese)

* New translations page-appearance.json (Korean)

* New translations page-appearance.json (Dutch)

* New translations page-appearance.json (Polish)

* New translations page-appearance.json (Russian)

* New translations page-appearance.json (Slovenian)

* New translations page-appearance.json (Swedish)

* New translations search-engine.json (Spanish)

* New translations docker.json (Chinese Simplified)

* New translations search-engine.json (Chinese Simplified)

* New translations app-shelf.json (Chinese Simplified)

* New translations docker.json (Chinese Simplified)

* New translations add-service-app-shelf.json (French)

* New translations usenet.json (LOLCAT)

* New translations usenet.json (Polish)

* New translations usenet.json (Russian)

* New translations usenet.json (Slovenian)

* New translations usenet.json (Swedish)

* New translations usenet.json (Ukrainian)

* New translations usenet.json (Chinese Simplified)

* New translations usenet.json (English)

* New translations usenet.json (Vietnamese)

* New translations usenet.json (Korean)

* New translations usenet.json (Dutch)

* New translations usenet.json (Japanese)

* New translations add-service-app-shelf.json (Spanish)

* New translations add-service-app-shelf.json (Swedish)

* New translations add-service-app-shelf.json (Danish)

* New translations add-service-app-shelf.json (German)

* New translations add-service-app-shelf.json (Hebrew)

* New translations add-service-app-shelf.json (Italian)

* New translations add-service-app-shelf.json (Japanese)

* New translations add-service-app-shelf.json (Korean)

* New translations add-service-app-shelf.json (Dutch)

* New translations add-service-app-shelf.json (Polish)

* New translations add-service-app-shelf.json (Russian)

* New translations add-service-app-shelf.json (Slovenian)

* New translations add-service-app-shelf.json (Ukrainian)

* New translations usenet.json (Italian)

* New translations add-service-app-shelf.json (Chinese Simplified)

* New translations add-service-app-shelf.json (English)

* New translations add-service-app-shelf.json (Vietnamese)

* New translations add-service-app-shelf.json (Portuguese, Brazilian)

* New translations add-service-app-shelf.json (LOLCAT)

* New translations usenet.json (French)

* New translations usenet.json (Spanish)

* New translations usenet.json (Danish)

* New translations usenet.json (German)

* New translations usenet.json (Hebrew)

* New translations docker.json (Italian)

* New translations usenet.json (Spanish)

* New translations usenet.json (Danish)

* New translations usenet.json (Italian)

* New translations usenet.json (Swedish)

* New translations usenet.json (Vietnamese)

* New translations search-engine.json (Italian)

* New translations usenet.json (Hebrew)

* New translations usenet.json (Hebrew)

* New translations docker.json (Ukrainian)

* New translations usenet.json (Ukrainian)

* 🐛 fix default favicon path (#492)

* :arrow_up: Updated: Next.js 12.1.6 -> 12.2.0

* Remove useless translations

* :globe_with_meridians: Add Vietnamese 🇻🇳 language support

* ✨ Add NZBGet download client

* 🔧 fix lint errors and bumb version

* Add dependencies

* :arrow_up: Updated: Next.js 12.1.6 -> 12.2.0

* ✨ Add NZBGet download client

* 🔧 fix lint errors and bumb version

Co-authored-by: Manuel <30572287+manuel-rw@users.noreply.github.com>
Co-authored-by: SR3u <wnmsr3u@gmail.com>
Co-authored-by: Jon Terry <jonathan.terry@rsa.com>
---
 .../da/layout/add-service-app-shelf.json      |  16 +++
 .../customization/page-appearance.json        |   9 +-
 .../de/layout/add-service-app-shelf.json      |  16 +++
 .../customization/page-appearance.json        |   9 +-
 .../es/layout/add-service-app-shelf.json      |  16 +++
 public/locales/es/modules/docker.json         |   2 +-
 .../customization/page-appearance.json        |   9 +-
 .../es/settings/general/search-engine.json    |   2 +-
 .../fr/layout/add-service-app-shelf.json      |  16 +++
 public/locales/fr/modules/dlspeed.json        |   4 +-
 .../customization/page-appearance.json        |   9 +-
 .../he/layout/add-service-app-shelf.json      |  16 +++
 .../customization/page-appearance.json        |   9 +-
 .../it/layout/add-service-app-shelf.json      |  16 +++
 public/locales/it/layout/app-shelf.json       |   4 +-
 public/locales/it/modules/docker.json         |   2 +-
 .../customization/page-appearance.json        |   9 +-
 .../it/settings/general/search-engine.json    |   2 +-
 .../ja/layout/add-service-app-shelf.json      |  16 +++
 .../customization/page-appearance.json        |   9 +-
 .../ko/layout/add-service-app-shelf.json      |  16 +++
 public/locales/ko/modules/dlspeed.json        |   4 +-
 .../locales/ko/modules/torrents-status.json   |   4 +-
 .../customization/page-appearance.json        |   9 +-
 .../lol/layout/add-service-app-shelf.json     |  16 +++
 .../customization/page-appearance.json        |   9 +-
 .../nl/layout/add-service-app-shelf.json      |  16 +++
 .../customization/page-appearance.json        |   9 +-
 .../pl/layout/add-service-app-shelf.json      |  16 +++
 .../customization/page-appearance.json        |   9 +-
 .../pt/layout/add-service-app-shelf.json      |  16 +++
 .../customization/page-appearance.json        |   9 +-
 public/locales/ru/authentication/login.json   |  16 +--
 public/locales/ru/common.json                 |  10 +-
 .../ru/layout/add-service-app-shelf.json      |  18 ++-
 public/locales/ru/layout/app-shelf.json       |   4 +-
 .../ru/modules/common-media-cards.json        |   4 +-
 public/locales/ru/modules/dashdot.json        |  28 ++--
 public/locales/ru/modules/date.json           |   6 +-
 public/locales/ru/modules/dlspeed.json        |  34 ++---
 public/locales/ru/modules/docker.json         |  64 ++++-----
 public/locales/ru/modules/overseerr.json      |  18 +--
 public/locales/ru/modules/ping.json           |  10 +-
 public/locales/ru/modules/search.json         |   2 +-
 .../locales/ru/modules/torrents-status.json   |  36 ++---
 public/locales/ru/modules/usenet.json         |  42 +++---
 public/locales/ru/modules/weather.json        |   4 +-
 public/locales/ru/settings/common.json        |   8 +-
 .../ru/settings/customization/app-width.json  |   4 +-
 .../customization/color-selector.json         |   4 +-
 .../customization/opacity-selector.json       |   4 +-
 .../customization/page-appearance.json        |  19 ++-
 .../customization/shade-selector.json         |   4 +-
 .../ru/settings/general/config-changer.json   |  38 ++---
 .../general/internationalization.json         |   4 +-
 .../ru/settings/general/module-enabler.json   |   4 +-
 .../ru/settings/general/search-engine.json    |  12 +-
 .../ru/settings/general/theme-selector.json   |   4 +-
 .../ru/settings/general/widget-positions.json |   4 +-
 .../sl/layout/add-service-app-shelf.json      |  16 +++
 .../customization/page-appearance.json        |   9 +-
 .../sv/layout/add-service-app-shelf.json      |  16 +++
 .../customization/page-appearance.json        |   9 +-
 .../uk/layout/add-service-app-shelf.json      |  16 +++
 public/locales/uk/modules/docker.json         |   2 +-
 .../customization/page-appearance.json        |  10 +-
 public/locales/vi/authentication/login.json   |  27 ++++
 public/locales/vi/common.json                 |  11 ++
 .../vi/layout/add-service-app-shelf.json      | 134 ++++++++++++++++++
 public/locales/vi/layout/app-shelf-menu.json  |  18 +++
 public/locales/vi/layout/app-shelf.json       |  12 ++
 public/locales/vi/modules/calendar.json       |  11 ++
 .../vi/modules/common-media-cards.json        |   6 +
 public/locales/vi/modules/common.json         |   5 +
 public/locales/vi/modules/dashdot.json        |  53 +++++++
 public/locales/vi/modules/date.json           |  11 ++
 public/locales/vi/modules/dlspeed.json        |  35 +++++
 public/locales/vi/modules/docker.json         |  83 +++++++++++
 public/locales/vi/modules/overseerr.json      |  30 ++++
 public/locales/vi/modules/ping.json           |  11 ++
 public/locales/vi/modules/search.json         |   9 ++
 .../locales/vi/modules/torrents-status.json   |  40 ++++++
 public/locales/vi/modules/usenet.json         |  49 +++++++
 public/locales/vi/modules/weather.json        |  32 +++++
 public/locales/vi/settings/common.json        |  14 ++
 .../vi/settings/customization/app-width.json  |   3 +
 .../customization/color-selector.json         |   3 +
 .../customization/opacity-selector.json       |   3 +
 .../customization/page-appearance.json        |  22 +++
 .../customization/shade-selector.json         |   3 +
 .../vi/settings/general/color-schema.json     |   3 +
 .../vi/settings/general/config-changer.json   |  55 +++++++
 .../general/internationalization.json         |   3 +
 .../vi/settings/general/module-enabler.json   |   3 +
 .../vi/settings/general/search-engine.json    |  14 ++
 .../vi/settings/general/theme-selector.json   |   3 +
 .../vi/settings/general/widget-positions.json |   3 +
 .../zh/layout/add-service-app-shelf.json      |  16 +++
 public/locales/zh/layout/app-shelf.json       |   4 +-
 public/locales/zh/modules/dlspeed.json        |  26 ++--
 public/locales/zh/modules/docker.json         |  20 +--
 .../customization/page-appearance.json        |   9 +-
 .../zh/settings/general/search-engine.json    |   2 +-
 103 files changed, 1269 insertions(+), 324 deletions(-)
 create mode 100644 public/locales/vi/authentication/login.json
 create mode 100644 public/locales/vi/common.json
 create mode 100644 public/locales/vi/layout/add-service-app-shelf.json
 create mode 100644 public/locales/vi/layout/app-shelf-menu.json
 create mode 100644 public/locales/vi/layout/app-shelf.json
 create mode 100644 public/locales/vi/modules/calendar.json
 create mode 100644 public/locales/vi/modules/common-media-cards.json
 create mode 100644 public/locales/vi/modules/common.json
 create mode 100644 public/locales/vi/modules/dashdot.json
 create mode 100644 public/locales/vi/modules/date.json
 create mode 100644 public/locales/vi/modules/dlspeed.json
 create mode 100644 public/locales/vi/modules/docker.json
 create mode 100644 public/locales/vi/modules/overseerr.json
 create mode 100644 public/locales/vi/modules/ping.json
 create mode 100644 public/locales/vi/modules/search.json
 create mode 100644 public/locales/vi/modules/torrents-status.json
 create mode 100644 public/locales/vi/modules/usenet.json
 create mode 100644 public/locales/vi/modules/weather.json
 create mode 100644 public/locales/vi/settings/common.json
 create mode 100644 public/locales/vi/settings/customization/app-width.json
 create mode 100644 public/locales/vi/settings/customization/color-selector.json
 create mode 100644 public/locales/vi/settings/customization/opacity-selector.json
 create mode 100644 public/locales/vi/settings/customization/page-appearance.json
 create mode 100644 public/locales/vi/settings/customization/shade-selector.json
 create mode 100644 public/locales/vi/settings/general/color-schema.json
 create mode 100644 public/locales/vi/settings/general/config-changer.json
 create mode 100644 public/locales/vi/settings/general/internationalization.json
 create mode 100644 public/locales/vi/settings/general/module-enabler.json
 create mode 100644 public/locales/vi/settings/general/search-engine.json
 create mode 100644 public/locales/vi/settings/general/theme-selector.json
 create mode 100644 public/locales/vi/settings/general/widget-positions.json

diff --git a/public/locales/da/layout/add-service-app-shelf.json b/public/locales/da/layout/add-service-app-shelf.json
index 677bf1683..80d76446b 100644
--- a/public/locales/da/layout/add-service-app-shelf.json
+++ b/public/locales/da/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Ugyldig adgangskode"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Brugernavn",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Ugyldigt brugernavn"
+                                }
+                            },
+                            "password": {
+                                "label": "Adgangskode",
+                                "placeholder": "adgangskode",
+                                "validation": {
+                                    "invalidPassword": "Ugyldig adgangskode"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/da/settings/customization/page-appearance.json b/public/locales/da/settings/customization/page-appearance.json
index dd70de077..c96002ca5 100644
--- a/public/locales/da/settings/customization/page-appearance.json
+++ b/public/locales/da/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logo",
-    "placeholder": "/img/logo.png"
+    "label": "Logo"
   },
   "favicon": {
-    "label": "Favicon",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "Baggrund",
-    "placeholder": "/img/background.png"
+    "label": "Baggrund"
   },
   "customCSS": {
     "label": "Tilpasset CSS",
diff --git a/public/locales/de/layout/add-service-app-shelf.json b/public/locales/de/layout/add-service-app-shelf.json
index f7dc884e8..090578f1a 100644
--- a/public/locales/de/layout/add-service-app-shelf.json
+++ b/public/locales/de/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Ungültiges Passwort"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Benutzername",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Invalider Benutzername"
+                                }
+                            },
+                            "password": {
+                                "label": "Passwort",
+                                "placeholder": "passwort",
+                                "validation": {
+                                    "invalidPassword": "Ungültiges Passwort"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/de/settings/customization/page-appearance.json b/public/locales/de/settings/customization/page-appearance.json
index c494a8857..e4e3d1e9d 100644
--- a/public/locales/de/settings/customization/page-appearance.json
+++ b/public/locales/de/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logo",
-    "placeholder": "/img/logo.png"
+    "label": "Logo"
   },
   "favicon": {
-    "label": "Favicon",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "Hintergrund",
-    "placeholder": "/img/background.png"
+    "label": "Hintergrund"
   },
   "customCSS": {
     "label": "Benutzerdefiniertes CSS",
diff --git a/public/locales/es/layout/add-service-app-shelf.json b/public/locales/es/layout/add-service-app-shelf.json
index 5f734dcfa..50ea3ad56 100644
--- a/public/locales/es/layout/add-service-app-shelf.json
+++ b/public/locales/es/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Contraseña Incorrecta"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Nombre de usuario",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Nombre de usuario incorrecto"
+                                }
+                            },
+                            "password": {
+                                "label": "Contraseña",
+                                "placeholder": "contraseña",
+                                "validation": {
+                                    "invalidPassword": "Contraseña Incorrecta"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/es/modules/docker.json b/public/locales/es/modules/docker.json
index f7fe95a0b..edd23cc74 100644
--- a/public/locales/es/modules/docker.json
+++ b/public/locales/es/modules/docker.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
     "name": "Docker",
-    "description": "Le permite manejar sus contenedores Docker de manera sencilla"
+    "description": "Permite administrar sus contenedores docker de manera sencilla"
   },
   "search": {
     "placeholder": "Buscar por nombre de contenedor o nombre de imagen"
diff --git a/public/locales/es/settings/customization/page-appearance.json b/public/locales/es/settings/customization/page-appearance.json
index db65c7b47..d55ab3519 100644
--- a/public/locales/es/settings/customization/page-appearance.json
+++ b/public/locales/es/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logo",
-    "placeholder": "/img/logo.png"
+    "label": "Logo"
   },
   "favicon": {
-    "label": "Favicon",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "Fondo",
-    "placeholder": "/img/background.png"
+    "label": "Fondo"
   },
   "customCSS": {
     "label": "CSS Personalizado",
diff --git a/public/locales/es/settings/general/search-engine.json b/public/locales/es/settings/general/search-engine.json
index 9ad683b4a..0b576aa00 100644
--- a/public/locales/es/settings/general/search-engine.json
+++ b/public/locales/es/settings/general/search-engine.json
@@ -9,6 +9,6 @@
     "placeholder": "URL de petición personalizada"
   },
   "searchNewTab": {
-    "label": "Abrir resultados de búsqueda en una nueva pestaña"
+    "label": "Abrir los resultados de la búsqueda en una pestaña nueva"
   }
 }
\ No newline at end of file
diff --git a/public/locales/fr/layout/add-service-app-shelf.json b/public/locales/fr/layout/add-service-app-shelf.json
index cae5f90ad..f94e8c0a4 100644
--- a/public/locales/fr/layout/add-service-app-shelf.json
+++ b/public/locales/fr/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Mot de passe invalide"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Nom d'utilisateur",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Nom d'utilisateur invalide"
+                                }
+                            },
+                            "password": {
+                                "label": "Mot de passe",
+                                "placeholder": "mot de passe",
+                                "validation": {
+                                    "invalidPassword": "Mot de passe invalide"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/fr/modules/dlspeed.json b/public/locales/fr/modules/dlspeed.json
index b6b1b0c3b..187fbd054 100644
--- a/public/locales/fr/modules/dlspeed.json
+++ b/public/locales/fr/modules/dlspeed.json
@@ -8,8 +8,8 @@
       "header": {
         "name": "Nom",
         "size": "Taille",
-        "download": "Duvet",
-        "upload": "Up",
+        "download": "Descendant",
+        "upload": "Montant",
         "estimatedTimeOfArrival": "ETA",
         "progress": "Progrès"
       },
diff --git a/public/locales/fr/settings/customization/page-appearance.json b/public/locales/fr/settings/customization/page-appearance.json
index d13ef87e0..d604e5c40 100644
--- a/public/locales/fr/settings/customization/page-appearance.json
+++ b/public/locales/fr/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logo",
-    "placeholder": "/img/logo.png"
+    "label": "Logo"
   },
   "favicon": {
-    "label": "Favicon",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "Contexte",
-    "placeholder": "/img/background.png"
+    "label": "Contexte"
   },
   "customCSS": {
     "label": "CSS personnalisé",
diff --git a/public/locales/he/layout/add-service-app-shelf.json b/public/locales/he/layout/add-service-app-shelf.json
index ee35905db..4b6ed80d5 100644
--- a/public/locales/he/layout/add-service-app-shelf.json
+++ b/public/locales/he/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "סיסמה שגויה"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "שם משתמש",
+                                "placeholder": "מנהל מערכת",
+                                "validation": {
+                                    "invalidUsername": "שם משתמש לא חוקי"
+                                }
+                            },
+                            "password": {
+                                "label": "סיסמה",
+                                "placeholder": "סיסמה",
+                                "validation": {
+                                    "invalidPassword": "סיסמה שגויה"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/he/settings/customization/page-appearance.json b/public/locales/he/settings/customization/page-appearance.json
index 86c38ae12..ba69da064 100644
--- a/public/locales/he/settings/customization/page-appearance.json
+++ b/public/locales/he/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "סמל",
-    "placeholder": "/img/logo.png"
+    "label": "סמל"
   },
   "favicon": {
-    "label": "אייקון לצד שם העמוד",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "אייקון לצד שם העמוד"
   },
   "background": {
-    "label": "רקע",
-    "placeholder": "/img/background.png"
+    "label": "רקע"
   },
   "customCSS": {
     "label": "CSS מותאם אישית",
diff --git a/public/locales/it/layout/add-service-app-shelf.json b/public/locales/it/layout/add-service-app-shelf.json
index 4c305a875..26f14ca46 100644
--- a/public/locales/it/layout/add-service-app-shelf.json
+++ b/public/locales/it/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Password non valida"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Nome utente",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Nome utente non valido"
+                                }
+                            },
+                            "password": {
+                                "label": "Password",
+                                "placeholder": "password",
+                                "validation": {
+                                    "invalidPassword": "Password non valida"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/it/layout/app-shelf.json b/public/locales/it/layout/app-shelf.json
index b3966b16e..295f9d021 100644
--- a/public/locales/it/layout/app-shelf.json
+++ b/public/locales/it/layout/app-shelf.json
@@ -2,8 +2,8 @@
   "accordions": {
     "downloads": {
       "text": "I tuoi download",
-      "torrents": "",
-      "usenet": ""
+      "torrents": "Scaricamenti di Torrent",
+      "usenet": "I tuoi scaricamenti di Usenet"
     },
     "others": {
       "text": "Altri"
diff --git a/public/locales/it/modules/docker.json b/public/locales/it/modules/docker.json
index 23269fae9..f1ba08684 100644
--- a/public/locales/it/modules/docker.json
+++ b/public/locales/it/modules/docker.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
     "name": "Docker",
-    "description": ""
+    "description": "Ti permette di gestire facilmente i tuoi container docker"
   },
   "search": {
     "placeholder": "Ricerca per contenitore o nome dell'immagine"
diff --git a/public/locales/it/settings/customization/page-appearance.json b/public/locales/it/settings/customization/page-appearance.json
index ba17a50a7..13012cfa5 100644
--- a/public/locales/it/settings/customization/page-appearance.json
+++ b/public/locales/it/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logo",
-    "placeholder": "/img/logo.png"
+    "label": "Logo"
   },
   "favicon": {
-    "label": "Favicon",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "Sfondo",
-    "placeholder": "/img/sfondo.png"
+    "label": "Sfondo"
   },
   "customCSS": {
     "label": "CSS personalizzato",
diff --git a/public/locales/it/settings/general/search-engine.json b/public/locales/it/settings/general/search-engine.json
index 73a07b7ec..750cf922d 100644
--- a/public/locales/it/settings/general/search-engine.json
+++ b/public/locales/it/settings/general/search-engine.json
@@ -9,6 +9,6 @@
     "placeholder": "URL di ricerca personalizzato"
   },
   "searchNewTab": {
-    "label": ""
+    "label": "Apri i risultati della ricerca in una nuova scheda"
   }
 }
\ No newline at end of file
diff --git a/public/locales/ja/layout/add-service-app-shelf.json b/public/locales/ja/layout/add-service-app-shelf.json
index 545dbd8ed..9d48b1ce9 100644
--- a/public/locales/ja/layout/add-service-app-shelf.json
+++ b/public/locales/ja/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "パスワードが無効です"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "ユーザー名",
+                                "placeholder": "アドミン",
+                                "validation": {
+                                    "invalidUsername": "ユーザー名が無効です"
+                                }
+                            },
+                            "password": {
+                                "label": "パスワード",
+                                "placeholder": "暗証番号",
+                                "validation": {
+                                    "invalidPassword": "パスワードが無効です"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/ja/settings/customization/page-appearance.json b/public/locales/ja/settings/customization/page-appearance.json
index cb8b61145..6fd80d79f 100644
--- a/public/locales/ja/settings/customization/page-appearance.json
+++ b/public/locales/ja/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "ホーマー"
   },
   "logo": {
-    "label": "ロゴマーク",
-    "placeholder": "/img/logo.png"
+    "label": "ロゴマーク"
   },
   "favicon": {
-    "label": "ファビコン",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "背景",
-    "placeholder": "/img/background.png"
+    "label": "背景"
   },
   "customCSS": {
     "label": "カスタムCSS",
diff --git a/public/locales/ko/layout/add-service-app-shelf.json b/public/locales/ko/layout/add-service-app-shelf.json
index 8f86d8c3a..76d8977ef 100644
--- a/public/locales/ko/layout/add-service-app-shelf.json
+++ b/public/locales/ko/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "잘못된 비밀번호"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "사용자 이름",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "잘못된 사용자 이름"
+                                }
+                            },
+                            "password": {
+                                "label": "비밀번호",
+                                "placeholder": "비밀번호",
+                                "validation": {
+                                    "invalidPassword": "잘못된 비밀번호"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/ko/modules/dlspeed.json b/public/locales/ko/modules/dlspeed.json
index d9076cc41..5ec5cd979 100644
--- a/public/locales/ko/modules/dlspeed.json
+++ b/public/locales/ko/modules/dlspeed.json
@@ -8,8 +8,8 @@
       "header": {
         "name": "이름",
         "size": "크기",
-        "download": "다운",
-        "upload": "업",
+        "download": "다운로드",
+        "upload": "업로드",
         "estimatedTimeOfArrival": "남은 시간",
         "progress": "진행률"
       },
diff --git a/public/locales/ko/modules/torrents-status.json b/public/locales/ko/modules/torrents-status.json
index 7639c5368..fad5c677f 100644
--- a/public/locales/ko/modules/torrents-status.json
+++ b/public/locales/ko/modules/torrents-status.json
@@ -13,8 +13,8 @@
       "header": {
         "name": "이름",
         "size": "크기",
-        "download": "다운",
-        "upload": "업",
+        "download": "다운로드",
+        "upload": "업로드",
         "estimatedTimeOfArrival": "남은 시간",
         "progress": "진행률"
       },
diff --git a/public/locales/ko/settings/customization/page-appearance.json b/public/locales/ko/settings/customization/page-appearance.json
index 1466fe4a2..7104c7496 100644
--- a/public/locales/ko/settings/customization/page-appearance.json
+++ b/public/locales/ko/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "로고",
-    "placeholder": "/img/logo.png"
+    "label": "로고"
   },
   "favicon": {
-    "label": "파비콘",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "배경",
-    "placeholder": "/img/background.png"
+    "label": "배경"
   },
   "customCSS": {
     "label": "커스텀 CSS",
diff --git a/public/locales/lol/layout/add-service-app-shelf.json b/public/locales/lol/layout/add-service-app-shelf.json
index 930f5b356..39dd49297 100644
--- a/public/locales/lol/layout/add-service-app-shelf.json
+++ b/public/locales/lol/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Invalid password"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Usernaem",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Invalid usernaem"
+                                }
+                            },
+                            "password": {
+                                "label": "Password",
+                                "placeholder": "password",
+                                "validation": {
+                                    "invalidPassword": "Invalid password"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/lol/settings/customization/page-appearance.json b/public/locales/lol/settings/customization/page-appearance.json
index ed5b4985f..d2596232d 100644
--- a/public/locales/lol/settings/customization/page-appearance.json
+++ b/public/locales/lol/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logooo",
-    "placeholder": "/img/logo.png"
+    "label": "Logooo"
   },
   "favicon": {
-    "label": "Favicon",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "Bakground",
-    "placeholder": "/img/background.png"
+    "label": "Bakground"
   },
   "customCSS": {
     "label": "Custom CSS",
diff --git a/public/locales/nl/layout/add-service-app-shelf.json b/public/locales/nl/layout/add-service-app-shelf.json
index 680dd3332..7720848f4 100644
--- a/public/locales/nl/layout/add-service-app-shelf.json
+++ b/public/locales/nl/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Ongeldig wachtwoord"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Gebruikersnaam",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Ongeldige gebruikersnaam"
+                                }
+                            },
+                            "password": {
+                                "label": "Wachtwoord",
+                                "placeholder": "wachtwoord",
+                                "validation": {
+                                    "invalidPassword": "Ongeldig wachtwoord"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/nl/settings/customization/page-appearance.json b/public/locales/nl/settings/customization/page-appearance.json
index 003923550..6694ed701 100644
--- a/public/locales/nl/settings/customization/page-appearance.json
+++ b/public/locales/nl/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logo",
-    "placeholder": "/img/logo.png"
+    "label": "Logo"
   },
   "favicon": {
-    "label": "Favicon",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "Achtergrond",
-    "placeholder": "/img/background.png"
+    "label": "Achtergrond"
   },
   "customCSS": {
     "label": "Eigen CSS",
diff --git a/public/locales/pl/layout/add-service-app-shelf.json b/public/locales/pl/layout/add-service-app-shelf.json
index f4eb5a5c3..afc37e457 100644
--- a/public/locales/pl/layout/add-service-app-shelf.json
+++ b/public/locales/pl/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Nieprawidłowe hasło"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Nazwa użytkownika",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Nieprawidłowa nazwa użytkownika"
+                                }
+                            },
+                            "password": {
+                                "label": "Hasło",
+                                "placeholder": "hasło",
+                                "validation": {
+                                    "invalidPassword": "Nieprawidłowe hasło"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/pl/settings/customization/page-appearance.json b/public/locales/pl/settings/customization/page-appearance.json
index 05a6982b4..7880d6595 100644
--- a/public/locales/pl/settings/customization/page-appearance.json
+++ b/public/locales/pl/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logo",
-    "placeholder": "/img/logo.png"
+    "label": "Logo"
   },
   "favicon": {
-    "label": "Ikona",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Ikona"
   },
   "background": {
-    "label": "Tło",
-    "placeholder": "/img/background.png"
+    "label": "Tło"
   },
   "customCSS": {
     "label": "Niestandardowy CSS",
diff --git a/public/locales/pt/layout/add-service-app-shelf.json b/public/locales/pt/layout/add-service-app-shelf.json
index abfff3dfd..6c0e1a860 100644
--- a/public/locales/pt/layout/add-service-app-shelf.json
+++ b/public/locales/pt/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Senha inválida"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Usuário",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Usuário inválido"
+                                }
+                            },
+                            "password": {
+                                "label": "Senha",
+                                "placeholder": "senha",
+                                "validation": {
+                                    "invalidPassword": "Senha inválida"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/pt/settings/customization/page-appearance.json b/public/locales/pt/settings/customization/page-appearance.json
index 2e160f154..6b8c66ecf 100644
--- a/public/locales/pt/settings/customization/page-appearance.json
+++ b/public/locales/pt/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": ""
   },
   "logo": {
-    "label": "Logo",
-    "placeholder": ""
+    "label": "Logo"
   },
   "favicon": {
-    "label": "",
-    "placeholder": ""
+    "label": ""
   },
   "background": {
-    "label": "",
-    "placeholder": ""
+    "label": ""
   },
   "customCSS": {
     "label": "CSS Personalizado",
diff --git a/public/locales/ru/authentication/login.json b/public/locales/ru/authentication/login.json
index 791ffe434..b5b05dea9 100644
--- a/public/locales/ru/authentication/login.json
+++ b/public/locales/ru/authentication/login.json
@@ -1,27 +1,27 @@
 {
-  "title": "",
-  "text": "",
+  "title": "С возвращением!",
+  "text": "Пожалуйста, введите пароль",
   "form": {
     "fields": {
       "password": {
         "label": "Пароль",
-        "placeholder": ""
+        "placeholder": "Ваш пароль"
       }
     },
     "buttons": {
-      "submit": ""
+      "submit": "Войти"
     }
   },
   "notifications": {
     "checking": {
-      "title": "",
-      "message": ""
+      "title": "Проверка пароля",
+      "message": "Ваш пароль проверяется..."
     },
     "correct": {
-      "title": ""
+      "title": "Пароль верный, перенаправляет вас..."
     },
     "wrong": {
-      "title": ""
+      "title": "Пароль неверный, попробуйте еще раз."
     }
   }
 }
diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json
index c610c224e..f5e2a45c2 100644
--- a/public/locales/ru/common.json
+++ b/public/locales/ru/common.json
@@ -1,11 +1,11 @@
 {
   "actions": {
-    "save": ""
+    "save": "Сохранить"
   },
-  "tip": "",
+  "tip": "Совет: ",
   "time": {
-    "seconds": "",
-    "minutes": "",
-    "hours": ""
+    "seconds": "секунды",
+    "minutes": "минут",
+    "hours": "часы"
   }
 }
diff --git a/public/locales/ru/layout/add-service-app-shelf.json b/public/locales/ru/layout/add-service-app-shelf.json
index d540152d9..ae52c1cc7 100644
--- a/public/locales/ru/layout/add-service-app-shelf.json
+++ b/public/locales/ru/layout/add-service-app-shelf.json
@@ -90,12 +90,28 @@
                                     "invalidPassword": "Неверный пароль"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Имя пользователя",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Неверное имя пользователя"
+                                }
+                            },
+                            "password": {
+                                "label": "Пароль",
+                                "placeholder": "Введите пароль",
+                                "validation": {
+                                    "invalidPassword": "Неверный пароль"
+                                }
+                            }
                         }
                     }
                 }
             },
             "advancedOptions": {
-                "title": "",
+                "title": "Дополнительные параметры",
                 "form": {
                     "httpStatusCodes": {
                         "label": "Коды состояния HTTP",
diff --git a/public/locales/ru/layout/app-shelf.json b/public/locales/ru/layout/app-shelf.json
index 14e08ed1b..671045d67 100644
--- a/public/locales/ru/layout/app-shelf.json
+++ b/public/locales/ru/layout/app-shelf.json
@@ -2,8 +2,8 @@
   "accordions": {
     "downloads": {
       "text": "Ваши загрузки",
-      "torrents": "",
-      "usenet": ""
+      "torrents": "Ваши торрент-загрузки",
+      "usenet": "Ваши загрузки Usenet"
     },
     "others": {
       "text": "Другое"
diff --git a/public/locales/ru/modules/common-media-cards.json b/public/locales/ru/modules/common-media-cards.json
index 9f6da0682..94619f4ee 100644
--- a/public/locales/ru/modules/common-media-cards.json
+++ b/public/locales/ru/modules/common-media-cards.json
@@ -1,6 +1,6 @@
 {
   "buttons": {
-    "play": "",
-    "request": ""
+    "play": "Играть",
+    "request": "Запрос"
   }
 }
\ No newline at end of file
diff --git a/public/locales/ru/modules/dashdot.json b/public/locales/ru/modules/dashdot.json
index 3504c0301..b15988789 100644
--- a/public/locales/ru/modules/dashdot.json
+++ b/public/locales/ru/modules/dashdot.json
@@ -4,49 +4,49 @@
     "description": "Модуль для отображения графиков из Dash.",
     "settings": {
       "cpuMultiView": {
-        "label": ""
+        "label": "Многоядерный процессор Вид"
       },
       "storageMultiView": {
-        "label": ""
+        "label": "Вид многодискового хранилища"
       },
       "useCompactView": {
-        "label": ""
+        "label": "Используйте компактный вид"
       },
       "graphs": {
-        "label": ""
+        "label": "Графики"
       },
       "url": {
-        "label": ""
+        "label": "Тире. URL"
       }
     }
   },
   "card": {
     "title": "Dash.",
     "errors": {
-      "noService": "",
-      "noInformation": ""
+      "noService": "Не найдено ни одной службы Dash. Пожалуйста, добавьте его в приборную панель Homarr или задайте Dash. URL в опциях модуля",
+      "noInformation": "Не удается получить информацию из тире. - Вы используете последнюю версию?"
     },
     "graphs": {
       "storage": {
-        "title": "",
+        "title": "Хранение",
         "label": "Хранилище:"
       },
       "network": {
-        "title": "",
+        "title": "Сеть",
         "label": "Сеть:",
         "metrics": {
-          "download": "",
-          "upload": ""
+          "download": "Вниз",
+          "upload": "Вверх"
         }
       },
       "cpu": {
-        "title": ""
+        "title": "ПРОЦЕССОР"
       },
       "memory": {
-        "title": ""
+        "title": "ОПЕРАТИВНАЯ ПАМЯТЬ"
       },
       "gpu": {
-        "title": ""
+        "title": "GPU"
       }
     }
   }
diff --git a/public/locales/ru/modules/date.json b/public/locales/ru/modules/date.json
index ab82eb8ed..cdb0f4a48 100644
--- a/public/locales/ru/modules/date.json
+++ b/public/locales/ru/modules/date.json
@@ -1,10 +1,10 @@
 {
   "descriptor": {
-    "name": "",
-    "description": "",
+    "name": "Дата",
+    "description": "Показать текущее время и дату в карточке",
     "settings": {
       "display24HourFormat": {
-        "label": ""
+        "label": "Отображение полного времени (24 часа)"
       }
     }
   }
diff --git a/public/locales/ru/modules/dlspeed.json b/public/locales/ru/modules/dlspeed.json
index 216086881..516735d11 100644
--- a/public/locales/ru/modules/dlspeed.json
+++ b/public/locales/ru/modules/dlspeed.json
@@ -1,34 +1,34 @@
 {
   "descriptor": {
-    "name": "",
-    "description": ""
+    "name": "Скорость загрузки",
+    "description": "Показать текущую скорость загрузки поддерживаемых сервисов"
   },
   "card": {
     "table": {
       "header": {
-        "name": "",
-        "size": "",
-        "download": "",
-        "upload": "",
-        "estimatedTimeOfArrival": "",
-        "progress": ""
+        "name": "Имя",
+        "size": "Размер",
+        "download": "Вниз",
+        "upload": "Вверх",
+        "estimatedTimeOfArrival": "РАСЧЕТНОЕ ВРЕМЯ ПРИБЫТИЯ",
+        "progress": "Прогресс"
       },
       "body": {
-        "nothingFound": ""
+        "nothingFound": "Торренты не найдены"
       }
     },
     "lineChart": {
-      "title": "",
-      "download": "",
-      "upload": "",
-      "timeSpan": "",
-      "totalDownload": "",
-      "totalUpload": ""
+      "title": "Текущая скорость загрузки",
+      "download": "Скачать: {{download}}",
+      "upload": "Загрузка: {{upload}}",
+      "timeSpan": "{{seconds}} несколько секунд назад",
+      "totalDownload": "Скачать: {{download}}/s",
+      "totalUpload": "Загрузка: {{upload}}/s"
     },
     "errors": {
       "noDownloadClients": {
-        "title": "",
-        "text": ""
+        "title": "Не найдено ни одного поддерживаемого клиента загрузки!",
+        "text": "Добавьте службу загрузки для просмотра текущих загрузок"
       }
     }
   }
diff --git a/public/locales/ru/modules/docker.json b/public/locales/ru/modules/docker.json
index 82d385368..9177ac326 100644
--- a/public/locales/ru/modules/docker.json
+++ b/public/locales/ru/modules/docker.json
@@ -1,83 +1,83 @@
 {
   "descriptor": {
-    "name": "",
-    "description": ""
+    "name": "Docker",
+    "description": "Позволяет легко управлять контейнерами docker"
   },
   "search": {
-    "placeholder": ""
+    "placeholder": "Поиск по имени контейнера или изображения"
   },
   "table": {
     "header": {
-      "name": "",
-      "image": "",
-      "ports": "",
-      "state": ""
+      "name": "Имя",
+      "image": "Изображение",
+      "ports": "Порты",
+      "state": "Государство"
     },
     "body": {
-      "portCollapse": ""
+      "portCollapse": "{{ports}} больше"
     },
     "states": {
-      "running": "",
-      "created": "",
-      "stopped": "",
-      "unknown": ""
+      "running": "Бег",
+      "created": "Создано",
+      "stopped": "Остановлено",
+      "unknown": "Неизвестно"
     }
   },
   "actionBar": {
     "addService": {
       "title": "Добавить сервис",
-      "message": ""
+      "message": "Добавить услугу в Homarr"
     },
     "restart": {
-      "title": ""
+      "title": "Перезапустить"
     },
     "stop": {
-      "title": ""
+      "title": "Остановить"
     },
     "start": {
-      "title": ""
+      "title": "Начало"
     },
     "refreshData": {
-      "title": ""
+      "title": "Обновить данные"
     },
     "remove": {
-      "title": ""
+      "title": "Удалить"
     },
     "addToHomarr": {
-      "title": ""
+      "title": "Добавить в Homarr"
     }
   },
   "actions": {
     "start": {
-      "start": "",
-      "end": ""
+      "start": "Начало",
+      "end": "Начало"
     },
     "stop": {
-      "start": "",
-      "end": ""
+      "start": "Остановка",
+      "end": "Остановлено"
     },
     "restart": {
-      "start": "",
-      "end": ""
+      "start": "Перезапуск",
+      "end": "Перезапущен"
     },
     "remove": {
-      "start": "",
-      "end": ""
+      "start": "Удаление",
+      "end": "Удалено"
     }
   },
   "errors": {
     "integrationFailed": {
-      "title": "",
-      "message": ""
+      "title": "Сбой интеграции Docker",
+      "message": "Вы забыли смонтировать сокет docker?"
     },
     "unknownError": {
-      "title": ""
+      "title": "Произошла ошибка"
     },
     "oneServiceAtATime": {
-      "title": ""
+      "title": "Пожалуйста, добавляйте только одну услугу за один раз!"
     }
   },
   "actionIcon": {
-    "tooltip": ""
+    "tooltip": "Docker"
   }
 }
\ No newline at end of file
diff --git a/public/locales/ru/modules/overseerr.json b/public/locales/ru/modules/overseerr.json
index 1300c27f3..e13e28541 100644
--- a/public/locales/ru/modules/overseerr.json
+++ b/public/locales/ru/modules/overseerr.json
@@ -1,28 +1,28 @@
 {
   "descriptor": {
     "name": "Overseerr",
-    "description": ""
+    "description": "Позволяет искать и добавлять медиафайлы из Overseerr/Jellyseerr"
   },
   "popup": {
     "item": {
       "buttons": {
-        "askFor": "",
-        "cancel": "",
-        "request": ""
+        "askFor": "Спросите на {{title}}",
+        "cancel": "Отмена",
+        "request": "Запрос"
       },
       "alerts": {
         "automaticApproval": {
-          "title": "",
-          "text": ""
+          "title": "Использование ключа API",
+          "text": "Этот запрос будет автоматически одобрен"
         }
       }
     },
     "seasonSelector": {
-      "caption": "",
+      "caption": "Отметьте сезоны, которые вы хотите загрузить",
       "table": {
         "header": {
-          "season": "",
-          "numberOfEpisodes": ""
+          "season": "Сезон",
+          "numberOfEpisodes": "Количество эпизодов"
         }
       }
     }
diff --git a/public/locales/ru/modules/ping.json b/public/locales/ru/modules/ping.json
index 3ba3aefa0..f81fc4737 100644
--- a/public/locales/ru/modules/ping.json
+++ b/public/locales/ru/modules/ping.json
@@ -1,11 +1,11 @@
 {
   "descriptor": {
-    "name": "",
-    "description": ""
+    "name": "Пинг",
+    "description": "Позволяет проверить, работает ли служба или возвращает определенный код состояния HTTP."
   },
   "states": {
-    "online": "",
-    "offline": "",
-    "loading": ""
+    "online": "Онлайн {{response}}",
+    "offline": "Offline {{response}}",
+    "loading": "Загрузка..."
   }
 }
\ No newline at end of file
diff --git a/public/locales/ru/modules/search.json b/public/locales/ru/modules/search.json
index cc7772dde..89465fa3a 100644
--- a/public/locales/ru/modules/search.json
+++ b/public/locales/ru/modules/search.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
     "name": "Поиск",
-    "description": ""
+    "description": "Строка поиска для поиска в Интернете, Youtube, Torrents или Overseerr"
   },
   "input": {
     "placeholder": "Искать в интернете..."
diff --git a/public/locales/ru/modules/torrents-status.json b/public/locales/ru/modules/torrents-status.json
index 86b10fa25..3448c5a20 100644
--- a/public/locales/ru/modules/torrents-status.json
+++ b/public/locales/ru/modules/torrents-status.json
@@ -1,39 +1,39 @@
 {
   "descriptor": {
-    "name": "",
-    "description": "",
+    "name": "Торрент",
+    "description": "Показать текущую скорость загрузки поддерживаемых сервисов",
     "settings": {
       "hideComplete": {
-        "label": ""
+        "label": "Скрыть завершенные торренты"
       }
     }
   },
   "card": {
     "table": {
       "header": {
-        "name": "",
-        "size": "",
-        "download": "",
-        "upload": "",
-        "estimatedTimeOfArrival": "",
-        "progress": ""
+        "name": "Имя",
+        "size": "Размер",
+        "download": "Вниз",
+        "upload": "Вверх",
+        "estimatedTimeOfArrival": "РАСЧЕТНОЕ ВРЕМЯ ПРИБЫТИЯ",
+        "progress": "Прогресс"
       },
       "body": {
-        "nothingFound": ""
+        "nothingFound": "Торренты не найдены"
       }
     },
     "lineChart": {
-      "title": "",
-      "download": "",
-      "upload": "",
-      "timeSpan": "",
-      "totalDownload": "",
-      "totalUpload": ""
+      "title": "Текущая скорость загрузки",
+      "download": "Скачать: {{download}}",
+      "upload": "Загрузка: {{upload}}",
+      "timeSpan": "{{seconds}} несколько секунд назад",
+      "totalDownload": "Скачать: {{download}}/s",
+      "totalUpload": "Загрузка: {{upload}}/s"
     },
     "errors": {
       "noDownloadClients": {
-        "title": "",
-        "text": ""
+        "title": "Не найдено ни одного поддерживаемого клиента загрузки!",
+        "text": "Добавьте службу загрузки для просмотра текущих загрузок"
       }
     }
   }
diff --git a/public/locales/ru/modules/usenet.json b/public/locales/ru/modules/usenet.json
index f0a923346..b485c9f3a 100644
--- a/public/locales/ru/modules/usenet.json
+++ b/public/locales/ru/modules/usenet.json
@@ -6,44 +6,44 @@
   "card": {
     "errors": {
       "noDownloadClients": {
-        "title": "",
-        "text": ""
+        "title": "Не найдено ни одного поддерживаемого клиента загрузки!",
+        "text": "Добавьте службу загрузки для просмотра текущих загрузок"
       }
     }
   },
   "tabs": {
-    "queue": "",
-    "history": ""
+    "queue": "Очередь",
+    "history": "История"
   },
   "info": {
-    "sizeLeft": "",
-    "paused": ""
+    "sizeLeft": "Размер слева",
+    "paused": "Приостановлено"
   },
   "queue": {
     "header": {
-      "name": "",
-      "size": "",
-      "eta": "",
-      "progress": ""
+      "name": "Имя",
+      "size": "Размер",
+      "eta": "РАСЧЕТНОЕ ВРЕМЯ ПРИБЫТИЯ",
+      "progress": "Прогресс"
     },
-    "empty": "",
+    "empty": "Пустой",
     "error": {
-      "title": "",
-      "message": ""
+      "title": "Ошибка",
+      "message": "Произошла ошибка"
     },
-    "paused": ""
+    "paused": "Приостановлено"
   },
   "history": {
     "header": {
-      "name": "",
-      "size": "",
-      "duration": ""
+      "name": "Имя",
+      "size": "Размер",
+      "duration": "Продолжительность"
     },
-    "empty": "",
+    "empty": "Пустой",
     "error": {
-      "title": "",
-      "message": ""
+      "title": "Ошибка",
+      "message": "Ошибка загрузки истории"
     },
-    "paused": ""
+    "paused": "Приостановлено"
   }
 }
diff --git a/public/locales/ru/modules/weather.json b/public/locales/ru/modules/weather.json
index 33382ec1e..38b177c57 100644
--- a/public/locales/ru/modules/weather.json
+++ b/public/locales/ru/modules/weather.json
@@ -21,12 +21,12 @@
       "rain": "Дождь",
       "freezingRain": "Ледяной дождь",
       "snowFall": "Снегопад",
-      "snowGrains": "",
+      "snowGrains": "Снежные зерна",
       "rainShowers": "Ливневый дождь",
       "snowShowers": "Пурга",
       "thunderstorm": "Гроза",
       "thunderstormWithHail": "Гроза с градом",
-      "unknown": ""
+      "unknown": "Неизвестно"
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/ru/settings/common.json b/public/locales/ru/settings/common.json
index c06dd8457..32405be02 100644
--- a/public/locales/ru/settings/common.json
+++ b/public/locales/ru/settings/common.json
@@ -2,13 +2,13 @@
   "title": "Настройки",
   "tooltip": "Настройки",
   "tabs": {
-    "common": "",
-    "customizations": ""
+    "common": "Общий",
+    "customizations": "Персонализации"
   },
   "tips": {
-    "configTip": ""
+    "configTip": "Загрузите файл конфигурации, перетащив его на страницу!"
   },
   "credits": {
-    "madeWithLove": ""
+    "madeWithLove": "Сделано с ❤️ по @."
   }
 }
\ No newline at end of file
diff --git a/public/locales/ru/settings/customization/app-width.json b/public/locales/ru/settings/customization/app-width.json
index 9e26dfeeb..4af9782d9 100644
--- a/public/locales/ru/settings/customization/app-width.json
+++ b/public/locales/ru/settings/customization/app-width.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "label": "Ширина приложения"
+}
\ No newline at end of file
diff --git a/public/locales/ru/settings/customization/color-selector.json b/public/locales/ru/settings/customization/color-selector.json
index 9e26dfeeb..1be91e0d4 100644
--- a/public/locales/ru/settings/customization/color-selector.json
+++ b/public/locales/ru/settings/customization/color-selector.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "suffix": "{{color}} цвет"
+}
\ No newline at end of file
diff --git a/public/locales/ru/settings/customization/opacity-selector.json b/public/locales/ru/settings/customization/opacity-selector.json
index 9e26dfeeb..4f978b688 100644
--- a/public/locales/ru/settings/customization/opacity-selector.json
+++ b/public/locales/ru/settings/customization/opacity-selector.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "label": "Непрозрачность приложения"
+}
\ No newline at end of file
diff --git a/public/locales/ru/settings/customization/page-appearance.json b/public/locales/ru/settings/customization/page-appearance.json
index 27ab9ce5c..339539b2c 100644
--- a/public/locales/ru/settings/customization/page-appearance.json
+++ b/public/locales/ru/settings/customization/page-appearance.json
@@ -1,25 +1,22 @@
 {
   "pageTitle": {
-    "label": "",
-    "placeholder": ""
+    "label": "Название страницы",
+    "placeholder": "Хомарр 🦞"
   },
   "logo": {
-    "label": "",
-    "placeholder": ""
+    "label": "Логотип"
   },
   "favicon": {
-    "label": "",
-    "placeholder": ""
+    "label": "Фавикон"
   },
   "background": {
-    "label": "",
-    "placeholder": ""
+    "label": "Справочная информация"
   },
   "customCSS": {
-    "label": "",
-    "placeholder": ""
+    "label": "Пользовательский CSS",
+    "placeholder": "Пользовательский CSS будет выполняться в последнюю очередь"
   },
   "buttons": {
-    "submit": ""
+    "submit": "Отправить"
   }
 }
diff --git a/public/locales/ru/settings/customization/shade-selector.json b/public/locales/ru/settings/customization/shade-selector.json
index 9e26dfeeb..e33ed7c13 100644
--- a/public/locales/ru/settings/customization/shade-selector.json
+++ b/public/locales/ru/settings/customization/shade-selector.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "label": "Оттенок"
+}
\ No newline at end of file
diff --git a/public/locales/ru/settings/general/config-changer.json b/public/locales/ru/settings/general/config-changer.json
index 6d130e67d..3b1e12b53 100644
--- a/public/locales/ru/settings/general/config-changer.json
+++ b/public/locales/ru/settings/general/config-changer.json
@@ -1,55 +1,55 @@
 {
   "configSelect": {
-    "label": ""
+    "label": "Загрузчик конфигурации"
   },
   "modal": {
-    "title": "",
+    "title": "Выберите имя новой конфигурации",
     "form": {
       "configName": {
-        "label": "",
-        "placeholder": ""
+        "label": "Имя конфигурации",
+        "placeholder": "Имя вашей новой конфигурации"
       },
-      "submitButton": ""
+      "submitButton": "Подтвердить"
     },
     "events": {
       "configSaved": {
-        "title": "",
-        "message": ""
+        "title": "Конфигурация сохранена",
+        "message": "Конфигурация сохранена как {{configName}}"
       }
     }
   },
   "buttons": {
-    "download": "",
+    "download": "Загрузить конфигурацию",
     "delete": {
-      "text": "",
+      "text": "Удалить конфигурацию",
       "notifications": {
         "deleted": {
-          "title": "",
-          "message": ""
+          "title": "Конфигурация удалена",
+          "message": "Конфигурация удалена"
         },
         "deleteFailed": {
-          "title": "",
-          "message": ""
+          "title": "Не удалось удалить конфигурацию",
+          "message": "Не удалось удалить конфигурацию"
         }
       }
     },
-    "saveCopy": ""
+    "saveCopy": "Сохранить копию"
   },
   "dropzone": {
     "notifications": {
       "invalidConfig": {
-        "title": "",
-        "message": ""
+        "title": "Невозможно загрузить конфигурацию",
+        "message": "Не удалось загрузить вашу конфигурацию. Неверный формат JSON."
       },
       "loadedSuccessfully": {
-        "title": ""
+        "title": "Конфигурация {{configName}} успешно загружена"
       }
     },
     "accept": {
-      "text": ""
+      "text": "Перетащите файлы сюда, чтобы загрузить конфигурацию. Поддерживается только JSON."
     },
     "reject": {
-      "text": ""
+      "text": "Этот формат файла не поддерживается. Пожалуйста, загружайте только JSON."
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/ru/settings/general/internationalization.json b/public/locales/ru/settings/general/internationalization.json
index 9e26dfeeb..1c8e25f7a 100644
--- a/public/locales/ru/settings/general/internationalization.json
+++ b/public/locales/ru/settings/general/internationalization.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "label": "Язык"
+}
\ No newline at end of file
diff --git a/public/locales/ru/settings/general/module-enabler.json b/public/locales/ru/settings/general/module-enabler.json
index 9e26dfeeb..ddfa4ac43 100644
--- a/public/locales/ru/settings/general/module-enabler.json
+++ b/public/locales/ru/settings/general/module-enabler.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "title": "Усилитель модуля"
+}
\ No newline at end of file
diff --git a/public/locales/ru/settings/general/search-engine.json b/public/locales/ru/settings/general/search-engine.json
index df277ccef..3826fd131 100644
--- a/public/locales/ru/settings/general/search-engine.json
+++ b/public/locales/ru/settings/general/search-engine.json
@@ -1,14 +1,14 @@
 {
-  "title": "",
+  "title": "Поисковая система",
   "tips": {
-    "generalTip": "",
-    "placeholderTip": ""
+    "generalTip": "Используйте префиксы !yt и !t перед вашим запросом для поиска на YouTube или для поиска торрента соответственно.",
+    "placeholderTip": "%s можно использовать в качестве заполнителя для запроса."
   },
   "customEngine": {
-    "label": "",
-    "placeholder": ""
+    "label": "URL запроса",
+    "placeholder": "URL пользовательского запроса"
   },
   "searchNewTab": {
-    "label": ""
+    "label": "Открыть результаты поиска в новой вкладке"
   }
 }
\ No newline at end of file
diff --git a/public/locales/ru/settings/general/theme-selector.json b/public/locales/ru/settings/general/theme-selector.json
index 9e26dfeeb..542b263b2 100644
--- a/public/locales/ru/settings/general/theme-selector.json
+++ b/public/locales/ru/settings/general/theme-selector.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "label": "Переключитесь на режим {{theme}}"
+}
\ No newline at end of file
diff --git a/public/locales/ru/settings/general/widget-positions.json b/public/locales/ru/settings/general/widget-positions.json
index 9e26dfeeb..44c3968fc 100644
--- a/public/locales/ru/settings/general/widget-positions.json
+++ b/public/locales/ru/settings/general/widget-positions.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "label": "Расположите виджеты слева"
+}
\ No newline at end of file
diff --git a/public/locales/sl/layout/add-service-app-shelf.json b/public/locales/sl/layout/add-service-app-shelf.json
index b142253b2..ffaa2f278 100644
--- a/public/locales/sl/layout/add-service-app-shelf.json
+++ b/public/locales/sl/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Neveljavno geslo"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Uporabniško ime",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Neveljavno uporabniško ime"
+                                }
+                            },
+                            "password": {
+                                "label": "Geslo",
+                                "placeholder": "geslo",
+                                "validation": {
+                                    "invalidPassword": "Neveljavno geslo"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/sl/settings/customization/page-appearance.json b/public/locales/sl/settings/customization/page-appearance.json
index 5acc19596..5d63587dc 100644
--- a/public/locales/sl/settings/customization/page-appearance.json
+++ b/public/locales/sl/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logotip",
-    "placeholder": "/img/logo.png"
+    "label": "Logotip"
   },
   "favicon": {
-    "label": "Favicon",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "Ozadje",
-    "placeholder": "/img/background.png"
+    "label": "Ozadje"
   },
   "customCSS": {
     "label": "Po meri CSS",
diff --git a/public/locales/sv/layout/add-service-app-shelf.json b/public/locales/sv/layout/add-service-app-shelf.json
index 0183548a6..fc9a29523 100644
--- a/public/locales/sv/layout/add-service-app-shelf.json
+++ b/public/locales/sv/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Ogiltigt lösenord"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Användarnamn",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Ogiltigt användarnamn"
+                                }
+                            },
+                            "password": {
+                                "label": "Lösenord",
+                                "placeholder": "lösenord",
+                                "validation": {
+                                    "invalidPassword": "Ogiltigt lösenord"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/sv/settings/customization/page-appearance.json b/public/locales/sv/settings/customization/page-appearance.json
index d810fc6a7..04513596d 100644
--- a/public/locales/sv/settings/customization/page-appearance.json
+++ b/public/locales/sv/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Logotyp",
-    "placeholder": "/img/logo.png"
+    "label": "Logotyp"
   },
   "favicon": {
-    "label": "Favicon",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "Favicon"
   },
   "background": {
-    "label": "Bakgrund",
-    "placeholder": "/img/background.png"
+    "label": "Bakgrund"
   },
   "customCSS": {
     "label": "Anpassad CSS",
diff --git a/public/locales/uk/layout/add-service-app-shelf.json b/public/locales/uk/layout/add-service-app-shelf.json
index 1692290eb..46a9216a9 100644
--- a/public/locales/uk/layout/add-service-app-shelf.json
+++ b/public/locales/uk/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "Невірний пароль"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Логін",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Невірний логін"
+                                }
+                            },
+                            "password": {
+                                "label": "Пароль",
+                                "placeholder": "пароль",
+                                "validation": {
+                                    "invalidPassword": "Невірний пароль"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/uk/modules/docker.json b/public/locales/uk/modules/docker.json
index b9dab4f7d..f899c7689 100644
--- a/public/locales/uk/modules/docker.json
+++ b/public/locales/uk/modules/docker.json
@@ -1,7 +1,7 @@
 {
   "descriptor": {
     "name": "Docker",
-    "description": ""
+    "description": "Дозволяє вам легко керувати контейнерами докер"
   },
   "search": {
     "placeholder": "Пошук по назві контейнера або образу"
diff --git a/public/locales/uk/settings/customization/page-appearance.json b/public/locales/uk/settings/customization/page-appearance.json
index 3687a9551..0fd2dea4f 100644
--- a/public/locales/uk/settings/customization/page-appearance.json
+++ b/public/locales/uk/settings/customization/page-appearance.json
@@ -4,16 +4,12 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "Логотип",
-    "placeholder": "/img/logo.png"
+    "label": "Логотип"
   },
   "favicon": {
-    "label": "Іконка",
-    "placeholder": "/imgs/favicon/favicon.png"
-  },
+    "label": "Іконка"
   "background": {
-    "label": "Фон",
-    "placeholder": "/img/background.png"
+    "label": "Фон"
   },
   "customCSS": {
     "label": "Власний CSS",
diff --git a/public/locales/vi/authentication/login.json b/public/locales/vi/authentication/login.json
new file mode 100644
index 000000000..6db3fcb6c
--- /dev/null
+++ b/public/locales/vi/authentication/login.json
@@ -0,0 +1,27 @@
+{
+  "title": "Chào mừng quay trở lại!",
+  "text": "Vui lòng nhập mật khẩu",
+  "form": {
+    "fields": {
+      "password": {
+        "label": "Mật khẩu",
+        "placeholder": "Mật khẩu của bạn"
+      }
+    },
+    "buttons": {
+      "submit": "Đăng nhập"
+    }
+  },
+  "notifications": {
+    "checking": {
+      "title": "Đang kiểm tra mật khẩu",
+      "message": "Mật khẩu của bạn đang được kiểm tra..."
+    },
+    "correct": {
+      "title": "Mật khẩu chính xác, đang điều hướng..."
+    },
+    "wrong": {
+      "title": "Sai mật khẩu, xin hãy thử lại."
+    }
+  }
+}
diff --git a/public/locales/vi/common.json b/public/locales/vi/common.json
new file mode 100644
index 000000000..06605cea9
--- /dev/null
+++ b/public/locales/vi/common.json
@@ -0,0 +1,11 @@
+{
+  "actions": {
+    "save": "Lưu"
+  },
+  "tip": "Mẹo: ",
+  "time": {
+    "seconds": "giây",
+    "minutes": "phút",
+    "hours": "giờ"
+  }
+}
diff --git a/public/locales/vi/layout/add-service-app-shelf.json b/public/locales/vi/layout/add-service-app-shelf.json
new file mode 100644
index 000000000..9b433e8a9
--- /dev/null
+++ b/public/locales/vi/layout/add-service-app-shelf.json
@@ -0,0 +1,134 @@
+{
+    "actionIcon": {
+        "tooltip": "Thêm một dịch vụ"
+    },
+    "modal": {
+        "title": "Thêm dịch vụ",
+        "form": {
+            "validation": {
+                "invalidUrl": "Vui lòng nhập một URL hợp lệ",
+                "noStatusCodeSelected": "Vui lòng chọn một mã trạng thái"
+            }
+        },
+        "tabs": {
+            "options": {
+                "title": "Tùy chọn",
+                "form": {
+                    "serviceName": {
+                        "label": "Tên dịch vụ",
+                        "placeholder": "Plex"
+                    },
+                    "iconUrl": {
+                        "label": "ULR biểu tượng"
+                    },
+                    "serviceUrl": {
+                        "label": "URL dịch vụ"
+                    },
+                    "onClickUrl": {
+                        "label": "URL khi nhấp chuột"
+                    },
+                    "serviceType": {
+                        "label": "Loại dịch vụ",
+                        "defaultValue": "Khác",
+                        "placeholder": "Chọn một"
+                    },
+                    "category": {
+                        "label": "Phân loại",
+                        "placeholder": "Chọn một phân loại hoặc tạo mới",
+                        "nothingFound": "Không tìm thấy",
+                        "createLabel": "+ Tạo {{query}}"
+                    },
+                    "integrations": {
+                        "apiKey": {
+                            "label": "Khoá API",
+                            "placeholder": "Khóa API của bạn",
+                            "validation": {
+                                "noKey": "Khóa không hợp lệ"
+                            },
+                            "tip": {
+                                "text": "Nhận khóa API",
+                                "link": "ở đây."
+                            }
+                        },
+                        "qBittorrent": {
+                            "username": {
+                                "label": "Tên người dùng",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Tên người dùng không hợp lệ"
+                                }
+                            },
+                            "password": {
+                                "label": "Mật khẩu",
+                                "placeholder": "adminadmin",
+                                "validation": {
+                                    "invalidPassword": "Mật khẩu không hợp lệ"
+                                }
+                            }
+                        },
+                        "deluge": {
+                            "password": {
+                                "label": "Mật khẩu",
+                                "placeholder": "mật_khẩu",
+                                "validation": {
+                                    "invalidPassword": "Mật khẩu không hợp lệ"
+                                }
+                            }
+                        },
+                        "transmission": {
+                            "username": {
+                                "label": "Tên người dùng",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Tên người dùng không hợp lệ"
+                                }
+                            },
+                            "password": {
+                                "label": "Mật khẩu",
+                                "placeholder": "adminadmin",
+                                "validation": {
+                                    "invalidPassword": "Mật khẩu không hợp lệ"
+                                }
+                            }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "Tên người dùng",
+                                "placeholder": "admin",
+                                "validation": {
+                                    "invalidUsername": "Tên người dùng không hợp lệ"
+                                }
+                            },
+                            "password": {
+                                "label": "Mật khẩu",
+                                "placeholder": "mật_khẩu",
+                                "validation": {
+                                    "invalidPassword": "Mật khẩu không hợp lệ"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "advancedOptions": {
+                "title": "Tùy chọn nâng cao",
+                "form": {
+                    "httpStatusCodes": {
+                        "label": "Mã trạng thái HTTP",
+                        "placeholder": "Chọn một mã trạng thái hợp lệ",
+                        "clearButtonLabel": "Xóa lựa chọn",
+                        "nothingFound": "Không tìm thấy"
+                    },
+                    "openServiceInNewTab": {
+                        "label": "Mở trong tab mới"
+                    },
+                    "buttons": {
+                        "submit": {
+                            "content": "Thêm dịch vụ"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/public/locales/vi/layout/app-shelf-menu.json b/public/locales/vi/layout/app-shelf-menu.json
new file mode 100644
index 000000000..825c6abaf
--- /dev/null
+++ b/public/locales/vi/layout/app-shelf-menu.json
@@ -0,0 +1,18 @@
+{
+  "modal": {
+    "title": "Chỉnh sửa dịch vụ",
+    "buttons": {
+      "save": "Lưu dịch vụ"
+    }
+  },
+  "menu": {
+    "labels": {
+      "settings": "Cài đặt",
+      "dangerZone": "Khu vực nguy hiểm"
+    },
+    "actions": {
+      "edit": "Sửa",
+      "delete": "Xóa"
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/layout/app-shelf.json b/public/locales/vi/layout/app-shelf.json
new file mode 100644
index 000000000..b95be70a9
--- /dev/null
+++ b/public/locales/vi/layout/app-shelf.json
@@ -0,0 +1,12 @@
+{
+  "accordions": {
+    "downloads": {
+      "text": "Tải xuống của bạn",
+      "torrents": "Tải xuống torrent của bạn",
+      "usenet": "Tải xuống Usenet của bạn"
+    },
+    "others": {
+      "text": "Khác"
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/calendar.json b/public/locales/vi/modules/calendar.json
new file mode 100644
index 000000000..d1faa1671
--- /dev/null
+++ b/public/locales/vi/modules/calendar.json
@@ -0,0 +1,11 @@
+{
+  "descriptor": {
+    "name": "Lịch",
+    "description": "Một mô-đun lịch để hiển thị các lượt phát hành sắp tới. Nó tương tác với API của Sonarr và Radarr.",
+    "settings": {
+      "sundayStart": {
+        "label": "Đặt đầu tuần là Chủ Nhật"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/common-media-cards.json b/public/locales/vi/modules/common-media-cards.json
new file mode 100644
index 000000000..112b83856
--- /dev/null
+++ b/public/locales/vi/modules/common-media-cards.json
@@ -0,0 +1,6 @@
+{
+  "buttons": {
+    "play": "Phát",
+    "request": "Yêu cầu"
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/common.json b/public/locales/vi/modules/common.json
new file mode 100644
index 000000000..d25fd6088
--- /dev/null
+++ b/public/locales/vi/modules/common.json
@@ -0,0 +1,5 @@
+{
+  "settings": {
+    "label": "Cài đặt"
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/dashdot.json b/public/locales/vi/modules/dashdot.json
new file mode 100644
index 000000000..ca91e7fdf
--- /dev/null
+++ b/public/locales/vi/modules/dashdot.json
@@ -0,0 +1,53 @@
+{
+  "descriptor": {
+    "name": "Dash.",
+    "description": "Một mô-đun để hiển thị biểu đồ cho quá trình Dash. của bạn.",
+    "settings": {
+      "cpuMultiView": {
+        "label": "Chế độ hiện đa nhân CPU"
+      },
+      "storageMultiView": {
+        "label": "Chế độ hiện đa ổ đĩa"
+      },
+      "useCompactView": {
+        "label": "Dùng chế độ thu gọn"
+      },
+      "graphs": {
+        "label": "Biểu đồ"
+      },
+      "url": {
+        "label": "URL của Dash."
+      }
+    }
+  },
+  "card": {
+    "title": "Dash.",
+    "errors": {
+      "noService": "Dịch vụ Dash. không được tìm thấy. Vui lòng thêm nó vào bảng Homarr của bạn hoặc thiết lập một đường dẫn Dash. trong tuỳ chọn của mô-đun",
+      "noInformation": "Không thể nhận thông tin từ dash. - bạn có đang chạy phiên bản mới nhất không?"
+    },
+    "graphs": {
+      "storage": {
+        "title": "Bộ nhớ",
+        "label": "Bộ nhớ:"
+      },
+      "network": {
+        "title": "Mạng",
+        "label": "Mạng:",
+        "metrics": {
+          "download": "Tải xuống",
+          "upload": "Tải lên"
+        }
+      },
+      "cpu": {
+        "title": "CPU"
+      },
+      "memory": {
+        "title": "RAM"
+      },
+      "gpu": {
+        "title": "GPU"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/date.json b/public/locales/vi/modules/date.json
new file mode 100644
index 000000000..d7ee3ee79
--- /dev/null
+++ b/public/locales/vi/modules/date.json
@@ -0,0 +1,11 @@
+{
+  "descriptor": {
+    "name": "Ngày giờ",
+    "description": "Hiển thị ngày và giờ trong một thẻ",
+    "settings": {
+      "display24HourFormat": {
+        "label": "Dùng thời gian 24 giờ"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/dlspeed.json b/public/locales/vi/modules/dlspeed.json
new file mode 100644
index 000000000..1805ef315
--- /dev/null
+++ b/public/locales/vi/modules/dlspeed.json
@@ -0,0 +1,35 @@
+{
+  "descriptor": {
+    "name": "Tốc độ tải",
+    "description": "Hiển thị tốc độ tải xuống của các dịch vụ được hỗ trợ"
+  },
+  "card": {
+    "table": {
+      "header": {
+        "name": "Tên",
+        "size": "Kích cỡ",
+        "download": "Tải xuống",
+        "upload": "Tải lên",
+        "estimatedTimeOfArrival": "Thời gian dự kiến",
+        "progress": "Tiến độ"
+      },
+      "body": {
+        "nothingFound": "Không tìm thấy torrent nào"
+      }
+    },
+    "lineChart": {
+      "title": "Tốc độ tải hiện tại",
+      "download": "Tải xuống: {{download}}",
+      "upload": "Tải lên: {{upload}}",
+      "timeSpan": "{{seconds}} giây trước",
+      "totalDownload": "Tải xuống: {{download}}/giây",
+      "totalUpload": "Tải lên: {{upload}}/giây"
+    },
+    "errors": {
+      "noDownloadClients": {
+        "title": "Không tìm thấy ứng dụng tải xuống được hỗ trợ nào!",
+        "text": "Hãy thêm dịch vụ tải xuống để xem các bản tải xuống của bạn"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/docker.json b/public/locales/vi/modules/docker.json
new file mode 100644
index 000000000..cbd35728f
--- /dev/null
+++ b/public/locales/vi/modules/docker.json
@@ -0,0 +1,83 @@
+{
+  "descriptor": {
+    "name": "Docker",
+    "description": "Cho phép bạn dễ dàng quản lý các khoang chứa docker"
+  },
+  "search": {
+    "placeholder": "Tìm kiếm bằng tên khoang chứa hoặc tên hình ảnh"
+  },
+  "table": {
+    "header": {
+      "name": "Tên",
+      "image": "Hình ảnh",
+      "ports": "Cổng",
+      "state": "Trạng thái"
+    },
+    "body": {
+      "portCollapse": "còn {{ports}}"
+    },
+    "states": {
+      "running": "Đang chạy",
+      "created": "Đã tạo",
+      "stopped": "Đã dừng",
+      "unknown": "Không rõ"
+    }
+  },
+  "actionBar": {
+    "addService": {
+      "title": "Thêm dịch vụ",
+      "message": "Thêm dịch vụ vào Homarr"
+    },
+    "restart": {
+      "title": "Khởi động lại"
+    },
+    "stop": {
+      "title": "Dừng"
+    },
+    "start": {
+      "title": "Bắt đầu"
+    },
+    "refreshData": {
+      "title": "Làm mới dữ liệu"
+    },
+    "remove": {
+      "title": "Xóa"
+    },
+    "addToHomarr": {
+      "title": "Thêm vào Homarr"
+    }
+  },
+  "actions": {
+    "start": {
+      "start": "Đang bắt đầu",
+      "end": "Đã bắt đầu"
+    },
+    "stop": {
+      "start": "Đang dừng",
+      "end": "Đã dừng"
+    },
+    "restart": {
+      "start": "Đang khởi động lại",
+      "end": "Đã khởi động lại"
+    },
+    "remove": {
+      "start": "Đang xoá",
+      "end": "Đã xoá"
+    }
+  },
+  "errors": {
+    "integrationFailed": {
+      "title": "Tích hợp Docker thất bại",
+      "message": "Có phải bạn quên gắn ổ cắm docker không?"
+    },
+    "unknownError": {
+      "title": "Có lỗi xảy ra"
+    },
+    "oneServiceAtATime": {
+      "title": "Vui lòng chỉ thêm từng dịch vụ một!"
+    }
+  },
+  "actionIcon": {
+    "tooltip": "Docker"
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/overseerr.json b/public/locales/vi/modules/overseerr.json
new file mode 100644
index 000000000..4634603d4
--- /dev/null
+++ b/public/locales/vi/modules/overseerr.json
@@ -0,0 +1,30 @@
+{
+  "descriptor": {
+    "name": "Overseerr",
+    "description": "Cho phép bạn tìm và thêm phương tiện truyền thông từ Overseerr/Jellyseerr"
+  },
+  "popup": {
+    "item": {
+      "buttons": {
+        "askFor": "Yêu cầu {{title}}",
+        "cancel": "Hủy",
+        "request": "Yêu cầu"
+      },
+      "alerts": {
+        "automaticApproval": {
+          "title": "Dùng khoá API",
+          "text": "Yêu cầu này sẽ được tự động phê duyệt"
+        }
+      }
+    },
+    "seasonSelector": {
+      "caption": "Đánh dấu các mùa bạn muốn tải về",
+      "table": {
+        "header": {
+          "season": "Mùa",
+          "numberOfEpisodes": "Số tập"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/ping.json b/public/locales/vi/modules/ping.json
new file mode 100644
index 000000000..47071817a
--- /dev/null
+++ b/public/locales/vi/modules/ping.json
@@ -0,0 +1,11 @@
+{
+  "descriptor": {
+    "name": "Ping",
+    "description": "Giúp bạn kiểm tra nếu dịch vụ đang hoạt động hoặc trả lại một mã trạng thái HTTP cụ thể."
+  },
+  "states": {
+    "online": "Trực tuyến {{response}}",
+    "offline": "Ngoại tuyến {{response}}",
+    "loading": "Đang tải..."
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/search.json b/public/locales/vi/modules/search.json
new file mode 100644
index 000000000..15a53c470
--- /dev/null
+++ b/public/locales/vi/modules/search.json
@@ -0,0 +1,9 @@
+{
+  "descriptor": {
+    "name": "Thanh tìm kiếm",
+    "description": "Thanh tìm kiếm để tìm trên web, Youtube, torrent hoặc Overseerr"
+  },
+  "input": {
+    "placeholder": "Tìm kiếm trên web..."
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/torrents-status.json b/public/locales/vi/modules/torrents-status.json
new file mode 100644
index 000000000..2da764d24
--- /dev/null
+++ b/public/locales/vi/modules/torrents-status.json
@@ -0,0 +1,40 @@
+{
+  "descriptor": {
+    "name": "Torrent",
+    "description": "Hiển thị tốc độ tải xuống hiện tại của các dịch vụ được hỗ trợ",
+    "settings": {
+      "hideComplete": {
+        "label": "Ẩn torrent đã hoàn thành"
+      }
+    }
+  },
+  "card": {
+    "table": {
+      "header": {
+        "name": "Tên",
+        "size": "Kích cỡ",
+        "download": "Tải xuống",
+        "upload": "Tải lên",
+        "estimatedTimeOfArrival": "Thời gian dự kiến",
+        "progress": "Tiến độ"
+      },
+      "body": {
+        "nothingFound": "Không tìm thấy torrent nào"
+      }
+    },
+    "lineChart": {
+      "title": "Tốc độ tải xuống hiện tại",
+      "download": "Tải xuống: {{download}}",
+      "upload": "Tải lên: {{upload}}",
+      "timeSpan": "{{seconds}} giây trước",
+      "totalDownload": "Tải xuống: {{download}}/giây",
+      "totalUpload": "Tải lên: {{upload}}/giây"
+    },
+    "errors": {
+      "noDownloadClients": {
+        "title": "Không tìm thấy ứng dụng tải xuống được hỗ trợ nào!",
+        "text": "Hãy thêm dịch vụ tải xuống để xem các bản tải xuống của bạn"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/modules/usenet.json b/public/locales/vi/modules/usenet.json
new file mode 100644
index 000000000..a1c2a1487
--- /dev/null
+++ b/public/locales/vi/modules/usenet.json
@@ -0,0 +1,49 @@
+{
+  "descriptor": {
+    "name": "Usenet",
+    "description": "Cho phép bạn xem lịch sử và hàng chờ usenet (Sabnzbd hoặc NZBGet), cũng như tạm dừng và tiếp tục tải xuống"
+  },
+  "card": {
+    "errors": {
+      "noDownloadClients": {
+        "title": "Không tìm thấy ứng dụng tải xuống được hỗ trợ nào!",
+        "text": "Hãy thêm dịch vụ tải xuống để xem các bản tải xuống của bạn"
+      }
+    }
+  },
+  "tabs": {
+    "queue": "Chờ",
+    "history": "Lịch sử"
+  },
+  "info": {
+    "sizeLeft": "Kích cỡ còn lại",
+    "paused": "Tạm dừng"
+  },
+  "queue": {
+    "header": {
+      "name": "Tên",
+      "size": "Kích cỡ",
+      "eta": "Thời gian dự kiến",
+      "progress": "Tiến độ"
+    },
+    "empty": "Trống",
+    "error": {
+      "title": "Lỗi",
+      "message": "Có lỗi xảy ra"
+    },
+    "paused": "Tạm dừng"
+  },
+  "history": {
+    "header": {
+      "name": "Tên",
+      "size": "Kích cỡ",
+      "duration": "Thời lượng"
+    },
+    "empty": "Trống",
+    "error": {
+      "title": "Lỗi",
+      "message": "Lỗi khi tải lịch sử"
+    },
+    "paused": "Tạm dừng"
+  }
+}
diff --git a/public/locales/vi/modules/weather.json b/public/locales/vi/modules/weather.json
new file mode 100644
index 000000000..d6175e6c6
--- /dev/null
+++ b/public/locales/vi/modules/weather.json
@@ -0,0 +1,32 @@
+{
+  "descriptor": {
+    "name": "Thời tiết",
+    "description": "Kiểm tra thời tiết hiện tại theo khu vực của bạn",
+    "settings": {
+      "displayInFahrenheit": {
+        "label": "Hiển thị bằng Fahrenheit"
+      },
+      "location": {
+        "label": "Vị trí thời tiết"
+      }
+    }
+  },
+  "card": {
+    "weatherDescriptions": {
+      "clear": "Nhiều nắng",
+      "mainlyClear": "Nắng nhẹ",
+      "fog": "Sương mù",
+      "drizzle": "Mưa phùn",
+      "freezingDrizzle": "Mưa phùn đông đá",
+      "rain": "Mưa",
+      "freezingRain": "Mưa băng",
+      "snowFall": "Tuyết rơi",
+      "snowGrains": "Có hạt tuyết",
+      "rainShowers": "Mưa rào",
+      "snowShowers": "Mưa tuyết",
+      "thunderstorm": "Bão",
+      "thunderstormWithHail": "Sấm sét kèm mưa đá",
+      "unknown": "Không xác định"
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/common.json b/public/locales/vi/settings/common.json
new file mode 100644
index 000000000..0a5e2e7bc
--- /dev/null
+++ b/public/locales/vi/settings/common.json
@@ -0,0 +1,14 @@
+{
+  "title": "Cài đặt",
+  "tooltip": "Cài đặt",
+  "tabs": {
+    "common": "Chung",
+    "customizations": "Cá nhân hoá"
+  },
+  "tips": {
+    "configTip": "Tải tệp cấu hình của bạn lên chỉ bằng cách kéo và thả tệp vào trong trang!"
+  },
+  "credits": {
+    "madeWithLove": "Được tạo bằng ❤️ bởi @"
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/customization/app-width.json b/public/locales/vi/settings/customization/app-width.json
new file mode 100644
index 000000000..e136ae3d7
--- /dev/null
+++ b/public/locales/vi/settings/customization/app-width.json
@@ -0,0 +1,3 @@
+{
+  "label": "Chiều rộng ứng dụng"
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/customization/color-selector.json b/public/locales/vi/settings/customization/color-selector.json
new file mode 100644
index 000000000..a9351916b
--- /dev/null
+++ b/public/locales/vi/settings/customization/color-selector.json
@@ -0,0 +1,3 @@
+{
+  "suffix": "Màu {{color}}"
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/customization/opacity-selector.json b/public/locales/vi/settings/customization/opacity-selector.json
new file mode 100644
index 000000000..cd630db3f
--- /dev/null
+++ b/public/locales/vi/settings/customization/opacity-selector.json
@@ -0,0 +1,3 @@
+{
+  "label": "Độ trong suốt ứng dụng"
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/customization/page-appearance.json b/public/locales/vi/settings/customization/page-appearance.json
new file mode 100644
index 000000000..7db328370
--- /dev/null
+++ b/public/locales/vi/settings/customization/page-appearance.json
@@ -0,0 +1,22 @@
+{
+  "pageTitle": {
+    "label": "Tiêu đề trang",
+    "placeholder": "Homarr 🦞"
+  },
+  "logo": {
+    "label": "Logo"
+  },
+  "favicon": {
+    "label": "Favicon"
+  },
+  "background": {
+    "label": "Hình nền"
+  },
+  "customCSS": {
+    "label": "CSS tuỳ chỉnh",
+    "placeholder": "CSS tùy chỉnh sẽ được áp dụng sau cùng"
+  },
+  "buttons": {
+    "submit": "Gửi"
+  }
+}
diff --git a/public/locales/vi/settings/customization/shade-selector.json b/public/locales/vi/settings/customization/shade-selector.json
new file mode 100644
index 000000000..753a7a364
--- /dev/null
+++ b/public/locales/vi/settings/customization/shade-selector.json
@@ -0,0 +1,3 @@
+{
+  "label": "Bóng"
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/general/color-schema.json b/public/locales/vi/settings/general/color-schema.json
new file mode 100644
index 000000000..f15148bb9
--- /dev/null
+++ b/public/locales/vi/settings/general/color-schema.json
@@ -0,0 +1,3 @@
+{
+  "label": "Chuyển sang chế độ {{scheme}}"
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/general/config-changer.json b/public/locales/vi/settings/general/config-changer.json
new file mode 100644
index 000000000..03198b250
--- /dev/null
+++ b/public/locales/vi/settings/general/config-changer.json
@@ -0,0 +1,55 @@
+{
+  "configSelect": {
+    "label": "Trình nạp cấu hình"
+  },
+  "modal": {
+    "title": "Chọn tên cho cấu hình mới của bạn",
+    "form": {
+      "configName": {
+        "label": "Tên cấu hình",
+        "placeholder": "Tên cấu hình mới của bạn"
+      },
+      "submitButton": "Xác nhận"
+    },
+    "events": {
+      "configSaved": {
+        "title": "Đã lưu cấu hình",
+        "message": "Đã lưu cấu hình thành {{configName}}"
+      }
+    }
+  },
+  "buttons": {
+    "download": "Tải cấu hình xuống",
+    "delete": {
+      "text": "Xóa cấu hình",
+      "notifications": {
+        "deleted": {
+          "title": "Đã xoá cấu hình",
+          "message": "Đã xoá cấu hình"
+        },
+        "deleteFailed": {
+          "title": "Xoá cấu hình thất bại",
+          "message": "Xoá cấu hình thất bại"
+        }
+      }
+    },
+    "saveCopy": "Lưu một bản sao"
+  },
+  "dropzone": {
+    "notifications": {
+      "invalidConfig": {
+        "title": "Không thể nạp cấu hình",
+        "message": "Không thể nạp cấu hình của bạn. Định dạng JSON không hợp lệ."
+      },
+      "loadedSuccessfully": {
+        "title": "Cấu hình {{configName}} được nạp thành công"
+      }
+    },
+    "accept": {
+      "text": "Kéo thả tệp vào đây để tải cấu hình lên. Chỉ hỗ trợ JSON."
+    },
+    "reject": {
+      "text": "Định dạng tệp này không được hỗ trợ. Vui lòng chỉ tải lên JSON."
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/general/internationalization.json b/public/locales/vi/settings/general/internationalization.json
new file mode 100644
index 000000000..fb9d00720
--- /dev/null
+++ b/public/locales/vi/settings/general/internationalization.json
@@ -0,0 +1,3 @@
+{
+  "label": "Ngôn ngữ"
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/general/module-enabler.json b/public/locales/vi/settings/general/module-enabler.json
new file mode 100644
index 000000000..d223fdff9
--- /dev/null
+++ b/public/locales/vi/settings/general/module-enabler.json
@@ -0,0 +1,3 @@
+{
+  "title": "Kích hoạt mô-đun"
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/general/search-engine.json b/public/locales/vi/settings/general/search-engine.json
new file mode 100644
index 000000000..57b7eca2f
--- /dev/null
+++ b/public/locales/vi/settings/general/search-engine.json
@@ -0,0 +1,14 @@
+{
+  "title": "Công cụ tìm kiếm",
+  "tips": {
+    "generalTip": "Sử dụng các tiền tố !yt và !t trước truy vấn để tìm kiếm trên YouTube hoặc torrent.",
+    "placeholderTip": "%s có thể được sử dụng làm phần giữ chỗ cho truy vấn."
+  },
+  "customEngine": {
+    "label": "URL truy vấn",
+    "placeholder": "URL truy vấn tuỳ chỉnh"
+  },
+  "searchNewTab": {
+    "label": "Mở kết quả tìm kiếm trong tab mới"
+  }
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/general/theme-selector.json b/public/locales/vi/settings/general/theme-selector.json
new file mode 100644
index 000000000..82cdbdcbe
--- /dev/null
+++ b/public/locales/vi/settings/general/theme-selector.json
@@ -0,0 +1,3 @@
+{
+  "label": "Chuyển sang chế độ {{theme}}"
+}
\ No newline at end of file
diff --git a/public/locales/vi/settings/general/widget-positions.json b/public/locales/vi/settings/general/widget-positions.json
new file mode 100644
index 000000000..4cdc1c02d
--- /dev/null
+++ b/public/locales/vi/settings/general/widget-positions.json
@@ -0,0 +1,3 @@
+{
+  "label": "Đặt tiện ích ở bên trái"
+}
\ No newline at end of file
diff --git a/public/locales/zh/layout/add-service-app-shelf.json b/public/locales/zh/layout/add-service-app-shelf.json
index 595a2617b..9c25c9e7c 100644
--- a/public/locales/zh/layout/add-service-app-shelf.json
+++ b/public/locales/zh/layout/add-service-app-shelf.json
@@ -90,6 +90,22 @@
                                     "invalidPassword": "无效密码"
                                 }
                             }
+                        },
+                        "nzbget": {
+                            "username": {
+                                "label": "用户名",
+                                "placeholder": "管理员",
+                                "validation": {
+                                    "invalidUsername": "无效的用户名"
+                                }
+                            },
+                            "password": {
+                                "label": "密码",
+                                "placeholder": "密码",
+                                "validation": {
+                                    "invalidPassword": "无效密码"
+                                }
+                            }
                         }
                     }
                 }
diff --git a/public/locales/zh/layout/app-shelf.json b/public/locales/zh/layout/app-shelf.json
index 37bfe0d90..b70ec03b1 100644
--- a/public/locales/zh/layout/app-shelf.json
+++ b/public/locales/zh/layout/app-shelf.json
@@ -2,8 +2,8 @@
   "accordions": {
     "downloads": {
       "text": "您的下载",
-      "torrents": "",
-      "usenet": ""
+      "torrents": "你的Torrent下载",
+      "usenet": "你的Usenet下载"
     },
     "others": {
       "text": "其他"
diff --git a/public/locales/zh/modules/dlspeed.json b/public/locales/zh/modules/dlspeed.json
index e3e53f68d..f6090e6da 100644
--- a/public/locales/zh/modules/dlspeed.json
+++ b/public/locales/zh/modules/dlspeed.json
@@ -6,28 +6,28 @@
   "card": {
     "table": {
       "header": {
-        "name": "命名",
-        "size": "尺寸",
-        "download": "下降",
-        "upload": "上",
-        "estimatedTimeOfArrival": "ETA",
-        "progress": "进展"
+        "name": "名称",
+        "size": "大小",
+        "download": "下移",
+        "upload": "上移",
+        "estimatedTimeOfArrival": "剩余时间",
+        "progress": "进度"
       },
       "body": {
-        "nothingFound": "没有找到山洪资源"
+        "nothingFound": "没有找到种子"
       }
     },
     "lineChart": {
-      "title": "当前的下载速度",
-      "download": "下载。 {{download}}",
-      "upload": "上传。 {{upload}}",
+      "title": "当前下载速度",
+      "download": "下载：{{download}}",
+      "upload": "上传： {{upload}}",
       "timeSpan": "{{seconds}} 秒前",
-      "totalDownload": "下载。 {{download}}/s",
-      "totalUpload": "上传。 {{upload}}/s"
+      "totalDownload": "下载： {{download}}/秒",
+      "totalUpload": "上传： {{upload}}/秒"
     },
     "errors": {
       "noDownloadClients": {
-        "title": "没有找到支持的下载客户端!",
+        "title": "没有找到支持的下载客户端！",
         "text": "添加下载服务，查看你当前的下载量"
       }
     }
diff --git a/public/locales/zh/modules/docker.json b/public/locales/zh/modules/docker.json
index e91d1ba75..103e91ecc 100644
--- a/public/locales/zh/modules/docker.json
+++ b/public/locales/zh/modules/docker.json
@@ -1,10 +1,10 @@
 {
   "descriptor": {
     "name": "Docker",
-    "description": ""
+    "description": "轻松管理你的docker容器"
   },
   "search": {
-    "placeholder": "按容器或图像名称搜索"
+    "placeholder": "按容器或镜像名称搜索"
   },
   "table": {
     "header": {
@@ -49,26 +49,26 @@
   },
   "actions": {
     "start": {
-      "start": "",
-      "end": ""
+      "start": "正在启动...",
+      "end": "已启动"
     },
     "stop": {
-      "start": "",
+      "start": "正在停止",
       "end": "已停止"
     },
     "restart": {
-      "start": "",
-      "end": ""
+      "start": "正在重启",
+      "end": "已重启"
     },
     "remove": {
-      "start": "",
-      "end": ""
+      "start": "删除中",
+      "end": "已删除"
     }
   },
   "errors": {
     "integrationFailed": {
       "title": "Docker整合失败",
-      "message": "你忘了安装docker socket吗？"
+      "message": "你忘了挂载docker socket吗？"
     },
     "unknownError": {
       "title": "出现了一个错误"
diff --git a/public/locales/zh/settings/customization/page-appearance.json b/public/locales/zh/settings/customization/page-appearance.json
index 9a78e8bec..82f7da30f 100644
--- a/public/locales/zh/settings/customization/page-appearance.json
+++ b/public/locales/zh/settings/customization/page-appearance.json
@@ -4,16 +4,13 @@
     "placeholder": "Homarr 🦞"
   },
   "logo": {
-    "label": "徽标",
-    "placeholder": "/img/logo.png"
+    "label": "徽标"
   },
   "favicon": {
-    "label": "网站图标",
-    "placeholder": "/imgs/favicon/favicon.png"
+    "label": "网站图标"
   },
   "background": {
-    "label": "背景",
-    "placeholder": "/img/background.png"
+    "label": "背景"
   },
   "customCSS": {
     "label": "自定义CSS",
diff --git a/public/locales/zh/settings/general/search-engine.json b/public/locales/zh/settings/general/search-engine.json
index ae232afc9..25ec90673 100644
--- a/public/locales/zh/settings/general/search-engine.json
+++ b/public/locales/zh/settings/general/search-engine.json
@@ -9,6 +9,6 @@
     "placeholder": "自定义查询网址"
   },
   "searchNewTab": {
-    "label": ""
+    "label": "在新选项卡中打开搜索结果页"
   }
 }
\ No newline at end of file