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
2020-11-05 06:31:55 +01:00
parent 2dd019d72f
commit bd0a01b235
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
org.kde.neochat.desktop
View File

@@ -3,6 +3,8 @@ Name=Neochat
Name[ca]=Neochat
Name[es]=Neochat
Name[nl]=Neochat
Name[nn]=Neochat
Name[pt]=Neochat
Name[sv]=Neochat
Name[uk]=Neochat
Name[x-test]=xxNeochatxx
@@ -22,6 +24,9 @@ Comment=Client for the Matrix protocol
Comment[ca]=Client per al protocol Matrix
Comment[es]=Cliente para el protocolo Matrix
Comment[nl]=Client voor het Matrix-protocol
Comment[nn]=Lynmeldings­klient for Matrix-protokollen
Comment[pt]=Cliente para o protocolo Matrix
Comment[sl]=Odjemalec za protokol Matrix
Comment[sv]=Klient för protokollet Matrix
Comment[uk]=Клієнт протоколу Matrix
Comment[x-test]=xxClient for the Matrix protocolxx