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"
2021-01-23 06:40:44 +01:00
parent 0f043e36c4
commit 80b6d80c7d
1 changed files with 1 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -33,6 +33,7 @@ Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
 Comment[nn]=Klient for Matrix, den desentraliserte lynmeldingsprotokollen.
 Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações
 Comment[sk]=Klient pre matrix, decentralizovaný komunikačný protokol
+Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix
 Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet
 Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними
 Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx