From 30ca8c3aebf0fde3b4cb2f048ae6361aef155bbf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 Jun 2020 05:46:03 +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" --- 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 e31d95a99..fc85cb6c6 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -24,6 +24,7 @@ Name[pt]=Falkon Name[pt_BR]=Falkon Name[ru]=Falkon Name[sk]=Falkon +Name[sl]=Falkon Name[sv]=Falkon Name[uk]=Falkon Name[x-test]=xxFalkonxx