Commit 21647201 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 1f187211
Pipeline #35505 skipped
......@@ -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
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