From af97c5f1ff6ed4261b50942356f6082a04de919d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 14 Apr 2019 05:49:06 +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.smshandler.desktop | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/urlhandler/org.kde.kdeconnect.smshandler.desktop b/urlhandler/org.kde.kdeconnect.smshandler.desktop index b200ee4ad..6047f2588 100644 --- a/urlhandler/org.kde.kdeconnect.smshandler.desktop +++ b/urlhandler/org.kde.kdeconnect.smshandler.desktop @@ -1,5 +1,13 @@ [Desktop Entry] Name=KDE Connect SMS URL Handler +Name[ca]=Gestor d'URL de SMS del KDE Connect +Name[en_GB]=KDE Connect SMS URL Handler +Name[nl]=URL behandelaar van KDE-Connect-SMS +Name[pt]=Tratamento de URL's de SMS do KDE Connect +Name[sv]=KDE-anslut hanterare av SMS-webbadress +Name[uk]=Обробник адрес у SMS KDE Connect +Name[x-test]=xxKDE Connect SMS URL Handlerxx +Name[zh_TW]=KDE 連線簡訊網址處理器 Exec=kdeconnect-handler %U Icon=kdeconnect Type=Application