Commit 1cea2686 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 b7c4f253
......@@ -35,7 +35,7 @@ Description[it]=Un kioslave per visualizzare i file della guida di windows
Description[ja]=WinHelp ファイルを表示するための kioslave
Description[kk]=WinHelp файлдарын оқитын kioslave
Description[km]=kioslave សម្រាប់​បង្ហាញ​ឯកសារ WinHelp
Description[ko]=WinHelp 파일을 표시하기 위한 KIO 슬레이브
Description[ko]=WinHelp 파일을 표시하 KIO 슬레이브
Description[ku]=Kioslave ji bo nîşandana pelên WinHelp
Description[lt]=Pagalbinė programa WinHelp failų atvaizdavimui
Description[lv]=KIO apstrādātājs WinHelp failu attēlošanai
......
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