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-21 06:57:29 +01:00
parent f7cbb876f0
commit cec47b40cc
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
neochat.notifyrc
View File

@@ -28,6 +28,7 @@ Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitza
Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat
Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato
Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen. Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações