From f822c7058cfcbb9620226b12099f5280a2310d68 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 Mar 2021 17:15:28 +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" --- wallpapers/Next/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 1de9bdea..5d30b307 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -7,6 +7,7 @@ Name[el]=Ο Γαλαξίας μας Name[en_GB]=Milky Way Name[es]=Vía Láctea Name[eu]=Esne-Bidea +Name[fi]=Linnunrata Name[fr]=Voie lactée Name[hu]=Tejút Name[ia]=Milky Way (Via Lactee)