From a143a83f6732e1bd73a70221e18a9ce3c3788912 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 4 Sep 2018 08:26:22 +0200 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/cube_config.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/cube/cube_config.desktop b/effects/cube/cube_config.desktop index 47ebd0f0d6..0be142b5ab 100644 --- a/effects/cube/cube_config.desktop +++ b/effects/cube/cube_config.desktop @@ -60,7 +60,7 @@ Name[pl]=Sześcian pulpitu Name[pt]=Cubo de Ecrãs Name[pt_BR]=Cubo de áreas de trabalho Name[ro]=Cub de birou -Name[ru]=Куб с рабочими столами +Name[ru]=Куб рабочих столов Name[si]=වැඩතල ඝනකය Name[sk]=Plochy na kocke Name[sl]=Kocka z namizji