From c610b6da5200658f3c15991f459722bfdeb76085 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 6 Feb 2018 05:18:30 +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 | 2 ++ korganizer/plugins/lunarphases/lunarphases.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kmail/editorplugins/inserttemplatecommand/kmail_inserttemplatecommandeditorplugin.json b/kmail/editorplugins/inserttemplatecommand/kmail_inserttemplatecommandeditorplugin.json index 79d8fcdf..c6748366 100644 --- a/kmail/editorplugins/inserttemplatecommand/kmail_inserttemplatecommandeditorplugin.json +++ b/kmail/editorplugins/inserttemplatecommand/kmail_inserttemplatecommandeditorplugin.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "This plugin allows you to insert a template command in composer.", + "Description[ca@valencia]": "Este connector permet inserir una orde de plantilla a l'editor.", "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.", @@ -10,6 +11,7 @@ "EnabledByDefault": "true", "Id": "kmailinserttemplatecommand", "Name": "Insert Template Command", + "Name[ca@valencia]": "Insereix orde de plantilla", "Name[ca]": "Insereix ordre de plantilla", "Name[nl]": "Sjablooncommando invoegen", "Name[pt]": "Inserir um Modelo de Comando", diff --git a/korganizer/plugins/lunarphases/lunarphases.desktop b/korganizer/plugins/lunarphases/lunarphases.desktop index e414f628..45bc2f2a 100644 --- a/korganizer/plugins/lunarphases/lunarphases.desktop +++ b/korganizer/plugins/lunarphases/lunarphases.desktop @@ -2,6 +2,7 @@ X-KDE-Library=korg_lunarphases Name=Lunar Phases Plugin for Calendars Name[ca]=Connector de fases lunars pels calendaris +Name[ca@valencia]=Connector de fases lunars pels calendaris Name[nl]=Plug-in voor maanfasen voor kalenders Name[pt]='Plugin' de Fases da Lua para os Calendários Name[sv]=Månfasinsticksprogram för kalendrar @@ -9,6 +10,7 @@ Name[uk]=Додаток фаз місяця для календарів Name[x-test]=xxLunar Phases Plugin for Calendarsxx Comment=This plugin shows the day's lunar phase (New, First, Last, Full) Comment[ca]=Aquest connector mostra la fase lunar del dia (Nova, Creixent, Plena, Minvant) +Comment[ca@valencia]=Este connector mostra la fase lunar del dia (Nova, Creixent, Plena, Minvant) Comment[nl]=Deze plug-in toont de maanfase van de dag (Nieuwe, Eerste, Laatste, Volle) Comment[pt]=Este 'plugin' mostra a fase da Lua do dia (Nova, Minguante, Crescente, Cheia) Comment[sv]=Insticksprogrammet visar dagens månfas (ny, första, sista, full) -- GitLab