From f43f38dac08d0f7802a844b7d04f123d731dedad Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 30 Jun 2022 01:45:32 +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 eb0a473a..f44d7fe9 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -7,6 +7,7 @@ Name[ca@valencia]=Aterratge segur Name[de]=Sichere Landung Name[es]=Aterrizaje seguro Name[fr]=Atterrissage en douceur +Name[ia]=Atterrage secur (Safe Landing) Name[it]=Atterraggio sicuro Name[nl]=Veilige landing Name[nn]=Trygg landing