None
thepab
mainline
<p>You have requested a new transition password.</p><p>Here it is already: <strong style="font-size:14px">#NEW_PASSWORD#</strong></p><p>Use it to log into your profile, there you can then assign your own password.</p>
<p> Vous avez demandé un nouveau mot de passe de transition. </p> <p> Le voici déjà : <strong style = "font-size : 14px"> #NEW_PASSWORD# </strong> </p> <p> Utiliser le pour vous connecter à votre profil, vous pourrez alors attribuer votre propre mot de passe. </p>
<p>You have requested a new transition password.</p><p>Here it is already: <strong style="font-size:14px">#NEW_PASSWORD#</strong></p><p>Use it to log into your profile, there you can then assign your own password.</p>
<p> Vous avez demandé un nouveau mot de passe de transition. </p> <p> Le voici déjà : <strong style = "font-size : 14px"> # NEW_PASSWORD # </strong> </p> <p> Utiliser le pour vous connecter à votre profil, vous pourrez alors attribuer votre propre mot de passe. </p>
First, rewinding head to replay your work on top of it... Applying: Currently translated at 100.0% (1198 of 1198 strings) Using index info to reconstruct a base tree... M js/web/_i18n/fr.json Falling back to patching base and 3-way merge... Auto-merging js/web/_i18n/fr.json CONFLICT (content): Merge conflict in js/web/_i18n/fr.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Currently translated at 100.0% (1198 of 1198 strings) 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". (1)4 years ago