Commit df9ca96c 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 cb2eaef7
......@@ -86,7 +86,7 @@ Comment[en_GB]=Month display with your appointments and events
Comment[es]=Calendario mensual con sus citas y eventos
Comment[eu]=Hileko ikuspegia zure hitzordu eta gertaerekin
Comment[fi]=Kalenterimerkintöjesi kuukausinäkymä
Comment[fr]=Vue mensuelle avec vos rendez-vous et événements
Comment[fr]=Vue mensuelle avec vos rendez-vous et évènements
Comment[he]=תצוגה חודשית עם הפגישות והאירועים שלך
Comment[hu]=Megjeleníti a hónapban esedékes időpontokat és eseményeket
Comment[it]=Visualizzazione del mese con i tuoi appuntamenti ed eventi
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