Avatar de l’utilisateur gunchleoc

Le composant est déverrouillé

  1. Pepper & Carrot
  2. Website
Le composant est déverrouillé Il y a 2 ans
Avatar de l’utilisateur Aucun

Échec du rebasement du dépôt

  1. Pepper & Carrot
  2. Website
 
First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Gaelic)
Using index info to reconstruct a base tree...
M	po/gd.po
Falling back to patching base and 3-way merge...
Auto-merging po/gd.po
CONFLICT (content): Merge conflict in po/gd.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Gaelic)

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)
Il y a 2 ans
Avatar de l’utilisateur gunchleoc

Modifications envoyées

  1. Pepper & Carrot
  2. Glossary Glossaire
  3. Gaélique écossais
Modifications envoyées Il y a 2 ans
Avatar de l’utilisateur gunchleoc

Modifications envoyées

  1. Pepper & Carrot
  2. Glossary Glossaire
  3. Français
Modifications envoyées Il y a 2 ans
Avatar de l’utilisateur gunchleoc

Dépôt rebasé

  1. Pepper & Carrot
  2. Glossary
Dépôt rebasé Il y a 2 ans
Avatar de l’utilisateur gunchleoc

Échec du rebasement du dépôt

  1. Pepper & Carrot
  2. Website
 
First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Gaelic)
Using index info to reconstruct a base tree...
M	po/gd.po
Falling back to patching base and 3-way merge...
Auto-merging po/gd.po
CONFLICT (content): Merge conflict in po/gd.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Gaelic)

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)
Il y a 2 ans
Avatar de l’utilisateur gunchleoc

Échec de la fusion de dépôt

  1. Pepper & Carrot
  2. Website
 
Auto-merging po/vi.po
CONFLICT (content): Merge conflict in po/vi.po
Auto-merging po/gd.po
CONFLICT (content): Merge conflict in po/gd.po
Automatic merge failed; fix conflicts and then commit the result.
 (1)
Il y a 2 ans
Avatar de l’utilisateur Aucun

Échec du rebasement du dépôt

  1. Pepper & Carrot
  2. Website
 
First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Gaelic)
Using index info to reconstruct a base tree...
M	po/gd.po
Falling back to patching base and 3-way merge...
Auto-merging po/gd.po
CONFLICT (content): Merge conflict in po/gd.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Gaelic)

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)
Il y a 2 ans
Avatar de l’utilisateur Aucun

Notification de dépôt reçue

  1. Pepper & Carrot
  2. Website
GitLab: https://framagit.org/peppercarrot/website-2021, main Il y a 2 ans
Avatar de l’utilisateur Aucun

Le composant est verrouillé

  1. Pepper & Carrot
  2. Website
Le composant a été verrouillé automatiquement à cause d’une alerte. Il y a 2 ans
Avatar de l’utilisateur Aucun

Alerte déclenchée

  1. Pepper & Carrot
  2. Website
Impossible de fusionner le dépôt. Il y a 2 ans
Avatar de l’utilisateur Aucun

Échec du rebasement du dépôt

  1. Pepper & Carrot
  2. Website
 
First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Gaelic)
Using index info to reconstruct a base tree...
M	po/gd.po
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Translated using Weblate (Vietnamese)
Using index info to reconstruct a base tree...
M	po/vi.po
Falling back to patching base and 3-way merge...
Auto-merging po/vi.po
CONFLICT (content): Merge conflict in po/vi.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 Translated using Weblate (Vietnamese)

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)
Il y a 2 ans
Avatar de l’utilisateur Aucun

Notification de dépôt reçue

  1. Pepper & Carrot
  2. Website
GitLab: https://framagit.org/peppercarrot/website-2021, main Il y a 2 ans
Avatar de l’utilisateur gunchleoc

Modifications poussées

  1. Pepper & Carrot
  2. Website
Modifications poussées Il y a 2 ans
Avatar de l’utilisateur Aucun

Modifications poussées

  1. Pepper & Carrot
  2. Website
Modifications poussées Il y a 2 ans
Avatar de l’utilisateur Aucun

Ressources mises à jour

  1. Pepper & Carrot
  2. Website
  3. Anglais
The “po/_catalog.pot” file was changed. Il y a 2 ans
Avatar de l’utilisateur Aucun

Dépôt rebasé

  1. Pepper & Carrot
  2. Website
Dépôt rebasé Il y a 2 ans
Avatar de l’utilisateur Aucun

Notification de dépôt reçue

  1. Pepper & Carrot
  2. Website
GitLab: https://framagit.org/peppercarrot/website-2021, main Il y a 2 ans
Avatar de l’utilisateur Navi

Traduction modifiée

  1. Pepper & Carrot
  2. Website
  3. Vietnamien
Fan Fiction
VTruyện viễn tưởng từ hâm mộ viên
Il y a 2 ans
Avatar de l’utilisateur Navi

Traduction modifiée

  1. Pepper & Carrot
  2. Website
  3. Vietnamien
Singulier
%d Fan-art
Pluriel
%d Fan-art
N%d nghệ thuật từ hâm mộ viên (%d)
Il y a 2 ans

Rechercher