From 40862c034a8cb9e5351532f07f2155ee21825e68 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 8 Feb 2018 07:02:28 +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/slide/slide_config.desktop | 1 + scripts/minimizeall/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/effects/slide/slide_config.desktop b/effects/slide/slide_config.desktop index f5a613e91a..ca9154159f 100644 --- a/effects/slide/slide_config.desktop +++ b/effects/slide/slide_config.desktop @@ -20,6 +20,7 @@ Name[eo]=Lumbildo Name[es]=Deslizar Name[et]=Liuglemine Name[eu]=Irristatu +Name[fi]=Liuku Name[fr]=Glisser Name[fy]=Glydzje Name[ga]=Sleamhnaigh diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 448ccda6f6..533755ba30 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -46,6 +46,7 @@ Comment[da]=Tilføjer en genvej til at minimere og gendanne alle vinduer Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder wieder anzuzeigen 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[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