ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
This commit is contained in:
l10n daemon script
2021-02-19 17:00:04 +01:00
parent df1835de2d
commit 16f661f6ae
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
neochat.notifyrc
View File

@@ -25,6 +25,14 @@ Name[x-test]=xxNeochatxx
Name[zh_CN]=Neochat
DesktopEntry=org.kde.neochat
Comment=A client for matrix, the decentralized communication protocol
Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat
Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
Comment[fr]=Un client pour « Matrix », le protocole décentralisé de communications.
Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado
Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet
Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними
Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx
[Event/message]