From c62650394f1e97283364951c42960d756aec760a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 31 May 2019 05:14:47 +0200 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" --- kcmkwin/kwindecoration/kwindecoration.desktop | 1 + kcmkwin/kwindecoration/package/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index 69a526465b..1bbbba7281 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -75,6 +75,7 @@ Name[zh_TW]=視窗裝飾 Comment=Configure window titlebars and borders Comment[ca]=Configura la barra de títol i les vores de les finestres Comment[ca@valencia]=Configura la barra de títol i les vores de les finestres +Comment[da]=Indstil vinduets titellinjer og kanter Comment[en_GB]=Configure window titlebars and borders Comment[es]=Configurar barra de título y bordes de las ventanas Comment[fr]=Configure les barres de titre et les bordures de la fenêtre diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop index b008734e37..8381f3d17e 100644 --- a/kcmkwin/kwindecoration/package/metadata.desktop +++ b/kcmkwin/kwindecoration/package/metadata.desktop @@ -77,6 +77,7 @@ Name[zh_TW]=視窗裝飾 Comment=Configure window titlebars and borders Comment[ca]=Configura la barra de títol i les vores de les finestres Comment[ca@valencia]=Configura la barra de títol i les vores de les finestres +Comment[da]=Indstil vinduets titellinjer og kanter Comment[en_GB]=Configure window titlebars and borders Comment[es]=Configurar barra de título y bordes de las ventanas Comment[fr]=Configure les barres de titre et les bordures de la fenêtre