From 1f191516ffa6fe1ac484ef5ee55313454614accf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 7 May 2021 01:17:37 +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 e3ad251e2..ef0349191 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[es]=Contenedor de Latte Name[nl]=Latte-container +Name[sl]=Latte zadrževalnik Name[sv]=Latte-omgivning Name[uk]=контейнер Латте Name[x-test]=xxLatte Containmentxx diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index 9e8f751a1..0c59f90fd 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[es]=Contenedor de Latte Name[nl]=Latte-container +Name[sl]=Latte zadrževalnik Name[sv]=Latte-omgivning Name[uk]=контейнер Латте Name[x-test]=xxLatte Containmentxx