From 149f756ce8e2d5461d3c189fc61c070bb8534d3f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 23 Mar 2022 02:09: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/eyeonscreen/package/metadata.desktop | 2 +- src/effects/slideback/metadata.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/effects/eyeonscreen/package/metadata.desktop b/src/effects/eyeonscreen/package/metadata.desktop index 8b6b8ee7e0..f87729dae4 100644 --- a/src/effects/eyeonscreen/package/metadata.desktop +++ b/src/effects/eyeonscreen/package/metadata.desktop @@ -41,7 +41,7 @@ Comment=Suck windows into the desktop Comment[ar]=تمتص النوافذ في سطح المكتب Comment[az]=Pəncərənin İş Masasının mərkəzinə çəkilməsi Comment[ca]=Enganxa les finestres a l'escriptori -Comment[ca@valencia]=Enganxa les finestres a l'escriptori +Comment[ca@valencia]=Apega les finestres a l'escriptori Comment[de]= Fenster in die Arbeitsfläche saugen Comment[en_GB]=Suck windows into the desktop Comment[es]=Aspirar las ventanas en el escritorio diff --git a/src/effects/slideback/metadata.json b/src/effects/slideback/metadata.json index fcb701cc38..2b7ab0ef8a 100644 --- a/src/effects/slideback/metadata.json +++ b/src/effects/slideback/metadata.json @@ -4,7 +4,7 @@ "Description": "Slide back windows when another window is raised", "Description[ar]": "مرر النوافذ للخلف عند صعود نافذة أخرى", "Description[az]": "Yeni pəncərə qaldırıldığında digər pəncərə arxaya sürüşür", - "Description[ca@valencia]": "Llisca arrere les finestres quan s'eleva una altra finestra", + "Description[ca@valencia]": "Llisca enrere les finestres quan s'eleva una altra finestra", "Description[ca]": "Llisca enrere les finestres quan s'eleva una altra finestra", "Description[cs]": "Zasunout okna, pokud ztratí zaměření", "Description[en_GB]": "Slide back windows when another window is raised", @@ -35,7 +35,7 @@ "Name": "Slide Back", "Name[ar]": "التمرير الخلفي", "Name[az]": "Arxasına sürüşdürmək", - "Name[ca@valencia]": "Llisca cap arrere", + "Name[ca@valencia]": "Llisca cap enrere", "Name[ca]": "Llisca cap enrere", "Name[cs]": "Zasunout", "Name[en_GB]": "Slide Back",