From 93bd741b6d6075e31d476854c2bc8f6237ae6c83 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 19 Jan 2021 06:37:28 +0100 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 07b6e239..81e113c6 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -13,6 +13,7 @@ Name[nn]=Mjølkevegen Name[pt]=Via Láctea Name[pt_BR]=Via Láctea Name[ru]=Млечный Путь +Name[sl]=Mlečna cesta Name[sv]=Vintergatan Name[uk]=Чумацький Шлях Name[x-test]=xxMilky Wayxx