Commit 6e94282b 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 d92ecc47
......@@ -12,6 +12,7 @@ Name[pt]='Plugin' de Fases da Lua para os Calendários
Name[sv]=Månfasinsticksprogram för kalendrar
Name[uk]=Додаток фаз місяця для календарів
Name[x-test]=xxLunar Phases Plugin for Calendarsxx
Name[zh_CN]=日历的月相插件
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)
......@@ -23,6 +24,7 @@ Comment[pt]=Este 'plugin' mostra a fase da Lua do dia (Nova, Minguante, Crescent
Comment[sv]=Insticksprogrammet visar dagens månfas (ny, första, sista, full)
Comment[uk]=Цей додаток показує фазу місяця (новий, перша чверть, остання чверть, повня)
Comment[x-test]=xxThis plugin shows the day's lunar phase (New, First, Last, Full)xx
Comment[zh_CN]=这个插件显示每日的月相(新月、弦月、盈凸月、满月)
Type=Service
X-KDE-ServiceTypes=Calendar/Plugin,Calendar/Decoration
X-KDE-KOrganizer-HasSettings=false
......
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