From 7a60008ff9d84891a3d88362458bcdf727b3589e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 10 Feb 2018 06:56:29 +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" --- scripts/minimizeall/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 533755ba30..59ac73fba6 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -47,6 +47,7 @@ Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder wie Comment[en_GB]=Adds a shortcut to minimise and restore all windows Comment[es]=Añade un acceso rápido para minimizar y restaurar todas la ventanas Comment[fi]=Lisää pikanäppäimen, joka pienentää tai palauttaa kaikki ikkunat +Comment[fr]=Ajoute un raccourci pour réduire ou afficher toutes les fenêtres Comment[gl]=Engade un atallo para minimizar e restaurar todas as xanelas. Comment[it]=Aggiunge una scorciatoia per minimizzare e ripristinare tutte le finestre Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren en te herstellen