From e511f2678234b3550fbb1115912a22af4d340956 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Jul 2016 13:39:58 +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" --- effects/cube/cubeslide_config.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/cube/cubeslide_config.desktop b/effects/cube/cubeslide_config.desktop index 3ea9583e26..d29e5509ac 100644 --- a/effects/cube/cubeslide_config.desktop +++ b/effects/cube/cubeslide_config.desktop @@ -9,7 +9,7 @@ Name=Desktop Cube Animation Name[ast]=Animación del cubu d'escritoriu Name[bg]=Кубична анимация върху работен плот Name[bs]=Animacija kocke površi -Name[ca]=Animació del cub d'escriptori +Name[ca]=Animació de cub per a l'escriptori Name[ca@valencia]=Animació del cub d'escriptori Name[cs]=Animace kostky plochy Name[csb]=Animacëjô Szescanu pùltu