From 3e09342c5e909c71f13db12f724a736851f89bad Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 12 Feb 2019 05:48:29 +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 | 7 +++++++ kcmkwin/kwindecoration/package/metadata.desktop | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index 7789b6bce8..dc58b08b69 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -73,6 +73,13 @@ 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[gl]=Configurar as barras de título e os bordos das xanelas +Comment[nl]=Titelbalken en randen van venster configureren +Comment[pt]=Configurar as barras de título e contornos das janelas +Comment[sv]=Anpassa namnlister och kanter för fönster +Comment[uk]=Налаштовування смужок заголовків та рамок вікон +Comment[x-test]=xxConfigure window titlebars and bordersxx X-KDE-Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration X-KDE-Keywords[bs]=kwin,prozor,upravitelj,granica,stil,tema,izgled,osjećati,izgled,dugme,držati,ivica,kwm,dekoracija diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop index 3fe1bea4b0..02b8bfa236 100644 --- a/kcmkwin/kwindecoration/package/metadata.desktop +++ b/kcmkwin/kwindecoration/package/metadata.desktop @@ -75,3 +75,10 @@ Name[x-test]=xxWindow Decorationsxx 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[gl]=Configurar as barras de título e os bordos das xanelas +Comment[nl]=Titelbalken en randen van venster configureren +Comment[pt]=Configurar as barras de título e contornos das janelas +Comment[sv]=Anpassa namnlister och kanter för fönster +Comment[uk]=Налаштовування смужок заголовків та рамок вікон +Comment[x-test]=xxConfigure window titlebars and bordersxx