From ad4fba5243146bdba18724381d4e87d44f257681 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 20 Aug 2020 09:38:12 +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" --- containment/metadata.desktop.cmake | 1 + containment/package/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake index b32eac24e..bf5d98c83 100644 --- a/containment/metadata.desktop.cmake +++ b/containment/metadata.desktop.cmake @@ -39,6 +39,7 @@ Comment[en_GB]=Containment provided for the Latte Dock Comment[es]=Contención proporcionada para Latte Dock Comment[eu]=Konfinamendua hornitu da Latte Dockentzako Comment[fi]=Latte-telakalla tarjottu sisällytys +Comment[fr]=Confinement fourni par le panneau « Latte » Comment[gl]=Contedor fornecido para a doca Latte. Comment[id]=Kontainmen disediakan untuk Dock Latte Comment[it]=Contenitore fornito per Latte Dock diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index 90f13a6b7..a38a0837a 100644 --- a/containment/package/metadata.desktop +++ b/containment/package/metadata.desktop @@ -39,6 +39,7 @@ Comment[en_GB]=Containment provided for the Latte Dock Comment[es]=Contención proporcionada para Latte Dock Comment[eu]=Konfinamendua hornitu da Latte Dockentzako Comment[fi]=Latte-telakalla tarjottu sisällytys +Comment[fr]=Confinement fourni par le panneau « Latte » Comment[gl]=Contedor fornecido para a doca Latte. Comment[id]=Kontainmen disediakan untuk Dock Latte Comment[it]=Contenitore fornito per Latte Dock