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-06-20 07:44:39 +02:00
parent 4c83ba3d6c
commit e53e4d1b07
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/GreaseMonkey/metadata.desktop
View File

@ -18,7 +18,7 @@ Name[pt]=GreaseMonkey
Name[sv]=GreaseMonkey
Name[uk]=GreaseMonkey
Name[x-test]=xxGreaseMonkeyxx
Name[zh_CN]=GreaseMonkey
Name[zh_CN]=油猴
Comment=Provides support for userscripts
Comment[ca]=Proporciona suport per scripts d'usuari
Comment[ca@valencia]=Proporciona suport per scripts d'usuari

4
src/plugins/VerticalTabs/metadata.desktop
View File

@ -18,7 +18,7 @@ Name[pt]=Páginas Verticais
Name[sv]=Vertikala flikar
Name[uk]=Вертикальні вкладки
Name[x-test]=xxVertical Tabsxx
Name[zh_CN]=垂直选项卡
Name[zh_CN]=垂直标签页
Comment=Adds ability to show tabs in sidebar
Comment[ca]=Afegeix la possibilitat de mostrar les pestanyes a la barra lateral
Comment[ca@valencia]=Afig la possibilitat de mostrar les pestanyes a la barra lateral
@ -37,7 +37,7 @@ Comment[pt]=Adiciona a capacidade de mostrar as páginas na barra lateral
Comment[sv]=Lägger till möjlighet att visa flikar i sidorader
Comment[uk]=Додає можливість показу вкладок на бічній панелі
Comment[x-test]=xxAdds ability to show tabs in sidebarxx
Comment[zh_CN]=添加在边栏中显示选项卡的功能
Comment[zh_CN]=添加在边栏中显示标签页的功能
Icon=:verticaltabs/data/icon.svg
Type=Service