mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +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
ff6de32d3d
commit
abb8a9db15
|
@ -29,6 +29,7 @@ Comment[pt]=Um navegador Web rápido e seguro
|
|||
Comment[sv]=En snabb och säker webbläsare
|
||||
Comment[uk]=Проста і безпечна програма для перегляду інтернету
|
||||
Comment[x-test]=xxA fast and secure web browserxx
|
||||
Comment[zh_CN]=快速、安全的网页浏览器
|
||||
GenericName=Web Browser
|
||||
GenericName[ar]=متصفّح وبّ
|
||||
GenericName[ast]=Restolador web
|
||||
|
|
Loading…
Reference in New Issue
Block a user