From f1f4d64576c9ca033f93805f9a8a20ac6f4d6778 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 12 Apr 2019 05:51:51 +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" --- src/desktoptheme/breeze-dark/metadata.desktop | 1 + src/desktoptheme/breeze-light/metadata.desktop | 1 + src/desktoptheme/breeze/metadata.desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop b/src/desktoptheme/breeze-dark/metadata.desktop index 3b78d5841..861820097 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop +++ b/src/desktoptheme/breeze-dark/metadata.desktop @@ -51,6 +51,7 @@ Comment[fr]=Breeze sombre, par KDE VDG Comment[gl]=Breeze escuro de KDE VDG Comment[id]=Breeze Dark oleh KDE VDG Comment[it]=Brezza scuro del KDE VDG +Comment[ko]=KDE VDG에서 만든 어두운 Breeze Comment[nl]=Breeze Dark door de KDE VDG Comment[nn]=Breeze mørk frå KDE VDG Comment[pl]=Ciemna bryza autorstwa KDE VDG diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index 233c882f5..849d6ef49 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -48,6 +48,7 @@ Comment[fr]=Breeze clair, par KDE VDG Comment[gl]=Breeze claro de KDE VDG Comment[id]=Breeze Light oleh KDE VDG Comment[it]=Brezza chiaro del KDE VDG +Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light Comment[nl]=Breeze Light door de KDE VDG Comment[nn]=Breeze lys frå KDE VDG Comment[pl]=Lekka Bryza autorstwa KDE VDG diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop index 5581e410f..9891cb287 100644 --- a/src/desktoptheme/breeze/metadata.desktop +++ b/src/desktoptheme/breeze/metadata.desktop @@ -51,6 +51,7 @@ Comment[fr]=Breeze, par KDE VDG Comment[gl]=Breeze de KDE VDG Comment[id]=Breeze oleh KDE VDG Comment[it]=Brezza del KDE VDG +Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Comment[nl]=Breeze door de KDE VDG Comment[nn]=Breeze frå KDE VDG Comment[pl]=Bryza autorstwa KDE VDG