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

2
org.kde.neochat.desktop
View File

@@ -1,6 +1,7 @@
[Desktop Entry]
Name=Neochat
Name[ca]=Neochat
Name[ca@valencia]=Neochat
Name[en_GB]=Neochat
Name[es]=Neochat
Name[fr]=Neochat
@@ -32,6 +33,7 @@ GenericName[uk]=Клієнт Matrix
GenericName[x-test]=xxMatrix Clientxx
Comment=Client for the Matrix protocol
Comment[ca]=Client per al protocol Matrix
Comment[ca@valencia]=Client per al protocol Matrix
Comment[en_GB]=Client for the Matrix protocol
Comment[es]=Cliente para el protocolo Matrix
Comment[fr]=Client pour le protocole « Matrix »