Commit c610b6da 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 2e2f486f
"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",
......@@ -2,6 +2,7 @@
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)
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