Commit bc261bea 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 1dd2fd4d
Pipeline #33480 skipped
......@@ -6,6 +6,7 @@ Name[ca@valencia]=Interfície de decoració del calendari
Name[cs]=Rozhraní dekorace kalendáře
Name[de]=Dekoration für den Kalender
Name[el]=Διεπαφή διακόσμησης ημερολογίου
Name[en_GB]=Calendar Decoration Interface
Name[es]=Interfaz de decoración del calendario
Name[et]=Kalendri dekoratsiooni liides
......@@ -46,6 +47,7 @@ Comment[ca@valencia]=Connector de decoració del calendari
Comment[cs]=Modul dekorace kalendáře
Comment[da]=Plugin til kalenderdekoration
Comment[de]=Dekoration für den Kalender
Comment[el]=Πρόσθετο διακόσμησης ημερολογίου
Comment[en_GB]=Calendar Decoration Plugin
Comment[es]=Complemento de decoración del calendario
Comment[et]=Kalendri dekoratsiooni plugin
Supports Markdown
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