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"
6 years ago · 1cea26861a
parent b7c4f253bb
commit 1cea26861a
1 changed files with 1 additions and 1 deletions
--- a/generators/chm/kio-msits/ms-its.protocol
+++ b/generators/chm/kio-msits/ms-its.protocol
@ -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