From 781d2f6fff3ad3f7c92c3892d415d6bbfdc26b22 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 31 Jul 2019 05:13:30 +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" --- examples/applets/nowplaying/metadata.desktop | 4 ++-- examples/applets/windowthumbnails/metadata.desktop | 4 ++-- .../plasma-dataengine-example-sourcesOnRequest.desktop | 2 +- src/desktoptheme/breeze-dark/metadata.desktop.cmake | 4 ++-- src/desktoptheme/breeze-light/metadata.desktop.cmake | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/applets/nowplaying/metadata.desktop b/examples/applets/nowplaying/metadata.desktop index e65ac8570..8b41ef492 100644 --- a/examples/applets/nowplaying/metadata.desktop +++ b/examples/applets/nowplaying/metadata.desktop @@ -16,7 +16,7 @@ Name[gd]='Ga chluich an-dràsta (QML) Name[gl]=Estase a reproducir (QML) Name[hu]=Most játszott (QML) Name[ia]=Ora reproducente (QML) -Name[id]=Sekarang memainkan (QML) +Name[id]=Sekarang memutar (QML) Name[it]=In riproduzione (QML) Name[ko]=지금 재생 중(QML) Name[lt]=Dabar grojama (QML) @@ -57,7 +57,7 @@ Comment[gd]=Seo qml airson inneal-smachd aig cluicheadair-mheadhanan mar dhearbh Comment[gl]=Unha proba de concepto de controlador de reprodutor multimedia en qml Comment[hu]=Bemutató médiavezérlő QML-ben írva Comment[ia]=Un prova de controlator qml de reproductor de media ideate -Comment[id]=Sebuah bukti konsep qml pengendali player media +Comment[id]=Sebuah bukti konsep qml pengendali pemutar media Comment[it]=Un prototipo qml del controllo di un lettore multimediale Comment[ko]=QML 기반 미디어 재생기 제어 예제 Comment[nb]=En qml mediespiller-styring, som proof of concept diff --git a/examples/applets/windowthumbnails/metadata.desktop b/examples/applets/windowthumbnails/metadata.desktop index 2d48bd5be..199ddf13a 100644 --- a/examples/applets/windowthumbnails/metadata.desktop +++ b/examples/applets/windowthumbnails/metadata.desktop @@ -15,7 +15,7 @@ Name[gd]=Ball-eisimpleir le liosta de dhealbhagan uinneige Name[gl]=Exemplo de lista de miniaturas de xanelas Name[hu]=Ablakbélyegképek lista - példa Name[ia]=Lista de miniaturas de fenestra de exemplo -Name[id]=Contoh daftar thumbnail window +Name[id]=Contoh daftar gambar-mini window Name[it]=Esempio di elenco di miniature delle finestre Name[ko]=창 미리 보기 그림 목록 예제 Name[nb]=Eksempelliste over vindus-småbilder @@ -54,7 +54,7 @@ Comment[gd]=Eisimpleir a sheallas dhut mar a nochdas tu dealbhagan uinneagan Comment[gl]=Un exemplo que como mostrar miniaturas de xanelas Comment[hu]=Példa ablakok bélyegképeinek megjelenítésére Comment[ia]=Exemplo monstrante como monstrar miniaturas de fenestra -Comment[id]=Menampilkan contoh bagaimana untuk menampilkan thumbnail window +Comment[id]=Menampilkan contoh bagaimana untuk menampilkan gambar-mini window Comment[it]=Esempio che mostra come visualizzare le miniature delle finestre Comment[ko]=창 미리 보기 그림을 보여 주는 방법 예제 Comment[nb]=Eksempel som viser hvordan vindus-småbildevisning lages diff --git a/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop b/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop index c55601fb1..b2203cf3a 100644 --- a/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop +++ b/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 contoh DataEngine menampilkan bagaimana respon untuk permintaan terhadap update dan penciptaan sumber +Comment[id]=Sebuah contoh DataEngine menampilkan bagaimana respon untuk permintaan terhadap pembaruan 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 diff --git a/src/desktoptheme/breeze-dark/metadata.desktop.cmake b/src/desktoptheme/breeze-dark/metadata.desktop.cmake index f2adce2f6..2c237a672 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-dark/metadata.desktop.cmake @@ -16,7 +16,7 @@ Name[gd]=Dorch-oiteag Name[gl]=Breeze escuro Name[hu]=Breeze Dark Name[ia]=Brisa obscure -Name[id]=Breeze Dark +Name[id]=Breeze Gelap Name[it]=Brezza scuro Name[ko]=어두운 Breeze Name[lt]=Breeze tamsi @@ -51,7 +51,7 @@ Comment[eu]=Breeze iluna, KDE VDGk egina Comment[fi]=Breeze Dark KDE VDG:ltä Comment[fr]=Breeze sombre, par KDE VDG Comment[gl]=Breeze escuro de KDE VDG -Comment[id]=Breeze Dark oleh KDE VDG +Comment[id]=Breeze Gelap oleh KDE VDG Comment[it]=Brezza scuro del KDE VDG Comment[ko]=KDE VDG에서 만든 어두운 Breeze Comment[nl]=Breeze Dark door de KDE VDG diff --git a/src/desktoptheme/breeze-light/metadata.desktop.cmake b/src/desktoptheme/breeze-light/metadata.desktop.cmake index 065e817ed..68e9c367f 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-light/metadata.desktop.cmake @@ -16,7 +16,7 @@ Name[gd]=Oiteag shoilleir Name[gl]=Breeze claro Name[hu]=Breeze Light Name[ia]=Brisa legier -Name[id]=Breeze Light +Name[id]=Breeze Terang Name[it]=Brezza chiaro Name[ko]=Breeze Light Name[nl]=Breeze Light @@ -48,7 +48,7 @@ Comment[eu]=Breeze argia, KDE VDGk egina Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Breeze clair, par KDE VDG Comment[gl]=Breeze claro de KDE VDG -Comment[id]=Breeze Light oleh KDE VDG +Comment[id]=Breeze Terang oleh KDE VDG Comment[it]=Brezza chiaro del KDE VDG Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light Comment[nl]=Breeze Light door de KDE VDG