Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 19:12:11 +01:00
Code Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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:
l10n daemon script 2021-08-12 01:13:11 +00:00
parent 1c2c8ab982
commit 4c0147106c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/applications/org.kde.falkon.desktop
View File

@ -105,7 +105,7 @@ GenericName[sl]=Spletni brskalnik
GenericName[sv]=Webbläsare GenericName[sv]=Webbläsare
GenericName[uk]=Переглядач інтернету GenericName[uk]=Переглядач інтернету
GenericName[x-test]=xxWeb Browserxx GenericName[x-test]=xxWeb Browserxx
GenericName[zh_CN]=网页浏览器 GenericName[zh_CN]=网络浏览器
GenericName[zh_TW]=網路瀏覽器 GenericName[zh_TW]=網路瀏覽器
Exec=falkon %u Exec=falkon %u
StartupWMClass=Falkon StartupWMClass=Falkon
@ -147,7 +147,7 @@ Name[sl]=Odpri novi zavihek
Name[sv]=Öppna ny flik Name[sv]=Öppna ny flik
Name[uk]=Відкрити нову вкладку Name[uk]=Відкрити нову вкладку
Name[x-test]=xxOpen new tabxx Name[x-test]=xxOpen new tabxx
Name[zh_CN]=打开新标签 Name[zh_CN]=打开新书签
Name[zh_TW]=開啟新分頁 Name[zh_TW]=開啟新分頁
Icon=tab-new Icon=tab-new
Exec=falkon --new-tab Exec=falkon --new-tab