Commit e8162aa7 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 6b34b906
......@@ -6,6 +6,7 @@ Name[es]=Ventanas
......@@ -16,6 +17,7 @@ Comment[es]=Listar ventanas y escritorios y cambiar entre ellos
Comment[fr]=Lister les fenêtres et les bureaux pour pouvoir passer de l'un à l'autre.
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[sv]=Lista fönster och skrivbord, och byt mellan dem
Comment[uk]=Показує список вікон і стільниць і перемикає їх
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