From b3a8fcab336905c8cc3d722dd9fb7f7ba32fa47c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 9 Jul 2022 01:48:55 +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 648d5e4c..66b4e131 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -5,6 +5,7 @@ Name[az]=Yumşaq eniş Name[bg]=Safe Landing Name[ca]=Aterratge segur Name[ca@valencia]=Aterratge segur +Name[cs]=Bezpečné přistání Name[de]=Sichere Landung Name[es]=Aterrizaje seguro Name[fr]=Atterrissage en douceur