From 3c810530e7622894fde5199bdf554fbe9973b664 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 18 Dec 2020 10:00:22 +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" --- urlhandler/org.kde.kdeconnect.handler.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop index 4a443c481..499c70264 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -24,6 +24,7 @@ Name[pl]=Obsługa adresów URL dla KDE Connect Name[pt]=Tratamento de URL's do KDE Connect Name[pt_BR]=Tratamento de URLs do KDE Connect Name[ro]=Manipulant de URL KDE Connect +Name[sk]=Obslužný program URL KDE Connect Name[sl]=Upravitelj naslovov KDE Connect Name[sv]=KDE-anslut webbadresshanterare Name[uk]=Обробник адрес KDE Connect