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"

kcms/mobileshell/package/metadata.desktop

@@ -7,9 +7,11 @@ Name[az]=Örtük
 Name[ca]=Intèrpret d'ordres
 Name[en_GB]=Shell
 Name[es]=Intérprete de órdenes
+Name[eu]=Oskola
 Name[fr]=Shell
 Name[hi]=शेल
 Name[hu]=Felület
+Name[ko]=셸
 Name[nl]=Shell
 Name[nn]=Skal
 Name[ro]=Interpretor
@@ -22,9 +24,11 @@ Comment[az]=Sistem
 Comment[ca]=Configura l'intèrpret d'ordres del sistema
 Comment[en_GB]=Configure the system shell
 Comment[es]=Configura el intérprete de órdenes del sistema
+Comment[eu]=Konfiguratu sistemaren oskola
 Comment[fr]=Configurer le shell du système
 Comment[hi]=तंत्र शेल विन्यस्त करें
 Comment[hu]=A rendszerfelület beállítása
+Comment[ko]=시스템 셸 설정
 Comment[nl]=De systeem-shell configureren
 Comment[nn]=Set opp systemskalet
 Comment[ro]=Configurează interpretorul sistemului
@@ -53,9 +57,11 @@ X-KDE-Keywords[az]=sistem,örtük,panel
 X-KDE-Keywords[ca]=sistema,intèrpret d'ordres,plafó
 X-KDE-Keywords[en_GB]=system,shell,panel
 X-KDE-Keywords[es]=sistema,intérprete,intérprete de órdenes,panel
+X-KDE-Keywords[eu]=sistema,shell,oskola,panela
 X-KDE-Keywords[fr]=système, shell, panneau
 X-KDE-Keywords[hi]=तंत्र,शैल,पैनल
 X-KDE-Keywords[hu]=rendszer,felület,panel
+X-KDE-Keywords[ko]=system,shell,panel,시스템,셸,패널
 X-KDE-Keywords[nl]=systeem,shell,paneel
 X-KDE-Keywords[nn]=system,skal,shell,panel
 X-KDE-Keywords[ro]=sistem,interpretor,panou

quicksettings/caffeine/metadata.desktop

@@ -7,9 +7,11 @@ Name[az]=Caffeine
 Name[ca]=Caffeine
 Name[en_GB]=Caffeine
 Name[es]=Cafeína
+Name[eu]=Caffeine
 Name[fr]=Caffeine
 Name[hi]=कैफीन
 Name[hu]=Caffeine
+Name[ko]=카페인
 Name[nl]=Cafeïne
 Name[nn]=Caffeine
 Name[ro]=Cafeină

quicksettings/keyboardtoggle/metadata.desktop

@@ -6,8 +6,10 @@ Name=Virtual Keyboard Toggle
 Name[ca]=Commutació del teclat virtual
 Name[en_GB]=Virtual Keyboard Toggle
 Name[es]=Conmutación del teclado virtual
+Name[eu]=Alegiazko teklatua txandakatzea
 Name[fr]=Basculement vers /hors clavier virtuel
 Name[hu]=Virtuális billentyűzet kapcsoló
+Name[ko]=가상 키보드 전환
 Name[nl]=Omschakeling van virtueel toetsenbord
 Name[sl]=Preklop navidezne tipkovnice
 Name[sv]=Visa eller dölj virtuellt tangentbord

quicksettings/powermenu/package/metadata.desktop

@@ -7,9 +7,11 @@ Name[az]=Güc menyusu
 Name[ca]=Power Menu
 Name[en_GB]=Power Menu
 Name[es]=Menú de energía
+Name[eu]=Energia menua
 Name[fr]=Menu « Énergie »
 Name[hi]=शक्ती मेन्यू
 Name[hu]=Energia menü
+Name[ko]=전원 메뉴
 Name[nl]=Energiemenu
 Name[nn]=Kraftmeny
 Name[ro]=Meniu avansat