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
d1afb50055
commit
22f11a2e19
|
@ -114,7 +114,7 @@ GenericName[ru]=Веб-браузер
|
|||
GenericName[sk]=Webový prehliadač
|
||||
GenericName[sl]=Spletni brskalnik
|
||||
GenericName[sv]=Webbläsare
|
||||
GenericName[tr]=Web Tarayıcı
|
||||
GenericName[tr]=Web Tarayıcısı
|
||||
GenericName[uk]=Переглядач інтернету
|
||||
GenericName[x-test]=xxWeb Browserxx
|
||||
GenericName[zh_CN]=网页浏览器
|
||||
|
|
Loading…
Reference in New Issue
Block a user