mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-19 18:26: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
478861094a
commit
4a549b035f
@ -36,7 +36,7 @@ Name[zh_TW]=Windows
|
||||
Comment=Windows like theme based on Material design
|
||||
Comment[az]=Material dizaynında Windows oxşarı mövzu
|
||||
Comment[ca]=Tema semblant al Windows, basat en el «Material design»
|
||||
Comment[ca@valencia]=Tema semblant al Windows, basat en el «Material design»
|
||||
Comment[ca@valencia]=Tema semblant a Windows, basat en el «Material design»
|
||||
Comment[cs]=Motiv podobný Windows založený na designu Material
|
||||
Comment[da]=Windows-lignende tema baseret på Material design
|
||||
Comment[de]=Windows ähnliches Design auf der Basis des Designs Material
|
||||
|
Loading…
Reference in New Issue
Block a user