From a0d98a61c5a6196028f909e2af88a823d9785c78 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 Nov 2019 05:27:01 +0100 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/sessionquit/package/metadata.desktop | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/effects/sessionquit/package/metadata.desktop b/effects/sessionquit/package/metadata.desktop index 34cd49f342..9512404151 100644 --- a/effects/sessionquit/package/metadata.desktop +++ b/effects/sessionquit/package/metadata.desktop @@ -1,21 +1,30 @@ [Desktop Entry] Name=Session Quit Name[ca]=Sortida de la sessió +Name[en_GB]=Session Quit +Name[es]=Cierre de sesión Name[eu]=Saiotik irtetea +Name[gl]=Saída de sesión Name[lt]=Seanso baigimas Name[nl]=Afsluiten van sessie Name[pt]=Saída da Sessão Name[pt_BR]=Saída da sessão +Name[sv]=Avsluta session Name[uk]=Вихід з сеансу Name[x-test]=xxSession Quitxx +Name[zh_TW]=離開工作階段 Icon=preferences-system-windows-effect-logout Comment=Keep the desktop background alive during logout until the end Comment[ca]=Manté viu el fons de l'escriptori durant la sortida de la sessió fins el final +Comment[en_GB]=Keep the desktop background alive during logout until the end +Comment[es]=Mantener el fondo del escritorio activo durante el cierre de sesión hasta el final Comment[eu]=Eutsi mahaigaineko atzeko-planoa bizirik saio-ixtean bukaera arte +Comment[gl]=Manter vivo o fondo de escritorio durante a saída ata o final Comment[lt]=Atsijungiant, išlaikyti darbalaukio foną reaguojantį iki pat galo Comment[nl]=De achtergrond van het bureaublad tot het einde levend houden gedurende afmelden Comment[pt]=Manter o fundo do ecrã activo durante a saída da sessão até ao fim Comment[pt_BR]=Mantém ativo o fundo da área de trabalho até o fim do fechamento da sessão +Comment[sv]=Behåll skrivbordets bakgrund levande under utloggning till slutet Comment[uk]=Не вимикати тло стільниці до кінця процедури виходу із облікового запису Comment[x-test]=xxKeep the desktop background alive during logout until the endxx