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:
l10n daemon script
2021-03-17 12:07:25 +01:00
parent aad95d2bc3
commit 70dba75d31
2 changed files with 3 additions and 0 deletions

View File

@@ -3,6 +3,7 @@ IconName=org.kde.neochat
Name=Neochat
Name[ca]=Neochat
Name[ca@valencia]=Neochat
Name[cs]=Neochat
Name[da]=Neochat
Name[de]=Neochat
Name[en_GB]=Neochat
@@ -49,6 +50,7 @@ Comment[zh_CN]=分布式通讯协议 Matrix 的客户端
Name=New message
Name[ca]=Missatge nou
Name[ca@valencia]=Missatge nou
Name[cs]=Nová zpráva
Name[de]=Neue Nachricht
Name[en_GB]=New message
Name[es]=Nuevo mensaje

View File

@@ -2,6 +2,7 @@
Name=Neochat
Name[ca]=Neochat
Name[ca@valencia]=Neochat
Name[cs]=Neochat
Name[da]=Neochat
Name[de]=Neochat
Name[en_GB]=Neochat