From 849f87c0b516634af67bea59260642d2fb91799d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 7 Mar 2022 01:43:56 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- applets/systemmonitor/coreusage/metadata.json | 1 + applets/systemmonitor/cpu/metadata.json | 1 + applets/systemmonitor/diskusage/metadata.json | 1 + applets/systemmonitor/memory/metadata.json | 1 + applets/systemmonitor/net/metadata.json | 1 + applets/systemmonitor/systemmonitor/package/metadata.json | 2 ++ lookandfeel.dark/metadata.json | 1 + lookandfeel.twilight/metadata.json | 1 + lookandfeel/metadata.json | 1 + plasmacalendarintegration/holidayeventsplugin.json | 1 + runners/helprunner/helprunner.json | 1 + 11 files changed, 12 insertions(+) diff --git a/applets/systemmonitor/coreusage/metadata.json b/applets/systemmonitor/coreusage/metadata.json index 85390dca1..456489e4b 100644 --- a/applets/systemmonitor/coreusage/metadata.json +++ b/applets/systemmonitor/coreusage/metadata.json @@ -41,6 +41,7 @@ "Description[ar]": "أداة مراقبة النظام التي تعرض استخدام كل نواة من المعالج", "Description[az]": "Sistem monitoru vidjeti hər CPU nüvəsinin istifadəsini göstərir", "Description[ca]": "Giny del monitor del sistema que mostra l'ús individual dels nuclis de la CPU", + "Description[de]": "Systemmonitor-Miniprogramm, das die Verwendung einzelner CPU-Kerne anzeigt", "Description[en_GB]": "System monitor Widget that shows usage of individual CPU cores", "Description[es]": "Elemento gráfico del monitor del sistema que muestra el uso de los núcleos individuales de la CPU", "Description[eu]": "PUZeko nukleoen banakako erabilera erakusten duen sistema gainbegiratzeko trepeta", diff --git a/applets/systemmonitor/cpu/metadata.json b/applets/systemmonitor/cpu/metadata.json index 3dd1b931e..aea1a0850 100644 --- a/applets/systemmonitor/cpu/metadata.json +++ b/applets/systemmonitor/cpu/metadata.json @@ -41,6 +41,7 @@ "Description[ar]": "أداة مراقبة النظام التي تعرض مجموع استخدام المعالج", "Description[az]": "Sistem monitoru vidjeti ümumi CPU istifadəsini göstərir", "Description[ca]": "Giny del monitor del sistema que mostra l'ús total de la CPU", + "Description[de]": "Systemmonitor-Miniprogramm, das die Verwendung des gesamten Prozessors anzeigt", "Description[en_GB]": "System monitor Widget that shows the total CPU usage", "Description[es]": "Elemento gráfico del monitor del sistema que muestra el uso total de CPU", "Description[eu]": "PUZ erabileraren guztizkoa erakusten duen sistema gainbegiratzeko trepeta", diff --git a/applets/systemmonitor/diskusage/metadata.json b/applets/systemmonitor/diskusage/metadata.json index 12e180ab4..81d3bc32f 100644 --- a/applets/systemmonitor/diskusage/metadata.json +++ b/applets/systemmonitor/diskusage/metadata.json @@ -42,6 +42,7 @@ "Description[ar]": "أداة مراقبة النظام التي تعرض استخدام قسم الجذر", "Description[az]": "Sistem monitoru vidjeti kök bölməsinin istifadəsini göstərir", "Description[ca]": "Giny del monitor del sistema que mostra l'ús de la partició arrel", + "Description[de]": "Systemmonitor-Miniprogramm, das die Verwendung des Basisordners anzeigt", "Description[en_GB]": "System monitor Widget that shows the usage of the root partition", "Description[es]": "Elemento gráfico del monitor del sistema que muestra el uso de la partición raíz", "Description[eu]": "Erro partizioaren erabilera erakusten duen sistema gainbegiratzeko trepeta", diff --git a/applets/systemmonitor/memory/metadata.json b/applets/systemmonitor/memory/metadata.json index b8bdcdd83..fdc8c2871 100644 --- a/applets/systemmonitor/memory/metadata.json +++ b/applets/systemmonitor/memory/metadata.json @@ -41,6 +41,7 @@ "Description[ar]": "أداة مراقبة النظام التي تعرض استخدام الذاكرة الفعلية", "Description[az]": "Sistem monitoru vidjeti fiziki yaddaşın istifadəsini göstərir", "Description[ca]": "Giny del monitor del sistema que mostra l'ús de la memòria física", + "Description[de]": "Systemmonitor-Miniprogramm, das die Verwendung des Arbeitsspeichers anzeigt", "Description[en_GB]": "System monitor Widget that shows physical memory usage", "Description[es]": "Elemento gráfico del monitor del sistema que muestra el uso de la memoria física", "Description[eu]": "Memoria fisikoaren erabilera erakusten duen sistema gainbegiratzeko trepeta", diff --git a/applets/systemmonitor/net/metadata.json b/applets/systemmonitor/net/metadata.json index 95b8901d1..13ef4044b 100644 --- a/applets/systemmonitor/net/metadata.json +++ b/applets/systemmonitor/net/metadata.json @@ -42,6 +42,7 @@ "Description[ar]": "أداة مراقبة النظام التي تعرض سرعة تنزيل ورفع البيانات", "Description[az]": "Sistem monitporu vidjeti verilənlərin endirilməsi və yüklənməsi tezliyini göstərir", "Description[ca]": "Giny del monitor del sistema que mostra la velocitat de baixada i pujada de les dades", + "Description[de]": "Systemmonitor-Miniprogramm, das die Download- und Upload-Datenrate anzeigt", "Description[en_GB]": "System monitor Widget that shows the download and upload data rate", "Description[es]": "Elemento gráfico del monitor del sistema que muestra las velocidades de subida y bajada de datos", "Description[eu]": "Zama-jaisteko eta -igotzeko datuen emaria erakusten duen sistema gainbegiratzeko trepeta", diff --git a/applets/systemmonitor/systemmonitor/package/metadata.json b/applets/systemmonitor/systemmonitor/package/metadata.json index 903049a46..377ffad21 100644 --- a/applets/systemmonitor/systemmonitor/package/metadata.json +++ b/applets/systemmonitor/systemmonitor/package/metadata.json @@ -42,6 +42,7 @@ "Description[ar]": "يعرض مخططًا قابلًا للتكوين لمتحسسات مراقبة النظام", "Description[az]": "Sistem monitoru sensorunun ayarlana bilən zolaqlarını göstərir", "Description[ca]": "Mostra un diagrama configurable d'un sensor del monitor del sistema", + "Description[de]": "Zeigt ein anpassbares Diagramm eines Systemmonitor-Sensors an", "Description[en_GB]": "Displays a configurable chart of a system monitor sensor", "Description[es]": "Muestra un gráfico configurable de un sensor del monitor del sistema", "Description[eu]": "Sistema gainbegiratzeko sentsore baten diagrama konfiguragarri bat azaltzen du", @@ -80,6 +81,7 @@ "Name[ca]": "Sensor del monitor del sistema", "Name[cs]": "Senzor monitoru systému", "Name[da]": "Systemovervågning-sensor", + "Name[de]": "Systemmonitor-Sensor", "Name[en_GB]": "System monitor Sensor", "Name[es]": "Sensor del monitor del sistema", "Name[et]": "Süsteemi jälgija sensor", diff --git a/lookandfeel.dark/metadata.json b/lookandfeel.dark/metadata.json index 00343b226..e4ad8bbd5 100644 --- a/lookandfeel.dark/metadata.json +++ b/lookandfeel.dark/metadata.json @@ -8,6 +8,7 @@ "Name[az]": "KDE Vizual Dizayn Qrupu", "Name[ca]": "Grup de disseny visual de KDE", "Name[cs]": "Skupina vizuálního návrhu KDE", + "Name[de]": "KDE Visual Design Group", "Name[en_GB]": "KDE Visual Design Group", "Name[es]": "El grupo de diseño visual de KDE", "Name[eu]": "KDE Diseinu bisualeko taldea", diff --git a/lookandfeel.twilight/metadata.json b/lookandfeel.twilight/metadata.json index 4abad0499..84911244c 100644 --- a/lookandfeel.twilight/metadata.json +++ b/lookandfeel.twilight/metadata.json @@ -8,6 +8,7 @@ "Name[az]": "KDE Vizual Dizayn Qrupu", "Name[ca]": "Grup de disseny visual de KDE", "Name[cs]": "Skupina vizuálního návrhu KDE", + "Name[de]": "KDE Visual Design Group", "Name[en_GB]": "KDE Visual Design Group", "Name[es]": "El grupo de diseño visual de KDE", "Name[eu]": "KDE Diseinu bisualeko taldea", diff --git a/lookandfeel/metadata.json b/lookandfeel/metadata.json index 54b0a60c6..b71393b7c 100644 --- a/lookandfeel/metadata.json +++ b/lookandfeel/metadata.json @@ -8,6 +8,7 @@ "Name[az]": "KDE Vizual Dizayn Qrupu", "Name[ca]": "Grup de disseny visual de KDE", "Name[cs]": "Skupina vizuálního návrhu KDE", + "Name[de]": "KDE Visual Design Group", "Name[en_GB]": "KDE Visual Design Group", "Name[es]": "El grupo de diseño visual de KDE", "Name[eu]": "KDE Diseinu bisualeko taldea", diff --git a/plasmacalendarintegration/holidayeventsplugin.json b/plasmacalendarintegration/holidayeventsplugin.json index 581a3ba7a..1be59d278 100644 --- a/plasmacalendarintegration/holidayeventsplugin.json +++ b/plasmacalendarintegration/holidayeventsplugin.json @@ -40,6 +40,7 @@ "Description[az]": "Ümumi bayramları göstərmək üçün təqvim əlavəsi", "Description[ca]": "Connector de calendari per a mostrar els festius oficials", "Description[cs]": "Modul kalendáře pro zobrazování státních svátků", + "Description[de]": "Kalendermodul zur Anzeige gesetzlicher Feiertage", "Description[en_GB]": "Calendar plugin for displaying public holidays", "Description[es]": "Complemento del calendario para mostrar días festivos nacionales", "Description[eu]": "Jaiegun ofizialak azaltzeko egutegi-plugina", diff --git a/runners/helprunner/helprunner.json b/runners/helprunner/helprunner.json index 57aad0f0c..275cc0694 100644 --- a/runners/helprunner/helprunner.json +++ b/runners/helprunner/helprunner.json @@ -68,6 +68,7 @@ "Name[ar]": "مساعدة المشغّل", "Name[az]": "KRunner köməyi", "Name[ca]": "Executor d'ajuda", + "Name[de]": "Hilfe", "Name[en_GB]": "Help Runner", "Name[es]": "Ayuda sobre lanzador", "Name[eu]": "Laguntza exekutatzailea",