From e4ff50624a0e1f37149bb27e081ed58f58e268e9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 13 Sep 2018 05:57:35 +0200 Subject: [PATCH] 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" --- effects/logout/package/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index 51d91856cf..edb31a69ea 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -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