From d0c9f7285a72d2363171db0518af0472d8c83b11 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Mar 2019 05:40:16 +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 6226e8ec7d..96f8dcc5e4 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -81,6 +81,7 @@ Comment[id]=Konfigurasikan tepi dan bilah-judul window Comment[it]=Configura la barra del titolo e i bordi delle finestre Comment[nl]=Titelbalken en randen van venster configureren Comment[nn]=Set opp tittellinjer og vindaugsrammer +Comment[pl]=Ustawienia pasków tytułów i obramowań okien Comment[pt]=Configurar as barras de título e contornos das janelas Comment[pt_BR]=Configure as barras de títulos e bordas da janela Comment[sv]=Anpassa namnlister och kanter för fönster diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop index 9ae44a93c5..c1def37f0f 100644 --- a/kcmkwin/kwindecoration/package/metadata.desktop +++ b/kcmkwin/kwindecoration/package/metadata.desktop @@ -83,6 +83,7 @@ Comment[id]=Konfigurasikan tepi dan bilah-judul window Comment[it]=Configura la barra del titolo e i bordi delle finestre Comment[nl]=Titelbalken en randen van venster configureren Comment[nn]=Set opp tittellinjer og vindaugsrammer +Comment[pl]=Ustawienia pasków tytułów i obramowań okien Comment[pt]=Configurar as barras de título e contornos das janelas Comment[pt_BR]=Configure as barras de títulos e bordas da janela Comment[sv]=Anpassa namnlister och kanter för fönster