From d0443e2e6b6b715a902d83b7ea5592f5278fb530 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 1 Jul 2020 06:01:31 +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 e3695922d..d9ef303b1 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -9,6 +9,7 @@ Name[eu]=KDE Connect-en URL maneiatzailea Name[fi]=KDE Connectin verkko-osoitekäsittelijä Name[fr]=Gestionnaire d'URL de KDE Connect Name[it]=Gestore URL di KDE Connect +Name[ko]=KDE Connect URL 처리기 Name[lt]=KDE Connect URL doroklė Name[nl]=URL behandelaar van KDE-Connect Name[nn]=KDE Connect adressehandsamar