From 453f342c712cfa49dcffd710cbbb7b6c319640e5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 6 Oct 2020 09:23:39 +0200 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 eca486dd..df1df9b2 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -2,6 +2,7 @@ Name=Shell Name[az]=Üzlük Name[ca]=Shell +Name[cs]=Shell Name[da]=Skal Name[de]=Flow Name[el]=Φλοιός