Commit db3debeb 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 a5fc055d
......@@ -15,7 +15,7 @@
"Description[it]": "Supporto completo per i formati di archivi zip e 7z",
"Description[ko]": "zip 및 7z 압축 형식 지원",
"Description[nl]": "Volledige ondersteuning voor de zip- en 7z-archiefformaten",
"Description[nn]": "Full støtte for arkivtformata ZIP og 7z",
"Description[nn]": "Full støtte for arkivformata ZIP og 7z",
"Description[pl]": "Pełna obsługa dla archiwów zip oraz 7z",
"Description[pt]": "Suporte total para os formatos de pacotes ZIP e 7z",
"Description[ru]": "Полная поддержка архивов ZIP и 7z",
......
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