From c1da6bd1d0264866a001501d958d6728a1910a78 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 18 Jul 2019 08:49: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 93695dcab3..73ed6c10d9 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -76,6 +76,7 @@ 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[de]=Titelleiste und Ränder von Fenstern einrichten Comment[en_GB]=Configure window titlebars and borders Comment[es]=Configurar barra de título y bordes de las ventanas Comment[eu]=Konfiguratu leihoen titulu-barrak eta ertzak diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop index 3bcc0d3010..5b4c31b1b4 100644 --- a/kcmkwin/kwindecoration/package/metadata.desktop +++ b/kcmkwin/kwindecoration/package/metadata.desktop @@ -78,6 +78,7 @@ 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[de]=Titelleiste und Ränder von Fenstern einrichten Comment[en_GB]=Configure window titlebars and borders Comment[es]=Configurar barra de título y bordes de las ventanas Comment[eu]=Konfiguratu leihoen titulu-barrak eta ertzak