From 27cec28f24970bdd190c174adef95da24a43add9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 3 Feb 2018 05:12:18 +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" --- .../kmail_inserttemplatecommandeditorplugin.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kmail/editorplugins/inserttemplatecommand/kmail_inserttemplatecommandeditorplugin.json b/kmail/editorplugins/inserttemplatecommand/kmail_inserttemplatecommandeditorplugin.json index a0f25973..79d8fcdf 100644 --- a/kmail/editorplugins/inserttemplatecommand/kmail_inserttemplatecommandeditorplugin.json +++ b/kmail/editorplugins/inserttemplatecommand/kmail_inserttemplatecommandeditorplugin.json @@ -1,10 +1,17 @@ { "KPlugin": { "Description": "This plugin allows you to insert a template command in composer.", + "Description[ca]": "Aquest connector permet inserir una ordre de plantilla a l'editor.", + "Description[nl]": "Deze plug-in stelt u in staat een sjablooncommando in de opsteller in te voegen.", + "Description[pt]": "Este 'plugin' permite-lhe inserir um comando-modelo no compositor.", + "Description[sv]": "Insticksprogrammet gör det möjligt att infoga ett mallkommando i brevfönstret.", + "Description[uk]": "За допомогою цього додатка можна вставити шаблонну команду символ до вікна редактора повідомлень.", + "Description[x-test]": "xxThis plugin allows you to insert a template command in composer.xx", "EnabledByDefault": "true", "Id": "kmailinserttemplatecommand", "Name": "Insert Template Command", "Name[ca]": "Insereix ordre de plantilla", + "Name[nl]": "Sjablooncommando invoegen", "Name[pt]": "Inserir um Modelo de Comando", "Name[sv]": "Infoga mallkommando", "Name[uk]": "Вставлення шаблонної команди", -- GitLab