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-12 06:24:28 +01:00
parent f07a0b77d2
commit 04020e7021
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
org.kde.neochat.desktop
View File

@@ -4,6 +4,7 @@ Name[ca]=Neochat
Name[es]=Neochat
Name[fr]=Neochat
Name[hu]=Neochat
Name[it]=Neochat
Name[nl]=Neochat
Name[nn]=Neochat
Name[pt]=Neochat
@@ -18,6 +19,7 @@ GenericName[ca@valencia]=Client del Matrix
GenericName[es]=Cliente para Matrix
GenericName[fr]=Client « Matrix »
GenericName[hu]=Matrix kliens
GenericName[it]=Client Matrix
GenericName[nl]=Matrix-client
GenericName[nn]=Matrix-klient
GenericName[pt]=Cliente de Matrix
@@ -31,6 +33,7 @@ Comment[ca]=Client per al protocol Matrix
Comment[es]=Cliente para el protocolo Matrix
Comment[fr]=Client pour le protocole « Matrix »
Comment[hu]=Kliens a Matrix protokollhoz
Comment[it]=Client per il protocollo Matrix
Comment[nl]=Client voor het Matrix-protocol
Comment[nn]=Lynmeldings­klient for Matrix-protokollen
Comment[pt]=Cliente para o protocolo Matrix