2. Modifications

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Modifications envoyées Il y a 11 mois

Dépôt rebasé Il y a 11 mois

Rebasing (1/39)
error: could not apply 1df63fdb... Translated using Weblate (Italian)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1df63fdb... Translated using Weblate (Italian)
Auto-merging support/documentation/po/livechat.it.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.it.po
 (1)

Il y a 11 mois

Auto-merging support/documentation/po/livechat.zh-Hant.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.zh-Hant.po
Auto-merging support/documentation/po/livechat.zh-Hans.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.zh-Hans.po
Auto-merging support/documentation/po/livechat.vi.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.vi.po
Auto-merging support/documentation/po/livechat.uk.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.uk.po
Auto-merging support/documentation/po/livechat.tok.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.tok.po
Auto-merging support/documentation/po/livechat.th.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.th.po
Auto-merging support/documentation/po/livechat.sv.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.sv.po
Auto-merging support/documentation/po/livechat.sq.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.sq.po
Auto-merging support/documentation/po/livechat.ru.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.ru.po
Auto-merging support/documentation/po/livechat.pt.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.pt.po
Auto-merging support/documentation/po/livechat.pl.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.pl.po
Auto-merging support/documentation/po/livechat.oc.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.oc.po
Auto-merging support/documentation/po/livechat.nn.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.nn.po
Auto-merging support/documentation/po/livechat.nl.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.nl.po
Auto-merging support/documentation/po/livechat.nb.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.nb.po
Auto-merging support/documentation/po/livechat.kab.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.kab.po
Auto-merging support/documentation/po/livechat.ja.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.ja.po
Auto-merging support/documentation/po/livechat.it.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.it.po
Auto-merging support/documentation/po/livechat.is.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.is.po
Auto-merging support/documentation/po/livechat.hu.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.hu.po
Auto-merging support/documentation/po/livechat.hr.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.hr.po
Auto-merging support/documentation/po/livechat.gl.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.gl.po
Auto-merging support/documentation/po/livechat.gd.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.gd.po
Auto-merging support/documentation/po/livechat.fr.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.fr.po
Auto-merging support/documentation/po/livechat.fi.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.fi.po
Auto-merging support/documentation/po/livechat.fa.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.fa.po
Auto-merging support/documentation/po/livechat.eu.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.eu.po
Auto-merging support/documentation/po/livechat.es.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.es.po
Auto-merging support/documentation/po/livechat.eo.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.eo.po
Auto-merging support/documentation/po/livechat.el.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.el.po
Auto-merging support/documentation/po/livechat.de.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.de.po
Auto-merging support/documentation/po/livechat.cs.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.cs.po
Auto-merging support/documentation/po/livechat.ca.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.ca.po
Auto-merging support/documentation/po/livechat.ar.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.ar.po
Automatic merge failed; fix conflicts and then commit the result.
 (1)

Il y a 11 mois

Rebasing (1/39)
error: could not apply 1df63fdb... Translated using Weblate (Italian)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1df63fdb... Translated using Weblate (Italian)
Auto-merging support/documentation/po/livechat.it.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.it.po
 (1)

Il y a 11 mois

Rebasing (1/39)
error: could not apply 1df63fdb... Translated using Weblate (Italian)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1df63fdb... Translated using Weblate (Italian)
Auto-merging support/documentation/po/livechat.it.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.it.po
 (1)

Il y a 11 mois

Rebasing (1/39)
error: could not apply 1df63fdb... Translated using Weblate (Italian)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1df63fdb... Translated using Weblate (Italian)
Auto-merging support/documentation/po/livechat.it.po
CONFLICT (content): Merge conflict in support/documentation/po/livechat.it.po
 (1)

Il y a 11 mois

Modifications envoyées Il y a 11 mois