From 10e0b28626ad0479121f298bfa682264eeafc3c7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Feb 2019 05:52:34 +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 a7c5d15172..6226e8ec7d 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[ca@valencia]=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 diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop index 4f297f9c9b..9ae44a93c5 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[ca@valencia]=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