From 858d7b0057ea5dc0f2d2a8644133017f57899643 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Jun 2017 04:30:27 +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.telhandler.desktop | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop index d3a5507e7..415d40a00 100644 --- a/urlhandler/org.kde.kdeconnect.telhandler.desktop +++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop @@ -1,5 +1,12 @@ [Desktop Entry] Name=KDE Connect Phone URL Handler +Name[ca]=Gestor d'URL de telèfons del KDE Connect +Name[nl]=URL behandelaar van KDE-Connect-telefoon +Name[pl]=KDE Connect - obsługa URL telefonu +Name[pt]=Tratamento de URL's Telefónicos do KDE Connect +Name[sv]=KDE-anslut hanterare av telefonwebbadress +Name[uk]=Обробник телефонних адрес KDE Connect +Name[x-test]=xxKDE Connect Phone URL Handlerxx Exec=kdeconnect-handler %U Icon=kdeconnect Type=Application