From 02f4d3f4f70116528831f1a6b710b5a757b897f9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Jan 2018 05:13:56 +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 edaa3ce54a..1fa1d346cf 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -48,6 +48,7 @@ Comment[es]=Añade un acceso rápido para minimizar y restaurar todas la ventana 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 +Comment[nn]=Legg til snarvegar for å minimera og gjenoppretta alle vindauge Comment[pl]=Dodaje skrót do zminimalizowania i przywracania wszystkich okien Comment[pt]=Adiciona um atalho para minimizar ou repor todas as janelas Comment[sl]=Doda bližnjico za skrčenje ali povečanje vseh oken