From eefd721de6f65b07cb0f3501fca970894fcc5e26 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 30 Jul 2020 09:33:28 +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 9ffec82f1..5398a43a9 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Gestor d'URL del KDE Connect Name[cs]=Nástroj pro práci s URL v KDE Connect Name[da]=URL-håndtering til KDE Connect Name[es]=Controlador de URL de KDE Connect +Name[eu]=KDE Connect-eko URL maneiatzailea Name[fi]=KDE Connectin verkko-osoitekäsittelijä Name[fr]=Gestionnaire d'URL de KDE Connect Name[ia]=Gerente de URL de KDE Connect