Commit e0db4a21 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 9e641d41
[Desktop Entry]
Name=Disks & Devices
Name[ast]=Discos y preseos
Name[az]=Disklər və Qurğular
Name[ca]=Discs i dispositius
Name[da]=Diske og enheder
......
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