From 2c8ff56540a3cbea905b86a49f6277817c7ee12c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 12 Dec 2019 05:47:19 +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 622f046aef..0c1bfbbaa5 100644 --- a/effects/sessionquit/package/metadata.desktop +++ b/effects/sessionquit/package/metadata.desktop @@ -7,6 +7,7 @@ Name[es]=Cierre de sesión Name[et]=Seansist väljumine Name[eu]=Saiotik irtetea Name[gl]=Saída de sesión +Name[id]=Sesi Berhenti Name[it]=Chiusura sessione Name[lt]=Seanso baigimas Name[nl]=Afsluiten van sessie @@ -28,6 +29,7 @@ Comment[es]=Mantener el fondo del escritorio activo durante el cierre de sesión 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[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 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