mirror of
https://invent.kde.org/network/falkon.git
synced 2024-09-21 09:42:10 +02: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
aca4f6c0a9
commit
45658dc521
|
@ -17,7 +17,7 @@ Name[pt]=Windows
|
|||
Name[sv]=Windows
|
||||
Name[uk]=Windows
|
||||
Name[x-test]=xxWindowsxx
|
||||
Name[zh_CN]=窗口
|
||||
Name[zh_CN]=Windows
|
||||
Comment=Windows like theme based on Material design
|
||||
Comment[ca]=Tema semblant al Windows basat en el «Material design»
|
||||
Comment[ca@valencia]=Tema semblant al Windows basat en el «Material design»
|
||||
|
|
Loading…
Reference in New Issue
Block a user