Changes in H5P/h5p-sort-paragraphs @ Translate H5P

serettig Repository rebase failed H5P h5p-sort-paragraphs	First, rewinding head to replay your work on top of it... Applying: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es_MX) translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging language/es_MX.json CONFLICT (add/add): 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) 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
germanvaleroelizondo Repository rebase failed H5P h5p-sort-paragraphs	First, rewinding head to replay your work on top of it... Applying: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es_MX) translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging language/es_MX.json CONFLICT (add/add): 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) 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
None Component locked H5P h5p-sort-paragraphs	The component was automatically locked because of an alert. 3 years ago
None Alert triggered H5P h5p-sort-paragraphs	Could not merge the repository. 3 years ago
germanvaleroelizondo Repository rebase failed H5P h5p-sort-paragraphs	First, rewinding head to replay your work on top of it... Applying: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es_MX) translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging language/es_MX.json CONFLICT (add/add): 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) 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
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Disabled Spanish 8 characters edited correcto 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Title for button that is disabled Spanish 8 characters edited Correcto 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Down Spanish 17 characters edited Texto del párrafo 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Title for "Down" button Spanish 17 characters edited Texto del párrafo 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Up Spanish 7 characters edited Párrafo 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Title for "Up" button Spanish 7 characters edited Párrafo 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Show solution Spanish 48 characters edited Usted obtuvo @score de un total de @total puntos 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Text for "Show solution" button Spanish 12 characters edited Su resultado 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Retry Spanish 84 characters edited Reintentar el trabajo. Reiniciar todos los elementos y comenzar el trabajo de nuevo. 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Text for "Retry" button Spanish 58 characters edited Descripción de tecnología asistiva para botón "Reintentar" 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Submit Spanish 56 characters edited Mostrar la solución. La solución correcta será mostrada. 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Text for "Submit" button Spanish 64 characters edited Descripción de tecnología asistiva para botón "Mostrar Solución" 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Check Spanish 65 characters edited ~~Descripción de tecnología asistiva para botón "Comprobar"~~Comprobar las respuestas. Las respuestas serán marcadas como correcta o incorrecta. 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Check Spanish 57 characters edited Descripción de tecnología asistiva para botón "Comprobar" 3 years ago
germanvaleroelizondo Translation approved H5P h5p-sort-paragraphs Spanish	English Text for "Check" button Spanish 57 characters edited Descripción de tecnología asistiva para botón "Comprobar" 3 years ago

233 / 235

/ 235

Search

Action

Author username

Starting date

Ending date