From 4d407abeda5430e2f794f2e0f66f353b9d86dba6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 1 Jun 2021 01:16:43 +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 | 2 ++ containment/package/metadata.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake index 9a3cdd234..91e5208ef 100644 --- a/containment/metadata.desktop.cmake +++ b/containment/metadata.desktop.cmake @@ -4,6 +4,7 @@ Name=Latte Containment Name[az]=Latte əhatəsi Name[ca]=Contenidor del Latte Name[ca@valencia]=Contenidor del Latte +Name[cs]=Kontejner Latte Name[es]=Contenedor de Latte Name[fr]=Conteneur pour Latte Name[it]=Contenitore di Latte @@ -19,6 +20,7 @@ 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 Comment[ca@valencia]=Contenidor proporcionat per l'acoblador Latte +Comment[cs]=Kontejner pro Latte Dock Comment[da]=Beholder til Latte-dokken Comment[de]=Containment für Latte-Dock Comment[el]=Περιέκτης της εφαρμογής Latte diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index f764085c7..d16a77546 100644 --- a/containment/package/metadata.desktop +++ b/containment/package/metadata.desktop @@ -4,6 +4,7 @@ Name=Latte Containment Name[az]=Latte əhatəsi Name[ca]=Contenidor del Latte Name[ca@valencia]=Contenidor del Latte +Name[cs]=Kontejner Latte Name[es]=Contenedor de Latte Name[fr]=Conteneur pour Latte Name[it]=Contenitore di Latte @@ -19,6 +20,7 @@ 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 Comment[ca@valencia]=Contenidor proporcionat per l'acoblador Latte +Comment[cs]=Kontejner pro Latte Dock Comment[da]=Beholder til Latte-dokken Comment[de]=Containment für Latte-Dock Comment[el]=Περιέκτης της εφαρμογής Latte