Changes in H5P/h5p-drag-question @ Translate H5P

otacke Repository rebase failed H5P h5p-drag-question	First, rewinding head to replay your work on top of it... Applying: Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/sr.json Falling back to patching base and 3-way merge... Auto-merging language/sr.json CONFLICT (content): Merge conflict in language/sr.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Nikola Glišić <glisapn@yahoo.com> updated Serbian 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
serettig Repository rebase failed H5P h5p-drag-question	First, rewinding head to replay your work on top of it... Applying: Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/sr.json Falling back to patching base and 3-way merge... Auto-merging language/sr.json CONFLICT (content): Merge conflict in language/sr.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Nikola Glišić <glisapn@yahoo.com> updated Serbian 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
serettig Repository rebase failed H5P h5p-drag-question	First, rewinding head to replay your work on top of it... Applying: Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/sr.json Falling back to patching base and 3-way merge... Auto-merging language/sr.json CONFLICT (content): Merge conflict in language/sr.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Nikola Glišić <glisapn@yahoo.com> updated Serbian 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
serettig Repository rebase failed H5P h5p-drag-question	First, rewinding head to replay your work on top of it... Applying: Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/sr.json Falling back to patching base and 3-way merge... Auto-merging language/sr.json CONFLICT (content): Merge conflict in language/sr.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Nikola Glišić <glisapn@yahoo.com> updated Serbian 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
serettig Repository rebase failed H5P h5p-drag-question	First, rewinding head to replay your work on top of it... Applying: Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/sr.json Falling back to patching base and 3-way merge... Auto-merging language/sr.json CONFLICT (content): Merge conflict in language/sr.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Nikola Glišić <glisapn@yahoo.com> updated Serbian 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
serettig Repository rebase failed H5P h5p-drag-question	First, rewinding head to replay your work on top of it... Applying: Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/sr.json Falling back to patching base and 3-way merge... Auto-merging language/sr.json CONFLICT (content): Merge conflict in language/sr.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Nikola Glišić <glisapn@yahoo.com> updated Serbian 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
rickard.skiold Repository rebase failed H5P h5p-drag-question	First, rewinding head to replay your work on top of it... Applying: Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/sr.json Falling back to patching base and 3-way merge... Auto-merging language/sr.json CONFLICT (content): Merge conflict in language/sr.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Nikola Glišić <glisapn@yahoo.com> updated Serbian 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-drag-question	The component was automatically locked because of an alert. 3 years ago
None Alert triggered H5P h5p-drag-question	Could not merge the repository. 3 years ago
None Repository rebase failed H5P h5p-drag-question	First, rewinding head to replay your work on top of it... Applying: Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/sr.json Falling back to patching base and 3-way merge... Auto-merging language/sr.json CONFLICT (content): Merge conflict in language/sr.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Nikola Glišić <glisapn@yahoo.com> updated Serbian 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
rickard.skiold Translation approved H5P h5p-drag-question Swedish	English Check the answers. The responses will be marked as correct, incorrect, or unanswered. Swedish 50 characters edited ~~Retry the task. Reset all responses and start the task over agai~~Starta ett nytt försök. Nollställer alla svar och startar om uppgiften. 3 years ago
rickard.skiold Translation approved H5P h5p-drag-question Swedish	English Assistive technology label for "Check" button Swedish 64 characters edited ~~Assistive technology label for "Retry" button~~Etikett för knappen "Försök igen" som används av tillgänglighetshjälpmedel 3 years ago
rickard.skiold Translation approved H5P h5p-drag-question Swedish	English Show score explanation Swedish 61 characters edited ~~Check the answers. The responses will be~~Rätta mina svar. Svaren kommer att marke~~d as correct, incorrect, or unanswered~~ras som korrekta, felaktiga eller ej besvarade. 3 years ago
rickard.skiold Translation approved H5P h5p-drag-question Swedish	English Textual representation of the score explanation button Swedish 63 characters edited ~~Assistive technology label for "Check" button~~Etikett för knappen "Rätta svar" som används av tillgänglighetshjälpmedel 3 years ago
rickard.skiold Translation approved H5P h5p-drag-question Swedish	English You got :num out of :total points Swedish 22 characters edited ~~Show score explanation~~Visa förklaring till poäng 3 years ago
rickard.skiold Translation approved H5P h5p-drag-question Swedish	English Textual representation of the score bar for those using a readspeaker Swedish 38 characters edited Textu~~al representation of the score explanation button~~ell visning av knappen som förklarar poäng 3 years ago
rickard.skiold Translation approved H5P h5p-drag-question Swedish	English Feedback Swedish 15 characters edited ~~You got :num out of~~Du fick :num av :total po~~ints~~äng 3 years ago
rickard.skiold Translation approved H5P h5p-drag-question Swedish	English Header for panel containing feedback for correct/incorrect answers Swedish 51 characters edited Textu~~al representation of the score bar for those using a readspeaker~~ell visning av poängindikator för de som använder skärmläsare 3 years ago
rickard.skiold Translation approved H5P h5p-drag-question Swedish	English Wrong answer Swedish 0 characters edited Feedback 3 years ago
rickard.skiold Translation approved H5P h5p-drag-question Swedish	English Label for incorrect answer Swedish 40 characters edited ~~Header fo~~Rubrik för panel ~~containing feedback for correct/incorrect answers~~som visar feedback avseende korrekta/felaktiga svar 3 years ago

198 / 251

/ 251

Search

Action

Author username

Starting date

Ending date