From d167f91cdc0a84b126f330a6fba13689e691bd40 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 24 Feb 2019 08:18:30 +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" --- linux/applications/org.kde.falkon.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 1f7f1ad96..2ba4594e3 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -19,6 +19,7 @@ Name[nn]=Falkon Name[pl]=Falkon Name[pt]=Falkon Name[pt_BR]=Falkon +Name[ru]=Falkon Name[sk]=Falkon Name[sv]=Falkon Name[uk]=Falkon