From 6b7c558cff6c1694b4528708ea37587930e23a08 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 4 Jun 2021 01:24:23 +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 91e5208ef..87af3d533 100644 --- a/containment/metadata.desktop.cmake +++ b/containment/metadata.desktop.cmake @@ -16,6 +16,7 @@ Name[sl]=Latte zadrževalnik Name[sv]=Latte-omgivning Name[uk]=контейнер Латте Name[x-test]=xxLatte Containmentxx +Name[zh_CN]=Latte 容器 Comment=Containment provided for the Latte Dock Comment[az]=Latte Dok paneli üçün təmin edilən qoruma Comment[ca]=Contenidor proporcionat per l'acoblador Latte diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index d16a77546..bfe21eb8e 100644 --- a/containment/package/metadata.desktop +++ b/containment/package/metadata.desktop @@ -16,6 +16,7 @@ Name[sl]=Latte zadrževalnik Name[sv]=Latte-omgivning Name[uk]=контейнер Латте Name[x-test]=xxLatte Containmentxx +Name[zh_CN]=Latte 容器 Comment=Containment provided for the Latte Dock Comment[az]=Latte Dok paneli üçün təmin edilən qoruma Comment[ca]=Contenidor proporcionat per l'acoblador Latte