From 022df2baadb4177c5baa965548437a45958b1238 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 6 Sep 2022 01:46:19 +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 6935da15..7e2a7809 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -22,6 +22,7 @@ Name[pl]=Bezpieczne lądowanie Name[pt]=Aterragem Segura Name[pt_BR]=Pouso seguro Name[ro]=Aterizare ușoară +Name[ru]=Safe Landing Name[sk]=Bezpečné pristátie Name[sl]=Varen pristanek Name[sv]=Säker landning