Commit 2f65fb18 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 4ec7a1fe
Pipeline #24107 passed with stage
in 16 minutes and 5 seconds
......@@ -36,7 +36,6 @@ Name[sr@latin]=Uvoznik iz mboxa
Name[sv]=Import av brevlådor
Name[tr]=MBoxAktarıcı
Name[uk]=Засіб імпортування MBox
Name[x-test]=xxMBoxImporterxx
Name[zh_CN]=MBox 导入器
Name[zh_TW]=信箱檔匯入器
Type=Application
......
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