From 3ece5162ba387ab1ee2cd033fc0dfc5933eb94a8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 28 Sep 2020 09:54:39 +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 bbec0b72a..ffb55d948 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -6,6 +6,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[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[eu]=KDE Connect-eko URL maneiatzailea Name[fi]=KDE Connectin verkko-osoitekäsittelijä