User avatar izendegi

Translation added

3 years ago
User avatar izendegi

Translation added

3 years ago
User avatar izendegi

Translation added

3 years ago
User avatar izendegi

Translation added

3 years ago
User avatar izendegi

Translation added

3 years ago
User avatar izendegi

Translation added

3 years ago
User avatar izendegi

Translation added

3 years ago
User avatar izendegi

Translation added

3 years ago
User avatar izendegi

Translation added

3 years ago
User avatar izendegi

Language added

Basque 3 years ago
User avatar izendegi

Resource updated

The “language/sr.json” file was changed. 3 years ago
User avatar izendegi

Resource updated

The “language/nl.json” file was changed. 3 years ago
User avatar izendegi

Resource updated

The “language/eu.json” file was changed. 3 years ago
User avatar izendegi

Resource updated

The “language/es.json” file was changed. 3 years ago
User avatar izendegi

Resource updated

The “language/es-mx.json” file was changed. 3 years ago
User avatar izendegi

Resource updated

The “language/el.json” file was changed. 3 years ago
User avatar izendegi

Resource updated

The “language/.en.json” file was changed. 3 years ago
User avatar otacke

Translation approved

3 years ago
User avatar serettig

Component unlocked

Component unlocked 3 years ago
User avatar otacke

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) translation using Weblate @ translate-h5p.tk.
Using index info to reconstruct a base tree...
M	language/es-mx.json
Falling back to patching base and 3-way merge...
Auto-merging language/es-mx.json
CONFLICT (content): Merge conflict in language/es-mx.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) translation using Weblate @ translate-h5p.tk.

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)
3 years ago

Search