Commit a97b6a6b 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 bb63278c
......@@ -3,6 +3,7 @@ IconName=kup
Name=Kup Backup System
Name[ca]=Sistema per a còpia de seguretat Kup
Name[ca@valencia]=Sistema per a còpia de seguretat Kup
Name[de]=Kup-Sicherungssystem
Name[es]=Sistema de copias de seguridad Kup
Name[fr]=Système de sauvegarde Kup
Name[it]=Sistema di copie di sicurezza Kup
......
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