2. Tails
3. wiki/src/index.*.po
4. Changes

warning: Failed to merge submodule submodules/pythonlib (commits don't follow merge-base) (1)

warning: Failed to merge submodule submodules/pythonlib (commits don't follow merge-base) (1)

error: Your local changes to the following files would be overwritten by merge:
	wiki/src/install/download-iso.ar.po
Please commit your changes or stash them before you merge.
Aborting (128)

warning: Failed to merge submodule submodules/pythonlib (not checked out) (1)

warning: Failed to merge submodule submodules/pythonlib (not checked out) (1)

warning: Failed to merge submodule submodules/pythonlib (not checked out) (1)

Auto-merging wiki/src/upgrade/v1/Tails/3.12.1/amd64/stable/upgrades.yml
Auto-merging wiki/src/upgrade/v1/Tails/3.12.1/amd64/alpha/upgrades.yml
Removing wiki/src/upgrade/v1/Tails/3.11.1/amd64/stable/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/3.11.1/amd64/alpha/upgrades.yml.pgp
Auto-merging wiki/src/upgrade/tails.fr.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.fr.po
Auto-merging wiki/src/upgrade/tails.fa.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.fa.po
Auto-merging wiki/src/upgrade/tails.de.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.de.po
Auto-merging wiki/src/upgrade/clone.fa.po
Auto-merging wiki/src/upgrade/clone.de.po
Auto-merging wiki/src/torrents/files/tails-amd64-3.12.packages
Auto-merging wiki/src/torrents/files/tails-amd64-3.12.build-manifest
Removing wiki/src/torrents/files/tails-amd64-3.11.torrent
Removing wiki/src/torrents/files/tails-amd64-3.11.iso.sig
Auto-merging wiki/src/support/faq.it.po
CONFLICT (content): Merge conflict in wiki/src/support/faq.it.po
Auto-merging wiki/src/support/faq.es.po
CONFLICT (content): Merge conflict in wiki/src/support/faq.es.po
Auto-merging wiki/src/news/version_3.2.fr.po
Auto-merging wiki/src/install/win/usb.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.pt.po
Auto-merging wiki/src/install/win/usb.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.fa.po
Auto-merging wiki/src/install/win/usb.de.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po
Auto-merging wiki/src/install/win.fa.po
Removing wiki/src/install/v1/Tails/amd64/stable/latest.yml
Auto-merging wiki/src/install/mac/usb.pt.po
Auto-merging wiki/src/install/mac/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.it.po
Auto-merging wiki/src/install/mac/usb.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.fr.po
Auto-merging wiki/src/install/mac/usb.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.fa.po
Auto-merging wiki/src/install/mac/usb-download.fa.po
Auto-merging wiki/src/install/mac/usb-download.de.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po
Removing wiki/src/install/mac/dvd.pt.po
Removing wiki/src/install/mac/dvd.mdwn
Removing wiki/src/install/mac/dvd.it.po
Removing wiki/src/install/mac/dvd.fr.po
CONFLICT (modify/delete): wiki/src/install/mac/dvd.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/dvd.fa.po left in tree.
Removing wiki/src/install/mac/dvd.es.po
Removing wiki/src/install/mac/dvd.de.po
Removing wiki/src/install/mac/dvd-overview.pt.po
Removing wiki/src/install/mac/dvd-overview.it.po
Removing wiki/src/install/mac/dvd-overview.html
Removing wiki/src/install/mac/dvd-overview.fr.po
CONFLICT (modify/delete): wiki/src/install/mac/dvd-overview.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/dvd-overview.fa.po left in tree.
Removing wiki/src/install/mac/dvd-overview.es.po
Removing wiki/src/install/mac/dvd-overview.de.po
Removing wiki/src/install/mac/dvd-download.pt.po
Removing wiki/src/install/mac/dvd-download.mdwn
Removing wiki/src/install/mac/dvd-download.it.po
Removing wiki/src/install/mac/dvd-download.fr.po
Removing wiki/src/install/mac/dvd-download.es.po
CONFLICT (modify/delete): wiki/src/install/mac/dvd-download.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/dvd-download.de.po left in tree.
Auto-merging wiki/src/install/mac/clone.fa.po
Auto-merging wiki/src/install/mac/clone-overview.de.po
Auto-merging wiki/src/install/mac.pt.po
Auto-merging wiki/src/install/mac.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po
Auto-merging wiki/src/install/linux/usb.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.pt.po
Auto-merging wiki/src/install/linux/usb.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.fa.po
Auto-merging wiki/src/install/linux/usb.de.po
Auto-merging wiki/src/install/linux.fa.po
Auto-merging wiki/src/install/linux.de.po
Removing wiki/src/install/inc/tails-installation-assistant.inline.pt.po
Removing wiki/src/install/inc/tails-installation-assistant.inline.mdwn
Removing wiki/src/install/inc/tails-installation-assistant.inline.it.po
Removing wiki/src/install/inc/tails-installation-assistant.inline.fr.po
Removing wiki/src/install/inc/tails-installation-assistant.inline.fa.po
Removing wiki/src/install/inc/tails-installation-assistant.inline.es.po
Removing wiki/src/install/inc/tails-installation-assistant.inline.de.po
Removing wiki/src/install/inc/stylesheets/router-mac.css
Removing wiki/src/install/inc/stylesheets/mac-usb.css
Removing wiki/src/install/inc/stylesheets/mac-dvd.css
Removing wiki/src/install/inc/stylesheets/download-only.css
Removing wiki/src/install/inc/stylesheets/debian.css
Auto-merging wiki/src/install/inc/steps/restart_second_time.inline.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/restart_second_time.inline.fr.po
Auto-merging wiki/src/install/inc/steps/restart_second_time.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/restart_second_time.inline.fa.po
Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po
Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/restart_first_time.inline.fa.po
Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.de.po
CONFLICT (modify/delete): wiki/src/install/inc/steps/not_at_all.inline.pt.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/not_at_all.inline.pt.po left in tree.
Removing wiki/src/install/inc/steps/not_at_all.inline.mdwn
CONFLICT (modify/delete): wiki/src/install/inc/steps/not_at_all.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/not_at_all.inline.it.po left in tree.
Removing wiki/src/install/inc/steps/not_at_all.inline.fr.po
CONFLICT (modify/delete): wiki/src/install/inc/steps/not_at_all.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/not_at_all.inline.fa.po left in tree.
Removing wiki/src/install/inc/steps/not_at_all.inline.es.po
Removing wiki/src/install/inc/steps/not_at_all.inline.de.po
Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.pt.po
Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn
Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.it.po
Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po
CONFLICT (modify/delete): wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po left in tree.
Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.es.po
Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po
Removing wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po
Removing wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn
Removing wiki/src/install/inc/steps/install_intermediary_intro.inline.it.po
Removing wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po
CONFLICT (modify/delete): wiki/src/install/inc/steps/install_intermediary_intro.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_intermediary_intro.inline.fa.po left in tree.
Removing wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po
CONFLICT (modify/delete): wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po left in tree.
Removing wiki/src/install/inc/steps/install_final.inline.pt.po
Removing wiki/src/install/inc/steps/install_final.inline.mdwn
Removing wiki/src/install/inc/steps/install_final.inline.it.po
Removing wiki/src/install/inc/steps/install_final.inline.fr.po
CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final.inline.fa.po left in tree.
CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final.inline.es.po left in tree.
Removing wiki/src/install/inc/steps/install_final.inline.de.po
Auto-merging wiki/src/install/inc/steps/download.inline.es.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.es.po
Removing wiki/src/install/inc/steps/debian_requirements.inline.pt.po
Removing wiki/src/install/inc/steps/debian_requirements.inline.mdwn
Removing wiki/src/install/inc/steps/debian_requirements.inline.it.po
Removing wiki/src/install/inc/steps/debian_requirements.inline.fr.po
CONFLICT (modify/delete): wiki/src/install/inc/steps/debian_requirements.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/debian_requirements.inline.fa.po left in tree.
Removing wiki/src/install/inc/steps/debian_requirements.inline.es.po
Removing wiki/src/install/inc/steps/debian_requirements.inline.de.po
Auto-merging wiki/src/install/inc/steps/create_persistence.inline.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/create_persistence.inline.fr.po
Auto-merging wiki/src/install/inc/steps/create_persistence.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/create_persistence.inline.fa.po
Auto-merging wiki/src/install/inc/steps/create_persistence.inline.es.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/create_persistence.inline.es.po
Removing wiki/src/install/inc/screenshots/uui_tails.png
Removing wiki/src/install/inc/screenshots/uui_format.png
Removing wiki/src/install/inc/screenshots/uui_format.gif
Removing wiki/src/install/inc/screenshots/uui.png
Removing wiki/src/install/inc/screenshots/tails_installer_in_debian.png
Removing wiki/src/install/inc/screenshots/software_sources_update.png
Removing wiki/src/install/inc/screenshots/notification_in_tails.png
Removing wiki/src/install/inc/screenshots/mac_startup_dvd.png
Removing wiki/src/install/inc/router/why_two.inline.pt.po
Removing wiki/src/install/inc/router/why_two.inline.it.po
Removing wiki/src/install/inc/router/why_two.inline.html
Removing wiki/src/install/inc/router/why_two.inline.fr.po
Removing wiki/src/install/inc/router/why_two.inline.fa.po
Removing wiki/src/install/inc/router/why_two.inline.es.po
Removing wiki/src/install/inc/router/why_two.inline.de.po
Auto-merging wiki/src/install/inc/overview.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po
Auto-merging wiki/src/install/inc/overview.es.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po
Removing wiki/src/install/inc/infography/upgrade-upgrade-usb.png
Removing wiki/src/install/inc/infography/restart-on-tails-usb.png
Removing wiki/src/install/inc/infography/restart-on-dvd.png
Removing wiki/src/install/inc/infography/plug-upgraded-usb.png
Removing wiki/src/install/inc/infography/plug-tails-usb.png
Removing wiki/src/install/inc/infography/plug-source-usb.png
Removing wiki/src/install/inc/infography/plug-first-usb.png
Removing wiki/src/install/inc/infography/os-debian-ubuntu.png
Removing wiki/src/install/inc/infography/new-tails.png
Removing wiki/src/install/inc/infography/intermediary-tails.png
Removing wiki/src/install/inc/infography/intermediary-tails.fr.png
Removing wiki/src/install/inc/infography/intermediary-tails-on-dvd.png
Removing wiki/src/install/inc/infography/intermediary-tails-on-dvd.fr.png
Removing wiki/src/install/inc/infography/install-intermediary-tails.png
Removing wiki/src/install/inc/infography/insert-dvd.png
Removing wiki/src/install/inc/infography/final-tails.png
Removing wiki/src/install/inc/infography/final-tails-with-persistence.png
Removing wiki/src/install/inc/infography/final-tails-with-persistence.fr.png
Removing wiki/src/install/inc/infography/clone-dvd.png
Removing wiki/src/install/inc/icons/tails-installer.png
Removing wiki/src/install/inc/icons/pc.png
Removing wiki/src/install/inc/icons/2-usb.png
Removing wiki/src/install/inc/icons/1-dvd.png
Auto-merging wiki/src/install/expert/usb.fa.po
Auto-merging wiki/src/install/download.fa.po
Auto-merging wiki/src/install/download-iso.it.po
Auto-merging wiki/src/install/download-iso.es.po
Removing wiki/src/install/debian/usb.pt.po
Removing wiki/src/install/debian/usb.mdwn
CONFLICT (modify/delete): wiki/src/install/debian/usb.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian/usb.it.po left in tree.
Removing wiki/src/install/debian/usb.fr.po
CONFLICT (modify/delete): wiki/src/install/debian/usb.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian/usb.fa.po left in tree.
Removing wiki/src/install/debian/usb.es.po
CONFLICT (modify/delete): wiki/src/install/debian/usb.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian/usb.de.po left in tree.
Removing wiki/src/install/debian/usb-overview.pt.po
Removing wiki/src/install/debian/usb-overview.it.po
Removing wiki/src/install/debian/usb-overview.html
Removing wiki/src/install/debian/usb-overview.fr.po
Removing wiki/src/install/debian/usb-overview.fa.po
Removing wiki/src/install/debian/usb-overview.es.po
Removing wiki/src/install/debian/usb-overview.de.po
Removing wiki/src/install/debian/usb-download.pt.po
Removing wiki/src/install/debian/usb-download.mdwn
CONFLICT (modify/delete): wiki/src/install/debian/usb-download.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian/usb-download.it.po left in tree.
Removing wiki/src/install/debian/usb-download.fr.po
Removing wiki/src/install/debian/usb-download.es.po
Removing wiki/src/install/debian/usb-download.de.po
Removing wiki/src/install/debian/clone-overview.pt.po
Removing wiki/src/install/debian/clone-overview.it.po
Removing wiki/src/install/debian/clone-overview.html
Removing wiki/src/install/debian/clone-overview.fr.po
Removing wiki/src/install/debian/clone-overview.fa.po
Removing wiki/src/install/debian/clone-overview.es.po
Removing wiki/src/install/debian/clone-overview.de.po
Removing wiki/src/install/debian.pt.po
Removing wiki/src/install/debian.it.po
Removing wiki/src/install/debian.html
Removing wiki/src/install/debian.fr.po
CONFLICT (modify/delete): wiki/src/install/debian.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian.fa.po left in tree.
Removing wiki/src/install/debian.es.po
CONFLICT (modify/delete): wiki/src/install/debian.de.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian.de.po left in tree.
Auto-merging wiki/src/install/clone.fa.po
Removing wiki/src/inc/stable_amd64_torrent_url.html
Auto-merging wiki/src/inc/stable_amd64_img_gpg_signature_output.html
Removing wiki/src/inc/stable_amd64_gpg_verify.html
Auto-merging wiki/src/doc/first_steps/bug_reporting.fa.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.es.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/bug_reporting.es.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.de.po
Auto-merging wiki/src/doc/about/trust.pt.po
Auto-merging wiki/src/doc/about/trust.fa.po
Auto-merging wiki/src/doc/about/trust.de.po
Removing wiki/src/blueprint/bootstrapping/assistant/mac.mdwn
Auto-merging po/de.po
Auto-merging po/ca.po
Removing config/chroot_local-patches/torbirdy-enable-gpg_already_torified.diff
Removing config/chroot_local-patches/torbirdy-enable-emailwizard.diff
Removing config/chroot_local-patches/torbirdy-60.2-compat.diff
Removing config/chroot_local-patches/enigmail-60.2-compat.diff
Removing config/chroot_local-includes/usr/local/bin/liferea
Removing config/chroot_local-includes/lib/live/config/0000-readahead
Auto-merging .gitignore
Automatic merge failed; fix conflicts and then commit the result. (1)

Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)