From 6f183b4ce4c1e381f17c366f1801d9871674ee0b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 25 Dec 2019 05:41:48 +0100 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" --- src/desktoptheme/breeze-dark/metadata.desktop.cmake | 1 + src/desktoptheme/breeze-light/metadata.desktop.cmake | 1 + src/desktoptheme/breeze/metadata.desktop.cmake | 1 + .../plasma-wallpaper-with-qml-extension.kdevtemplate | 2 ++ .../qml-plasmoid-with-qml-extension.kdevtemplate | 1 + 5 files changed, 6 insertions(+) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop.cmake b/src/desktoptheme/breeze-dark/metadata.desktop.cmake index d16c70f85..5db253b08 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-dark/metadata.desktop.cmake @@ -56,6 +56,7 @@ Comment[fi]=Breeze Dark KDE VDG:ltä Comment[fr]=Breeze sombre, par KDE VDG Comment[gl]=Breeze escuro de KDE VDG Comment[hu]=Breeze Dark a KDE VDG-től +Comment[ia]=Breeze Dark (Brisa Obscure) per le KDE VDG Comment[id]=Breeze Gelap oleh KDE VDG Comment[it]=Brezza scuro del KDE VDG Comment[ko]=KDE VDG에서 만든 어두운 Breeze diff --git a/src/desktoptheme/breeze-light/metadata.desktop.cmake b/src/desktoptheme/breeze-light/metadata.desktop.cmake index b54d41752..3be4f2876 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-light/metadata.desktop.cmake @@ -54,6 +54,7 @@ Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Breeze clair, par KDE VDG Comment[gl]=Breeze claro de KDE VDG Comment[hu]=Breeze Light a KDE VDG-től +Comment[ia]=Brisa legier per le KDE VDG Comment[id]=Breeze Terang oleh KDE VDG Comment[it]=Brezza chiaro del KDE VDG Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light diff --git a/src/desktoptheme/breeze/metadata.desktop.cmake b/src/desktoptheme/breeze/metadata.desktop.cmake index 338ee54e2..72c4723ec 100644 --- a/src/desktoptheme/breeze/metadata.desktop.cmake +++ b/src/desktoptheme/breeze/metadata.desktop.cmake @@ -56,6 +56,7 @@ Comment[fi]=Breeze KDE VDG:ltä Comment[fr]=Breeze, par KDE VDG Comment[gl]=Breeze de KDE VDG Comment[hu]=Breeze a KDE VDG-től +Comment[ia]=Breeze (Brisa) per le KDE VDG Comment[id]=Breeze oleh KDE VDG Comment[it]=Brezza del KDE VDG Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze diff --git a/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate b/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate index 532871e47..31d82f1e3 100644 --- a/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate +++ b/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate @@ -13,6 +13,7 @@ Name[fi]=Yksinkertainen Plasma-taustakuva QML-laajennuksella Name[fr]=Fond d'écran Plasma simple avec extension QML Name[gl]=Fondo de escritorio simple de Plasma con extensión de QML Name[hu]=Egyszerű Plasma háttérkép QML bővítménnyel +Name[ia]=Simple tapete de papiro de Plasma con extension QML Name[id]=Wallpaper Plasma sederhana dengan ektensi QML Name[it]=Semplice sfondo di Plasma con estensione QML Name[ko]=QML 확장을 사용하는 간단한 Plasma 배경 그림 @@ -43,6 +44,7 @@ Comment[fi]=Plasma-taustakuva, joka käyttää oman QML-laajennusliitännäisen Comment[fr]=Un modèle de fond d'écran Plasma utilisant une API personnalisée fournie par son propre module externe d'extension QML Comment[gl]=Un fondo de escritorio de Plasma que usa unha API personalizada fornecida por un complemento de extensión de QML de seu. Comment[hu]=Saját, QML bővítmény által biztosított API-t használó Plasma háttérkép +Comment[ia]=Un tapete de papiro de Plasma que usa API personalisate fornite per un proprie plgin de extension QML Comment[id]=Sebuah wallpaper Plasma yang menggunakan kustom API yang disediakan oleh plugin ekstensi QML sendiri Comment[it]=Uno sfondo di Plasma che utilizza API personalizzate fornite da una propria estensione QML Comment[ko]=QML 확장 플러그인이 추가로 제공하는 API를 사용하는 Plasma 배경 그림 diff --git a/templates/qml-plasmoid-with-qml-extension/qml-plasmoid-with-qml-extension.kdevtemplate b/templates/qml-plasmoid-with-qml-extension/qml-plasmoid-with-qml-extension.kdevtemplate index 612b667f6..53e48b579 100644 --- a/templates/qml-plasmoid-with-qml-extension/qml-plasmoid-with-qml-extension.kdevtemplate +++ b/templates/qml-plasmoid-with-qml-extension/qml-plasmoid-with-qml-extension.kdevtemplate @@ -50,6 +50,7 @@ Comment[fi]=Plasma-sovelman malli, joka käyttää oman QML-laajennusliitännäi Comment[fr]=Un modèle d'applet Plasma utilisant une API personnalisée fournie par son propre module externe d'extension QML Comment[gl]=Un modelo para un trebello de Plasma que usa unha API personalizada fornecida por un complemento de extensión de QML de seu. Comment[hu]=Saját, QML bővítmény által biztosított API-t használó Plasma kisalkalmazás-sablon +Comment[ia]=Un patrono per un applet de Plasma que usa API personalisate per un proprie plugin de extension QML Comment[id]=Sebuah templat untuk applet Plasma yang menggunakan kustom yang disediakan API oleh plugin ekstensi QML sendiri Comment[it]=Un modello per un'applet di Plasma che utilizza API personalizzate fornite da una propria estensione QML Comment[ko]=QML 확장 플러그인이 추가로 제공하는 API를 사용하는 Plasma 애플릿 템플릿