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"

neochat.notifyrc

@@ -4,6 +4,7 @@ Name=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
 Name[da]=Neochat
+Name[de]=Neochat
 Name[en_GB]=Neochat
 Name[es]=Neochat
 Name[eu]=Neochat
@@ -23,6 +24,7 @@ DesktopEntry=org.kde.neochat
 Comment=IM client for the Matrix protocol
 Comment[ca]=Client de MI per al protocol Matrix
 Comment[ca@valencia]=Client de MI per al protocol Matrix
+Comment[de]=IM-Programm für das Matrix-Protokoll
 Comment[en_GB]=IM client for the Matrix protocol
 Comment[es]=Cliente de MI para el protocolo Matrix
 Comment[eu]=Matrix protokolorako bat-bateko mezularitza bezeroa
@@ -43,6 +45,7 @@ Comment[x-test]=xxIM client for the Matrix protocolxx
 Name=New message
 Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
+Name[de]=Neue Nachricht
 Name[en_GB]=New message
 Name[es]=Nuevo mensaje
 Name[eu]=Mezu berria
@@ -61,6 +64,7 @@ Name[x-test]=xxNew messagexx
 Comment=There is a new message
 Comment[ca]=Hi ha un missatge nou
 Comment[ca@valencia]=Hi ha un missatge nou
+Comment[de]=Es ist eine neue Nachricht vorhanden
 Comment[en_GB]=There is a new message
 Comment[es]=Hay un mensaje nuevo
 Comment[eu]=Mezu berri bat dago