mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 04:36:34 +01:00
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:
parent
cc6fc7a4fa
commit
501678d0d8
@ -32,8 +32,8 @@ Name[zh_CN]=微风
|
||||
Name[zh_TW]=Breeze
|
||||
Comment=Breeze Team
|
||||
Comment[ar]=فريق نسيم
|
||||
Comment[ca]=L'equip «Breeze»
|
||||
Comment[ca@valencia]=L'equip «Breeze»
|
||||
Comment[ca]=L'equip del «Breeze»
|
||||
Comment[ca@valencia]=L'equip del «Breeze»
|
||||
Comment[cs]=Team Breeze
|
||||
Comment[da]=Breeze-tema
|
||||
Comment[de]=Breeze-Team
|
||||
|
Loading…
Reference in New Issue
Block a user