From c990c4926454d10275121dc9646efff2c27dfdcf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 20 Apr 2021 01:23:33 +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" --- dataengines/devicenotifications/devicenotifications.notifyrc | 2 ++ kcms/desktoptheme/plasma-themes.knsrc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dataengines/devicenotifications/devicenotifications.notifyrc b/dataengines/devicenotifications/devicenotifications.notifyrc index 6c5057b67..aa45c80e2 100644 --- a/dataengines/devicenotifications/devicenotifications.notifyrc +++ b/dataengines/devicenotifications/devicenotifications.notifyrc @@ -83,8 +83,10 @@ Name=Device Status Name[az]=Qurğuların statusu Name[ca]=Estat del dispositiu Name[cs]=Stav zařízení +Name[de]=Gerätestatus Name[en_GB]=Device Status Name[es]=Estado del dispositivo +Name[fi]=Laitteen tila Name[fr]=État du périphérique Name[ia]=Stato de dispositivo Name[id]=Status Perangkat diff --git a/kcms/desktoptheme/plasma-themes.knsrc b/kcms/desktoptheme/plasma-themes.knsrc index 8c80af33d..e0fef2ac4 100644 --- a/kcms/desktoptheme/plasma-themes.knsrc +++ b/kcms/desktoptheme/plasma-themes.knsrc @@ -3,8 +3,10 @@ Name=Plasma Themes Name[az]=Plasma mövzuları Name[ca]=Temes del Plasma Name[cs]=Motivy Plasmy +Name[de]=Plasma-Designs Name[en_GB]=Plasma Themes Name[es]=Temas de Plasma +Name[fi]=Plasma-teemat Name[fr]=Thèmes Plasma Name[ia]=Themas de Plasma Name[it]=Temi di Plasma