Commit b5392802 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 5d580b9f
[Desktop Entry]
Name=Eye on Screen
Name[ca]=Ull a la pantalla
Name[es]=Ojo a la pantalla
Name[et]=Eye on Screen
Name[eu]=Begirada pantailan
Name[id]=Mata di Layar
......@@ -16,6 +17,7 @@ Name[zh_TW]=螢幕之眼
Comment=Suck windows into the desktop
Comment[ca]=Enganxa les finestres a l'escriptori
Comment[es]=Aspirar las ventanas en el escritorio
Comment[et]=Akende imemine töölauale
Comment[eu]=Mahaigainak leihoak xurgatu
Comment[id]=Sedot window ke desktop
......@@ -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[es]=Mover las ventanas a las esquinas de la pantalla
Comment[et]=Akende liigutamine ekraani nurkadesse
Comment[eu]=Eraman leihoak pantailako bazterretara
Comment[id]=Pindahkan window ke sudut layar
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