From 8a0252a1227026ddbfc19a4137b54ad6ab72c822 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 18 Aug 2022 01:47:54 +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" --- applets/activitybar/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applets/activitybar/metadata.json b/applets/activitybar/metadata.json index 9b585cd2b..3ee27c0f2 100644 --- a/applets/activitybar/metadata.json +++ b/applets/activitybar/metadata.json @@ -96,7 +96,7 @@ "Name[ast]": "Barra d'actividaes", "Name[az]": "İş otağı paneli", "Name[be@latin]": "Panel zaniatkaŭ", - "Name[bg]": "Лента за активност", + "Name[bg]": "Лента на дейности", "Name[bs]": "Traka aktivnosti", "Name[ca@valencia]": "Barra d'activitat", "Name[ca]": "Barra d'activitat",