From 3d5178a7c6b9aa1a17b4d76f07aba4c48dd201e0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 22 Feb 2018 07:26:39 +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 ca9154159f..f4cdb582ae 100644 --- a/effects/slide/slide_config.desktop +++ b/effects/slide/slide_config.desktop @@ -48,6 +48,7 @@ Name[nn]=Skliding Name[pa]=ਸਲਾਈਡ Name[pl]=Slajd Name[pt]=Deslizar +Name[pt_BR]=Deslizar Name[ro]=Alunecă Name[ru]=Прокрутка Name[si]=ලිස්සන්න diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 03bdc5418f..37f1919184 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -55,6 +55,7 @@ Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren en te hers 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[pt_BR]=Adiciona um atalho para minimizar e restaurar todas as janelas Comment[sl]=Doda bližnjico za skrčenje ali povečanje vseh oken Comment[sr]=Додаје пречицу за минимизовање и обнављање свих прозора Comment[sr@ijekavian]=Додаје пречицу за минимизовање и обнављање свих прозора