Commit eced9675 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 00e4e8b2
......@@ -22,6 +22,7 @@ GenericName[ca@valencia]=Terminal
GenericName[cs]=Terminál
GenericName[de]=Terminal
GenericName[es]=Terminal
GenericName[fr]=Terminal
GenericName[nl]=Terminal
GenericName[pl]=Terminal
GenericName[pt]=Terminal
......
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