Merge branch 'main' into patch-7

Assets/Translations/de.json

@@ -415,7 +415,7 @@
     "random": "Zufällig",
     "reboot": "Neu starten",
     "refresh": "Aktualisieren",
-    "required": "Erforderlich",
+    "required": "(erforderlich)",
     "reset": "Zurücksetzen",
     "resume": "Fortsetzen",
     "save": "Speichern",
@@ -614,7 +614,7 @@
       "system-install-hint": "Installieren Sie fastfetch, um Systeminformationen anzuzeigen",
       "system-kernel": "Kernel:",
       "system-loading": "Systeminformationen werden geladen...",
-      "system-memory": "Speicher",
+      "system-memory": "Speicher:",
       "system-monitor": "Monitor:",
       "system-not-installed": "fastfetch ist nicht installiert",
       "system-os": "Betriebssystem:",
@@ -1205,9 +1205,9 @@
       "update-available": "Neues Plugin-Update verfügbar",
       "update-available-plural": "Neue Plugin-Updates verfügbar ({count})",
       "update-error": "Fehler beim Aktualisieren des Plugins: {plugin}: {error}.",
-      "update-pending": "v{aktuell} → v{neu} (benötigt Noctalia v{erforderlich})",
+      "update-pending": "v{current} → v{new} (benötigt Noctalia v{required})",
       "update-success": "{plugin} wurde auf v{version} aktualisiert.",
-      "update-version": "v{aktuell} → v{neu}",
+      "update-version": "v{current} → v{new}",
       "updating": "Aktualisierung läuft..."
     },
     "region": {

Assets/Translations/es.json

@@ -415,7 +415,7 @@
     "random": "Aleatorio",
     "reboot": "Reiniciar",
     "refresh": "Refrescar",
-    "required": "Obligatorio",
+    "required": "(obligatorio)",
     "reset": "Restablecer",
     "resume": "Reanudar",
     "save": "Guardar",
@@ -1205,9 +1205,9 @@
       "update-available": "Nueva actualización de plugin disponible",
       "update-available-plural": "Nuevas actualizaciones de plugins disponibles ({count})",
       "update-error": "Error al actualizar el plugin: {plugin}: {error}.",
-      "update-pending": "v{actual} → v{nuevo} (requiere Noctalia v{requerida})",
+      "update-pending": "v{current} → v{new} (requiere Noctalia v{required})",
       "update-success": "{plugin} actualizado a la versión {version}.",
-      "update-version": "v{actual} → v{nuevo}",
+      "update-version": "v{current} → v{new}",
       "updating": "Actualizando..."
     },
     "region": {

Assets/Translations/fr.json

@@ -415,7 +415,7 @@
     "random": "Aléatoire",
     "reboot": "Redémarrer",
     "refresh": "Actualiser",
-    "required": "Obligatoire",
+    "required": "(requis)",
     "reset": "Réinitialiser",
     "resume": "Reprendrer",
     "save": "Enregistrer",
@@ -1207,7 +1207,7 @@
       "update-error": "Échec de la mise à jour du plugin : {plugin} : {error}.",
       "update-pending": "v{current} → v{new} (nécessite Noctalia v{required})",
       "update-success": "Mise à jour du plugin {plugin} vers la version {version}.",
-      "update-version": "v{actuel} → v{nouveau}",
+      "update-version": "v{current} → v{new}",
       "updating": "Mise à jour..."
     },
     "region": {

Assets/Translations/hu.json

@@ -415,7 +415,7 @@
     "random": "Véletlen",
     "reboot": "Újraindítás",
     "refresh": "Frissítés",
-    "required": "Kötelező",
+    "required": "(kötelező)",
     "reset": "Visszaállítás",
     "resume": "Folytatás",
     "save": "Mentés",

Assets/Translations/ja.json

@@ -415,7 +415,7 @@
     "random": "ランダム",
     "reboot": "再起動",
     "refresh": "更新",
-    "required": "必須",
+    "required": "(必須)",
     "reset": "リセット",
     "resume": "再開",
     "save": "保存",
@@ -614,7 +614,7 @@
       "system-install-hint": "fastfetch をインストールしてシステム情報を表示する",
       "system-kernel": "カーネル",
       "system-loading": "システム情報を読み込み中...",
-      "system-memory": "記憶",
+      "system-memory": "メモリ:",
       "system-monitor": "モニター",
       "system-not-installed": "fastfetch がインストールされていません",
       "system-os": "OS:",

Assets/Translations/ku.json

@@ -415,7 +415,7 @@
     "random": "Bêserûber",
     "reboot": "Restart",
     "refresh": "Nûkirin",
-    "required": "Pêwîst",
+    "required": "(pêwîst)",
     "reset": "Vegerandin",
     "resume": "Berdewam kirin",
     "save": "Tomar bike",
@@ -1204,10 +1204,10 @@
       "update-all-success": "Hemû pêvek bi serkeftî hatin nûkirin.",
       "update-available": "Rojanekirina pêveka nû heye",
       "update-available-plural": "Rojanekirinên pêvekên nû hene ({count})",
-      "update-error": "ڕێ ل نوو کرنەیا پلاکینێ هاتە گرتن: {plugin}: {error}.",
-      "update-pending": "v{niha} → v{nu} (hewce dike Noctalia v{pêwîst})",
+      "update-error": "Nekarî plugîn nûve bikin: {plugin}: {error}.",
+      "update-pending": "v{current} → v{new} (hewce dike Noctalia v{required})",
       "update-success": "{plugin} hate nûkirin bo v{version}.",
-      "update-version": "v{niha} → v{nû}",
+      "update-version": "v{current} → v{new}",
       "updating": "Tê rojanekirin..."
     },
     "region": {

Assets/Translations/nl.json

@@ -415,7 +415,7 @@
     "random": "Willekeurig",
     "reboot": "Herstarten",
     "refresh": "Vernieuwen",
-    "required": "Vereist",
+    "required": "(vereist)",
     "reset": "Resetten",
     "resume": "Hervatten",
     "save": "Opslaan",
@@ -1207,7 +1207,7 @@
       "update-error": "Plugin bijwerken mislukt: {plugin}: {error}.",
       "update-pending": "v{current} → v{new} (vereist Noctalia v{required})",
       "update-success": "{plugin} is bijgewerkt naar v{version}.",
-      "update-version": "v{huidig} → v{nieuw}",
+      "update-version": "v{current} → v{new}",
       "updating": "Bezig met updaten..."
     },
     "region": {

Assets/Translations/pl.json

@@ -415,7 +415,7 @@
     "random": "Losowy",
     "reboot": "Restart",
     "refresh": "Odśwież",
-    "required": "Wymagane",
+    "required": "(wymagane)",
     "reset": "Zresetuj",
     "resume": "Wznów",
     "save": "Zapisz",
@@ -1205,7 +1205,7 @@
       "update-available": "Dostępna nowa aktualizacja wtyczki",
       "update-available-plural": "Dostępne nowe aktualizacje wtyczek ({count})",
       "update-error": "Błąd aktualizacji wtyczki {plugin}: {error}.",
-      "update-pending": "v{bieżąca} → v{nowa} (wymaga Noctalii v{wymagana})",
+      "update-pending": "v{current} → v{new} (wymaga Noctalii v{required})",
       "update-success": "Zaktualizowano {plugin} do v{version}.",
       "update-version": "v{current} → v{new}",
       "updating": "Aktualizowanie {plugin}..."

Assets/Translations/pt.json

@@ -415,7 +415,7 @@
     "random": "Aleatório",
     "reboot": "Reiniciar",
     "refresh": "Atualizar",
-    "required": "Obrigatório",
+    "required": "(obrigatório)",
     "reset": "Reiniciar",
     "resume": "Retomar",
     "save": "Salvar",
@@ -1205,9 +1205,9 @@
       "update-available": "Nova atualização de plugin disponível",
       "update-available-plural": "Novas atualizações de plugin disponíveis ({count})",
       "update-error": "Falha ao atualizar o plugin: {plugin}: {error}.",
-      "update-pending": "v{atual} → v{novo} (requer Noctalia v{requerida})",
+      "update-pending": "v{current} → v{new} (requer Noctalia v{required})",
       "update-success": "{plugin} atualizado para a versão {version}.",
-      "update-version": "v{atual} → v{novo}",
+      "update-version": "v{current} → v{new}",
       "updating": "Atualizando..."
     },
     "region": {

Assets/Translations/ru.json

@@ -415,7 +415,7 @@
     "random": "Случайный",
     "reboot": "Перезагрузить",
     "refresh": "Обновить",
-    "required": "Обязательно",
+    "required": "(обязательно)",
     "reset": "Сброс",
     "resume": "Продолжить",
     "save": "Сохранить",
@@ -1207,7 +1207,7 @@
       "update-error": "Не удалось обновить плагин: {plugin}: {error}.",
       "update-pending": "v{current} → v{new} (требуется Noctalia v{required})",
       "update-success": "Плагин {plugin} обновлён до версии {version}.",
-      "update-version": "v{текущее} → v{новое}",
+      "update-version": "v{current} → v{new}",
       "updating": "Обновление..."
     },
     "region": {

Assets/Translations/tr.json

@@ -415,7 +415,7 @@
     "random": "Rastgele",
     "reboot": "Yeniden başlat",
     "refresh": "Yenile",
-    "required": "Gerekli",
+    "required": "(gerekli)",
     "reset": "Sıfırla",
     "resume": "Sürdür",
     "save": "Kaydet",
@@ -1205,9 +1205,9 @@
       "update-available": "Yeni eklenti güncellemesi mevcut",
       "update-available-plural": "Yeni eklenti güncellemeleri mevcut ({count})",
       "update-error": "Eklenti güncellenemedi: {plugin}: {error}.",
-      "update-pending": "v{mevcut} → v{yeni} (Noctalia v{gerekli} gerektirir)",
+      "update-pending": "v{current} → v{new} (Noctalia v{required} gerektirir)",
       "update-success": "{plugin} v{version} sürümüne güncellendi.",
-      "update-version": "v{mevcut} → v{yeni}",
+      "update-version": "v{current} → v{new}",
       "updating": "Güncelleniyor..."
     },
     "region": {

Assets/Translations/uk-UA.json

@@ -415,7 +415,7 @@
     "random": "Випадковий",
     "reboot": "Перезапустити",
     "refresh": "Оновити",
-    "required": "Обов'язково",
+    "required": "(обов'язково)",
     "reset": "Скинути",
     "resume": "Продовжити",
     "save": "Зберегти",

Assets/Translations/zh-CN.json

@@ -389,7 +389,7 @@
     "look": "样式",
     "media": "媒体",
     "media-player": "媒体播放器",
-    "memory": "内存",
+    "memory": "记忆",
     "monitors": "显示器",
     "network": "网络",
     "next": "下一个",
@@ -415,7 +415,7 @@
     "random": "随机",
     "reboot": "重启",
     "refresh": "刷新",
-    "required": "必需",
+    "required": "(必需的)",
     "reset": "重置",
     "resume": "继续",
     "save": "保存",
@@ -614,7 +614,7 @@
       "system-install-hint": "安装 fastfetch 以查看系统信息",
       "system-kernel": "内核：",
       "system-loading": "正在加载系统信息...",
-      "system-memory": "内存：",
+      "system-memory": "记忆：",
       "system-monitor": "监视器",
       "system-not-installed": "未安装 fastfetch",
       "system-os": "操作系统：",
@@ -1205,9 +1205,9 @@
       "update-available": "新插件更新可用",
       "update-available-plural": "新插件更新可用（{count}个）",
       "update-error": "更新插件失败：{plugin}：{error}。",
-      "update-pending": "v{当前} → v{新} (需要 Noctalia v{所需})",
+      "update-pending": "v{current} → v{new} (需要 Noctalia v{required})",
       "update-success": "已将 {plugin} 更新至 v{version}。",
-      "update-version": "v{当前} → v{新}",
+      "update-version": "v{current} → v{new}",
       "updating": "正在更新..."
     },
     "region": {

Assets/Translations/zh-TW.json

@@ -397,14 +397,13 @@
     "random": "隨機",
     "reboot": "重新啟動",
     "refresh": "重新整理",
-    "required": "必要",
+    "required": "(必填)",
     "reset": "重設",
     "resume": "繼續",
     "save": "儲存",
     "scanning": "掃描中...",
     "screen-corners": "畫面邊角",
     "search": "搜尋",
-    "security": "---",
     "select": "選取",
     "shutdown": "關機",
     "signal": "訊號",
@@ -426,11 +425,11 @@
     "upload": "上傳",
     "version": "版本",
     "visualizer": "視覺效果",
-    "volume": "---",
+    "volume": "音量",
     "volumes": "音量",
     "wallpaper": "桌布",
     "weather": "天氣",
-    "weather-loading": "載入現在天氣...",
+    "weather-loading": "正在載入天氣...",
     "week": "週",
     "widgets": "小工具",
     "width": "寬度"
@@ -465,11 +464,14 @@
       "education": "教育",
       "emoji-activity": "活動",
       "emoji-animals": "動物",
+      "emoji-flags": "旗幟",
+      "emoji-food": "食物及飲料",
       "emoji-nature": "大自然",
       "emoji-objects": "物品",
-      "emoji-people": "人物肢體",
+      "emoji-people": "人物及肢體",
       "emoji-recent": "最近使用",
       "emoji-symbols": "符號",
+      "emoji-travel": "旅行及地點",
       "game": "遊戲",
       "graphics": "圖像",
       "misc": "其他",
@@ -495,7 +497,11 @@
       "clipboard-loading": "剪貼簿歷史載入中...",
       "clipboard-search-description": "搜尋剪貼簿歷史",
       "command-description": "執行 shell 指令",
-      "emoji-loading-description": "請稍候"
+      "emoji": "挑選表情符號",
+      "emoji-loading": "載入表情符號...",
+      "emoji-loading-description": "請稍候",
+      "emoji-no-recent": "還沒有最近使用的表情符號",
+      "emoji-search-description": "搜尋和複製表情符號"
     },
     "result": "結果",
     "results": "結果"
@@ -556,9 +562,6 @@
       "mirrored": "鏡像",
       "wave": "波形"
     },
-    "visualizer-visibility": {
-      "with-background": "---"
-    },
     "workspace-labels": {
       "index": "編號",
       "index-and-name": "編號及名稱",
@@ -867,6 +870,7 @@
       "profile-desc": "編輯你的使用者資訊及頭像",
       "profile-picture-description": "你的頭像會在整個介面中出現",
       "profile-picture-label": "{user} 的個人頭像",
+      "profile-title": "個人檔案",
       "profile-tooltip": "個人頭像",
       "screen-corners-desc": "自訂畫面邊角的弧度及視覺效果",
       "screen-corners-radius-description": "調整畫面所使用的邊角半徑",
@@ -933,6 +937,7 @@
       "settings-ignore-mouse-input-description": "對啟動器停用滑鼠互動及滾輪捲動",
       "settings-ignore-mouse-input-label": "忽略滑鼠輸入",
       "settings-position-description": "選擇啟動器面板要出現的地方",
+      "settings-show-categories-description": "顯示分類標籤來篩選應用程式",
       "settings-show-categories-label": "顯示分類",
       "settings-show-icon-background-description": "在圖示後面顯示一個圓角矩形為背景",
       "settings-show-icon-background-label": "顯示圖示背景",
@@ -1022,6 +1027,9 @@
       "sounds-enabled-label": "啟用通知音效",
       "sounds-excluded-apps-label": "排除的應用程式",
       "sounds-excluded-apps-placeholder": "discord,firefox,chrome,chromium,edge",
+      "sounds-files-critical-label": "非常危急的音效",
+      "sounds-files-low-label": "低急迫性的音效",
+      "sounds-files-normal-label": "普通急迫的音效",
       "sounds-files-placeholder": "輸入音效檔所在的路徑",
       "sounds-files-select-file": "選擇音效檔",
       "sounds-files-title": "音效檔",

Modules/LockScreen/LockScreenPanel.qml

@@ -106,7 +106,7 @@ Item {
     radius: Style.radiusL
     color: Color.mSurface
 
-    width: 750
+    width: Settings.data.general.showHibernateOnLockScreen ? 800 : 750
 
     ColumnLayout {
       anchors.fill: parent
@@ -121,6 +121,11 @@ Item {
         visible: !Settings.data.general.compactLockScreen
 
         // Media widget with visualizer
+        Item {
+          Layout.preferredWidth: Style.marginM
+          visible: MediaService.currentPlayer && MediaService.canPlay
+        }
+
         Rectangle {
           Layout.preferredWidth: 220
           // Expand to take remaining space when weather is hidden
@@ -312,7 +317,7 @@ Item {
           spacing: Style.marginXS
 
           Repeater {
-            model: MediaService.currentPlayer && MediaService.canPlay ? 3 : 4
+            model: MediaService.currentPlayer && MediaService.canPlay ? 2 : 4
             delegate: ColumnLayout {
               Layout.fillWidth: true
               spacing: Style.marginXXS + 1

Services/Theming/TemplateRegistry.qml

@@ -183,6 +183,11 @@ Singleton {
           "name": "vencord",
           "path": "~/.config/Vencord",
           "requiresThemesFolder": false
+        },
+        {
+          "name": "betterdiscord",
+          "path": "~/.config/BetterDiscord",
+          "requiresThemesFolder": false
         }
       ]
     },

Widgets/NComboBox.qml

@@ -91,8 +91,8 @@ RowLayout {
       }
     }
     return I18n.tr("panels.indicator.default-value", {
-      "value": displayValue
-    });
+                     "value": displayValue
+                   });
   }
 
   function itemCount() {