From 8a3128c8cfaa6f1c487846ec9035456eb57c0d13 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 9 Jan 2018 05:06:46 +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, 1 insertion(+), 1 deletion(-) diff --git a/effects/slide/slide_config.desktop b/effects/slide/slide_config.desktop index f62b382130..26827a3682 100644 --- a/effects/slide/slide_config.desktop +++ b/effects/slide/slide_config.desktop @@ -31,7 +31,6 @@ Name[hne]=स्लाइड Name[hr]=Pomak Name[hu]=Csúsztatott váltás Name[ia]=Glissa -Name[id]=Geser Name[is]=Renna til Name[it]=Scivola Name[kk]=Сырғанату diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index d18e50bf2a..a66c45df0d 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -44,6 +44,7 @@ Comment[ca]=Afegeix una drecera per a minimitzar i restaurar totes les finestres Comment[ca@valencia]=Afig una drecera per a minimitzar i restaurar totes les finestres 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[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[pl]=Dodaje skrót do zminimalizowania i przywracania wszystkich okien Comment[pt]=Adiciona um atalho para minimizar ou repor todas as janelas