Commit 27cec28f authored by Script Kiddy's avatar Script Kiddy

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"
parent 930a0147
{
"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]": "Вставлення шаблонної команди",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment