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-30 01:14:29 +00:00
parent 308af0d3cd
commit bb3f4297b0
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neochat.notifyrc
View File

@@ -5,6 +5,7 @@ Name[az]=NeoChat
Name[ca]=NeoChat Name[ca]=NeoChat
Name[ca@valencia]=NeoChat Name[ca@valencia]=NeoChat
Name[cs]=NeoChat Name[cs]=NeoChat
Name[de]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat
@@ -21,6 +22,7 @@ Comment=A client for matrix, the decentralized communication protocol
Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu
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[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat
Comment[de]=Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll
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[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat

1
org.kde.neochat.desktop
View File

@@ -4,6 +4,7 @@ Name[az]=NeoChat
Name[ca]=NeoChat Name[ca]=NeoChat
Name[ca@valencia]=NeoChat Name[ca@valencia]=NeoChat
Name[cs]=NeoChat Name[cs]=NeoChat
Name[de]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat