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"
8 years ago · abb8a9db15
parent ff6de32d3d
commit abb8a9db15
1 changed files with 1 additions and 0 deletions
--- a/linux/applications/org.kde.Falkon.desktop
+++ b/linux/applications/org.kde.Falkon.desktop
@ -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