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

@@ -14,6 +14,7 @@ Name[eu]=Oskola
 Name[fr]=Shell
 Name[hi]=शेल
 Name[hu]=Felület
+Name[ia]=Shell
 Name[ko]=셸
 Name[nl]=Shell
 Name[nn]=Skal
@@ -35,6 +36,7 @@ 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[ia]=Configura le shell de systema
 Comment[ko]=시스템 셸 설정
 Comment[nl]=De systeem-shell configureren
 Comment[nn]=Set opp systemskalet
@@ -72,6 +74,7 @@ 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[ia]=system,systema,shell,pannello
 X-KDE-Keywords[ko]=system,shell,panel,시스템,셸,패널
 X-KDE-Keywords[nl]=systeem,shell,paneel
 X-KDE-Keywords[nn]=system,skal,shell,panel

quicksettings/caffeine/metadata.desktop

@@ -14,6 +14,7 @@ Name[fi]=Caffeine
 Name[fr]=Caffeine
 Name[hi]=कैफीन
 Name[hu]=Caffeine
+Name[ia]=Caffeine
 Name[ko]=카페인
 Name[nl]=Cafeïne
 Name[nn]=Caffeine

quicksettings/keyboardtoggle/metadata.desktop

@@ -12,6 +12,7 @@ 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[ia]=Commuta Claviero Virtual
 Name[ko]=가상 키보드 전환
 Name[nl]=Omschakeling van virtueel toetsenbord
 Name[pt_BR]=Alternar teclado virtual

quicksettings/powermenu/package/metadata.desktop

@@ -13,6 +13,7 @@ Name[fi]=Virranhallintavalikko
 Name[fr]=Menu « Énergie »
 Name[hi]=शक्ती मेन्यू
 Name[hu]=Energia menü
+Name[ia]=Menu de Potentia
 Name[ko]=전원 메뉴
 Name[nl]=Energiemenu
 Name[nn]=Kraftmeny