From 21647201c2b98bfd759ccfa8d724d749c7242fe9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 25 Sep 2020 06:16:02 +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 96180f54f..1836dfcb0 100644 --- a/generators/chm/kio-msits/ms-its.protocol +++ b/generators/chm/kio-msits/ms-its.protocol @@ -62,7 +62,7 @@ Description[sv]=En I/O-slav för att visa WinHelp-filer Description[th]=ส่วนเสริม kioslave สำหรับแสดงแฟ้ม WinHelp Description[tr]=WinHelp dosyalarını göstermek için bir kioslave Description[uk]=Підлеглий засіб введення-виведення для перегляду файлів WinHelp -Description[vi]=Dịch vụ trợ giúp đọc tập tin CHM của Windows +Description[vi]=Dịch vụ trợ giúp đọc tệp CHM của Windows Description[x-test]=xxA kioslave for displaying WinHelp filesxx Description[zh_CN]=用以显示 WinHelp 文件的 kioslave Description[zh_TW]=顯示 WinHelp 檔的 kioslave