From 82c0fb5a065daca11e6d649ec0fe514cdba06fd0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 11 Jun 2021 01:24:36 +0000 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 87af3d533..6cf9fd785 100644 --- a/containment/metadata.desktop.cmake +++ b/containment/metadata.desktop.cmake @@ -6,6 +6,7 @@ Name[ca]=Contenidor del Latte Name[ca@valencia]=Contenidor del Latte Name[cs]=Kontejner Latte Name[es]=Contenedor de Latte +Name[fi]=Latte-säilö Name[fr]=Conteneur pour Latte Name[it]=Contenitore di Latte Name[ko]=Latte 컨테이너 diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index bfe21eb8e..00d10b031 100644 --- a/containment/package/metadata.desktop +++ b/containment/package/metadata.desktop @@ -6,6 +6,7 @@ Name[ca]=Contenidor del Latte Name[ca@valencia]=Contenidor del Latte Name[cs]=Kontejner Latte Name[es]=Contenedor de Latte +Name[fi]=Latte-säilö Name[fr]=Conteneur pour Latte Name[it]=Contenitore di Latte Name[ko]=Latte 컨테이너