From a46fe062cf60a6a0e8bd1356bf772381bdc4ace0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Aug 2024 02:25:59 +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" --- app/latte-layouts.knsrc | 2 +- app/lattedock.notifyrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc index 6e757a23b..27800d161 100644 --- a/app/latte-layouts.knsrc +++ b/app/latte-layouts.knsrc @@ -4,7 +4,7 @@ Name[ar]=مخطّطات لاتيه Name[az]=Latte Maketləri Name[ca]=Disposicions del Latte Name[ca@valencia]=Disposicions de Latte -Name[cs]=Rozložení Latte +Name[cs]=Rozvržení Latte Name[de]=Latte-Profile Name[el]=Προφίλ Latte Name[en_GB]=Latte Layouts diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index c6d7dc155..9d6d86ac4 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -321,7 +321,7 @@ Name[ar]=بدل إلى تخطيط Name[az]=Maketi Keçmək Name[ca]=Commuta a la disposició Name[ca@valencia]=Canvia a la disposició -Name[cs]=Přepnout na rozložení +Name[cs]=Přepnout na rozvržení Name[da]=Skift til layout Name[de]=Wechsel zu Profil Name[el]=Εναλλαγή στο προφίλ