From 45745976da2bbef22fed71527ef68b3b933ad613 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 9 Aug 2022 01:45: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 c9cb4aa4..6935da15 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -6,6 +6,7 @@ Name[bg]=Safe Landing Name[ca]=Aterratge segur Name[ca@valencia]=Aterratge segur Name[cs]=Bezpečné přistání +Name[da]=Sikker landing Name[de]=Sichere Landung Name[en_GB]=Safe Landing Name[es]=Aterrizaje seguro