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-03-01 09:49:45 +01:00
parent 2d75c34b17
commit a5570838ca
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

@@ -26,6 +26,7 @@ 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[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat
Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat
Comment[en_GB]=A client for matrix, the decentralised communication protocol Comment[en_GB]=A client for matrix, the decentralised communication protocol
Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
Comment[fi]=Hajautetun Matrix-viestintäyhteyskäytännön asiakasohjelma Comment[fi]=Hajautetun Matrix-viestintäyhteyskäytännön asiakasohjelma