From 25194c1d23122cb9f88b8ee2cb52ce32a323cc41 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 14 Mar 2022 01:45:26 +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" --- kcms/mobileshell/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/kcms/mobileshell/package/metadata.desktop b/kcms/mobileshell/package/metadata.desktop index 8fc1b6e0..32ac162d 100644 --- a/kcms/mobileshell/package/metadata.desktop +++ b/kcms/mobileshell/package/metadata.desktop @@ -7,6 +7,7 @@ Name[az]=Örtük Name[ca]=Intèrpret d'ordres Name[ca@valencia]=Intèrpret d'ordres Name[cs]=Shell +Name[de]=Shell Name[en_GB]=Shell Name[es]=Intérprete de órdenes Name[eu]=Oskola