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"

examples/containments/testcontainment/metadata.desktop

@@ -16,7 +16,7 @@ Name[gd]=Deuchainn air soithichean
 Name[gl]=Proba de contedor
 Name[hu]=Tartalomteszt
 Name[ia]=Essayo de Containment
-Name[id]=Uji Pembatasan
+Name[id]=Containment Test
 Name[it]=Prova del contenitore
 Name[ko]=컨테이너 테스트
 Name[mr]=कंटेनमेंट चाचणी

examples/dataengines/customDataContainers/plasma-dataengine-example-customDataContainers.desktop

@@ -15,7 +15,7 @@ Name[gd]=DataContainers gnàthaichte
 Name[gl]=DataContainers personalizado
 Name[hu]=Egyéni DataContainerek
 Name[ia]=DataContainers (Contento de datos) personalisate
-Name[id]=WadahData Kustom
+Name[id]=Custom DataContainers
 Name[it]=DataContainer personalizzati
 Name[ko]=사용자 정의 데이터 컨테이너
 Name[nb]=Tilpassede DataContainers
@@ -54,7 +54,7 @@ Comment[gd]=Taisbeanadh air mar a chruthaicheas tu fo-chlasaichean aig DataConta
 Comment[gl]=Unha demostración de como facer subclases de DataContainer
 Comment[hu]=A DataContainer alosztályként használatának demonstrációja
 Comment[ia]=Un demonstration de como poner in sub-classe un DataContainer
-Comment[id]=Sebuah demonstrasi bagaimana untuk menyubkelas WadahData
+Comment[id]=Sebuah demonstrasi bagaimana untuk mensubkelas WadahData
 Comment[it]=Una dimostrazione di come creare sottoclassi di DataContainer
 Comment[ko]=DataContainer 파생 클래스를 작성하는 방법 시연
 Comment[nb]=En demonstrasjon av hvordan subklasser av DataContainer lages

examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop

@@ -54,7 +54,7 @@ Comment[gd]=Ball-eisimpleir airson inneal-dàta a sheallas mar a fhreagrar do dh
 Comment[gl]=Un exemplo de DataEngine que mostra como responder a pedidos de creación e actualización de orixes
 Comment[hu]=DataEngine példa forráslétrehozási és frissítési kérések megválaszolására
 Comment[ia]=Un exemplo de dataEngine (motor de datos) monstrante como responder a requestas de creation de fonte e actualisationes
-Comment[id]=Sebuah pertampilan contoh MesinData bagaimana untuk merespon atas permintaan terhadap update dan penciptaan sumber
+Comment[id]=Sebuah contoh DataEngine menampilkan bagaimana respon untuk permintaan terhadap update dan penciptaan sumber
 Comment[it]=Un esempio di motore di dati che mostra come rispondere alle richieste di creazione di fonti e aggiornamenti
 Comment[ko]=원본 생성과 업데이트에 반응할 방법에 대한 데이터 엔진 예제
 Comment[nb]=Et DataEngine-eksempel som viser hvordan forespørsel om oppretting og oppdatering av kilder skal besvares

src/desktoptheme/air/metadata.desktop

@@ -63,7 +63,7 @@ Comment[gd]=Anail
 Comment[gl]=Un folgo de ar fresco
 Comment[hu]=Friss fuvallat
 Comment[ia]=Un respiration de aere fresc
-Comment[id]=Sebuah hirupan nafas yang segar
+Comment[id]=Sebuah hirupan udara yang segar
 Comment[it]=Una ventata di aria fresca
 Comment[ko]=신선한 바람
 Comment[lt]=Gryno oro gurkšnis

src/plasma/data/servicetypes/plasma-containmentactions.desktop

@@ -20,7 +20,7 @@ Comment[gd]=Plasma ContainmentActions
 Comment[gl]=ContainmentActions de Plasma
 Comment[hu]=Plasma ContainmentActions
 Comment[ia]=Actiones  de continemento Plasma
-Comment[id]=AksiPembatasan Plasma
+Comment[id]=ContainmentActions Plasma
 Comment[it]=ContainmentActions di Plasma
 Comment[ko]=Plasma ContainmentActions
 Comment[lt]=Plasma konteinerių veiksmai

src/plasma/data/servicetypes/plasma-generic.desktop

@@ -20,7 +20,7 @@ Name[gd]=Pacaid Plasma
 Name[gl]=Paquete de Plasma
 Name[hu]=Plasma csomag
 Name[ia]=Pacchetto de Plasma
-Name[id]=Paket Plasma
+Name[id]=Plasma Package
 Name[it]=Pacchetto di Plasma
 Name[ko]=Plasma 패키지
 Name[lt]=Plasma paketas

src/plasma/data/servicetypes/plasma-lookandfeel.desktop

@@ -20,7 +20,7 @@ Name[gd]=Coltas Plasma
 Name[gl]=Aparencia e comportamento de Plasma
 Name[hu]=A Plasma megjelenése
 Name[ia]=Aspecto (Look and feel) de Plasma
-Name[id]=Look and Feel Plasma
+Name[id]=Plasma Look and Feel
 Name[it]=Aspetto di Plasma
 Name[ko]=Plasma 모습과 느낌
 Name[nb]=Plasma utseende og oppførsel

src/plasma/data/servicetypes/plasma-shell.desktop

@@ -20,7 +20,7 @@ Name[gd]=Plasma Shell
 Name[gl]=Intérprete de ordes de Plasma
 Name[hu]=Plasma felület
 Name[ia]=Plasma Shell (Shell de Plasma)
-Name[id]=Shell Plasma
+Name[id]=Plasma Shell
 Name[it]=Shell di Plasma
 Name[ko]=Plasma 셸
 Name[lt]=Plasma apvalkalas

src/plasma/packagestructure/containmentactions-packagestructure.json

@@ -26,7 +26,6 @@
         "Name[fr]": "Actions de conteneur",
         "Name[gl]": "Accións de contención",
         "Name[ia]": "Actiones de continer",
-        "Name[id]": "Aksi Pembatasan",
         "Name[it]": "Azioni dei contenitori",
         "Name[ko]": "컨테이너 동작",
         "Name[nl]": "Containeracties",

src/scriptengines/python/plasma-scriptengine-runner-python.desktop

@@ -16,7 +16,7 @@ Name[gd]=Ruitheadair Plasma
 Name[gl]=Executor de Python
 Name[hu]=Python-indító
 Name[ia]=Python Runner (Executor de Python)
-Name[id]=Pejalan Python
+Name[id]=Python Runner
 Name[it]=Esecutore Python
 Name[ko]=파이썬 실행기
 Name[lt]=Python leistukas

src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop

@@ -17,7 +17,7 @@ Name[gd]=Ruby Widget
 Name[gl]=Trebello en Ruby
 Name[hu]=Ruby felületi elem
 Name[ia]=Widget de Ruby
-Name[id]=Widget Ruby
+Name[id]=Ruby Widget
 Name[it]=Widget Ruby
 Name[ko]=루비 위젯
 Name[lt]=Ruby valdiklis