Commit 75b8a813 authored by Script Kiddy's avatar Script Kiddy

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 dce0b0f4
......@@ -35,6 +35,7 @@ Comment[mr]=स्क्रीनवरील मोजपट्टी
Comment[nl]=Liniaal op het scherm
Comment[pa]=ਆਨ-ਸਕਰੀਨ ਰੂਲਰ
Comment[pl]=Linijka na ekranie
Comment[pt]=Régua no Ecrã
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