From f75e1d18a976ac4c86e9f74a4fd387991afa5bb7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Feb 2019 05:53:00 +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" --- lookandfeel/metadata.desktop | 1 + sddm-theme/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 07d647719..99dd90c3e 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Comment=Breeze by the KDE VDG Comment[ca]=Brisa pel VDG del KDE +Comment[ca@valencia]=Brisa pel VDG del KDE Comment[es]=Brisa por KDE VDG Comment[gl]=Breeze de KDE VDG Comment[id]=Breeze oleh KDE VDG diff --git a/sddm-theme/metadata.desktop b/sddm-theme/metadata.desktop index 88925c1aa..8f5750049 100644 --- a/sddm-theme/metadata.desktop +++ b/sddm-theme/metadata.desktop @@ -45,6 +45,7 @@ Name[zh_CN]=微风 Name[zh_TW]=微風 Description=Breeze Description[ca]=Brisa +Description[ca@valencia]=Brisa Description[es]=Brisa Description[gl]=Breeze Description[id]=Breeze