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-01-15 06:38:23 +01:00
parent 7762f5f5ae
commit b7da732a15
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
neochat.notifyrc
View File

@@ -24,6 +24,16 @@ Name[x-test]=xxNeochatxx
Name[zh_CN]=Neochat Name[zh_CN]=Neochat
DesktopEntry=org.kde.neochat DesktopEntry=org.kde.neochat
Comment=A client for matrix, the decentralized communication protocol 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[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações
Comment[sk]=Klient pre matrix, decentralizovaný komunikačný protokol
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] [Event/message]