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"

src/org.kde.partitionmanager.desktop

@@ -31,7 +31,7 @@ Name[ms]=Pengurus Partisyen KDE
 Name[nb]=KDE partisjonshåndtering
 Name[nds]=KDE-Partitschonenpleger
 Name[nl]=KDE Partitiebeheerder
-Name[nn]=KDE-partisjonshandtering
+Name[nn]=Partisjonshandsaming for KDE
 Name[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ
 Name[pl]=Zarządzanie partycjami
 Name[pt]=Gestor de Partições do KDE
@@ -176,6 +176,7 @@ Keywords[it]=partizione;disco;
 Keywords[ko]=partition;disk;파티션;디스크;
 Keywords[lt]=skaidinys;diskas;
 Keywords[nl]=partitie;schijf
+Keywords[nn]=partisjon;disk;
 Keywords[pl]=partycja;dysk;
 Keywords[pt]=partição;disco;
 Keywords[sl]=razdelek;particija;disk;