From 37f82dcc8f3de2e42589369b0e85323d4efb5547 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Oct 2020 09:36:48 +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" --- 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 74b26ac3a..51bd85fff 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -8,6 +8,7 @@ Name[da]=URL-håndtering til KDE Connect Name[de]=KDE Connect-SMS-Dienstprogramm für URLs (Adressen) Name[en_GB]=KDE Connect URL Handler Name[es]=Controlador de URL de KDE Connect +Name[et]=KDE Connecti URL-ide käitleja Name[eu]=KDE Connect-eko URL maneiatzailea Name[fi]=KDE Connectin verkko-osoitekäsittelijä Name[fr]=Gestionnaire d'URL de KDE Connect