Commit 5666bac8 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 199aaf20
......@@ -3,7 +3,7 @@ Icon=template_web_design
Name=Web Design [ 2160x1440 , 72ppi RGB , 8bit ]
Name[bs]=Web dizajn [ 2160x1440 , 72ppi RGB , 8bit ]
Name[ca]=Disseny web [ 2160x1440 / 72ppi RGB / 8bit ]
Name[ca@valencia]=Disseny Web [ 2160x1440 / 72ppi RGB / 8bit ]
Name[ca@valencia]=Disseny web [ 2160x1440 / 72ppi RGB / 8bit ]
Name[da]=Webdesign [ 2160x1440 , 72ppi RGB , 8bit ]
Name[de]=Web-Design [ 2160x1440 , 72ppi RGB , 8bit ]
Name[en_GB]=Web Design [ 2160x1440 , 72ppi RGB , 8bit ]
......
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