Commit d2051d65 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 cfeca03e
......@@ -8,6 +8,7 @@ Name[it]=Finestre
......@@ -19,6 +20,7 @@ Comment[it]=Elenca e scambia le finestre ed i desktop
Comment[nl]=Toon vensters en bureaubladen en schakel ze om
Comment[nn]=Vis vindauge og skrivebord, og byt mellom dei
Comment[pt]=Listar as janelas e ecrãs e mudar entre elas
Comment[sl]=Prikaži seznam oken in namizij in preklopi med njimi
Comment[sv]=Lista fönster och skrivbord, och byt mellan dem
Comment[uk]=Показує список вікон і стільниць і перемикає їх
Comment[x-test]=xxList windows and desktops and switch themxx
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