Commit 5f8a7768 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 2c66e1f6
......@@ -4,6 +4,7 @@ Name[ca]=Ull a la pantalla
Name[et]=Eye on Screen
Name[nl]=Oog op scherm
Name[pt]=Olho no Ecrã
Name[pt_BR]=Olho na tela
Name[sv]=Ögat på skärmen
Name[uk]=Око на екрані
Name[x-test]=xxEye on Screenxx
......@@ -14,6 +15,7 @@ Comment[ca]=Enganxa les finestres a l'escriptori
Comment[et]=Akende imemine töölauale
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
Comment[sv]=Sug in fönster i skrivbordet
Comment[uk]=Засмоктування вікон до стільниці
Comment[x-test]=xxSuck windows into the desktopxx
......@@ -46,6 +46,7 @@ Comment[ca]=Mou les finestres cap a les cantonades de la pantalla
Comment[et]=Akende liigutamine ekraani nurkadesse
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
Comment[sv]=Flytta fönster till skärmhörn
Comment[uk]=Пересування вікон до кутів екрана
Comment[x-test]=xxMove windows into screen cornersxx
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