Commit 66e2d31c 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 58f55cac
......@@ -77,7 +77,7 @@ Comment=A GnuPG frontend
Comment[ar]=واجهة لـ GnuPG
Comment[bg]=Клиент за GnuPG
Comment[bs]=Okruženje za GnuPG
Comment[ca]=Un frontal gràfic pel GnuPG
Comment[ca]=Un frontal gràfic per al GnuPG
Comment[ca@valencia]=Un frontal gràfic pel GnuPG
Comment[cs]=Rozhraní pro GnuPG
Comment[cy]=Blaen-wyneb GnuPG
......
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