From d0cc92b74c5cbe85dd6fa4adccf54c80b53bc8cd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 May 2020 06:31:10 +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" --- wallpapers/Next/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 189983e8..f3d4559c 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -4,10 +4,12 @@ Name[ca]=Flow Name[es]=Fujo Name[et]=Flow Name[eu]=Flow +Name[fr]=Flux Name[nl]=Flow Name[nn]=Flyt Name[pt]=Fluxo Name[pt_BR]=Flow +Name[ru]=Поток Name[sk]=Prúd Name[sv]=Flow Name[uk]=Потік