Commit 93e8231b 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 679427da
[Desktop Entry]
Name=Eye on Screen
Name[ca]=Ull a la pantalla
Name[cs]=Oko na obrazovce
Name[es]=Ojo a la pantalla
Name[et]=Eye on Screen
Name[eu]=Begirada pantailan
......@@ -43,6 +43,7 @@ Name[zh_TW]=視窗光圈
Comment=Move windows into screen corners
Comment[ca]=Mou les finestres cap a les cantonades de la pantalla
Comment[cs]=Přesunout okna do rohů obrazovky
Comment[es]=Mover las ventanas a las esquinas de la pantalla
Comment[et]=Akende liigutamine ekraani nurkadesse
Comment[eu]=Eraman leihoak pantailako bazterretara
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