From 163c36595e8d21319598d59d16b3391597312045 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 7 Nov 2022 01:51:06 +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" --- src/effects/mousemark/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/effects/mousemark/metadata.json b/src/effects/mousemark/metadata.json index 222fca8a17..c3baa0cc52 100644 --- a/src/effects/mousemark/metadata.json +++ b/src/effects/mousemark/metadata.json @@ -5,7 +5,7 @@ "Description[ar]": "يسمح لك برسم خطوط على سطح المكتب", "Description[az]": "Siçan kursoru ilə ekranda şəkil çəkməyə imkan verir", "Description[bg]": "Позволява ви да чертаете линии на работния плот", - "Description[ca@valencia]": "Permet dibuixar línies a l'escriptori", + "Description[ca@valencia]": "Permet dibuixar línies en l'escriptori", "Description[ca]": "Permet dibuixar línies a l'escriptori", "Description[cs]": "Umožní kreslit čáry na ploše", "Description[de]": "Lässt Sie mit der Maus Linien auf die Arbeitsfläche zeichnen",