Commit dfac582d 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 a5c0a519
......@@ -29,7 +29,7 @@ Name[hi]=शॉर्टकट व संकेत
Name[hr]=Prečaci i kretnje mišem
Name[hu]=Gyorsbillentyűk és mozdulatok
Name[ia]=Vias breve e gestures
Name[id]=Pintasan dan Gerak-gerik
Name[id]=Pintasan dan Gestur
Name[is]=Flýtilyklar og bendingar
Name[it]=Scorciatoie e gesti
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