From 978160d9d99067166216e3c9d6499faef9ec7b01 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Mar 2019 05:53:54 +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 | 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 6ae804964..3b78d5841 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[ca@valencia]=Brisa fosca pel VDG del KDE Comment[de]=Breeze-Dunkel von der KDE VDG +Comment[en_GB]=Breeze Dark by the KDE VDG Comment[es]=Brisa oscuro por KDE VDG Comment[fi]=Breeze Dark KDE VDG:ltä Comment[fr]=Breeze sombre, par KDE VDG diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index a34086731..233c882f5 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[ca@valencia]=Brisa clara pel VDG del KDE Comment[de]=Breeze-Hell von der KDE VDG +Comment[en_GB]=Breeze Light by the KDE VDG Comment[es]=Brisa claro por KDE VDG Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Breeze clair, par KDE VDG diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop index b3c9a83c1..5581e410f 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[ca@valencia]=Brisa pel VDG del KDE Comment[de]=Breeze von der KDE VDG +Comment[en_GB]=Breeze by the KDE VDG Comment[es]=Brisa por KDE VDG Comment[fi]=Breeze KDE VDG:ltä Comment[fr]=Breeze, par KDE VDG