Commit ede53f73 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 c66cde73
......@@ -9,6 +9,7 @@ Name[it]=Eye On Screen
Name[ko]=화면 위의 눈
Name[lt]=Akis ekrane
Name[nl]=Oog op scherm
Name[nn]=Auge på skjerm
Name[pt]=Olho no Ecrã
Name[pt_BR]=Olho na tela
Name[sv]=Ögat på skärmen
......@@ -26,6 +27,7 @@ Comment[it]=Risucchia le finestre nel desktop
Comment[ko]=창을 바탕 화면으로 흡수
Comment[lt]=Įtraukti langus į darbalaukį
Comment[nl]=Zuig vensters in het bureaublad
Comment[nn]=Sug vindauge inn i skrivebordet
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
......
......@@ -51,6 +51,7 @@ Comment[it]=Sposta le finestre negli angoli dello schermo
Comment[ko]=창을 화면 꼭짓점으로 이동
Comment[lt]=Perkelti langus į kampus
Comment[nl]=Verplaats vensters in de hoeken van het scherm
Comment[nn]=Flytt vindauge til skjermhjørne
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
......
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