From 95e7d82f5b014e5adec14d6c29c1a26d55b50ef5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 16 Jun 2022 01:54:22 +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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 920d843d..581ce050 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -1,8 +1,10 @@ [Desktop Entry] Name=Safe Landing Name[ar]=هبوط آمن +Name[az]=Yumşaq eniş Name[ca]=Aterratge segur Name[ca@valencia]=Aterratge segur +Name[de]=Sichere Landung Name[es]=Aterrizaje seguro Name[fr]=Atterrissage en douceur Name[it]=Atterraggio sicuro