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:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user