Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/xwiki-contrib/notes-application/changes/?format=api&page=5
https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/changes/?format=api&page=6", "previous": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/changes/?format=api&page=4", "results": [ { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-19T03:30:13.406805Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283746, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283746/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-18T03:30:11.457673Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283665, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283665/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-17T03:30:11.454134Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283662, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283662/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-16T03:30:14.096797Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283658, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283658/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-15T03:30:10.032185Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283570, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283570/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-14T03:30:08.923454Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283431, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283431/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-13T03:30:11.100741Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283381, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283381/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-12T03:30:10.619425Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283375, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283375/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-11T10:14:51.055284Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283363, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283363/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-11T03:30:10.574074Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283260, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283260/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-10T03:30:11.046564Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283251, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283251/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-09T03:30:09.873218Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283245, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283245/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-08T03:30:10.128823Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283231, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283231/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-07T03:30:10.727333Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283230, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283230/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-06T03:30:11.917525Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283141, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283141/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-05T04:45:31.221062Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283138, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283138/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-05T03:30:13.319230Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283135, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283135/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-04T20:01:44.679505Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283134, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283134/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-04T20:00:48.329520Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 283133, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283133/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-04T03:30:10.250987Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282969, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282969/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-03T03:30:09.459890Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282968, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282968/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-02T03:30:12.481957Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282728, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282728/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-01T03:30:15.478810Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282609, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282609/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-28T03:30:13.274061Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282606, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282606/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-27T03:30:15.187625Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282604, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282604/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-26T03:30:14.468376Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282600, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282600/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-25T03:30:14.809311Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282594, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282594/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-24T03:30:13.672393Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282585, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282585/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-23T03:30:13.514707Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282582, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282582/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-22T03:30:12.820688Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282572, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282572/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-21T03:30:12.929882Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282571, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282571/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-20T03:30:14.251441Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282382, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282382/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-19T03:30:13.735864Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282096, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282096/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-18T03:30:14.670577Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282093, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282093/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-17T03:30:15.102150Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282091, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282091/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-16T03:30:16.036281Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282086, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282086/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-15T03:30:14.272384Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282083, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282083/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-14T03:30:13.134761Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282078, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282078/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-13T03:30:21.374605Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282076, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282076/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-12T03:30:13.541668Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282072, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282072/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-11T03:30:13.590515Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 282010, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/282010/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-10T03:30:17.083588Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 281995, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/281995/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-09T03:30:23.074678Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 281988, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/281988/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-08T03:30:12.877272Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 281893, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/281893/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-07T12:06:57.175636Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 281891, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/281891/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-07T03:30:15.505976Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 281888, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/281888/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-06T03:30:16.825887Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 281885, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/281885/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-05T03:30:16.914352Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 281847, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/281847/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-04T03:30:18.748913Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 281808, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/281808/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-02-03T03:30:18.149280Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\n\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n\n (1)", "id": 281783, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/281783/?format=api" } ] }{ "count": 7422, "next": "