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-04 06:30:04 +01:00
parent 5cf771de41
commit 36a92be7bd
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
org.kde.neochat.desktop
View File

@@ -1,5 +1,11 @@
[Desktop Entry]
Name=Neochat
Name[ca]=Neochat
Name[es]=Neochat
Name[nl]=Neochat
Name[sv]=Neochat
Name[uk]=Neochat
Name[x-test]=xxNeochatxx
GenericName=Matrix Client
GenericName[ca]=Client del Matrix
GenericName[ca@valencia]=Client del Matrix
@@ -13,6 +19,12 @@ GenericName[sv]=Matrix-klient
GenericName[uk]=Клієнт Matrix
GenericName[x-test]=xxMatrix Clientxx
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[sv]=Klient för protokollet Matrix
Comment[uk]=Клієнт протоколу Matrix
Comment[x-test]=xxClient for the Matrix protocolxx
Exec=neochat
Terminal=false
Icon=neochat