From c3c6c3a6697a363ae26154322d540b8216e0eb58 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Jul 2020 09:55:53 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 79509166..c857821b 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -9,6 +9,7 @@ Name[et]=Flow Name[eu]=Flow Name[fi]=Flow Name[fr]=Flux +Name[ia]=Fluxo (Flow) Name[it]=Flusso Name[ko]=흐름 Name[nl]=Flow