Commit e4ff5062 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 6072b0cd
......@@ -16,6 +16,7 @@ Name[nn]=Logg ut
Name[pl]=Wylogowywanie
Name[pt]=Encerrar
Name[pt_BR]=Encerrar sessão
Name[ru]=Завершение работы
Name[sv]=Logga ut
Name[uk]=Вихід
Name[x-test]=xxLogoutxx
......@@ -39,6 +40,7 @@ Comment[nn]=Ton ut til utloggingsbiletet
Comment[pl]=Płynne zanikanie do ekranu wylogowywania
Comment[pt]=Desvanecer suavemente para o ecrã de encerramento
Comment[pt_BR]=Suaviza o desaparecimento para a tela de encerramento da sessão
Comment[ru]=Плавное появление экрана завершения работы
Comment[sv]=Tona mjukt till utloggningsskärmen
Comment[uk]=Плавний перехід до вікна виходу з системи
Comment[x-test]=xxSmoothly fade to the logout screenxx
......
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