From beb35d8b8fb6d2aebfcc625fbbdf18244f0e1817 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Feb 2019 05:59:41 +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 | 2 ++ kcmkwin/kwindecoration/package/metadata.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index dc58b08b69..c15bf3ee45 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -75,11 +75,13 @@ 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[it]=Configura la barra del titolo e i bordi delle finestre 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 +Comment[zh_TW]=設定視窗的標題列和邊框 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 02b8bfa236..61e71b30ff 100644 --- a/kcmkwin/kwindecoration/package/metadata.desktop +++ b/kcmkwin/kwindecoration/package/metadata.desktop @@ -77,8 +77,10 @@ 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[it]=Configura la barra del titolo e i bordi delle finestre 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 +Comment[zh_TW]=設定視窗的標題列和邊框