Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +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 2018-01-20 04:54:01 +01:00
parent 10a5689b74
commit f1a3b7643e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ Name[sk]=Falkon
Name[sv]=Falkon Name[sv]=Falkon
Name[uk]=Falkon Name[uk]=Falkon
Name[x-test]=xxFalkonxx Name[x-test]=xxFalkonxx
Name[zh_CN]=Falkon
Type=Application Type=Application
Icon=qupzilla Icon=qupzilla
Categories=Network;WebBrowser; Categories=Network;WebBrowser;
@ -78,6 +79,7 @@ Name[sk]=Otvoriť novú záložku
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]=打开新标签
Exec=falkon --new-tab Exec=falkon --new-tab
[Desktop Action NewWindow] [Desktop Action NewWindow]
@ -97,6 +99,7 @@ Name[pt]=Abrir uma nova janela
Name[sv]=Öppna nytt fönster Name[sv]=Öppna nytt fönster
Name[uk]=Відкрити нове вікно Name[uk]=Відкрити нове вікно
Name[x-test]=xxOpen new windowxx Name[x-test]=xxOpen new windowxx
Name[zh_CN]=打开新窗口
Exec=falkon --new-window Exec=falkon --new-window
[Desktop Action PrivateBrowsing] [Desktop Action PrivateBrowsing]
@ -116,4 +119,5 @@ Name[pt]=Iniciar a navegação privada
Name[sv]=Starta privat webbläsning Name[sv]=Starta privat webbläsning
Name[uk]=Конфіденційний перегляд Name[uk]=Конфіденційний перегляд
Name[x-test]=xxStart private browsingxx Name[x-test]=xxStart private browsingxx
Name[zh_CN]=启动隐身浏览
Exec=falkon --private-browsing Exec=falkon --private-browsing

1
src/lib/data/breeze-fallback/index.theme
View File

@ -33,6 +33,7 @@ Comment[pt]=Equipa do Brisa
Comment[sv]=Breeze-gruppen Comment[sv]=Breeze-gruppen
Comment[uk]=Команда Breeze Comment[uk]=Команда Breeze
Comment[x-test]=xxBreeze Teamxx Comment[x-test]=xxBreeze Teamxx
Comment[zh_CN]=微风团队
DisplayDepth=32 DisplayDepth=32
Inherits=default Inherits=default
Directories=16x16,22x22,32x32 Directories=16x16,22x22,32x32