From b0acd555462c861ad826135de03ed7eb5d55380c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 Feb 2021 06:51:54 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 778308e5c..e4522bb63 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -96,7 +96,7 @@ GenericName[lt]=Saityno naršyklė GenericName[nl]=Webbrowser GenericName[nn]=Nettlesar GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ -GenericName[pl]=Przeglądarka internetowa +GenericName[pl]=Przeglądarka sieciowa GenericName[pt]=Navegador Web GenericName[pt_BR]=Navegador Web GenericName[ru]=Веб-браузер