From 0b1e9cfb2c70c75df7c1e2831c2cf270746fbe09 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Jan 2020 05:53:26 +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 1873c110ee..ed0b08f6b5 100644 --- a/effects/sessionquit/package/metadata.desktop +++ b/effects/sessionquit/package/metadata.desktop @@ -6,6 +6,7 @@ Name[en_GB]=Session Quit Name[es]=Cierre de sesión Name[et]=Seansist väljumine Name[eu]=Saiotik irtetea +Name[fi]=Istunnon lopetus Name[gl]=Saída de sesión Name[ia]=Abandona session Name[id]=Sesi Berhenti @@ -29,6 +30,7 @@ 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[fi]=Pidä työpöydän tausta käynnissä aina uloskirjautumisen loppuun Comment[gl]=Manter vivo o fondo de escritorio durante a saída ata o final Comment[id]=Jaga latarbelakang desktop tetap nyala selama logout sampai akhir Comment[it]=Mantieni attivo lo sfondo del desktop durante la chiusura della sessione fino alla fine