Changes

HTTP 200 OK
Allow: GET, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "count": 2114018,
    "next": "https://translate.tails.boum.org/api/projects/tails/changes/?format=api&page=42198",
    "previous": "https://translate.tails.boum.org/api/projects/tails/changes/?format=api&page=42196",
    "results": [
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:34:58Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17689,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17689/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:34:18Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17688,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17688/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:33:38Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17687,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17687/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:32:59Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17686,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17686/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:32:20Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17685,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17685/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:31:40Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17684,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17684/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:31:00Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17683,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17683/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:30:20Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17682,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17682/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:29:39Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17681,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17681/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:28:59Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17680,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17680/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:28:19Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17679,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17679/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:27:38Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17678,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17678/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:26:57Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17677,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17677/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:26:17Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17676,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17676/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:25:37Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17675,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17675/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:24:56Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17674,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17674/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:24:15Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17673,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17673/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:23:37Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17672,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17672/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/news/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/news/fr/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2015-08-28T20:23:12Z",
            "action": 17,
            "target": "",
            "id": 17671,
            "action_name": "Changes committed",
            "url": "https://translate.tails.boum.org/api/changes/17671/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:22:38Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17669,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17669/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:21:55Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17668,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17668/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:21:15Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17667,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17667/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:20:33Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17666,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17666/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:19:50Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17665,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17665/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/and_the_winner_is/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/and_the_winner_is/fr/?format=api",
            "user": "https://translate.tails.boum.org/api/users/AtomiKe/?format=api",
            "author": "https://translate.tails.boum.org/api/users/AtomiKe/?format=api",
            "timestamp": "2015-08-28T20:19:21Z",
            "action": 1,
            "target": "",
            "id": 17664,
            "action_name": "Translation completed",
            "url": "https://translate.tails.boum.org/api/changes/17664/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:18:54Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17663,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17663/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/AtomiKe/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:18:24Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17662,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17662/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/and_the_winner_is/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/and_the_winner_is/fr/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2015-08-28T20:17:30Z",
            "action": 17,
            "target": "",
            "id": 17661,
            "action_name": "Changes committed",
            "url": "https://translate.tails.boum.org/api/changes/17661/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:17:29Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17659,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17659/?format=api"
        },
        {
            "unit": "https://translate.tails.boum.org/api/units/35468/?format=api",
            "component": "https://translate.tails.boum.org/api/components/tails/and_the_winner_is/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/and_the_winner_is/fr/?format=api",
            "user": "https://translate.tails.boum.org/api/users/AtomiKe/?format=api",
            "author": "https://translate.tails.boum.org/api/users/AtomiKe/?format=api",
            "timestamp": "2015-08-28T20:16:58Z",
            "action": 5,
            "target": "Nous réitérons nos remerciements aux 31 graphistes qui ont fait le succès de ce concours.",
            "id": 17658,
            "action_name": "Translation added",
            "url": "https://translate.tails.boum.org/api/changes/17658/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:16:45Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17657,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17657/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:16:05Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17656,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17656/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/and_the_winner_is/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/and_the_winner_is/fr/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2015-08-28T20:15:41Z",
            "action": 17,
            "target": "",
            "id": 17655,
            "action_name": "Changes committed",
            "url": "https://translate.tails.boum.org/api/changes/17655/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/and_the_winner_is/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/and_the_winner_is/fr/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2015-08-28T20:15:28Z",
            "action": 17,
            "target": "",
            "id": 17653,
            "action_name": "Changes committed",
            "url": "https://translate.tails.boum.org/api/changes/17653/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:14:58Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17652,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17652/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:14:17Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17649,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17649/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/and_the_winner_is/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/and_the_winner_is/fr/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2015-08-28T20:13:51Z",
            "action": 17,
            "target": "",
            "id": 17648,
            "action_name": "Changes committed",
            "url": "https://translate.tails.boum.org/api/changes/17648/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:13:21Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17646,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17646/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:12:38Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17645,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17645/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:11:56Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17644,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17644/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/and_the_winner_is/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/and_the_winner_is/fr/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2015-08-28T20:11:32Z",
            "action": 17,
            "target": "",
            "id": 17643,
            "action_name": "Changes committed",
            "url": "https://translate.tails.boum.org/api/changes/17643/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:11:02Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17642,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17642/?format=api"
        },
        {
            "unit": "https://translate.tails.boum.org/api/units/35463/?format=api",
            "component": "https://translate.tails.boum.org/api/components/tails/and_the_winner_is/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/and_the_winner_is/fr/?format=api",
            "user": "https://translate.tails.boum.org/api/users/AtomiKe/?format=api",
            "author": "https://translate.tails.boum.org/api/users/AtomiKe/?format=api",
            "timestamp": "2015-08-28T20:10:54Z",
            "action": 5,
            "target": "Six autres excellentes propositions rassemblée dans un top 7 :",
            "id": 17641,
            "action_name": "Translation added",
            "url": "https://translate.tails.boum.org/api/changes/17641/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:10:21Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17640,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17640/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/and_the_winner_is/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/and_the_winner_is/fr/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2015-08-28T20:09:55Z",
            "action": 17,
            "target": "",
            "id": 17638,
            "action_name": "Changes committed",
            "url": "https://translate.tails.boum.org/api/changes/17638/?format=api"
        },
        {
            "unit": "https://translate.tails.boum.org/api/units/35461/?format=api",
            "component": "https://translate.tails.boum.org/api/components/tails/and_the_winner_is/?format=api",
            "translation": "https://translate.tails.boum.org/api/translations/tails/and_the_winner_is/fr/?format=api",
            "user": "https://translate.tails.boum.org/api/users/AtomiKe/?format=api",
            "author": "https://translate.tails.boum.org/api/users/AtomiKe/?format=api",
            "timestamp": "2015-08-28T20:09:45Z",
            "action": 5,
            "target": "Pendant les prochains jours, nous allons terminer les dernières finitions sur le logo et l'intégrer à Tails 1.0. N'hésitez pas à le commenter.",
            "id": 17637,
            "action_name": "Translation added",
            "url": "https://translate.tails.boum.org/api/changes/17637/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:09:25Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17636,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17636/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:08:44Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17635,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17635/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:08:03Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17634,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17634/?format=api"
        },
        {
            "unit": null,
            "component": "https://translate.tails.boum.org/api/components/tails/index/?format=api",
            "translation": null,
            "user": "https://translate.tails.boum.org/api/users/emmapeel/?format=api",
            "author": null,
            "timestamp": "2015-08-28T20:07:21Z",
            "action": 22,
            "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
            "id": 17633,
            "action_name": "Repository merge failed",
            "url": "https://translate.tails.boum.org/api/changes/17633/?format=api"
        }
    ]
}