From 6634b8ff2020b7bbf0dcb4468a419d520a612373 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 20 May 2021 01:16:44 +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 cc29d03ca..9a3cdd234 100644 --- a/containment/metadata.desktop.cmake +++ b/containment/metadata.desktop.cmake @@ -7,6 +7,7 @@ Name[ca@valencia]=Contenidor del Latte Name[es]=Contenedor de Latte Name[fr]=Conteneur pour Latte Name[it]=Contenitore di Latte +Name[ko]=Latte 컨테이너 Name[nl]=Latte-container Name[pl]=Pojemnik Latte Name[pt]=Contentor do Latte diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index 12936d002..f764085c7 100644 --- a/containment/package/metadata.desktop +++ b/containment/package/metadata.desktop @@ -7,6 +7,7 @@ Name[ca@valencia]=Contenidor del Latte Name[es]=Contenedor de Latte Name[fr]=Conteneur pour Latte Name[it]=Contenitore di Latte +Name[ko]=Latte 컨테이너 Name[nl]=Latte-container Name[pl]=Pojemnik Latte Name[pt]=Contentor do Latte