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
4c0147106c
commit
217270bcdf
@ -105,7 +105,7 @@ GenericName[sl]=Spletni brskalnik
|
||||
GenericName[sv]=Webbläsare
|
||||
GenericName[uk]=Переглядач інтернету
|
||||
GenericName[x-test]=xxWeb Browserxx
|
||||
GenericName[zh_CN]=网络浏览器
|
||||
GenericName[zh_CN]=网页浏览器
|
||||
GenericName[zh_TW]=網路瀏覽器
|
||||
Exec=falkon %u
|
||||
StartupWMClass=Falkon
|
||||
@ -147,7 +147,7 @@ Name[sl]=Odpri novi zavihek
|
||||
Name[sv]=Öppna ny flik
|
||||
Name[uk]=Відкрити нову вкладку
|
||||
Name[x-test]=xxOpen new tabxx
|
||||
Name[zh_CN]=打开新书签
|
||||
Name[zh_CN]=新建标签页
|
||||
Name[zh_TW]=開啟新分頁
|
||||
Icon=tab-new
|
||||
Exec=falkon --new-tab
|
||||
|
Loading…
Reference in New Issue
Block a user