Commit 06168723 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 5f8a7768
......@@ -2,6 +2,7 @@
Name=Eye on Screen
Name[ca]=Ull a la pantalla
Name[et]=Eye on Screen
Name[eu]=Begirada pantailan
Name[nl]=Oog op scherm
Name[pt]=Olho no Ecrã
Name[pt_BR]=Olho na tela
......@@ -13,6 +14,7 @@ Icon=preferences-system-windows-effect-eyeonscreen
Comment=Suck windows into the desktop
Comment[ca]=Enganxa les finestres a l'escriptori
Comment[et]=Akende imemine töölauale
Comment[eu]=Mahaigainak leihoak xurgatu
Comment[nl]=Zuig vensters in het bureaublad
Comment[pt]=Aspira as janelas para o ecrã
Comment[pt_BR]=Suga as janelas para a área de trabalho
......
......@@ -44,6 +44,7 @@ Icon=preferences-system-windows-effect-windowaperture
Comment=Move windows into screen corners
Comment[ca]=Mou les finestres cap a les cantonades de la pantalla
Comment[et]=Akende liigutamine ekraani nurkadesse
Comment[eu]=Eraman leihoak pantailako bazterretara
Comment[nl]=Verplaats vensters in de hoeken van het scherm
Comment[pt]=Mover as janelas para os cantos do ecrã
Comment[pt_BR]=Move as janelas para os cantos da tela
......
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