From 2860504d6b732aebf130e181eb6e38afe629c97d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 24 Feb 2019 05:28:07 +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 21e71856e..5a3247bc3 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -18,6 +18,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