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"

kdecoration/config/kcm_breezedecoration.json

@@ -8,6 +8,7 @@
         "Description[es]": "Modificar el aspecto de las decoraciones de ventanas",
         "Description[eu]": "Leiho apainduren itxura aldatzea",
         "Description[fr]": "Modifier l'apparence des décorations de fenêtres",
+        "Description[ko]": "창 장식의 모양을 수정합니다",
         "Description[nl]": "Wijzig het uiterlijk van vensterdecoraties",
         "Description[pl]": "Zmień wygląd okien",
         "Description[pt]": "Modificar a aparência das decorações das janelas",
@@ -27,6 +28,7 @@
         "Name[es]": "Decoración de ventanas Brisa",
         "Name[eu]": "Breeze leihoen apaindura",
         "Name[fr]": "Décoration de fenêtre pour Breeze",
+        "Name[ko]": "Breeze 창 장식",
         "Name[nl]": "Breeze vensterdecoratie",
         "Name[pl]": "Wygląd okien Bryzy",
         "Name[pt]": "Decoração de Janelas Brisa",

kstyle/config/breezestyleconfig.json

@@ -8,6 +8,7 @@
         "Description[es]": "Modificar el aspecto de los widgets",
         "Description[eu]": "Trepeten itxura aldatzea",
         "Description[fr]": "Modifier l'apparence des composants graphiques",
+        "Description[ko]": "위젯의 모양 수정",
         "Description[nl]": "Wijzig het uiterlijk van widgets",
         "Description[pl]": "Zmień wygląd interfejsu",
         "Description[pt]": "Modificar a aparência dos elementos gráficos",
@@ -27,6 +28,7 @@
         "Name[es]": "Estilo de widgets Brisa",
         "Name[eu]": "Breeze trepeten estiloa",
         "Name[fr]": "Style des composants graphiques de Breeze",
+        "Name[ko]": "Breeze 위젯 스타일",
         "Name[nl]": "Breeze widgetstijl",
         "Name[pl]": "Wygląd interfejsu Bryzy",
         "Name[pt]": "Estilo Gráfico Brisa",

wallpapers/Next/metadata.json

@@ -11,6 +11,7 @@
                 "Name[es]": "Louis Durrant",
                 "Name[eu]": "Louis Durrant",
                 "Name[fr]": "Louis Durrant",
+                "Name[ko]": "Louis Durrant",
                 "Name[nl]": "Louis Durrant",
                 "Name[pl]": "Louis Durrant",
                 "Name[pt]": "Louis Durrant",
@@ -33,6 +34,7 @@
         "Name[es]": "Aterrizaje seguro",
         "Name[eu]": "Lurreratze segurua",
         "Name[fr]": "Atterrissage en douceur",
+        "Name[ko]": "안전한 착륙",
         "Name[nl]": "Veilige landing",
         "Name[pl]": "Bezpieczne lądowanie",
         "Name[pt]": "Aterragem Suave",