Commit 51bf12e6 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 4e10c990
......@@ -40,7 +40,7 @@ Name[hne]=जूम
Name[hr]=Povećanje
Name[hu]=Kinagyítás
Name[ia]=Zoom
Name[id]=Zoom
Name[id]=Zum
Name[is]=Aðdráttur
Name[it]=Ingrandimento
Name[ja]=ズーム
......
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