From 39ddc54c0a5f934fb96150a1276d9954210d2096 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 15 Aug 2018 08:14:58 +0200 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 d6b1991cb6..1774f68436 100644 --- a/effects/slide/slide_config.desktop +++ b/effects/slide/slide_config.desktop @@ -38,6 +38,7 @@ Name[ja]=スライド Name[kk]=Сырғанату Name[km]=ស្លាយ Name[kn]=ಜಾರು +Name[ko]=슬라이드 Name[ku]=Xîş Bike Name[lv]=Slīdēt Name[mai]=स्लाइड diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index d348246a1c..8f2fac6b6b 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -54,6 +54,7 @@ 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[id]=Menambahkan sebuah pintasan untuk minimalkan dan pulihkan semua jendela Comment[it]=Aggiunge una scorciatoia per minimizzare e ripristinare tutte le finestre +Comment[ko]=모든 창을 최소화하고 복원하는 단축키를 추가합니다 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