From b5040fe4250af95dada1a345d96fc09b30dc98ea Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 20 Jun 2020 07:42:21 +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/sessionquit/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/sessionquit/package/metadata.desktop b/effects/sessionquit/package/metadata.desktop index e35edceb9f..bd4f622be7 100644 --- a/effects/sessionquit/package/metadata.desktop +++ b/effects/sessionquit/package/metadata.desktop @@ -3,6 +3,7 @@ Name=Session Quit Name[ca]=Sortida de la sessió Name[cs]=Sezení bylo ukončeno Name[da]=Afslutning af session +Name[de]=Sitzung beenden Name[en_GB]=Session Quit Name[es]=Cierre de sesión Name[et]=Seansist väljumine