Commit b3f947c9 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 a09352f9
......@@ -61,6 +61,7 @@ GenericName[sk]=Editor e-mailového filtra Sieve skripty
GenericName[sv]=Editor av Sieve-skript för filtrering av e-post
GenericName[uk]=Редактор скриптів фільтрування електронної пошти
GenericName[x-test]=xxEditor for email filter Sieve scriptsxx
GenericName[zh_TW]=用來編輯郵件過濾 Sieve 文稿的編輯器
Comment=Edit IMAP Sieve filters
Comment[ar]=حرّر مرشّحات «سِڤ» IMAP
Comment[ca]=Edita els filtres «Sieve» per a IMAP
......
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