Commit ffcdd751 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 df6baa43
......@@ -7,6 +7,7 @@ Name[eu]=Begirada pantailan
Name[id]=Mata di Layar
Name[it]=Eye On Screen
Name[ko]=화면 위의 눈
Name[lt]=Akis ekrane
Name[nl]=Oog op scherm
Name[pt]=Olho no Ecrã
Name[pt_BR]=Olho na tela
......@@ -23,6 +24,7 @@ Comment[eu]=Mahaigainak leihoak xurgatu
Comment[id]=Sedot window ke desktop
Comment[it]=Risucchia le finestre nel desktop
Comment[ko]=창을 바탕 화면으로 흡수
Comment[lt]=Įtraukti langus į darbalaukį
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
......@@ -49,6 +49,7 @@ Comment[eu]=Eraman leihoak pantailako bazterretara
Comment[id]=Pindahkan window ke sudut layar
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[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