From 93dd7773515cb759453701a7ef23045e3127ea80 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 5 Feb 2018 06:51:49 +0100 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/slide/slide_config.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/slide/slide_config.desktop b/effects/slide/slide_config.desktop index cb884e504d..f5a613e91a 100644 --- a/effects/slide/slide_config.desktop +++ b/effects/slide/slide_config.desktop @@ -32,6 +32,7 @@ Name[hu]=Csúsztatott váltás Name[ia]=Glissa Name[is]=Renna til Name[it]=Scivola +Name[ja]=スライド Name[kk]=Сырғанату Name[km]=ស្លាយ Name[kn]=ಜಾರು