From 81961f65c6cc36e79aeabe15e02f1711a9ceb95d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Jul 2016 09:56:15 +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 d29e5509ac..6224970a58 100644 --- a/effects/cube/cubeslide_config.desktop +++ b/effects/cube/cubeslide_config.desktop @@ -10,7 +10,7 @@ Name[ast]=Animación del cubu d'escritoriu Name[bg]=Кубична анимация върху работен плот Name[bs]=Animacija kocke površi Name[ca]=Animació de cub per a l'escriptori -Name[ca@valencia]=Animació del cub d'escriptori +Name[ca@valencia]=Animació de cub per a l'escriptori Name[cs]=Animace kostky plochy Name[csb]=Animacëjô Szescanu pùltu Name[da]=Animeret skrivebordsterning