From 226fb7d30b27a9d0bdb3862f4af832d62889ba00 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 7 Aug 2018 05:48:25 +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/logout/package/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index b2d6899b0a..80126cc9a8 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -3,6 +3,7 @@ Name=Logout Name[ca]=Sortida Name[ca@valencia]=Eixida Name[cs]=Odhlášení +Name[es]=Cerrar la sesión Name[eu]=Saio-ixtea Name[fr]=Déconnexion Name[id]=Logout @@ -18,6 +19,7 @@ Icon=preferences-system-windows-effect-logout Comment=Smoothly fade to the logout screen Comment[ca]=Transició suau a la pantalla de sortida Comment[ca@valencia]=Transició suau a la pantalla d'eixida +Comment[es]=Desvanecer suavemente hasta la pantalla de cierre de sesión Comment[eu]=Emeki desagertu saio-ixteko pantailarantz Comment[fr]=Effectue un dégradé progressif vers l'écran de déconnexion Comment[id]=Memudar dengan halus ke layar logout