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"

org.kde.neochat.desktop

@@ -13,6 +13,7 @@ Name[hu]=Neochat
 Name[it]=Neochat
 Name[nl]=Neochat
 Name[nn]=Neochat
+Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pt]=Neochat
 Name[pt_BR]=Neochat
 Name[sk]=Neochat
@@ -34,6 +35,7 @@ GenericName[hu]=Matrix kliens
 GenericName[it]=Client Matrix
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
+GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ
 GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
 GenericName[sk]=Matrix Client
@@ -55,6 +57,7 @@ Comment[hu]=Kliens a Matrix protokollhoz
 Comment[it]=Client per il protocollo Matrix
 Comment[nl]=Client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
+Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ
 Comment[pt]=Cliente para o protocolo Matrix
 Comment[pt_BR]=Cliente para o protocolo Matrix
 Comment[sk]=Klient protokolu Matrix