Commit a9b1e7d7 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 453d4e2d
......@@ -81,6 +81,7 @@ Name[he]=התה מוכן
Name[hne]=चाय बन गे हे
Name[hr]=Čaj je spreman
Name[hu]=Kész a tea!
Name[ia]=The es preste
Name[is]=Teið er tilbúið
Name[it]=Il tè è pronto
Name[ja]=お茶の用意ができました
......@@ -148,6 +149,7 @@ Comment[he]=התה מוכן
Comment[hne]=चाय बन गे हे
Comment[hr]=Čaj je spreman
Comment[hu]=Kész a tea!
Comment[ia]=The es preste
Comment[is]=Teið er tilbúið
Comment[it]=Il tè è pronto
Comment[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