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=3
{ "count": 7422, "next": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/changes/?format=api&page=4", "previous": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/changes/?format=api&page=2", "results": [ { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-11T12:19:27.539027Z", "action": 18, "target": "", "id": 297110, "action_name": "Changes pushed", "url": "https://l10n.xwiki.org/api/changes/297110/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-11T11:57:19.767164Z", "action": 18, "target": "", "id": 297102, "action_name": "Changes pushed", "url": "https://l10n.xwiki.org/api/changes/297102/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-11T11:36:19.303929Z", "action": 18, "target": "", "id": 297094, "action_name": "Changes pushed", "url": "https://l10n.xwiki.org/api/changes/297094/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-11T11:22:56.654810Z", "action": 18, "target": "", "id": 297086, "action_name": "Changes pushed", "url": "https://l10n.xwiki.org/api/changes/297086/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-11T10:50:15.344651Z", "action": 18, "target": "", "id": 297076, "action_name": "Changes pushed", "url": "https://l10n.xwiki.org/api/changes/297076/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-11T09:50:40.856570Z", "action": 18, "target": "", "id": 297072, "action_name": "Changes pushed", "url": "https://l10n.xwiki.org/api/changes/297072/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-10T20:31:07.278870Z", "action": 18, "target": "", "id": 297060, "action_name": "Changes pushed", "url": "https://l10n.xwiki.org/api/changes/297060/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-01-26T17:29:07.549888Z", "action": 18, "target": "", "id": 295780, "action_name": "Changes pushed", "url": "https://l10n.xwiki.org/api/changes/295780/?format=api" }, { "unit": "https://l10n.xwiki.org/api/units/524490/?format=api", "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": "https://l10n.xwiki.org/api/translations/xwiki-contrib/notes-application/de/?format=api", "user": "https://l10n.xwiki.org/api/users/Simpel/?format=api", "author": "https://l10n.xwiki.org/api/users/Simpel/?format=api", "timestamp": "2022-01-26T15:51:08.938966Z", "action": 5, "target": "Notizen", "id": 295746, "action_name": "Translation added", "url": "https://l10n.xwiki.org/api/changes/295746/?format=api" }, { "unit": "https://l10n.xwiki.org/api/units/524491/?format=api", "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": "https://l10n.xwiki.org/api/translations/xwiki-contrib/notes-application/de/?format=api", "user": "https://l10n.xwiki.org/api/users/Simpel/?format=api", "author": "https://l10n.xwiki.org/api/users/Simpel/?format=api", "timestamp": "2022-01-26T15:48:47.069404Z", "action": 5, "target": "Diese Anwendung zielt darauf ab, die aktuellen Dokumente zusammenzuführen.", "id": 295745, "action_name": "Translation added", "url": "https://l10n.xwiki.org/api/changes/295745/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-01-26T15:47:41.118055Z", "action": 18, "target": "", "id": 295744, "action_name": "Changes pushed", "url": "https://l10n.xwiki.org/api/changes/295744/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": "https://l10n.xwiki.org/api/translations/xwiki-contrib/notes-application/de/?format=api", "user": "https://l10n.xwiki.org/api/users/Simpel/?format=api", "author": "https://l10n.xwiki.org/api/users/Simpel/?format=api", "timestamp": "2022-01-26T15:47:37.914728Z", "action": 48, "target": "", "id": 295743, "action_name": "Language added", "url": "https://l10n.xwiki.org/api/changes/295743/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": "https://l10n.xwiki.org/api/translations/xwiki-contrib/notes-application/es/?format=api", "user": "https://l10n.xwiki.org/api/users/Simpel/?format=api", "author": "https://l10n.xwiki.org/api/users/Simpel/?format=api", "timestamp": "2022-01-26T15:47:37.751011Z", "action": 0, "target": "", "id": 295741, "action_name": "Resource updated", "url": "https://l10n.xwiki.org/api/changes/295741/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": "https://l10n.xwiki.org/api/translations/xwiki-contrib/notes-application/de/?format=api", "user": "https://l10n.xwiki.org/api/users/Simpel/?format=api", "author": "https://l10n.xwiki.org/api/users/Simpel/?format=api", "timestamp": "2022-01-26T15:47:37.616673Z", "action": 0, "target": "", "id": 295740, "action_name": "Resource updated", "url": "https://l10n.xwiki.org/api/changes/295740/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": "https://l10n.xwiki.org/api/users/surli/?format=api", "author": null, "timestamp": "2021-05-18T09:04:24.233634Z", "action": 15, "target": "", "id": 286286, "action_name": "Component unlocked", "url": "https://l10n.xwiki.org/api/changes/286286/?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-05-18T06:22:04.436338Z", "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": 286285, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286285/?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-05-18T03:30:12.558079Z", "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": 286283, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286283/?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-05-17T03:30:11.428563Z", "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": 286282, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286282/?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-05-16T03:30:10.871747Z", "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": 286281, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286281/?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-05-15T16:31:23.787323Z", "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": 286273, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286273/?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-05-15T16:30:49.678727Z", "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": 286265, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286265/?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-05-15T16:25:46.661035Z", "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": 286260, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286260/?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-05-15T13:55:04.570049Z", "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": 286248, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286248/?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-05-15T03:30:10.757115Z", "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": 286247, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286247/?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-05-14T03:30:11.138790Z", "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": 286246, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286246/?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-05-13T03:30:10.314383Z", "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": 286245, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286245/?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-05-12T03:30:10.821546Z", "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": 286244, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286244/?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-05-11T03:30:11.466560Z", "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": 286243, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286243/?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-05-10T03:30:10.181073Z", "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": 286242, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286242/?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-05-09T03:30:10.432905Z", "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": 286241, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286241/?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-05-08T03:30:10.554815Z", "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": 286153, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286153/?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-05-07T03:30:11.065967Z", "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": 286152, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286152/?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-05-06T03:30:10.758088Z", "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": 286151, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286151/?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-05-05T03:30:11.058150Z", "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": 286150, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286150/?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-05-04T03:30:11.809218Z", "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": 286146, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286146/?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-05-03T03:30:12.512638Z", "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": 286145, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286145/?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-05-02T03:30:13.005327Z", "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": 286144, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286144/?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-05-01T03:30:11.374701Z", "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": 286059, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286059/?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-04-30T03:30:14.042634Z", "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": 286055, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286055/?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-04-29T04:19:03.627240Z", "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": 286046, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286046/?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-04-29T04:18:57.222560Z", "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": 286037, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286037/?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-04-29T03:30:16.867299Z", "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": 286034, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286034/?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-04-28T10:08:04.322460Z", "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": 286025, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286025/?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-04-28T10:07:57.146015Z", "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": 286016, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286016/?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-04-28T03:30:11.781329Z", "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": 286009, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/286009/?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-04-27T21:58:48.274486Z", "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": 285992, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285992/?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-04-27T09:55:25.697283Z", "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": 285974, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285974/?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-04-27T09:55:24.482841Z", "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": 285972, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285972/?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-04-27T03:30:13.986531Z", "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": 285726, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285726/?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-04-26T03:30:11.326500Z", "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": 285719, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285719/?format=api" } ] }