Commit bff12145 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 64914cc0
Pipeline #31930 skipped
......@@ -13,6 +13,7 @@ Name[eu]=Egutegia apaintzeko interfazea
Name[fi]=Kalenteritekstin koristeluliitännäinen
Name[fr]=Interface de décoration d'agenda
Name[gl]=Interface de decoración de calendarios
Name[hi]=कैलेन्डर सजावट अंतरफलक
Name[ia]=Interfacie de decoration de Calendario
Name[it]=Interfaccia di decorazione del calendario
......@@ -52,6 +53,7 @@ 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
Comment[hi]=कैलेन्डर सजावट प्लगिन
Comment[ia]=Plug-in de decoration de Calendario
Comment[it]=Estensione di decorazione del 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