From dcfbb6a3146af0b74b2138f89cda9e136e072afe Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Apr 2020 10:16:55 +0200 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 e7cd5bdfa..bbdda64b6 100644 --- a/app/latte-layouts.knsrc +++ b/app/latte-layouts.knsrc @@ -8,7 +8,7 @@ Name[de]=Latte-Profile Name[el]=Προφίλ Latte Name[en_GB]=Latte Layouts Name[es]=Distribuciones de Latte -Name[eu]=Latte diseinuak +Name[eu]=Latte antolamenduak Name[fi]=Latte-asettelut Name[gl]=Disposicións de Latte Name[id]=Tataletak Latte diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index 401934bae..d83b7bd33 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -235,7 +235,7 @@ Name[de]=Wechsel zu Profil Name[el]=Εναλλαγή στο προφίλ Name[en_GB]=Switch to layout Name[es]=Cambiar a distribución -Name[eu]=Aldatu diseinura +Name[eu]=Aldatu antolamendura Name[fi]=Vaihda asetteluun Name[gl]=Cambiar á disposición Name[id]=Beralih ke tataletak