From 386d64368d60ee9bfe60af8114afca52794a6fac Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 Aug 2018 05:31:42 +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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index afb6fe7efe..0311971230 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -1,13 +1,18 @@ [Desktop Entry] Name=Logout +Name[ca]=Sortida +Name[fr]=Déconnexion Name[nl]=Afmelden +Name[nn]=Logg ut Name[pt]=Encerrar Name[uk]=Вихід Name[x-test]=xxLogoutxx Name[zh_TW]=登出 Icon=preferences-system-windows-effect-logout Comment=Smoothly fade to the logout screen +Comment[ca]=Transició suau a la pantalla de sortida Comment[nl]=Langzaam naar het afmeldscherm vervagen +Comment[nn]=Ton ut til utloggingsbiletet Comment[pt]=Desvanecer suavemente para o ecrã de encerramento Comment[uk]=Плавний перехід до вікна виходу з системи Comment[x-test]=xxSmoothly fade to the logout screenxx