Commit 63fd5d6a authored by Script Kiddy's avatar Script Kiddy
Browse files

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 c1ed1bfd
......@@ -133,7 +133,7 @@ Comment[fa]=کلیک
Comment[fi]=Napsauta
Comment[fr]=Clic
Comment[ga]=Cliceáil
Comment[gl]=Premer unha tecla ou botón
Comment[gl]=Clic
Comment[he]=לחיצה
Comment[hne]=किलिक
Comment[hu]=Kattintás
......
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