Commit d2b3da7c 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 fabf2084
......@@ -152,6 +152,7 @@ Comment[de]=Ein Programm zur Vergrößerung von Bildschirmausschnitten
Comment[el]=Εργαλείο μεγέθυνσης οθόνης
Comment[en_GB]=A screen magnification tool
Comment[es]=Una herramienta para aumentar la pantalla
Comment[et]=Ekraani suurendamise tööriist
Comment[eu]=Pantaila-irudiaren zatiak handiagotzeko tresna bat
Comment[fr]=Un outil loupe d'écran
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