mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +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
a57094bfc1
commit
d0d552d634
|
@ -34,7 +34,7 @@ Name[sv]=Falkon
|
||||||
Name[tr]=Falkon
|
Name[tr]=Falkon
|
||||||
Name[uk]=Falkon
|
Name[uk]=Falkon
|
||||||
Name[x-test]=xxFalkonxx
|
Name[x-test]=xxFalkonxx
|
||||||
Name[zh_CN]=Falkon
|
Name[zh_CN]=Falkon 浏览器
|
||||||
Name[zh_TW]=Falkon
|
Name[zh_TW]=Falkon
|
||||||
Type=Application
|
Type=Application
|
||||||
Icon=falkon
|
Icon=falkon
|
||||||
|
|
Loading…
Reference in New Issue
Block a user