From 87917677d61e572f18d1b6f72c752dc672f5135e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 14 Feb 2019 05:43:32 +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 c15bf3ee45..3b3edc1e17 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -74,6 +74,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[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[it]=Configura la barra del titolo e i bordi delle finestre Comment[nl]=Titelbalken en randen van venster configureren diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop index 61e71b30ff..1acf6becd2 100644 --- a/kcmkwin/kwindecoration/package/metadata.desktop +++ b/kcmkwin/kwindecoration/package/metadata.desktop @@ -76,6 +76,7 @@ Name[zh_CN]=窗口装饰 Name[zh_TW]=視窗裝飾 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[it]=Configura la barra del titolo e i bordi delle finestre Comment[nl]=Titelbalken en randen van venster configureren