From 1cea26861a6f0a2c15baa8384b4100f3ec80ec0d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Apr 2020 10:55:58 +0200 Subject: [PATCH] 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" --- generators/chm/kio-msits/ms-its.protocol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/chm/kio-msits/ms-its.protocol b/generators/chm/kio-msits/ms-its.protocol index 1686f2105..627317fa1 100644 --- 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