From 0123a53d8af7ee4f8ecf3a0bb171513645fd1dc5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Feb 2019 06:00:12 +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" --- components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc b/components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc index e871f101c..400229d39 100644 --- a/components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc +++ b/components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc @@ -17,7 +17,7 @@ Name[nn]=Tillegg for bakgrunnsbilete Name[pa]=ਵਾਲਪੇਪਰ ਪਲੱਗਇਨਾਂ Name[pl]=Wtyczki tapety Name[pt]='Plugins' de Papel de Parede -Name[pt_BR]=Plug-ins de papéis de parede +Name[pt_BR]=Plugins de papéis de parede Name[ru]=Подключаемые модули, предоставляющие обои рабочего стола Name[sk]=Doplnky tapety Name[sv]=Insticksprogram för skrivbordsunderlägg