From e0b70205f76cb8cd6d17cd2c5d95b41e4ad25433 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Nov 2019 05:39:52 +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 + 3 files changed, 3 insertions(+) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop.cmake b/src/desktoptheme/breeze-dark/metadata.desktop.cmake index 9a59b85b9..e5753ca1d 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-dark/metadata.desktop.cmake @@ -54,6 +54,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[hu]=Breeze Dark a KDE VDG-től 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 4cc8a653d..59855cde4 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-light/metadata.desktop.cmake @@ -52,6 +52,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[hu]=Breeze Light a KDE VDG-től 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 1c3e4c6ed..b23ac855b 100644 --- a/src/desktoptheme/breeze/metadata.desktop.cmake +++ b/src/desktoptheme/breeze/metadata.desktop.cmake @@ -54,6 +54,7 @@ Comment[eu]=Breeze, KDE VDGk egina 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[id]=Breeze oleh KDE VDG Comment[it]=Brezza del KDE VDG Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze