From 32e16e8c98d14bee450f5e27d4c3c56212510f39 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 22 Feb 2019 05:35:03 +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" --- examples/applets/dataenginemodel/metadata.desktop | 2 +- src/desktoptheme/breeze-dark/metadata.desktop | 1 + src/desktoptheme/breeze-light/metadata.desktop | 1 + src/desktoptheme/breeze/metadata.desktop | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/applets/dataenginemodel/metadata.desktop b/examples/applets/dataenginemodel/metadata.desktop index f164094b1..6edb95927 100644 --- a/examples/applets/dataenginemodel/metadata.desktop +++ b/examples/applets/dataenginemodel/metadata.desktop @@ -14,7 +14,7 @@ Comment[gd]=Aplaid-eisimpleir a sheallas mar a chleachdas tu modailean leabaicht Comment[gl]=Un miniaplicativo de exemplo que mostra como usar os modelos incorporados nos DataEngines Comment[hu]=Példa kisalkalmazás a DataEngine-be ágyazott modellek használatának bemutatására Comment[ia]=Applet de exemplo que monstra como usar Models (modellos) insertate in DataEngines (Motores de datos) -Comment[id]=Contoh applet yang menampilkan bagaimana untuk menggunakan Model terbenam dalam DataEngine +Comment[id]=Contoh applet yang menampilkan bagaimana untuk menggunakan Model tertanam dalam DataEngine Comment[it]=Applet di esempio che mostra come utilizzare i modelli integrati nei motori di dati Comment[ko]=데이터 엔진에 임베드된 모델 사용법 시연 애플릿 Comment[nb]=Eksempel-applet som viser bruk av Modeller innebygget i DataEngines diff --git a/src/desktoptheme/breeze-dark/metadata.desktop b/src/desktoptheme/breeze-dark/metadata.desktop index 5074b257c..d66fae5f0 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop +++ b/src/desktoptheme/breeze-dark/metadata.desktop @@ -44,6 +44,7 @@ Comment=Breeze Dark by the KDE VDG Comment[ca]=Brisa fosca pel VDG del KDE Comment[es]=Brisa oscuro por KDE VDG Comment[gl]=Breeze escuro de KDE VDG +Comment[id]=Breeze Dark oleh KDE VDG Comment[nl]=Breeze Dark door de KDE VDG Comment[pt]=Brisa Escuro da VDG do KDE Comment[pt_BR]=Breeze Dark pelo KDE VDG diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index 37b9d3217..1367f9b23 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -41,6 +41,7 @@ Comment=Breeze Light by the KDE VDG Comment[ca]=Brisa clara pel VDG del KDE Comment[es]=Brisa claro por KDE VDG Comment[gl]=Breeze claro de KDE VDG +Comment[id]=Breeze Light oleh KDE VDG Comment[nl]=Breeze Light door de KDE VDG Comment[pt]=Brisa Claro da VDG do KDE Comment[pt_BR]=Breeze Light pelo KDE VDG diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop index d9c5663f1..f9ea830e9 100644 --- a/src/desktoptheme/breeze/metadata.desktop +++ b/src/desktoptheme/breeze/metadata.desktop @@ -44,6 +44,7 @@ Comment=Breeze by the KDE VDG Comment[ca]=Brisa pel VDG del KDE Comment[es]=Brisa por KDE VDG Comment[gl]=Breeze de KDE VDG +Comment[id]=Breeze oleh KDE VDG Comment[nl]=Breeze door de KDE VDG Comment[pt]=Brisa da VDG do KDE Comment[pt_BR]=Breeze pelo KDE VDG