Closes #4099 - Translate ticket merge email templates to French.

app/views/mailer/ticket_update_merged_into/fr.html.erb

@@ -0,0 +1,11 @@
+Un Ticket (#{ticket.title}) a été fusionné dans un autre ticket
+
+<div>Bonjour #{recipient.firstname},</div>
+<br>
+<div>
+Un Ticket (#{ticket.title}) a été fusionné dans un autre ticket par "<b>#{current_user.longname}</b>".
+</div>
+<br>
+<div>
+  <a href="#{config.http_type}://#{config.fqdn}/#ticket/zoom/#{ticket.id}" target="zammad_app">#{t('View this in Zammad')}</a>
+</div>

app/views/mailer/ticket_update_received_merge/fr.html.erb

@@ -0,0 +1,11 @@
+Un autre ticket a été fusionné dans le ticket (#{ticket.title})
+
+<div>Bonjour #{recipient.firstname},</div>
+<br>
+<div>
+Un autre ticket a été fusionné dans le ticket (#{ticket.title}) par "<b>#{current_user.longname}</b>".
+</div>
+<br>
+<div>
+  <a href="#{config.http_type}://#{config.fqdn}/#ticket/zoom/#{ticket.id}" target="zammad_app">#{t('View this in Zammad')}</a>
+</div>

i18n/zammad.pot

@@ -10579,8 +10579,10 @@ msgstr ""
 #: app/views/mailer/ticket_update/zh-cn.html.erb
 #: app/views/mailer/ticket_update/zh-tw.html.erb
 #: app/views/mailer/ticket_update_merged_into/en.html.erb
+#: app/views/mailer/ticket_update_merged_into/fr.html.erb
 #: app/views/mailer/ticket_update_merged_into/ru.html.erb
 #: app/views/mailer/ticket_update_received_merge/en.html.erb
+#: app/views/mailer/ticket_update_received_merge/fr.html.erb
 #: app/views/mailer/ticket_update_received_merge/ru.html.erb
 msgid "View this in Zammad"
 msgstr ""