From 84e5d92f6771337af7f00015306dff08d03c00aa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 31 Jul 2022 01:49:29 +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/slideback/metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/effects/slideback/metadata.json b/src/effects/slideback/metadata.json index 2db9711fd2..bc414edb15 100644 --- a/src/effects/slideback/metadata.json +++ b/src/effects/slideback/metadata.json @@ -5,7 +5,7 @@ "Description[ar]": "مرر النوافذ للخلف عند صعود نافذة أخرى", "Description[az]": "Yeni pəncərə qaldırıldığında digər pəncərə arxaya sürüşür", "Description[bg]": "Плъзгане на прозорците назад, когато се повдигне друг прозорец", - "Description[ca@valencia]": "Llisca enrere les finestres quan s'eleva una altra finestra", + "Description[ca@valencia]": "Llisca arrere 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[de]": "Fenster nach hinten gleiten, wenn ein anderes Fenster aktiviert wird.", @@ -41,7 +41,7 @@ "Name[ar]": "التمرير الخلفي", "Name[az]": "Arxasına sürüşdürmək", "Name[bg]": "Плъзгане назад", - "Name[ca@valencia]": "Llisca cap enrere", + "Name[ca@valencia]": "Llisca cap arrere", "Name[ca]": "Llisca cap enrere", "Name[cs]": "Zasunout", "Name[de]": "Nach hinten gleiten",