From a6b705bb75965caa362fd30321cae85eb6c8e6f7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 Nov 2019 05:31:05 +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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects/sessionquit/package/metadata.desktop b/effects/sessionquit/package/metadata.desktop index 17365e7c51..7772c9eb85 100644 --- a/effects/sessionquit/package/metadata.desktop +++ b/effects/sessionquit/package/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=Sortida de la sessió Name[cs]=Sezení bylo ukončeno Name[en_GB]=Session Quit Name[es]=Cierre de sesión +Name[et]=Seansist väljumine Name[eu]=Saiotik irtetea Name[gl]=Saída de sesión Name[it]=Chiusura sessione @@ -22,6 +23,7 @@ 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[et]=Töölaua taust hoitakse väljalogimisel alles kuni lõpuni 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[it]=Mantieni attivo lo sfondo del desktop durante la chiusura della sessione fino alla fine