From 5cba424dc0d11a4cc59ace6162f14168dce295d9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 19 Mar 2019 05:59:50 +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/kwineffects/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwineffects/package/metadata.desktop b/kcmkwin/kwineffects/package/metadata.desktop index 5c961e278c..747c3f6d4e 100644 --- a/kcmkwin/kwineffects/package/metadata.desktop +++ b/kcmkwin/kwineffects/package/metadata.desktop @@ -76,7 +76,7 @@ Comment[nn]=Skrivebords­effektar Comment[pa]=ਡੈਸਕਟਾਪ ਪਰਭਾਵ Comment[pl]=Efekty pulpitu Comment[pt]=Efeitos do Ecrã -Comment[pt_BR]=Efeitos da Área de Trabalho +Comment[pt_BR]=Efeitos da área de trabalho Comment[ro]=Efecte de birou Comment[ru]=Настройка эффектов рабочего стола Comment[sk]=Efekty plochy