Commit dfd19f2c 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 3903be52
......@@ -4,6 +4,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[de]=Mondphasen-Modul für Kalender
Name[en_GB]=Lunar Phases Plugin for Calendars
Name[fr]=Module de phases lunaires pour les agendas
Name[it]=Estensione fasi lunari per i calendari
Name[nl]=Plug-in voor maanfasen voor kalenders
......@@ -14,6 +15,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[en_GB]=This plugin shows the day's lunar phase (New, First, Last, Full)
Comment[fr]=Ce module affiche la phase lunaire des jours (nouvelle lune, premier quartier, pleine lune, dernier quartier)
Comment[it]=Questa estensione mostra la fase lunare del giorno (nuova, primo quarto, ultimo quarto, piena)
Comment[nl]=Deze plug-in toont de maanfase van de dag (Nieuwe, Eerste, Laatste, Volle)
......
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