From 0c6bf857be1ff3fdb4cef23c0763c3053f2033f3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Oct 2021 01:16:55 +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/overview/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/effects/overview/metadata.json b/src/effects/overview/metadata.json index 35d7922d59..bbde1c1444 100644 --- a/src/effects/overview/metadata.json +++ b/src/effects/overview/metadata.json @@ -3,7 +3,7 @@ "Category": "Window Management", "Description": "Allows you to overview virtual desktops and windows", "Description[az]": "Pəncərələrə və iş masalarına ümumi baxışa imkan yaradır", - "Description[ca]": "Permet un vista general dels escriptoris virtuals i les finestres", + "Description[ca]": "Permet una vista general dels escriptoris virtuals i les finestres", "Description[es]": "Le permite mostrar una vista general de los escritorios virtuales y de las ventanas", "Description[fr]": "Permet d'avoir un aperçu des bureaux virtuels et des fenêtres", "Description[nl]": "Biedt u een overzicht van virtuele bureaubladen en vensters",