From 06736423edf7fa2546444435a1d49a7665e4a3e4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 12 Jun 2017 05:09:43 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop index 415d40a00..40ccbd1ba 100644 --- a/urlhandler/org.kde.kdeconnect.telhandler.desktop +++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=KDE Connect Phone URL Handler Name[ca]=Gestor d'URL de telèfons del KDE Connect +Name[ca@valencia]=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