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-10-27 06:19:17 +01:00
parent 1876d9148b
commit 3c5cd095b8
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
linux/org.eu.encom.spectral.desktop
View File

@@ -3,18 +3,21 @@ Name=Spectral
Name[ca]=Spectral Name[ca]=Spectral
Name[ca@valencia]=Spectral Name[ca@valencia]=Spectral
Name[nl]=Spectral Name[nl]=Spectral
Name[sv]=Spectral
Name[uk]=Spectral Name[uk]=Spectral
Name[x-test]=xxSpectralxx Name[x-test]=xxSpectralxx
GenericName=Matrix Client GenericName=Matrix Client
GenericName[ca]=Client del Matrix GenericName[ca]=Client del Matrix
GenericName[ca@valencia]=Client del Matrix GenericName[ca@valencia]=Client del Matrix
GenericName[nl]=Matrix-client GenericName[nl]=Matrix-client
GenericName[sv]=Matrix-klient
GenericName[uk]=Клієнт Matrix GenericName[uk]=Клієнт Matrix
GenericName[x-test]=xxMatrix Clientxx GenericName[x-test]=xxMatrix Clientxx
Comment=IM client for the Matrix protocol Comment=IM client for the Matrix protocol
Comment[ca]=Client de MI per al protocol Matrix Comment[ca]=Client de MI per al protocol Matrix
Comment[ca@valencia]=Client de MI per al protocol Matrix Comment[ca@valencia]=Client de MI per al protocol Matrix
Comment[nl]=IM-client voor het Matrix-protocol Comment[nl]=IM-client voor het Matrix-protocol
Comment[sv]=Direktmeddelandeklient för protokollet Matrix
Comment[uk]=Клієнт служби миттєвого обміну повідомленнями для протоколу Matrix Comment[uk]=Клієнт служби миттєвого обміну повідомленнями для протоколу Matrix
Comment[x-test]=xxIM client for the Matrix protocolxx Comment[x-test]=xxIM client for the Matrix protocolxx
Exec=spectral Exec=spectral