From 0196b6f29ad5df55ca11df918385c5d8d576503e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 30 Mar 2019 06:07:26 +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 6ccddc0d9a..528124373c 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -86,6 +86,7 @@ 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[sk]=Nastaviť titulné pásy a okraje Comment[sv]=Anpassa namnlister och kanter för fönster Comment[uk]=Налаштовування смужок заголовків та рамок вікон Comment[x-test]=xxConfigure window titlebars and bordersxx diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop index a64bd76529..d5e900759b 100644 --- a/kcmkwin/kwindecoration/package/metadata.desktop +++ b/kcmkwin/kwindecoration/package/metadata.desktop @@ -88,6 +88,7 @@ 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[sk]=Nastaviť titulné pásy a okraje Comment[sv]=Anpassa namnlister och kanter för fönster Comment[uk]=Налаштовування смужок заголовків та рамок вікон Comment[x-test]=xxConfigure window titlebars and bordersxx