Commit e94e6413 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 2757fd52
......@@ -9,6 +9,7 @@ Name[de]=Dekoration für den Kalender
Name[en_GB]=Calendar Decoration Interface
Name[es]=Interfaz de decoración del calendario
Name[et]=Kalendri dekoratsiooni liides
Name[eu]=Calendar Decoration Interface
Name[fi]=Kalenteritekstin koristeluliitännäinen
Name[fr]=Interface de décoration d'agenda
Name[gl]=Interface de decoración de calendarios
......@@ -47,6 +48,7 @@ Comment[de]=Dekoration für den Kalender
Comment[en_GB]=Calendar Decoration Plugin
Comment[es]=Complemento de decoración del calendario
Comment[et]=Kalendri dekoratsiooni plugin
Comment[eu]=Egutegia apaintzeko plugina
Comment[fi]=Kalenteritekstin koristeluliitännäinen
Comment[fr]=Module de décoration d'agenda
Comment[gl]=Complemento para a decoración do calendario
......
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