From 9e736e523a99e317a3ee59e28b7e4f63eed4212c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 15 Aug 2018 05:48:31 +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/logout/package/metadata.desktop | 2 ++
 effects/scale/scale_config.desktop      | 3 +++
 effects/slide/slide_config.desktop      | 1 +
 scripts/minimizeall/metadata.desktop    | 1 +
 4 files changed, 7 insertions(+)

diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop
index 359fa0e72c..702b86904b 100644
--- a/effects/logout/package/metadata.desktop
+++ b/effects/logout/package/metadata.desktop
@@ -7,6 +7,7 @@ Name[es]=Cerrar la sesión
 Name[eu]=Saio-ixtea
 Name[fr]=Déconnexion
 Name[id]=Logout
+Name[ko]=로그아웃
 Name[nl]=Afmelden
 Name[nn]=Logg ut
 Name[pt]=Encerrar
@@ -23,6 +24,7 @@ Comment[es]=Desvanecer suavemente hasta la pantalla de cierre de sesión
 Comment[eu]=Emeki desagertu saio-ixteko pantailarantz
 Comment[fr]=Effectue un dégradé progressif vers l'écran de déconnexion
 Comment[id]=Melesap secara halus ke layar logout
+Comment[ko]=로그아웃 화면으로 부드럽게 전환합니다
 Comment[nl]=Langzaam naar het afmeldscherm vervagen
 Comment[nn]=Ton ut til utloggingsbiletet
 Comment[pt]=Desvanecer suavemente para o ecrã de encerramento
diff --git a/effects/scale/scale_config.desktop b/effects/scale/scale_config.desktop
index 783afb395c..58edc5c57b 100644
--- a/effects/scale/scale_config.desktop
+++ b/effects/scale/scale_config.desktop
@@ -8,7 +8,10 @@ X-KDE-ParentComponents=scale
 Name=Scale
 Name[ca]=Escala
 Name[eu]=Eskalatu
+Name[ko]=크기 조정
 Name[nl]=Schalen
+Name[nn]=Skalering
 Name[pt]=Escala
+Name[sv]=Skala
 Name[uk]=Масштабування
 Name[x-test]=xxScalexx
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