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

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

@ -29,6 +29,7 @@ Comment[pt]=Um navegador Web rápido e seguro
Comment[sv]=En snabb och säker webbläsare Comment[sv]=En snabb och säker webbläsare
Comment[uk]=Проста і безпечна програма для перегляду інтернету Comment[uk]=Проста і безпечна програма для перегляду інтернету
Comment[x-test]=xxA fast and secure web browserxx Comment[x-test]=xxA fast and secure web browserxx
Comment[zh_CN]=快速、安全的网页浏览器
GenericName=Web Browser GenericName=Web Browser
GenericName[ar]=متصفّح وبّ GenericName[ar]=متصفّح وبّ
GenericName[ast]=Restolador web GenericName[ast]=Restolador web