Commit 4d29ea38 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 5224972c
......@@ -3,6 +3,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[fr]=Module de phases lunaires pour les agendas
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
......@@ -11,6 +12,7 @@ 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[fr]=Ce module affiche la phase lunaire des jours (nouvelle lune, premier quartier, pleine lune, dernier quartier)
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