From 40477aff2d8178eb99b8e5f7d6bae6076ef4bffe Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 22 Feb 2019 05:41:10 +0100 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 caca2ef149..a7c5d15172 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[es]=Configurar barra de título y bordes de las ventanas Comment[gl]=Configurar as barras de título e os bordos das xanelas +Comment[id]=Konfigurasikan tepi dan bilah-judul window Comment[it]=Configura la barra del titolo e i bordi delle finestre Comment[nl]=Titelbalken en randen van venster configureren Comment[nn]=Set opp tittellinjer og vindaugsrammer diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop index e0b7b9315e..4f297f9c9b 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[es]=Configurar barra de título y bordes de las ventanas Comment[gl]=Configurar as barras de título e os bordos das xanelas +Comment[id]=Konfigurasikan tepi dan bilah-judul window Comment[it]=Configura la barra del titolo e i bordi delle finestre Comment[nl]=Titelbalken en randen van venster configureren Comment[nn]=Set opp tittellinjer og vindaugsrammer