From 4ff145adf27449733cf3461e8a01637da6e021af Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 24 Sep 2016 12:33:15 +0000 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" --- kdecoration/config/breezedecorationconfig.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop index 5dcc8873..04fa3253 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -30,7 +30,7 @@ Name[lt]=Lango dekoracija Name[nb]=Vinduspynt Name[nl]=Vensterdecoratie Name[nn]=Vindaugspynt -Name[pl]=Wystrój okien +Name[pl]=Wygląd okien Name[pt]=Decoração de Janelas Name[pt_BR]=Decorações da janela Name[ro]=Decorații pentru ferestre