From afbaa911f9ab1e2406b0c072c7665dc951f57c57 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 28 Nov 2017 05:04:29 +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.telhandler.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop index 470cf96a9..0ac9296cd 100644 --- a/urlhandler/org.kde.kdeconnect.telhandler.desktop +++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop @@ -4,6 +4,7 @@ Name[ca]=Gestor d'URL de telèfons del KDE Connect Name[ca@valencia]=Gestor d'URL de telèfons del KDE Connect Name[cs]=Nástroj pro práci s URL telefonu v KDE Connect Name[da]=Telefon-URL-håndtering til KDE Connect +Name[de]=KDE-Connect-Telefon-Dienstprogramm für URLs (Adressen) Name[el]=KDE Connect χειριστής URL για σύνδεση τηλεφώνου Name[en_GB]=KDE Connect Phone URL Handler Name[es]=Controlador de URL de teléfonos de KDE Connect