Commit ec385c27 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 8c588f2f
[Desktop Entry]
Name=Move to directory
Name[ar]=انقل إلى الدّليل
Name[ca]=Mou al directori
Name[ca@valencia]=Mou al directori
Name[de]=In Ordner schieben
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