From 9e23d20f8fced11b911b94869918e7a21937235d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 31 Oct 2016 12:00:16 +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"
---
 effects/resize/resize_config.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/effects/resize/resize_config.desktop b/effects/resize/resize_config.desktop
index 687d23c65f..7b6badcb8a 100644
--- a/effects/resize/resize_config.desktop
+++ b/effects/resize/resize_config.desktop
@@ -49,7 +49,7 @@ Name[mr]=चौकट आकार बदल
 Name[nb]=Endre størrelse på vinduet
 Name[nds]=Finstergrött ännern
 Name[nl]=Afmeting venster aanpassen
-Name[nn]=Endra storleik på vindauget
+Name[nn]=Skaler vindauge
 Name[pa]=ਵਿੰਡੋ ਮੁੜ-ਆਕਾਰ
 Name[pl]=Zmiana rozmiaru okien
 Name[pt]=Dimensionar a Janela