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

@@ -1,6 +1,12 @@
 [Global]
 IconName=neochat
 Name=Neochat
+Name[ca]=Neochat
+Name[es]=Neochat
+Name[nl]=Neochat
+Name[sv]=Neochat
+Name[uk]=Neochat
+Name[x-test]=xxNeochatxx
 DesktopEntry=org.kde.neochat
 Comment=IM client for the Matrix protocol
 Comment[ca]=Client de MI per al protocol Matrix
@@ -17,5 +23,17 @@ Comment[x-test]=xxIM client for the Matrix protocolxx
 
 [Event/message]
 Name=New message
+Name[ca]=Missatge nou
+Name[es]=Nuevo mensaje
+Name[nl]=Nieuw bericht
+Name[sv]=Nytt meddelande
+Name[uk]=Нове повідомлення
+Name[x-test]=xxNew messagexx
 Comment=There is a new message
+Comment[ca]=Hi ha un missatge nou
+Comment[es]=Hay un mensaje nuevo
+Comment[nl]=Er is een nieuw bericht
+Comment[sv]=Det finns ett nytt meddelande
+Comment[uk]=Надійшло нове повідомлення
+Comment[x-test]=xxThere is a new messagexx
 Action=Popup

org.kde.neochat.desktop

@@ -1,5 +1,11 @@
 [Desktop Entry]
 Name=Neochat
+Name[ca]=Neochat
+Name[es]=Neochat
+Name[nl]=Neochat
+Name[sv]=Neochat
+Name[uk]=Neochat
+Name[x-test]=xxNeochatxx
 GenericName=Matrix Client
 GenericName[ca]=Client del Matrix
 GenericName[ca@valencia]=Client del Matrix
@@ -13,6 +19,12 @@ GenericName[sv]=Matrix-klient
 GenericName[uk]=Клієнт Matrix
 GenericName[x-test]=xxMatrix Clientxx
 Comment=Client for the Matrix protocol
+Comment[ca]=Client per al protocol Matrix
+Comment[es]=Cliente para el protocolo Matrix
+Comment[nl]=Client voor het Matrix-protocol
+Comment[sv]=Klient för protokollet Matrix
+Comment[uk]=Клієнт протоколу Matrix
+Comment[x-test]=xxClient for the Matrix protocolxx
 Exec=neochat
 Terminal=false
 Icon=neochat