From e9840c5ba692dac3cc51a6c47c4fc35282634e52 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 25 Jun 2019 05:20:51 +0200 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 b21b6a9ee2..ba7fff99b9 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -79,6 +79,7 @@ Comment[da]=Indstil vinduets titellinjer og kanter Comment[en_GB]=Configure window titlebars and borders Comment[es]=Configurar barra de título y bordes de las ventanas Comment[eu]=Konfiguratu leihoen titulu-barrak eta ertzak +Comment[fi]=Ikkunan otsikkopalkkien ja reunojen asetukset Comment[fr]=Configure les barres de titre et les bordures de la fenêtre Comment[gl]=Configurar as barras de título e os bordos das xanelas Comment[id]=Konfigurasikan bingkai dan bilah-judul window diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop index 36edb526d4..6e8d4b232b 100644 --- a/kcmkwin/kwindecoration/package/metadata.desktop +++ b/kcmkwin/kwindecoration/package/metadata.desktop @@ -81,6 +81,7 @@ Comment[da]=Indstil vinduets titellinjer og kanter Comment[en_GB]=Configure window titlebars and borders Comment[es]=Configurar barra de título y bordes de las ventanas Comment[eu]=Konfiguratu leihoen titulu-barrak eta ertzak +Comment[fi]=Ikkunan otsikkopalkkien ja reunojen asetukset Comment[fr]=Configure les barres de titre et les bordures de la fenêtre Comment[gl]=Configurar as barras de título e os bordos das xanelas Comment[id]=Konfigurasikan bingkai dan bilah-judul window