From 7f37d7934d099f04fd3d32d5104394bb5048e053 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Dec 2019 09:13:11 +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" --- indicator/org.kde.kdeconnect.nonplasma.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index ad561a966..2047e8c28 100644 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -22,7 +22,7 @@ Name[pl]=Wskaźnik KDE Connect Name[pt]=Indicador do KDE Connect Name[pt_BR]=Indicador do KDE Connect Name[ru]=Индикатор KDE Connect -Name[sk]=Ukozaovateľ KDE Connect +Name[sk]=KDE Connect Indikátor Name[sr]=КДЕ‑конекцијин показатељ Name[sr@ijekavian]=КДЕ‑конекцијин показатељ Name[sr@ijekavianlatin]=KDE‑konekcijin pokazatelj