SVN_SILENT made messages (.desktop file) - always resolve ours
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:
@@ -1,6 +1,17 @@
|
||||
[Desktop Entry]
|
||||
Name=Neochat
|
||||
GenericName=Matrix Client
|
||||
GenericName[ca]=Client del Matrix
|
||||
GenericName[ca@valencia]=Client del Matrix
|
||||
GenericName[es]=Cliente para Matrix
|
||||
GenericName[fr]=Client « Matrix »
|
||||
GenericName[nl]=Matrix-client
|
||||
GenericName[nn]=Matrix-klient
|
||||
GenericName[pt]=Cliente de Matrix
|
||||
GenericName[sl]=Odjemalec Matrix
|
||||
GenericName[sv]=Matrix-klient
|
||||
GenericName[uk]=Клієнт Matrix
|
||||
GenericName[x-test]=xxMatrix Clientxx
|
||||
Comment=Client for the Matrix protocol
|
||||
Exec=neochat
|
||||
Terminal=false
|
||||
|
||||
Reference in New Issue
Block a user