Commit c2f6e5d6 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 94b2b2a2
......@@ -130,7 +130,7 @@ Name[lt]=Kompaktiškas
Name[nb]=Kompakt
Name[nl]=Compact
Name[nn]=Kompakt
Name[pa]=ਸੰਖਿਪਤ
Name[pa]=ਸੰਖੇਪ
Name[pl]=Kompaktowy
Name[pt]=Compacta
Name[pt_BR]=Compacto
......
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