Commit c9500484 authored by Script Kiddy's avatar Script Kiddy

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"
parent 8022ae61
......@@ -21,7 +21,6 @@ Name[pt_BR]=Angelfish
Name[ru]=Angelfish
Name[sv]=Angelfish
Name[uk]=Angelfish
Name[x-test]=xxAngelfishxx
Name[zh_TW]=Angelfish
Comment=Mobile web browser
Comment[ca]=Navegador web mòbil
......@@ -49,7 +48,6 @@ Comment[ru]=Веб-браузер для мобильных устройств
Comment[sk]=Mobilný webový prehliadač
Comment[sv]=Mobilwebbläsare
Comment[uk]=Браузер для мобільних пристроїв
Comment[x-test]=xxMobile web browserxx
Comment[zh_TW]=行動網頁瀏覽器
GenericName=Web Browser
GenericName[ca]=Navegador web
......@@ -77,7 +75,6 @@ GenericName[ru]=Веб-браузер
GenericName[sk]=Webový prehliadač
GenericName[sv]=Webbläsare
GenericName[uk]=Браузер
GenericName[x-test]=xxWeb Browserxx
GenericName[zh_TW]=網頁瀏覽器
Encoding=UTF-8
Icon=org.kde.mobile.angelfish
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment