Commit e16334b3 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 e327cce4
......@@ -12,6 +12,7 @@ Name[bg]=Показване на боята
Name[bn_IN]=Paint প্রদর্শন করা হবে
Name[ca]=Mostra el pintat
Name[ca@valencia]=Mostra el pintat
Name[cs]=Zobrazit kreslení
Name[csb]=Pòkôżë Paint
Name[da]=Vis tegning
Name[de]=Zeichnungsbereiche hervorheben
......
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