Commit 3903be52 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 df603227
......@@ -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[de]=Mondphasen-Modul für Kalender
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
......
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