|
None
Repository merge failed |
9 years ago
|
|
None
Repository merge failed |
Auto-merging wiki/src/wishlist.fa.po CONFLICT (add/add): Merge conflict in wiki/src/wishlist.fa.po Auto-merging wiki/src/upgrade/v1/Tails/2.2/i386/stable/upgrades.yml Auto-merging wiki/src/upgrade/v1/Tails/2.0.1/i386/stable/upgrades.yml Auto-merging wiki/src/upgrade/v1/Tails/2.0.1/i386/alpha/upgrades.yml Removing wiki/src/upgrade/v1/Tails/1.9~rc1/i386/stable/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9~rc1/i386/alpha/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9/i386/stable/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9/i386/alpha/upgrades.yml.pgp Auto-merging wiki/src/upgrade/v1/Tails/1.8.1/i386/alpha/upgrades.yml Removing wiki/src/torrents/files/tails-i386-1.7.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.7.torrent Removing wiki/src/torrents/files/tails-i386-1.7.packages Removing wiki/src/torrents/files/tails-i386-1.7.iso.sig Auto-merging wiki/src/torrents.fa.po CONFLICT (add/add): Merge conflict in wiki/src/torrents.fa.po Auto-merging wiki/src/todo.fa.po CONFLICT (add/add): Merge conflict in wiki/src/todo.fa.po Auto-merging wiki/src/support/talk.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/talk.fa.po Auto-merging wiki/src/support/tails-support.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/tails-support.fa.po Auto-merging wiki/src/support/learn.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/learn.fa.po Auto-merging wiki/src/support/known_issues.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/known_issues.fa.po Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/support/faq.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/faq.fa.po Auto-merging wiki/src/support/chat.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/chat.fa.po Auto-merging wiki/src/support.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support.fa.po Auto-merging wiki/src/sidebar.fa.po CONFLICT (add/add): Merge conflict in wiki/src/sidebar.fa.po Auto-merging wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fa.po Auto-merging wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.fa.po Auto-merging wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.pt.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.pt.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fa.po Auto-merging wiki/src/security/Upgrade_Tor.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Upgrade_Tor.fa.po Auto-merging wiki/src/security/Security_hole_in_I2P_0.9.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Security_hole_in_I2P_0.9.13.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.4.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.4.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.3.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.0.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.0.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.0.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.0.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.9.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.9.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.8.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.8.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.8.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.8.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.5.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.23.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.23.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.22.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.22.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.22.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.22.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.21.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.21.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.20.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.20.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.20.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.20.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.19.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.19.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.18.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.18.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.16.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.16.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.15.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.15.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.14.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.14.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.13.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.12.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.12.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.11.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.1.fa.po Auto-merging wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fa.po Auto-merging wiki/src/security/IP_address_leak_with_icedove.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/IP_address_leak_with_icedove.fa.po Auto-merging wiki/src/security.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security.fa.po Auto-merging wiki/src/press/media_appearances_2015.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2015.fa.po Auto-merging wiki/src/press/media_appearances_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2014.fa.po Auto-merging wiki/src/press/media_appearances_2013.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2013.fa.po Auto-merging wiki/src/press/media_appearances_2012.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2012.fa.po Auto-merging wiki/src/press/media_appearances_2011.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2011.fa.po Auto-merging wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/press.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press.fa.po Auto-merging wiki/src/news/windows_camouflage_jessie.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/windows_camouflage_jessie.fa.po Auto-merging wiki/src/news/who_are_you_helping.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/who_are_you_helping.fa.po Auto-merging wiki/src/news/version_1.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.5.fa.po Auto-merging wiki/src/news/version_1.4.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.4.fa.po Auto-merging wiki/src/news/version_1.4.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.4.1.fa.po Auto-merging wiki/src/news/version_1.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.fa.po Auto-merging wiki/src/news/version_1.3.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.2.fa.po Auto-merging wiki/src/news/version_1.3.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.1.fa.po Auto-merging wiki/src/news/version_1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.fa.po Auto-merging wiki/src/news/version_1.2.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.3.fa.po Auto-merging wiki/src/news/version_1.2.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.2.fa.po Auto-merging wiki/src/news/version_1.2.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.1.fa.po Auto-merging wiki/src/news/version_1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.fa.po Auto-merging wiki/src/news/version_1.1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.2.fa.po Auto-merging wiki/src/news/version_1.1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.1.fa.po Auto-merging wiki/src/news/version_1.0.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.0.fa.po Auto-merging wiki/src/news/version_1.0.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.0.1.fa.po Auto-merging wiki/src/news/version_0.9.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.9.fa.po Auto-merging wiki/src/news/version_0.8.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.8.fa.po Auto-merging wiki/src/news/version_0.8.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.8.1.fa.po Auto-merging wiki/src/news/version_0.7.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.fa.po Auto-merging wiki/src/news/version_0.7.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.2.fa.po Auto-merging wiki/src/news/version_0.7.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.1.fa.po Auto-merging wiki/src/news/version_0.6.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.fa.po Auto-merging wiki/src/news/version_0.6.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.2.fa.po Auto-merging wiki/src/news/version_0.6.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.1.fa.po Auto-merging wiki/src/news/version_0.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.5.fa.po Auto-merging wiki/src/news/version_0.4.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.4.2.fa.po Auto-merging wiki/src/news/version_0.4.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.4.1.fa.po Auto-merging wiki/src/news/version_0.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.3.fa.po Auto-merging wiki/src/news/version_0.23.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.23.fa.po Auto-merging wiki/src/news/version_0.22.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.22.fa.po Auto-merging wiki/src/news/version_0.22.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.22.1.fa.po Auto-merging wiki/src/news/version_0.21.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.21.fa.po Auto-merging wiki/src/news/version_0.20.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.20.fa.po Auto-merging wiki/src/news/version_0.20.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.20.1.fa.po Auto-merging wiki/src/news/version_0.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.2.fa.po Auto-merging wiki/src/news/version_0.19.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.19.fa.po Auto-merging wiki/src/news/version_0.18.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.18.fa.po Auto-merging wiki/src/news/version_0.17.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.fa.po Auto-merging wiki/src/news/version_0.17.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.2.fa.po Auto-merging wiki/src/news/version_0.17.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.1.fa.po Auto-merging wiki/src/news/version_0.16.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.16.fa.po Auto-merging wiki/src/news/version_0.15.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.15.fa.po Auto-merging wiki/src/news/version_0.14.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.14.fa.po Auto-merging wiki/src/news/version_0.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.13.fa.po Auto-merging wiki/src/news/version_0.12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.12.fa.po Auto-merging wiki/src/news/version_0.12.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.12.1.fa.po Auto-merging wiki/src/news/version_0.11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.11.fa.po Auto-merging wiki/src/news/version_0.10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.fa.po Auto-merging wiki/src/news/version_0.10.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.2.fa.po Auto-merging wiki/src/news/version_0.10.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.1.fa.po Auto-merging wiki/src/news/usability_testing_2014_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/usability_testing_2014_05.fa.po Auto-merging wiki/src/news/thedaywefightback.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/thedaywefightback.fa.po Auto-merging wiki/src/news/test_incremental_upgrades.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_incremental_upgrades.fa.po Auto-merging wiki/src/news/test_UEFI.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_UEFI.fa.po Auto-merging wiki/src/news/test_1.4-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.4-rc1.fa.po Auto-merging wiki/src/news/test_1.3-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.3-rc1.fa.po Auto-merging wiki/src/news/test_1.2-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.2-rc1.fa.po Auto-merging wiki/src/news/test_1.1-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.1-rc1.fa.po Auto-merging wiki/src/news/test_1.1-beta1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.1-beta1.fa.po Auto-merging wiki/src/news/test_1.0-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.0-rc1.fa.po Auto-merging wiki/src/news/test_0.23-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.23-rc1.fa.po Auto-merging wiki/src/news/test_0.22.1-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.22.1-rc1.fa.po Auto-merging wiki/src/news/test_0.22-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.22-rc1.fa.po Auto-merging wiki/src/news/test_0.21-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.21-rc1.fa.po Auto-merging wiki/src/news/test_0.20-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.20-rc1.fa.po Auto-merging wiki/src/news/test_0.19-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.19-rc1.fa.po Auto-merging wiki/src/news/test_0.18-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.18-rc1.fa.po Auto-merging wiki/src/news/test_0.17.2-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.17.2-rc1.fa.po Auto-merging wiki/src/news/test_0.17-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.17-rc1.fa.po Auto-merging wiki/src/news/test_0.16-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.16-rc1.fa.po Auto-merging wiki/src/news/test_0.15-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.15-rc1.fa.po Auto-merging wiki/src/news/test_0.14-rc2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.14-rc2.fa.po Auto-merging wiki/src/news/test_0.14-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.14-rc1.fa.po Auto-merging wiki/src/news/test_0.13-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.13-rc1.fa.po Auto-merging wiki/src/news/tails-testers.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/tails-testers.fa.po Auto-merging wiki/src/news/summit_2013.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/summit_2013.fa.po Auto-merging wiki/src/news/spoof-mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/spoof-mac.fa.po Auto-merging wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/signing_key_transition.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/signing_key_transition.fa.po Auto-merging wiki/src/news/signing_key_transition.de.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.de.po Auto-merging wiki/src/news/report_end_of_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_end_of_2014.fa.po Auto-merging wiki/src/news/report_2015_08.mdwn Auto-merging wiki/src/news/report_2015_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_05.fa.po Auto-merging wiki/src/news/report_2015_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_04.fa.po Auto-merging wiki/src/news/report_2015_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_03.fa.po Auto-merging wiki/src/news/report_2015_01-02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_01-02.fa.po Auto-merging wiki/src/news/report_2014_06-07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_06-07.fa.po Auto-merging wiki/src/news/report_2014_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_05.fa.po Auto-merging wiki/src/news/report_2014_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_04.fa.po Auto-merging wiki/src/news/report_2014_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_03.fa.po Auto-merging wiki/src/news/report_2014_02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_02.fa.po Auto-merging wiki/src/news/report_2014_01.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_01.fa.po Auto-merging wiki/src/news/report_2013_12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_12.fa.po Auto-merging wiki/src/news/report_2013_11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_11.fa.po Auto-merging wiki/src/news/report_2013_10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_10.fa.po Auto-merging wiki/src/news/report_2013_09.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_09.fa.po Auto-merging wiki/src/news/report_2013_08.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_08.fa.po Auto-merging wiki/src/news/report_2013_07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_07.fa.po Auto-merging wiki/src/news/report_2013_06.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_06.fa.po Auto-merging wiki/src/news/report_2013_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_05.fa.po Auto-merging wiki/src/news/report_2013_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_04.fa.po Auto-merging wiki/src/news/report_2013_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_03.fa.po Auto-merging wiki/src/news/report_2013_02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_02.fa.po Auto-merging wiki/src/news/report_2013_01.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_01.fa.po Auto-merging wiki/src/news/report_2012_12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_12.fa.po Auto-merging wiki/src/news/report_2012_11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_11.fa.po Auto-merging wiki/src/news/report_2012_10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_10.fa.po Auto-merging wiki/src/news/report_2012_09.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_09.fa.po Auto-merging wiki/src/news/report_2012_08.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_08.fa.po Auto-merging wiki/src/news/report_2012_07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_07.fa.po Auto-merging wiki/src/news/report_2012_01-04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_01-04.fa.po Auto-merging wiki/src/news/report_2011_05-06.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_05-06.fa.po Auto-merging wiki/src/news/report_2011_03-04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_03-04.fa.po Auto-merging wiki/src/news/report_2011_01-02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_01-02.fa.po Auto-merging wiki/src/news/new_project_name.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/new_project_name.fa.po Auto-merging wiki/src/news/new_SSL_certificate.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/new_SSL_certificate.fa.po Auto-merging wiki/src/news/logo_contest.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/logo_contest.fa.po Auto-merging wiki/src/news/improve_the_infrastructure_behind_Tails.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/improve_the_infrastructure_behind_Tails.fa.po Auto-merging wiki/src/news/fpf_campaign.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/fpf_campaign.fa.po Auto-merging wiki/src/news/bounties_2013_report.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/bounties_2013_report.fa.po Auto-merging wiki/src/news/and_the_winner_is.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/and_the_winner_is.fa.po Auto-merging wiki/src/news/amnesia_may_now_work_on_the_Mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/amnesia_may_now_work_on_the_Mac.fa.po Auto-merging wiki/src/news/Tails_HackFest_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Tails_HackFest_2014.fa.po Auto-merging wiki/src/news/On_0days_exploits_and_disclosure.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/On_0days_exploits_and_disclosure.fa.po Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fa.po Auto-merging wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po Auto-merging wiki/src/news/IP_leakage_with_Icedove.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/IP_leakage_with_Icedove.fa.po Auto-merging wiki/src/news.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news.fa.po Auto-merging wiki/src/misc/unsafe_browser_warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/misc/unsafe_browser_warning.fa.po Removing wiki/src/lib/spip_out.gif Auto-merging wiki/src/lib/menu.png Removing wiki/src/install/v1/Tails/i386/stable/1.7.yml Removing wiki/src/install/inc/stylesheets/scenarios.css Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po Removing wiki/src/install/inc/screenshots/gnome_disks.png Removing wiki/src/install/inc/infography/temporary-tails.png Removing wiki/src/install/inc/infography/temporary-tails-on-dvd.png Auto-merging wiki/src/index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/index.fa.po Auto-merging wiki/src/inc/stable_i386_release_notes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/stable_i386_release_notes.fa.po Removing wiki/src/inc/stable_i386_iso_size_mib.html Auto-merging wiki/src/inc/stable_i386_date.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/stable_i386_date.fa.po Auto-merging wiki/src/inc/release_notes/1.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/release_notes/1.5.fa.po Auto-merging wiki/src/getting_started.fa.po CONFLICT (add/add): Merge conflict in wiki/src/getting_started.fa.po Auto-merging wiki/src/download.fa.po CONFLICT (add/add): Merge conflict in wiki/src/download.fa.po Auto-merging wiki/src/doc/upgrade/error.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/upgrade/error.fa.po Auto-merging wiki/src/doc/sensitive_documents/sound_and_video.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/sound_and_video.fa.po Auto-merging wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po Auto-merging wiki/src/doc/sensitive_documents/office_suite.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/office_suite.fa.po Auto-merging wiki/src/doc/sensitive_documents/metadata.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fa.po Auto-merging wiki/src/doc/sensitive_documents/metadata.de.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.de.po Auto-merging wiki/src/doc/sensitive_documents/graphics.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/graphics.fa.po Auto-merging wiki/src/doc/sensitive_documents.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents.index.fa.po Auto-merging wiki/src/doc/sensitive_documents.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents.fa.po Auto-merging wiki/src/doc/introduction.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/introduction.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po Auto-merging wiki/src/doc/get/trusting_tails_signing_key.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/trusting_tails_signing_key.fa.po Auto-merging wiki/src/doc/get/signing_key_transition.inline.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fa.po Auto-merging wiki/src/doc/get.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get.index.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.release_notes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/upgrade.release_notes.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/upgrade.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage/windows_camouflage.jpg Removing wiki/src/doc/first_steps/startup_options/windows_camouflage/syslinux.png Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.pt.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.mdwn Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.fr.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.de.po Auto-merging wiki/src/doc/first_steps/startup_options/network_configuration.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/network_configuration.fa.po Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.fa.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Auto-merging wiki/src/doc/first_steps/startup_options.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options.fa.po Auto-merging wiki/src/doc/first_steps/start_tails.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/start_tails.fa.po Auto-merging wiki/src/doc/first_steps/shutdown.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/shutdown.fa.po Auto-merging wiki/src/doc/first_steps/shutdown.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/shutdown.de.po Auto-merging wiki/src/doc/first_steps/reset/windows.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/windows.fa.po Auto-merging wiki/src/doc/first_steps/reset/mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/mac.fa.po Auto-merging wiki/src/doc/first_steps/reset/linux.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/linux.fa.po Auto-merging wiki/src/doc/first_steps/reset.intro.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.intro.fa.po Auto-merging wiki/src/doc/first_steps/reset.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.fa.po Auto-merging wiki/src/doc/first_steps/persistence/warnings.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/warnings.fa.po Auto-merging wiki/src/doc/first_steps/persistence/use.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/use.fa.po Auto-merging wiki/src/doc/first_steps/persistence/upgrade.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/upgrade.fa.po Auto-merging wiki/src/doc/first_steps/persistence/delete.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/delete.fa.po Auto-merging wiki/src/doc/first_steps/persistence/copy.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/copy.fa.po Auto-merging wiki/src/doc/first_steps/persistence/configure.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/configure.fa.po Removing wiki/src/doc/first_steps/persistence/claws-mail.png Auto-merging wiki/src/doc/first_steps/persistence/check_file_system.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/check_file_system.fa.po Auto-merging wiki/src/doc/first_steps/persistence/change_passphrase.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/change_passphrase.fa.po Auto-merging wiki/src/doc/first_steps/persistence.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence.fa.po Auto-merging wiki/src/doc/first_steps/persistence.caution.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence.caution.fa.po Auto-merging wiki/src/doc/first_steps/media.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/media.fa.po Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-starting.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-off.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/synaptic.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/sound.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/shutdown.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/power.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/keyboard-en.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/keyboard-de.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet-text.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet-seal.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/computer.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/claws-mail.png Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/windows.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/windows.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/first_steps/installation/manual.intro.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual.intro.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual.fa.po Auto-merging wiki/src/doc/first_steps/installation.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation.fa.po Auto-merging wiki/src/doc/first_steps/dvd.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/dvd.fa.po Auto-merging wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fa.po Auto-merging wiki/src/doc/first_steps/bug_reporting.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/bug_reporting.fa.po Auto-merging wiki/src/doc/first_steps/accessibility.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/accessibility.fa.po Auto-merging wiki/src/doc/first_steps/accessibility.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.de.po Auto-merging wiki/src/doc/first_steps.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps.index.fa.po Auto-merging wiki/src/doc/first_steps.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po Auto-merging wiki/src/doc/encryption_and_privacy/virtual_keyboard.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/virtual_keyboard.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/truecrypt.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/truecrypt.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.pt.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.de.po Auto-merging wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/keyringer.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/keyringer.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_secret.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.fr.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.fr.png Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/checksums.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/checksums.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fa.po Auto-merging wiki/src/doc/encryption_and_privacy.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy.index.fa.po Auto-merging wiki/src/doc/encryption_and_privacy.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy.fa.po Auto-merging wiki/src/doc/anonymous_internet/why_tor_is_slow.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/why_tor_is_slow.fa.po Auto-merging wiki/src/doc/anonymous_internet/vidalia.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/vidalia.fa.po Auto-merging wiki/src/doc/anonymous_internet/vidalia.de.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.fa.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.fa.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/thunderbird.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/thunderbird.fa.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.fa.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Removing wiki/src/doc/anonymous_internet/networkmanager/networkmanager.png Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fr.po Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fa.po Auto-merging wiki/src/doc/anonymous_internet/i2p.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/i2p.fa.po Auto-merging wiki/src/doc/anonymous_internet/electrum.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/electrum.fa.po Auto-merging wiki/src/doc/anonymous_internet/electrum.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.de.po Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.mdwn Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.fr.po Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.de.po Auto-merging wiki/src/doc/anonymous_internet/claws_mail.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/claws_mail.fa.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.fa.po Auto-merging wiki/src/doc/anonymous_internet.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet.index.fa.po Auto-merging wiki/src/doc/anonymous_internet.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet.fa.po Auto-merging wiki/src/doc/advanced_topics/wireless_devices.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/wireless_devices.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/boxes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/boxes.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization.caution.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization.caution.fa.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fa.po Auto-merging wiki/src/doc/advanced_topics/cold_boot_attacks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/cold_boot_attacks.fa.po Auto-merging wiki/src/doc/advanced_topics/cold_boot_attacks.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/cold_boot_attacks.de.po Auto-merging wiki/src/doc/advanced_topics/additional_software.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/additional_software.fa.po Auto-merging wiki/src/doc/advanced_topics/additional_software.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/additional_software.de.po Auto-merging wiki/src/doc/advanced_topics.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.index.fa.po Auto-merging wiki/src/doc/advanced_topics.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.fa.po Auto-merging wiki/src/doc/about/warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/warning.fa.po Auto-merging wiki/src/doc/about/trust.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/trust.fa.po Auto-merging wiki/src/doc/about/tor.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/tor.fa.po Auto-merging wiki/src/doc/about/requirements.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/requirements.fa.po Auto-merging wiki/src/doc/about/openpgp_keys.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/openpgp_keys.fa.po Auto-merging wiki/src/doc/about/license.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/license.fa.po Auto-merging wiki/src/doc/about/fingerprint.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/fingerprint.fa.po Auto-merging wiki/src/doc/about/finances.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/finances.fa.po Auto-merging wiki/src/doc/about/features.fr.po Auto-merging wiki/src/doc/about/features.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/features.fa.po Auto-merging wiki/src/doc/about/features.de.po Auto-merging wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po Auto-merging wiki/src/doc/about.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about.index.fa.po Auto-merging wiki/src/doc.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc.fa.po Removing wiki/src/contribute/release_process/tor.mdwn Removing wiki/src/contribute/low-hanging_fruit_sessions.mdwn Auto-merging wiki/src/contribute/how/donate.fa.po CONFLICT (add/add): Merge conflict in wiki/src/contribute/how/donate.fa.po Auto-merging wiki/src/contribute.fa.po CONFLICT (add/add): Merge conflict in wiki/src/contribute.fa.po Auto-merging wiki/src/bugs.fa.po CONFLICT (add/add): Merge conflict in wiki/src/bugs.fa.po Removing wiki/src/blueprint/report_2015_12.mdwn Removing wiki/src/blueprint/report_2015_11.mdwn Removing wiki/src/blueprint/report_2015_10.mdwn Removing wiki/src/blueprint/report_2015_09.mdwn Removing wiki/src/blueprint/derivatives.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn Removing wiki/src/blueprint/SponsorS/reports/2016_01.mdwn Removing wiki/src/blueprint/SponsorS/reports/2015_12.mdwn Auto-merging wiki/src/about.fa.po CONFLICT (add/add): Merge conflict in wiki/src/about.fa.po Removing features/windows_camouflage.feature Removing features/step_definitions/windows_camouflage.rb Removing features/images/WindowsWindowButtons.png Removing features/images/WindowsTorBrowserWindow.png Removing features/images/WindowsTorBrowserTaskBar.png Removing features/images/WindowsTorBrowserOfflinePromptStart.png Removing features/images/WindowsTorBrowserOfflinePrompt.png Removing features/images/WindowsSysTraySound.png Removing features/images/WindowsSysTrayKeyboard.png Removing features/images/WindowsSysTrayGpgApplet.png Removing features/images/WindowsStartMenu.png Removing features/images/WindowsStartButton.png Removing features/images/WindowsRunDialog.png Removing features/images/WindowsNotificationX.png Removing features/images/WindowsDesktop.png Removing features/images/WindowsApplicationsTorBrowser.png Removing features/images/WindowsApplicationsTails.png Removing features/images/WindowsApplicationsMenu.png Removing features/images/WindowsApplicationsInternet.png Removing features/images/TotemMainWindow.png Removing features/images/TorBrowserWarningDialogOkButton.png Removing features/images/TorBrowserCouldNotReadTheContentsOfWarning.png Removing features/images/SynapticSearch.png Removing features/images/SynapticPolicyKitAuthPrompt.png Removing features/images/SeahorseEdit.png Removing features/images/PrintToFile.png Removing features/images/PidginScrollArrowUp.png Removing features/images/PersistenceWizardWindow.png Removing features/images/OpenWithImportKey.png Removing features/images/MACSpoofNetworkBlocked.png Removing features/images/KeyImportedNotification.png Removing features/images/I2P_starting_notification.png Removing features/images/GnomeTorIsReady.png Removing features/images/GnomeSSHServerSSH.png Removing features/images/GnomeSSHFTP.png Removing features/images/GnomeSSHConnectButton.png Removing features/images/GnomeSSHConnect.png Removing features/images/GnomePlacesConnectToServer.png Removing features/images/GnomeNotificationAppletCloseButton.png Removing features/images/GnomeNotificationAppletClearAllButton.png Removing features/images/GeditNewDocument.png Removing features/images/EvincePrintOutputFileSelected.png Removing features/images/EvincePrintOutputFile.png Removing config/chroot_sources/wheezy-backports.chroot Removing config/chroot_sources/wheezy-backports.binary Removing config/chroot_sources/jessie.chroot Removing config/chroot_sources/jessie.binary Removing config/chroot_sources/jessie-updates.chroot Removing config/chroot_sources/jessie-updates.binary Removing config/chroot_local-patches/zenity-fix-whitespacing-box-sizes.diff Removing config/chroot_local-patches/torsocks_whisperback.patch Removing config/chroot_local-patches/torsocks_seahorse.patch Removing config/chroot_local-patches/torsocks_liferea.patch Removing config/chroot_local-patches/torsocks_gobby-0.5.patch Removing config/chroot_local-patches/torsocks_claws-mail.diff Removing config/chroot_local-patches/keep_resolvconf_on_shutdown.diff Removing config/chroot_local-patches/gdm-background.diff Removing config/chroot_local-patches/florence_icon.patch Removing config/chroot_local-patches/do_not_start_tor_on_boot.diff Removing config/chroot_local-patches/do_not_start_network-manager_on_boot.diff Removing config/chroot_local-patches/do_not_start_i2p_on_boot.diff Removing config/chroot_local-patches/do_not_start_hdparm_on_boot.diff Removing config/chroot_local-patches/do_not_run_ttdnsd_initscript.diff Removing config/chroot_local-patches/do_not_run_pulseaudio_initscript.diff Removing config/chroot_local-patches/do_not_run_plymouth_on_shutdown.diff Removing config/chroot_local-patches/do_not_run_gdomap_initscript.diff Removing config/chroot_local-patches/disable_kexec_initscript.diff Removing config/chroot_local-patches/Greeter-Activate-win8-theme-using-a-script.patch Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/userChrome.css Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/theme.js Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/localstore.rdf Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userChrome.css Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/common/prefs.js Removing config/chroot_local-includes/usr/share/pixmaps/outlook_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/msn_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/ie_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/blue_dot.png Removing config/chroot_local-includes/usr/share/pixmaps/backgrounds/xp-bliss.jpg Auto-merging config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/memory_wipe Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/pidgin.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/iceweasel.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/icedove.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/florence.png Removing config/chroot_local-includes/usr/share/gnome-panel/4.0/applets/org.boum.tails.ShutdownHelper.panel-applet Removing config/chroot_local-includes/usr/share/gdm/greeter/autostart/spice-vdagent.desktop Removing config/chroot_local-includes/usr/share/dbus-1/services/org.gnome.panel.applet.ShutdownHelperFactory.service Removing config/chroot_local-includes/usr/share/applications/tails-activate-win8-theme.desktop Removing config/chroot_local-includes/usr/local/sbin/tails-unblock-network Removing config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector Removing config/chroot_local-includes/usr/local/sbin/tails-prepare-win8-theme Auto-merging config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper Auto-merging config/chroot_local-includes/usr/local/lib/tails-spoof-mac Auto-merging config/chroot_local-includes/usr/local/lib/tails-set-wireless-devices-state Auto-merging config/chroot_local-includes/usr/local/lib/tails-htp-notify-user Removing config/chroot_local-includes/usr/local/lib/shutdown-helper-applet Auto-merging config/chroot_local-includes/usr/local/lib/end-profile Removing config/chroot_local-includes/usr/local/bin/torified-claws-mail Removing config/chroot_local-includes/usr/local/bin/tails-warn-about-disabled-persistence Removing config/chroot_local-includes/usr/local/bin/tails-virt-notify-user Removing config/chroot_local-includes/usr/local/bin/tails-security-check-wrapper Removing config/chroot_local-includes/usr/local/bin/tails-save-im-environment Removing config/chroot_local-includes/usr/local/bin/tails-configure-keyboard Removing config/chroot_local-includes/usr/local/bin/tails-activate-win8-theme Removing config/chroot_local-includes/usr/lib/bonobo/servers/ShutdownHelper_Factory.server Removing config/chroot_local-includes/usr/lib/apt/methods/tor+http Removing config/chroot_local-includes/usr/bin/tor-launcher Removing config/chroot_local-includes/lib/live/config/2060-kiosk-mode Removing config/chroot_local-includes/lib/live/config/0000-resolv-conf Removing config/chroot_local-includes/etc/xdg/autostart/virt-notify.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-warn-about-disabled-persistence.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-upgrade-frontend.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-configure-keyboard.desktop Removing config/chroot_local-includes/etc/xdg/autostart/security-check.desktop Removing config/chroot_local-includes/etc/xdg/autostart/save-im-environment.desktop Removing config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-directories.desktop Removing config/chroot_local-includes/etc/xdg/autostart/add-GNOME-bookmarks.desktop Removing config/chroot_local-includes/etc/sudoers.d/zzz_tor-launcher Removing config/chroot_local-includes/etc/sudoers.d/zzz_tor-has-bootstrapped Removing config/chroot_local-includes/etc/skel/.config/menus/gnome-settings.menu Removing config/chroot_local-includes/etc/skel/.config/menus/gnome-applications.menu Removing config/chroot_local-includes/etc/skel/.config/gnome-panel/panel-default-layout.layout Removing config/chroot_local-includes/etc/skel/.claws-mail/dispheaderrc Removing config/chroot_local-includes/etc/skel/.claws-mail/clawsrc Removing config/chroot_local-includes/etc/skel/.claws-mail/accountrc.tmpl Removing config/chroot_local-includes/etc/resolvconf/interface-order Removing config/chroot_local-includes/etc/live/config.d/x-session-manager.conf Removing config/chroot_local-includes/etc/init.d/tor-controlport-filter Removing config/chroot_local-includes/etc/init.d/tails-set-wireless-devices-state Removing config/chroot_local-includes/etc/init.d/tails-sdmem-on-media-removal Removing config/chroot_local-includes/etc/init.d/tails-reconfigure-memlockd Removing config/chroot_local-includes/etc/init.d/tails-reconfigure-kexec Removing config/chroot_local-includes/etc/init.d/tails-kexec Removing config/chroot_local-includes/etc/init.d/tails-detect-virtualization Removing config/chroot_local-includes/etc/init.d/tails-autotest-remote-shell Removing config/chroot_local-includes/etc/init.d/htpdate Removing config/chroot_local-includes/etc/gdm3/greeter.gconf-defaults Removing config/chroot_local-includes/etc/fstab Removing config/chroot_local-includes/etc/fonts/conf.d/13-antialias.conf Removing config/chroot_local-includes/etc/fonts/conf.d/12-hintstyle-hintslight.conf Removing config/chroot_local-includes/etc/fonts/conf.d/11-lcdfilter-default.conf Removing config/chroot_local-includes/etc/fonts/conf.d/10-sub-pixel-rgb.conf Removing config/chroot_local-includes/etc/fonts/conf.d/10-autohint.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/13-antialias.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/12-hintstyle-hintslight.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/11-lcdfilter-default.conf Auto-merging config/chroot_local-includes/etc/default/htpdate.pools Removing config/chroot_local-includes/etc/X11/xorg.conf.d/disable-screen-blanking.conf Removing config/chroot_local-includes/etc/X11/Xsession.d/80im-starter Auto-merging config/chroot_local-includes/etc/NetworkManager/dispatcher.d/01-wait-for-notification-recipient.sh Removing config/chroot_local-hooks/99-zzz_resolvconf Removing config/chroot_local-hooks/50-fine-tune-syndaemon Auto-merging config/chroot_local-hooks/50-dkms Removing config/chroot_local-hooks/40-etc_modules Removing config/chroot_local-hooks/21-gdm_background Removing config/chroot_local-hooks/17-clean_up_resolvconf Removing config/chroot_local-hooks/04-nolvm Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
None
Repository merge failed |
Auto-merging wiki/src/wishlist.fa.po CONFLICT (add/add): Merge conflict in wiki/src/wishlist.fa.po Auto-merging wiki/src/upgrade/v1/Tails/2.2/i386/stable/upgrades.yml Auto-merging wiki/src/upgrade/v1/Tails/2.0.1/i386/stable/upgrades.yml Auto-merging wiki/src/upgrade/v1/Tails/2.0.1/i386/alpha/upgrades.yml Removing wiki/src/upgrade/v1/Tails/1.9~rc1/i386/stable/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9~rc1/i386/alpha/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9/i386/stable/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9/i386/alpha/upgrades.yml.pgp Auto-merging wiki/src/upgrade/v1/Tails/1.8.1/i386/alpha/upgrades.yml Removing wiki/src/torrents/files/tails-i386-1.7.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.7.torrent Removing wiki/src/torrents/files/tails-i386-1.7.packages Removing wiki/src/torrents/files/tails-i386-1.7.iso.sig Auto-merging wiki/src/torrents.fa.po CONFLICT (add/add): Merge conflict in wiki/src/torrents.fa.po Auto-merging wiki/src/todo.fa.po CONFLICT (add/add): Merge conflict in wiki/src/todo.fa.po Auto-merging wiki/src/support/talk.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/talk.fa.po Auto-merging wiki/src/support/tails-support.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/tails-support.fa.po Auto-merging wiki/src/support/learn.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/learn.fa.po Auto-merging wiki/src/support/known_issues.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/known_issues.fa.po Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/support/faq.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/faq.fa.po Auto-merging wiki/src/support/chat.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/chat.fa.po Auto-merging wiki/src/support.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support.fa.po Auto-merging wiki/src/sidebar.fa.po CONFLICT (add/add): Merge conflict in wiki/src/sidebar.fa.po Auto-merging wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fa.po Auto-merging wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.fa.po Auto-merging wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.pt.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.pt.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fa.po Auto-merging wiki/src/security/Upgrade_Tor.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Upgrade_Tor.fa.po Auto-merging wiki/src/security/Security_hole_in_I2P_0.9.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Security_hole_in_I2P_0.9.13.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.4.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.4.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.3.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.0.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.0.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.0.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.0.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.9.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.9.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.8.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.8.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.8.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.8.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.5.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.23.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.23.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.22.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.22.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.22.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.22.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.21.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.21.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.20.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.20.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.20.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.20.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.19.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.19.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.18.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.18.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.16.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.16.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.15.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.15.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.14.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.14.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.13.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.12.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.12.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.11.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.1.fa.po Auto-merging wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fa.po Auto-merging wiki/src/security/IP_address_leak_with_icedove.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/IP_address_leak_with_icedove.fa.po Auto-merging wiki/src/security.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security.fa.po Auto-merging wiki/src/press/media_appearances_2015.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2015.fa.po Auto-merging wiki/src/press/media_appearances_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2014.fa.po Auto-merging wiki/src/press/media_appearances_2013.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2013.fa.po Auto-merging wiki/src/press/media_appearances_2012.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2012.fa.po Auto-merging wiki/src/press/media_appearances_2011.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2011.fa.po Auto-merging wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/press.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press.fa.po Auto-merging wiki/src/news/windows_camouflage_jessie.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/windows_camouflage_jessie.fa.po Auto-merging wiki/src/news/who_are_you_helping.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/who_are_you_helping.fa.po Auto-merging wiki/src/news/version_1.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.5.fa.po Auto-merging wiki/src/news/version_1.4.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.4.fa.po Auto-merging wiki/src/news/version_1.4.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.4.1.fa.po Auto-merging wiki/src/news/version_1.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.fa.po Auto-merging wiki/src/news/version_1.3.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.2.fa.po Auto-merging wiki/src/news/version_1.3.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.1.fa.po Auto-merging wiki/src/news/version_1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.fa.po Auto-merging wiki/src/news/version_1.2.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.3.fa.po Auto-merging wiki/src/news/version_1.2.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.2.fa.po Auto-merging wiki/src/news/version_1.2.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.1.fa.po Auto-merging wiki/src/news/version_1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.fa.po Auto-merging wiki/src/news/version_1.1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.2.fa.po Auto-merging wiki/src/news/version_1.1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.1.fa.po Auto-merging wiki/src/news/version_1.0.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.0.fa.po Auto-merging wiki/src/news/version_1.0.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.0.1.fa.po Auto-merging wiki/src/news/version_0.9.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.9.fa.po Auto-merging wiki/src/news/version_0.8.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.8.fa.po Auto-merging wiki/src/news/version_0.8.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.8.1.fa.po Auto-merging wiki/src/news/version_0.7.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.fa.po Auto-merging wiki/src/news/version_0.7.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.2.fa.po Auto-merging wiki/src/news/version_0.7.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.1.fa.po Auto-merging wiki/src/news/version_0.6.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.fa.po Auto-merging wiki/src/news/version_0.6.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.2.fa.po Auto-merging wiki/src/news/version_0.6.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.1.fa.po Auto-merging wiki/src/news/version_0.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.5.fa.po Auto-merging wiki/src/news/version_0.4.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.4.2.fa.po Auto-merging wiki/src/news/version_0.4.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.4.1.fa.po Auto-merging wiki/src/news/version_0.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.3.fa.po Auto-merging wiki/src/news/version_0.23.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.23.fa.po Auto-merging wiki/src/news/version_0.22.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.22.fa.po Auto-merging wiki/src/news/version_0.22.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.22.1.fa.po Auto-merging wiki/src/news/version_0.21.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.21.fa.po Auto-merging wiki/src/news/version_0.20.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.20.fa.po Auto-merging wiki/src/news/version_0.20.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.20.1.fa.po Auto-merging wiki/src/news/version_0.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.2.fa.po Auto-merging wiki/src/news/version_0.19.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.19.fa.po Auto-merging wiki/src/news/version_0.18.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.18.fa.po Auto-merging wiki/src/news/version_0.17.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.fa.po Auto-merging wiki/src/news/version_0.17.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.2.fa.po Auto-merging wiki/src/news/version_0.17.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.1.fa.po Auto-merging wiki/src/news/version_0.16.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.16.fa.po Auto-merging wiki/src/news/version_0.15.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.15.fa.po Auto-merging wiki/src/news/version_0.14.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.14.fa.po Auto-merging wiki/src/news/version_0.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.13.fa.po Auto-merging wiki/src/news/version_0.12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.12.fa.po Auto-merging wiki/src/news/version_0.12.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.12.1.fa.po Auto-merging wiki/src/news/version_0.11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.11.fa.po Auto-merging wiki/src/news/version_0.10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.fa.po Auto-merging wiki/src/news/version_0.10.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.2.fa.po Auto-merging wiki/src/news/version_0.10.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.1.fa.po Auto-merging wiki/src/news/usability_testing_2014_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/usability_testing_2014_05.fa.po Auto-merging wiki/src/news/thedaywefightback.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/thedaywefightback.fa.po Auto-merging wiki/src/news/test_incremental_upgrades.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_incremental_upgrades.fa.po Auto-merging wiki/src/news/test_UEFI.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_UEFI.fa.po Auto-merging wiki/src/news/test_1.4-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.4-rc1.fa.po Auto-merging wiki/src/news/test_1.3-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.3-rc1.fa.po Auto-merging wiki/src/news/test_1.2-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.2-rc1.fa.po Auto-merging wiki/src/news/test_1.1-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.1-rc1.fa.po Auto-merging wiki/src/news/test_1.1-beta1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.1-beta1.fa.po Auto-merging wiki/src/news/test_1.0-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.0-rc1.fa.po Auto-merging wiki/src/news/test_0.23-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.23-rc1.fa.po Auto-merging wiki/src/news/test_0.22.1-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.22.1-rc1.fa.po Auto-merging wiki/src/news/test_0.22-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.22-rc1.fa.po Auto-merging wiki/src/news/test_0.21-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.21-rc1.fa.po Auto-merging wiki/src/news/test_0.20-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.20-rc1.fa.po Auto-merging wiki/src/news/test_0.19-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.19-rc1.fa.po Auto-merging wiki/src/news/test_0.18-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.18-rc1.fa.po Auto-merging wiki/src/news/test_0.17.2-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.17.2-rc1.fa.po Auto-merging wiki/src/news/test_0.17-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.17-rc1.fa.po Auto-merging wiki/src/news/test_0.16-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.16-rc1.fa.po Auto-merging wiki/src/news/test_0.15-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.15-rc1.fa.po Auto-merging wiki/src/news/test_0.14-rc2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.14-rc2.fa.po Auto-merging wiki/src/news/test_0.14-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.14-rc1.fa.po Auto-merging wiki/src/news/test_0.13-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.13-rc1.fa.po Auto-merging wiki/src/news/tails-testers.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/tails-testers.fa.po Auto-merging wiki/src/news/summit_2013.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/summit_2013.fa.po Auto-merging wiki/src/news/spoof-mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/spoof-mac.fa.po Auto-merging wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/signing_key_transition.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/signing_key_transition.fa.po Auto-merging wiki/src/news/signing_key_transition.de.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.de.po Auto-merging wiki/src/news/report_end_of_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_end_of_2014.fa.po Auto-merging wiki/src/news/report_2015_08.mdwn Auto-merging wiki/src/news/report_2015_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_05.fa.po Auto-merging wiki/src/news/report_2015_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_04.fa.po Auto-merging wiki/src/news/report_2015_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_03.fa.po Auto-merging wiki/src/news/report_2015_01-02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_01-02.fa.po Auto-merging wiki/src/news/report_2014_06-07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_06-07.fa.po Auto-merging wiki/src/news/report_2014_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_05.fa.po Auto-merging wiki/src/news/report_2014_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_04.fa.po Auto-merging wiki/src/news/report_2014_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_03.fa.po Auto-merging wiki/src/news/report_2014_02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_02.fa.po Auto-merging wiki/src/news/report_2014_01.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_01.fa.po Auto-merging wiki/src/news/report_2013_12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_12.fa.po Auto-merging wiki/src/news/report_2013_11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_11.fa.po Auto-merging wiki/src/news/report_2013_10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_10.fa.po Auto-merging wiki/src/news/report_2013_09.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_09.fa.po Auto-merging wiki/src/news/report_2013_08.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_08.fa.po Auto-merging wiki/src/news/report_2013_07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_07.fa.po Auto-merging wiki/src/news/report_2013_06.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_06.fa.po Auto-merging wiki/src/news/report_2013_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_05.fa.po Auto-merging wiki/src/news/report_2013_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_04.fa.po Auto-merging wiki/src/news/report_2013_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_03.fa.po Auto-merging wiki/src/news/report_2013_02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_02.fa.po Auto-merging wiki/src/news/report_2013_01.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_01.fa.po Auto-merging wiki/src/news/report_2012_12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_12.fa.po Auto-merging wiki/src/news/report_2012_11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_11.fa.po Auto-merging wiki/src/news/report_2012_10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_10.fa.po Auto-merging wiki/src/news/report_2012_09.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_09.fa.po Auto-merging wiki/src/news/report_2012_08.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_08.fa.po Auto-merging wiki/src/news/report_2012_07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_07.fa.po Auto-merging wiki/src/news/report_2012_01-04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_01-04.fa.po Auto-merging wiki/src/news/report_2011_05-06.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_05-06.fa.po Auto-merging wiki/src/news/report_2011_03-04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_03-04.fa.po Auto-merging wiki/src/news/report_2011_01-02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_01-02.fa.po Auto-merging wiki/src/news/new_project_name.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/new_project_name.fa.po Auto-merging wiki/src/news/new_SSL_certificate.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/new_SSL_certificate.fa.po Auto-merging wiki/src/news/logo_contest.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/logo_contest.fa.po Auto-merging wiki/src/news/improve_the_infrastructure_behind_Tails.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/improve_the_infrastructure_behind_Tails.fa.po Auto-merging wiki/src/news/fpf_campaign.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/fpf_campaign.fa.po Auto-merging wiki/src/news/bounties_2013_report.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/bounties_2013_report.fa.po Auto-merging wiki/src/news/and_the_winner_is.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/and_the_winner_is.fa.po Auto-merging wiki/src/news/amnesia_may_now_work_on_the_Mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/amnesia_may_now_work_on_the_Mac.fa.po Auto-merging wiki/src/news/Tails_HackFest_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Tails_HackFest_2014.fa.po Auto-merging wiki/src/news/On_0days_exploits_and_disclosure.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/On_0days_exploits_and_disclosure.fa.po Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fa.po Auto-merging wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po Auto-merging wiki/src/news/IP_leakage_with_Icedove.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/IP_leakage_with_Icedove.fa.po Auto-merging wiki/src/news.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news.fa.po Auto-merging wiki/src/misc/unsafe_browser_warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/misc/unsafe_browser_warning.fa.po Removing wiki/src/lib/spip_out.gif Auto-merging wiki/src/lib/menu.png Removing wiki/src/install/v1/Tails/i386/stable/1.7.yml Removing wiki/src/install/inc/stylesheets/scenarios.css Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po Removing wiki/src/install/inc/screenshots/gnome_disks.png Removing wiki/src/install/inc/infography/temporary-tails.png Removing wiki/src/install/inc/infography/temporary-tails-on-dvd.png Auto-merging wiki/src/index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/index.fa.po Auto-merging wiki/src/inc/stable_i386_release_notes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/stable_i386_release_notes.fa.po Removing wiki/src/inc/stable_i386_iso_size_mib.html Auto-merging wiki/src/inc/stable_i386_date.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/stable_i386_date.fa.po Auto-merging wiki/src/inc/release_notes/1.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/release_notes/1.5.fa.po Auto-merging wiki/src/getting_started.fa.po CONFLICT (add/add): Merge conflict in wiki/src/getting_started.fa.po Auto-merging wiki/src/download.fa.po CONFLICT (add/add): Merge conflict in wiki/src/download.fa.po Auto-merging wiki/src/doc/upgrade/error.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/upgrade/error.fa.po Auto-merging wiki/src/doc/sensitive_documents/sound_and_video.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/sound_and_video.fa.po Auto-merging wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po Auto-merging wiki/src/doc/sensitive_documents/office_suite.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/office_suite.fa.po Auto-merging wiki/src/doc/sensitive_documents/metadata.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fa.po Auto-merging wiki/src/doc/sensitive_documents/metadata.de.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.de.po Auto-merging wiki/src/doc/sensitive_documents/graphics.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/graphics.fa.po Auto-merging wiki/src/doc/sensitive_documents.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents.index.fa.po Auto-merging wiki/src/doc/sensitive_documents.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents.fa.po Auto-merging wiki/src/doc/introduction.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/introduction.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po Auto-merging wiki/src/doc/get/trusting_tails_signing_key.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/trusting_tails_signing_key.fa.po Auto-merging wiki/src/doc/get/signing_key_transition.inline.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fa.po Auto-merging wiki/src/doc/get.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get.index.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.release_notes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/upgrade.release_notes.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/upgrade.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage/windows_camouflage.jpg Removing wiki/src/doc/first_steps/startup_options/windows_camouflage/syslinux.png Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.pt.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.mdwn Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.fr.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.de.po Auto-merging wiki/src/doc/first_steps/startup_options/network_configuration.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/network_configuration.fa.po Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.fa.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Auto-merging wiki/src/doc/first_steps/startup_options.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options.fa.po Auto-merging wiki/src/doc/first_steps/start_tails.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/start_tails.fa.po Auto-merging wiki/src/doc/first_steps/shutdown.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/shutdown.fa.po Auto-merging wiki/src/doc/first_steps/shutdown.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/shutdown.de.po Auto-merging wiki/src/doc/first_steps/reset/windows.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/windows.fa.po Auto-merging wiki/src/doc/first_steps/reset/mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/mac.fa.po Auto-merging wiki/src/doc/first_steps/reset/linux.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/linux.fa.po Auto-merging wiki/src/doc/first_steps/reset.intro.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.intro.fa.po Auto-merging wiki/src/doc/first_steps/reset.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.fa.po Auto-merging wiki/src/doc/first_steps/persistence/warnings.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/warnings.fa.po Auto-merging wiki/src/doc/first_steps/persistence/use.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/use.fa.po Auto-merging wiki/src/doc/first_steps/persistence/upgrade.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/upgrade.fa.po Auto-merging wiki/src/doc/first_steps/persistence/delete.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/delete.fa.po Auto-merging wiki/src/doc/first_steps/persistence/copy.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/copy.fa.po Auto-merging wiki/src/doc/first_steps/persistence/configure.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/configure.fa.po Removing wiki/src/doc/first_steps/persistence/claws-mail.png Auto-merging wiki/src/doc/first_steps/persistence/check_file_system.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/check_file_system.fa.po Auto-merging wiki/src/doc/first_steps/persistence/change_passphrase.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/change_passphrase.fa.po Auto-merging wiki/src/doc/first_steps/persistence.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence.fa.po Auto-merging wiki/src/doc/first_steps/persistence.caution.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence.caution.fa.po Auto-merging wiki/src/doc/first_steps/media.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/media.fa.po Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-starting.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-off.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/synaptic.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/sound.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/shutdown.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/power.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/keyboard-en.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/keyboard-de.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet-text.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet-seal.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/computer.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/claws-mail.png Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/windows.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/windows.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/first_steps/installation/manual.intro.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual.intro.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual.fa.po Auto-merging wiki/src/doc/first_steps/installation.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation.fa.po Auto-merging wiki/src/doc/first_steps/dvd.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/dvd.fa.po Auto-merging wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fa.po Auto-merging wiki/src/doc/first_steps/bug_reporting.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/bug_reporting.fa.po Auto-merging wiki/src/doc/first_steps/accessibility.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/accessibility.fa.po Auto-merging wiki/src/doc/first_steps/accessibility.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.de.po Auto-merging wiki/src/doc/first_steps.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps.index.fa.po Auto-merging wiki/src/doc/first_steps.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po Auto-merging wiki/src/doc/encryption_and_privacy/virtual_keyboard.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/virtual_keyboard.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/truecrypt.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/truecrypt.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.pt.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.de.po Auto-merging wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/keyringer.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/keyringer.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_secret.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.fr.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.fr.png Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/checksums.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/checksums.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fa.po Auto-merging wiki/src/doc/encryption_and_privacy.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy.index.fa.po Auto-merging wiki/src/doc/encryption_and_privacy.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy.fa.po Auto-merging wiki/src/doc/anonymous_internet/why_tor_is_slow.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/why_tor_is_slow.fa.po Auto-merging wiki/src/doc/anonymous_internet/vidalia.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/vidalia.fa.po Auto-merging wiki/src/doc/anonymous_internet/vidalia.de.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.fa.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.fa.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/thunderbird.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/thunderbird.fa.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.fa.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Removing wiki/src/doc/anonymous_internet/networkmanager/networkmanager.png Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fr.po Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fa.po Auto-merging wiki/src/doc/anonymous_internet/i2p.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/i2p.fa.po Auto-merging wiki/src/doc/anonymous_internet/electrum.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/electrum.fa.po Auto-merging wiki/src/doc/anonymous_internet/electrum.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.de.po Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.mdwn Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.fr.po Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.de.po Auto-merging wiki/src/doc/anonymous_internet/claws_mail.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/claws_mail.fa.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.fa.po Auto-merging wiki/src/doc/anonymous_internet.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet.index.fa.po Auto-merging wiki/src/doc/anonymous_internet.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet.fa.po Auto-merging wiki/src/doc/advanced_topics/wireless_devices.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/wireless_devices.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/boxes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/boxes.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization.caution.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization.caution.fa.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fa.po Auto-merging wiki/src/doc/advanced_topics/cold_boot_attacks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/cold_boot_attacks.fa.po Auto-merging wiki/src/doc/advanced_topics/cold_boot_attacks.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/cold_boot_attacks.de.po Auto-merging wiki/src/doc/advanced_topics/additional_software.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/additional_software.fa.po Auto-merging wiki/src/doc/advanced_topics/additional_software.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/additional_software.de.po Auto-merging wiki/src/doc/advanced_topics.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.index.fa.po Auto-merging wiki/src/doc/advanced_topics.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.fa.po Auto-merging wiki/src/doc/about/warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/warning.fa.po Auto-merging wiki/src/doc/about/trust.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/trust.fa.po Auto-merging wiki/src/doc/about/tor.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/tor.fa.po Auto-merging wiki/src/doc/about/requirements.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/requirements.fa.po Auto-merging wiki/src/doc/about/openpgp_keys.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/openpgp_keys.fa.po Auto-merging wiki/src/doc/about/license.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/license.fa.po Auto-merging wiki/src/doc/about/fingerprint.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/fingerprint.fa.po Auto-merging wiki/src/doc/about/finances.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/finances.fa.po Auto-merging wiki/src/doc/about/features.fr.po Auto-merging wiki/src/doc/about/features.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/features.fa.po Auto-merging wiki/src/doc/about/features.de.po Auto-merging wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po Auto-merging wiki/src/doc/about.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about.index.fa.po Auto-merging wiki/src/doc.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc.fa.po Removing wiki/src/contribute/release_process/tor.mdwn Removing wiki/src/contribute/low-hanging_fruit_sessions.mdwn Auto-merging wiki/src/contribute/how/donate.fa.po CONFLICT (add/add): Merge conflict in wiki/src/contribute/how/donate.fa.po Auto-merging wiki/src/contribute.fa.po CONFLICT (add/add): Merge conflict in wiki/src/contribute.fa.po Auto-merging wiki/src/bugs.fa.po CONFLICT (add/add): Merge conflict in wiki/src/bugs.fa.po Removing wiki/src/blueprint/report_2015_12.mdwn Removing wiki/src/blueprint/report_2015_11.mdwn Removing wiki/src/blueprint/report_2015_10.mdwn Removing wiki/src/blueprint/report_2015_09.mdwn Removing wiki/src/blueprint/derivatives.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn Removing wiki/src/blueprint/SponsorS/reports/2016_01.mdwn Removing wiki/src/blueprint/SponsorS/reports/2015_12.mdwn Auto-merging wiki/src/about.fa.po CONFLICT (add/add): Merge conflict in wiki/src/about.fa.po Removing features/windows_camouflage.feature Removing features/step_definitions/windows_camouflage.rb Removing features/images/WindowsWindowButtons.png Removing features/images/WindowsTorBrowserWindow.png Removing features/images/WindowsTorBrowserTaskBar.png Removing features/images/WindowsTorBrowserOfflinePromptStart.png Removing features/images/WindowsTorBrowserOfflinePrompt.png Removing features/images/WindowsSysTraySound.png Removing features/images/WindowsSysTrayKeyboard.png Removing features/images/WindowsSysTrayGpgApplet.png Removing features/images/WindowsStartMenu.png Removing features/images/WindowsStartButton.png Removing features/images/WindowsRunDialog.png Removing features/images/WindowsNotificationX.png Removing features/images/WindowsDesktop.png Removing features/images/WindowsApplicationsTorBrowser.png Removing features/images/WindowsApplicationsTails.png Removing features/images/WindowsApplicationsMenu.png Removing features/images/WindowsApplicationsInternet.png Removing features/images/TotemMainWindow.png Removing features/images/TorBrowserWarningDialogOkButton.png Removing features/images/TorBrowserCouldNotReadTheContentsOfWarning.png Removing features/images/SynapticSearch.png Removing features/images/SynapticPolicyKitAuthPrompt.png Removing features/images/SeahorseEdit.png Removing features/images/PrintToFile.png Removing features/images/PidginScrollArrowUp.png Removing features/images/PersistenceWizardWindow.png Removing features/images/OpenWithImportKey.png Removing features/images/MACSpoofNetworkBlocked.png Removing features/images/KeyImportedNotification.png Removing features/images/I2P_starting_notification.png Removing features/images/GnomeTorIsReady.png Removing features/images/GnomeSSHServerSSH.png Removing features/images/GnomeSSHFTP.png Removing features/images/GnomeSSHConnectButton.png Removing features/images/GnomeSSHConnect.png Removing features/images/GnomePlacesConnectToServer.png Removing features/images/GnomeNotificationAppletCloseButton.png Removing features/images/GnomeNotificationAppletClearAllButton.png Removing features/images/GeditNewDocument.png Removing features/images/EvincePrintOutputFileSelected.png Removing features/images/EvincePrintOutputFile.png Removing config/chroot_sources/wheezy-backports.chroot Removing config/chroot_sources/wheezy-backports.binary Removing config/chroot_sources/jessie.chroot Removing config/chroot_sources/jessie.binary Removing config/chroot_sources/jessie-updates.chroot Removing config/chroot_sources/jessie-updates.binary Removing config/chroot_local-patches/zenity-fix-whitespacing-box-sizes.diff Removing config/chroot_local-patches/torsocks_whisperback.patch Removing config/chroot_local-patches/torsocks_seahorse.patch Removing config/chroot_local-patches/torsocks_liferea.patch Removing config/chroot_local-patches/torsocks_gobby-0.5.patch Removing config/chroot_local-patches/torsocks_claws-mail.diff Removing config/chroot_local-patches/keep_resolvconf_on_shutdown.diff Removing config/chroot_local-patches/gdm-background.diff Removing config/chroot_local-patches/florence_icon.patch Removing config/chroot_local-patches/do_not_start_tor_on_boot.diff Removing config/chroot_local-patches/do_not_start_network-manager_on_boot.diff Removing config/chroot_local-patches/do_not_start_i2p_on_boot.diff Removing config/chroot_local-patches/do_not_start_hdparm_on_boot.diff Removing config/chroot_local-patches/do_not_run_ttdnsd_initscript.diff Removing config/chroot_local-patches/do_not_run_pulseaudio_initscript.diff Removing config/chroot_local-patches/do_not_run_plymouth_on_shutdown.diff Removing config/chroot_local-patches/do_not_run_gdomap_initscript.diff Removing config/chroot_local-patches/disable_kexec_initscript.diff Removing config/chroot_local-patches/Greeter-Activate-win8-theme-using-a-script.patch Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/userChrome.css Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/theme.js Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/localstore.rdf Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userChrome.css Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/common/prefs.js Removing config/chroot_local-includes/usr/share/pixmaps/outlook_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/msn_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/ie_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/blue_dot.png Removing config/chroot_local-includes/usr/share/pixmaps/backgrounds/xp-bliss.jpg Auto-merging config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/memory_wipe Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/pidgin.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/iceweasel.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/icedove.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/florence.png Removing config/chroot_local-includes/usr/share/gnome-panel/4.0/applets/org.boum.tails.ShutdownHelper.panel-applet Removing config/chroot_local-includes/usr/share/gdm/greeter/autostart/spice-vdagent.desktop Removing config/chroot_local-includes/usr/share/dbus-1/services/org.gnome.panel.applet.ShutdownHelperFactory.service Removing config/chroot_local-includes/usr/share/applications/tails-activate-win8-theme.desktop Removing config/chroot_local-includes/usr/local/sbin/tails-unblock-network Removing config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector Removing config/chroot_local-includes/usr/local/sbin/tails-prepare-win8-theme Auto-merging config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper Auto-merging config/chroot_local-includes/usr/local/lib/tails-spoof-mac Auto-merging config/chroot_local-includes/usr/local/lib/tails-set-wireless-devices-state Auto-merging config/chroot_local-includes/usr/local/lib/tails-htp-notify-user Removing config/chroot_local-includes/usr/local/lib/shutdown-helper-applet Auto-merging config/chroot_local-includes/usr/local/lib/end-profile Removing config/chroot_local-includes/usr/local/bin/torified-claws-mail Removing config/chroot_local-includes/usr/local/bin/tails-warn-about-disabled-persistence Removing config/chroot_local-includes/usr/local/bin/tails-virt-notify-user Removing config/chroot_local-includes/usr/local/bin/tails-security-check-wrapper Removing config/chroot_local-includes/usr/local/bin/tails-save-im-environment Removing config/chroot_local-includes/usr/local/bin/tails-configure-keyboard Removing config/chroot_local-includes/usr/local/bin/tails-activate-win8-theme Removing config/chroot_local-includes/usr/lib/bonobo/servers/ShutdownHelper_Factory.server Removing config/chroot_local-includes/usr/lib/apt/methods/tor+http Removing config/chroot_local-includes/usr/bin/tor-launcher Removing config/chroot_local-includes/lib/live/config/2060-kiosk-mode Removing config/chroot_local-includes/lib/live/config/0000-resolv-conf Removing config/chroot_local-includes/etc/xdg/autostart/virt-notify.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-warn-about-disabled-persistence.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-upgrade-frontend.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-configure-keyboard.desktop Removing config/chroot_local-includes/etc/xdg/autostart/security-check.desktop Removing config/chroot_local-includes/etc/xdg/autostart/save-im-environment.desktop Removing config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-directories.desktop Removing config/chroot_local-includes/etc/xdg/autostart/add-GNOME-bookmarks.desktop Removing config/chroot_local-includes/etc/sudoers.d/zzz_tor-launcher Removing config/chroot_local-includes/etc/sudoers.d/zzz_tor-has-bootstrapped Removing config/chroot_local-includes/etc/skel/.config/menus/gnome-settings.menu Removing config/chroot_local-includes/etc/skel/.config/menus/gnome-applications.menu Removing config/chroot_local-includes/etc/skel/.config/gnome-panel/panel-default-layout.layout Removing config/chroot_local-includes/etc/skel/.claws-mail/dispheaderrc Removing config/chroot_local-includes/etc/skel/.claws-mail/clawsrc Removing config/chroot_local-includes/etc/skel/.claws-mail/accountrc.tmpl Removing config/chroot_local-includes/etc/resolvconf/interface-order Removing config/chroot_local-includes/etc/live/config.d/x-session-manager.conf Removing config/chroot_local-includes/etc/init.d/tor-controlport-filter Removing config/chroot_local-includes/etc/init.d/tails-set-wireless-devices-state Removing config/chroot_local-includes/etc/init.d/tails-sdmem-on-media-removal Removing config/chroot_local-includes/etc/init.d/tails-reconfigure-memlockd Removing config/chroot_local-includes/etc/init.d/tails-reconfigure-kexec Removing config/chroot_local-includes/etc/init.d/tails-kexec Removing config/chroot_local-includes/etc/init.d/tails-detect-virtualization Removing config/chroot_local-includes/etc/init.d/tails-autotest-remote-shell Removing config/chroot_local-includes/etc/init.d/htpdate Removing config/chroot_local-includes/etc/gdm3/greeter.gconf-defaults Removing config/chroot_local-includes/etc/fstab Removing config/chroot_local-includes/etc/fonts/conf.d/13-antialias.conf Removing config/chroot_local-includes/etc/fonts/conf.d/12-hintstyle-hintslight.conf Removing config/chroot_local-includes/etc/fonts/conf.d/11-lcdfilter-default.conf Removing config/chroot_local-includes/etc/fonts/conf.d/10-sub-pixel-rgb.conf Removing config/chroot_local-includes/etc/fonts/conf.d/10-autohint.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/13-antialias.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/12-hintstyle-hintslight.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/11-lcdfilter-default.conf Auto-merging config/chroot_local-includes/etc/default/htpdate.pools Removing config/chroot_local-includes/etc/X11/xorg.conf.d/disable-screen-blanking.conf Removing config/chroot_local-includes/etc/X11/Xsession.d/80im-starter Auto-merging config/chroot_local-includes/etc/NetworkManager/dispatcher.d/01-wait-for-notification-recipient.sh Removing config/chroot_local-hooks/99-zzz_resolvconf Removing config/chroot_local-hooks/50-fine-tune-syndaemon Auto-merging config/chroot_local-hooks/50-dkms Removing config/chroot_local-hooks/40-etc_modules Removing config/chroot_local-hooks/21-gdm_background Removing config/chroot_local-hooks/17-clean_up_resolvconf Removing config/chroot_local-hooks/04-nolvm Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
None
Repository merge failed |
Auto-merging wiki/src/wishlist.fa.po CONFLICT (add/add): Merge conflict in wiki/src/wishlist.fa.po Auto-merging wiki/src/upgrade/v1/Tails/2.2/i386/stable/upgrades.yml Auto-merging wiki/src/upgrade/v1/Tails/2.0.1/i386/stable/upgrades.yml Auto-merging wiki/src/upgrade/v1/Tails/2.0.1/i386/alpha/upgrades.yml Removing wiki/src/upgrade/v1/Tails/1.9~rc1/i386/stable/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9~rc1/i386/alpha/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9/i386/stable/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9/i386/alpha/upgrades.yml.pgp Auto-merging wiki/src/upgrade/v1/Tails/1.8.1/i386/alpha/upgrades.yml Removing wiki/src/torrents/files/tails-i386-1.7.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.7.torrent Removing wiki/src/torrents/files/tails-i386-1.7.packages Removing wiki/src/torrents/files/tails-i386-1.7.iso.sig Auto-merging wiki/src/torrents.fa.po CONFLICT (add/add): Merge conflict in wiki/src/torrents.fa.po Auto-merging wiki/src/todo.fa.po CONFLICT (add/add): Merge conflict in wiki/src/todo.fa.po Auto-merging wiki/src/support/talk.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/talk.fa.po Auto-merging wiki/src/support/tails-support.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/tails-support.fa.po Auto-merging wiki/src/support/learn.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/learn.fa.po Auto-merging wiki/src/support/known_issues.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/known_issues.fa.po Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/support/faq.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/faq.fa.po Auto-merging wiki/src/support/chat.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/chat.fa.po Auto-merging wiki/src/support.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support.fa.po Auto-merging wiki/src/sidebar.fa.po CONFLICT (add/add): Merge conflict in wiki/src/sidebar.fa.po Auto-merging wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fa.po Auto-merging wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.fa.po Auto-merging wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.pt.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.pt.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fa.po Auto-merging wiki/src/security/Upgrade_Tor.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Upgrade_Tor.fa.po Auto-merging wiki/src/security/Security_hole_in_I2P_0.9.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Security_hole_in_I2P_0.9.13.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.4.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.4.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.3.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.0.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.0.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.0.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.0.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.9.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.9.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.8.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.8.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.8.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.8.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.5.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.23.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.23.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.22.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.22.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.22.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.22.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.21.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.21.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.20.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.20.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.20.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.20.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.19.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.19.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.18.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.18.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.16.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.16.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.15.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.15.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.14.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.14.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.13.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.12.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.12.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.11.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.1.fa.po Auto-merging wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fa.po Auto-merging wiki/src/security/IP_address_leak_with_icedove.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/IP_address_leak_with_icedove.fa.po Auto-merging wiki/src/security.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security.fa.po Auto-merging wiki/src/press/media_appearances_2015.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2015.fa.po Auto-merging wiki/src/press/media_appearances_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2014.fa.po Auto-merging wiki/src/press/media_appearances_2013.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2013.fa.po Auto-merging wiki/src/press/media_appearances_2012.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2012.fa.po Auto-merging wiki/src/press/media_appearances_2011.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2011.fa.po Auto-merging wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/press.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press.fa.po Auto-merging wiki/src/news/windows_camouflage_jessie.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/windows_camouflage_jessie.fa.po Auto-merging wiki/src/news/who_are_you_helping.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/who_are_you_helping.fa.po Auto-merging wiki/src/news/version_1.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.5.fa.po Auto-merging wiki/src/news/version_1.4.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.4.fa.po Auto-merging wiki/src/news/version_1.4.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.4.1.fa.po Auto-merging wiki/src/news/version_1.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.fa.po Auto-merging wiki/src/news/version_1.3.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.2.fa.po Auto-merging wiki/src/news/version_1.3.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.1.fa.po Auto-merging wiki/src/news/version_1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.fa.po Auto-merging wiki/src/news/version_1.2.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.3.fa.po Auto-merging wiki/src/news/version_1.2.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.2.fa.po Auto-merging wiki/src/news/version_1.2.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.1.fa.po Auto-merging wiki/src/news/version_1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.fa.po Auto-merging wiki/src/news/version_1.1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.2.fa.po Auto-merging wiki/src/news/version_1.1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.1.fa.po Auto-merging wiki/src/news/version_1.0.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.0.fa.po Auto-merging wiki/src/news/version_1.0.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.0.1.fa.po Auto-merging wiki/src/news/version_0.9.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.9.fa.po Auto-merging wiki/src/news/version_0.8.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.8.fa.po Auto-merging wiki/src/news/version_0.8.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.8.1.fa.po Auto-merging wiki/src/news/version_0.7.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.fa.po Auto-merging wiki/src/news/version_0.7.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.2.fa.po Auto-merging wiki/src/news/version_0.7.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.1.fa.po Auto-merging wiki/src/news/version_0.6.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.fa.po Auto-merging wiki/src/news/version_0.6.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.2.fa.po Auto-merging wiki/src/news/version_0.6.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.1.fa.po Auto-merging wiki/src/news/version_0.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.5.fa.po Auto-merging wiki/src/news/version_0.4.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.4.2.fa.po Auto-merging wiki/src/news/version_0.4.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.4.1.fa.po Auto-merging wiki/src/news/version_0.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.3.fa.po Auto-merging wiki/src/news/version_0.23.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.23.fa.po Auto-merging wiki/src/news/version_0.22.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.22.fa.po Auto-merging wiki/src/news/version_0.22.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.22.1.fa.po Auto-merging wiki/src/news/version_0.21.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.21.fa.po Auto-merging wiki/src/news/version_0.20.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.20.fa.po Auto-merging wiki/src/news/version_0.20.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.20.1.fa.po Auto-merging wiki/src/news/version_0.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.2.fa.po Auto-merging wiki/src/news/version_0.19.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.19.fa.po Auto-merging wiki/src/news/version_0.18.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.18.fa.po Auto-merging wiki/src/news/version_0.17.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.fa.po Auto-merging wiki/src/news/version_0.17.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.2.fa.po Auto-merging wiki/src/news/version_0.17.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.1.fa.po Auto-merging wiki/src/news/version_0.16.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.16.fa.po Auto-merging wiki/src/news/version_0.15.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.15.fa.po Auto-merging wiki/src/news/version_0.14.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.14.fa.po Auto-merging wiki/src/news/version_0.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.13.fa.po Auto-merging wiki/src/news/version_0.12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.12.fa.po Auto-merging wiki/src/news/version_0.12.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.12.1.fa.po Auto-merging wiki/src/news/version_0.11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.11.fa.po Auto-merging wiki/src/news/version_0.10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.fa.po Auto-merging wiki/src/news/version_0.10.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.2.fa.po Auto-merging wiki/src/news/version_0.10.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.1.fa.po Auto-merging wiki/src/news/usability_testing_2014_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/usability_testing_2014_05.fa.po Auto-merging wiki/src/news/thedaywefightback.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/thedaywefightback.fa.po Auto-merging wiki/src/news/test_incremental_upgrades.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_incremental_upgrades.fa.po Auto-merging wiki/src/news/test_UEFI.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_UEFI.fa.po Auto-merging wiki/src/news/test_1.4-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.4-rc1.fa.po Auto-merging wiki/src/news/test_1.3-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.3-rc1.fa.po Auto-merging wiki/src/news/test_1.2-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.2-rc1.fa.po Auto-merging wiki/src/news/test_1.1-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.1-rc1.fa.po Auto-merging wiki/src/news/test_1.1-beta1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.1-beta1.fa.po Auto-merging wiki/src/news/test_1.0-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.0-rc1.fa.po Auto-merging wiki/src/news/test_0.23-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.23-rc1.fa.po Auto-merging wiki/src/news/test_0.22.1-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.22.1-rc1.fa.po Auto-merging wiki/src/news/test_0.22-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.22-rc1.fa.po Auto-merging wiki/src/news/test_0.21-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.21-rc1.fa.po Auto-merging wiki/src/news/test_0.20-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.20-rc1.fa.po Auto-merging wiki/src/news/test_0.19-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.19-rc1.fa.po Auto-merging wiki/src/news/test_0.18-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.18-rc1.fa.po Auto-merging wiki/src/news/test_0.17.2-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.17.2-rc1.fa.po Auto-merging wiki/src/news/test_0.17-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.17-rc1.fa.po Auto-merging wiki/src/news/test_0.16-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.16-rc1.fa.po Auto-merging wiki/src/news/test_0.15-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.15-rc1.fa.po Auto-merging wiki/src/news/test_0.14-rc2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.14-rc2.fa.po Auto-merging wiki/src/news/test_0.14-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.14-rc1.fa.po Auto-merging wiki/src/news/test_0.13-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.13-rc1.fa.po Auto-merging wiki/src/news/tails-testers.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/tails-testers.fa.po Auto-merging wiki/src/news/summit_2013.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/summit_2013.fa.po Auto-merging wiki/src/news/spoof-mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/spoof-mac.fa.po Auto-merging wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/signing_key_transition.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/signing_key_transition.fa.po Auto-merging wiki/src/news/signing_key_transition.de.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.de.po Auto-merging wiki/src/news/report_end_of_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_end_of_2014.fa.po Auto-merging wiki/src/news/report_2015_08.mdwn Auto-merging wiki/src/news/report_2015_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_05.fa.po Auto-merging wiki/src/news/report_2015_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_04.fa.po Auto-merging wiki/src/news/report_2015_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_03.fa.po Auto-merging wiki/src/news/report_2015_01-02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_01-02.fa.po Auto-merging wiki/src/news/report_2014_06-07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_06-07.fa.po Auto-merging wiki/src/news/report_2014_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_05.fa.po Auto-merging wiki/src/news/report_2014_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_04.fa.po Auto-merging wiki/src/news/report_2014_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_03.fa.po Auto-merging wiki/src/news/report_2014_02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_02.fa.po Auto-merging wiki/src/news/report_2014_01.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_01.fa.po Auto-merging wiki/src/news/report_2013_12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_12.fa.po Auto-merging wiki/src/news/report_2013_11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_11.fa.po Auto-merging wiki/src/news/report_2013_10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_10.fa.po Auto-merging wiki/src/news/report_2013_09.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_09.fa.po Auto-merging wiki/src/news/report_2013_08.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_08.fa.po Auto-merging wiki/src/news/report_2013_07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_07.fa.po Auto-merging wiki/src/news/report_2013_06.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_06.fa.po Auto-merging wiki/src/news/report_2013_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_05.fa.po Auto-merging wiki/src/news/report_2013_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_04.fa.po Auto-merging wiki/src/news/report_2013_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_03.fa.po Auto-merging wiki/src/news/report_2013_02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_02.fa.po Auto-merging wiki/src/news/report_2013_01.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_01.fa.po Auto-merging wiki/src/news/report_2012_12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_12.fa.po Auto-merging wiki/src/news/report_2012_11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_11.fa.po Auto-merging wiki/src/news/report_2012_10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_10.fa.po Auto-merging wiki/src/news/report_2012_09.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_09.fa.po Auto-merging wiki/src/news/report_2012_08.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_08.fa.po Auto-merging wiki/src/news/report_2012_07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_07.fa.po Auto-merging wiki/src/news/report_2012_01-04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_01-04.fa.po Auto-merging wiki/src/news/report_2011_05-06.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_05-06.fa.po Auto-merging wiki/src/news/report_2011_03-04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_03-04.fa.po Auto-merging wiki/src/news/report_2011_01-02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_01-02.fa.po Auto-merging wiki/src/news/new_project_name.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/new_project_name.fa.po Auto-merging wiki/src/news/new_SSL_certificate.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/new_SSL_certificate.fa.po Auto-merging wiki/src/news/logo_contest.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/logo_contest.fa.po Auto-merging wiki/src/news/improve_the_infrastructure_behind_Tails.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/improve_the_infrastructure_behind_Tails.fa.po Auto-merging wiki/src/news/fpf_campaign.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/fpf_campaign.fa.po Auto-merging wiki/src/news/bounties_2013_report.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/bounties_2013_report.fa.po Auto-merging wiki/src/news/and_the_winner_is.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/and_the_winner_is.fa.po Auto-merging wiki/src/news/amnesia_may_now_work_on_the_Mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/amnesia_may_now_work_on_the_Mac.fa.po Auto-merging wiki/src/news/Tails_HackFest_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Tails_HackFest_2014.fa.po Auto-merging wiki/src/news/On_0days_exploits_and_disclosure.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/On_0days_exploits_and_disclosure.fa.po Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fa.po Auto-merging wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po Auto-merging wiki/src/news/IP_leakage_with_Icedove.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/IP_leakage_with_Icedove.fa.po Auto-merging wiki/src/news.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news.fa.po Auto-merging wiki/src/misc/unsafe_browser_warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/misc/unsafe_browser_warning.fa.po Removing wiki/src/lib/spip_out.gif Auto-merging wiki/src/lib/menu.png Removing wiki/src/install/v1/Tails/i386/stable/1.7.yml Removing wiki/src/install/inc/stylesheets/scenarios.css Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po Removing wiki/src/install/inc/screenshots/gnome_disks.png Removing wiki/src/install/inc/infography/temporary-tails.png Removing wiki/src/install/inc/infography/temporary-tails-on-dvd.png Auto-merging wiki/src/index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/index.fa.po Auto-merging wiki/src/inc/stable_i386_release_notes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/stable_i386_release_notes.fa.po Removing wiki/src/inc/stable_i386_iso_size_mib.html Auto-merging wiki/src/inc/stable_i386_date.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/stable_i386_date.fa.po Auto-merging wiki/src/inc/release_notes/1.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/release_notes/1.5.fa.po Auto-merging wiki/src/getting_started.fa.po CONFLICT (add/add): Merge conflict in wiki/src/getting_started.fa.po Auto-merging wiki/src/download.fa.po CONFLICT (add/add): Merge conflict in wiki/src/download.fa.po Auto-merging wiki/src/doc/upgrade/error.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/upgrade/error.fa.po Auto-merging wiki/src/doc/sensitive_documents/sound_and_video.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/sound_and_video.fa.po Auto-merging wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po Auto-merging wiki/src/doc/sensitive_documents/office_suite.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/office_suite.fa.po Auto-merging wiki/src/doc/sensitive_documents/metadata.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fa.po Auto-merging wiki/src/doc/sensitive_documents/metadata.de.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.de.po Auto-merging wiki/src/doc/sensitive_documents/graphics.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/graphics.fa.po Auto-merging wiki/src/doc/sensitive_documents.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents.index.fa.po Auto-merging wiki/src/doc/sensitive_documents.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents.fa.po Auto-merging wiki/src/doc/introduction.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/introduction.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po Auto-merging wiki/src/doc/get/trusting_tails_signing_key.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/trusting_tails_signing_key.fa.po Auto-merging wiki/src/doc/get/signing_key_transition.inline.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fa.po Auto-merging wiki/src/doc/get.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get.index.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.release_notes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/upgrade.release_notes.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/upgrade.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage/windows_camouflage.jpg Removing wiki/src/doc/first_steps/startup_options/windows_camouflage/syslinux.png Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.pt.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.mdwn Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.fr.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.de.po Auto-merging wiki/src/doc/first_steps/startup_options/network_configuration.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/network_configuration.fa.po Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.fa.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Auto-merging wiki/src/doc/first_steps/startup_options.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options.fa.po Auto-merging wiki/src/doc/first_steps/start_tails.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/start_tails.fa.po Auto-merging wiki/src/doc/first_steps/shutdown.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/shutdown.fa.po Auto-merging wiki/src/doc/first_steps/shutdown.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/shutdown.de.po Auto-merging wiki/src/doc/first_steps/reset/windows.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/windows.fa.po Auto-merging wiki/src/doc/first_steps/reset/mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/mac.fa.po Auto-merging wiki/src/doc/first_steps/reset/linux.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/linux.fa.po Auto-merging wiki/src/doc/first_steps/reset.intro.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.intro.fa.po Auto-merging wiki/src/doc/first_steps/reset.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.fa.po Auto-merging wiki/src/doc/first_steps/persistence/warnings.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/warnings.fa.po Auto-merging wiki/src/doc/first_steps/persistence/use.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/use.fa.po Auto-merging wiki/src/doc/first_steps/persistence/upgrade.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/upgrade.fa.po Auto-merging wiki/src/doc/first_steps/persistence/delete.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/delete.fa.po Auto-merging wiki/src/doc/first_steps/persistence/copy.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/copy.fa.po Auto-merging wiki/src/doc/first_steps/persistence/configure.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/configure.fa.po Removing wiki/src/doc/first_steps/persistence/claws-mail.png Auto-merging wiki/src/doc/first_steps/persistence/check_file_system.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/check_file_system.fa.po Auto-merging wiki/src/doc/first_steps/persistence/change_passphrase.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/change_passphrase.fa.po Auto-merging wiki/src/doc/first_steps/persistence.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence.fa.po Auto-merging wiki/src/doc/first_steps/persistence.caution.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence.caution.fa.po Auto-merging wiki/src/doc/first_steps/media.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/media.fa.po Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-starting.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-off.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/synaptic.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/sound.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/shutdown.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/power.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/keyboard-en.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/keyboard-de.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet-text.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet-seal.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/computer.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/claws-mail.png Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/windows.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/windows.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/first_steps/installation/manual.intro.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual.intro.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual.fa.po Auto-merging wiki/src/doc/first_steps/installation.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation.fa.po Auto-merging wiki/src/doc/first_steps/dvd.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/dvd.fa.po Auto-merging wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fa.po Auto-merging wiki/src/doc/first_steps/bug_reporting.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/bug_reporting.fa.po Auto-merging wiki/src/doc/first_steps/accessibility.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/accessibility.fa.po Auto-merging wiki/src/doc/first_steps/accessibility.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.de.po Auto-merging wiki/src/doc/first_steps.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps.index.fa.po Auto-merging wiki/src/doc/first_steps.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po Auto-merging wiki/src/doc/encryption_and_privacy/virtual_keyboard.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/virtual_keyboard.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/truecrypt.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/truecrypt.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.pt.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.de.po Auto-merging wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/keyringer.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/keyringer.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_secret.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.fr.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.fr.png Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/checksums.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/checksums.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fa.po Auto-merging wiki/src/doc/encryption_and_privacy.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy.index.fa.po Auto-merging wiki/src/doc/encryption_and_privacy.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy.fa.po Auto-merging wiki/src/doc/anonymous_internet/why_tor_is_slow.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/why_tor_is_slow.fa.po Auto-merging wiki/src/doc/anonymous_internet/vidalia.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/vidalia.fa.po Auto-merging wiki/src/doc/anonymous_internet/vidalia.de.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.fa.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.fa.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/thunderbird.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/thunderbird.fa.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.fa.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Removing wiki/src/doc/anonymous_internet/networkmanager/networkmanager.png Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fr.po Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fa.po Auto-merging wiki/src/doc/anonymous_internet/i2p.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/i2p.fa.po Auto-merging wiki/src/doc/anonymous_internet/electrum.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/electrum.fa.po Auto-merging wiki/src/doc/anonymous_internet/electrum.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.de.po Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.mdwn Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.fr.po Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.de.po Auto-merging wiki/src/doc/anonymous_internet/claws_mail.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/claws_mail.fa.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.fa.po Auto-merging wiki/src/doc/anonymous_internet.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet.index.fa.po Auto-merging wiki/src/doc/anonymous_internet.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet.fa.po Auto-merging wiki/src/doc/advanced_topics/wireless_devices.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/wireless_devices.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/boxes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/boxes.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization.caution.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization.caution.fa.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fa.po Auto-merging wiki/src/doc/advanced_topics/cold_boot_attacks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/cold_boot_attacks.fa.po Auto-merging wiki/src/doc/advanced_topics/cold_boot_attacks.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/cold_boot_attacks.de.po Auto-merging wiki/src/doc/advanced_topics/additional_software.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/additional_software.fa.po Auto-merging wiki/src/doc/advanced_topics/additional_software.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/additional_software.de.po Auto-merging wiki/src/doc/advanced_topics.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.index.fa.po Auto-merging wiki/src/doc/advanced_topics.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.fa.po Auto-merging wiki/src/doc/about/warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/warning.fa.po Auto-merging wiki/src/doc/about/trust.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/trust.fa.po Auto-merging wiki/src/doc/about/tor.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/tor.fa.po Auto-merging wiki/src/doc/about/requirements.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/requirements.fa.po Auto-merging wiki/src/doc/about/openpgp_keys.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/openpgp_keys.fa.po Auto-merging wiki/src/doc/about/license.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/license.fa.po Auto-merging wiki/src/doc/about/fingerprint.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/fingerprint.fa.po Auto-merging wiki/src/doc/about/finances.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/finances.fa.po Auto-merging wiki/src/doc/about/features.fr.po Auto-merging wiki/src/doc/about/features.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/features.fa.po Auto-merging wiki/src/doc/about/features.de.po Auto-merging wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po Auto-merging wiki/src/doc/about.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about.index.fa.po Auto-merging wiki/src/doc.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc.fa.po Removing wiki/src/contribute/release_process/tor.mdwn Removing wiki/src/contribute/low-hanging_fruit_sessions.mdwn Auto-merging wiki/src/contribute/how/donate.fa.po CONFLICT (add/add): Merge conflict in wiki/src/contribute/how/donate.fa.po Auto-merging wiki/src/contribute.fa.po CONFLICT (add/add): Merge conflict in wiki/src/contribute.fa.po Auto-merging wiki/src/bugs.fa.po CONFLICT (add/add): Merge conflict in wiki/src/bugs.fa.po Removing wiki/src/blueprint/report_2015_12.mdwn Removing wiki/src/blueprint/report_2015_11.mdwn Removing wiki/src/blueprint/report_2015_10.mdwn Removing wiki/src/blueprint/report_2015_09.mdwn Removing wiki/src/blueprint/derivatives.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn Removing wiki/src/blueprint/SponsorS/reports/2016_01.mdwn Removing wiki/src/blueprint/SponsorS/reports/2015_12.mdwn Auto-merging wiki/src/about.fa.po CONFLICT (add/add): Merge conflict in wiki/src/about.fa.po Removing features/windows_camouflage.feature Removing features/step_definitions/windows_camouflage.rb Removing features/images/WindowsWindowButtons.png Removing features/images/WindowsTorBrowserWindow.png Removing features/images/WindowsTorBrowserTaskBar.png Removing features/images/WindowsTorBrowserOfflinePromptStart.png Removing features/images/WindowsTorBrowserOfflinePrompt.png Removing features/images/WindowsSysTraySound.png Removing features/images/WindowsSysTrayKeyboard.png Removing features/images/WindowsSysTrayGpgApplet.png Removing features/images/WindowsStartMenu.png Removing features/images/WindowsStartButton.png Removing features/images/WindowsRunDialog.png Removing features/images/WindowsNotificationX.png Removing features/images/WindowsDesktop.png Removing features/images/WindowsApplicationsTorBrowser.png Removing features/images/WindowsApplicationsTails.png Removing features/images/WindowsApplicationsMenu.png Removing features/images/WindowsApplicationsInternet.png Removing features/images/TotemMainWindow.png Removing features/images/TorBrowserWarningDialogOkButton.png Removing features/images/TorBrowserCouldNotReadTheContentsOfWarning.png Removing features/images/SynapticSearch.png Removing features/images/SynapticPolicyKitAuthPrompt.png Removing features/images/SeahorseEdit.png Removing features/images/PrintToFile.png Removing features/images/PidginScrollArrowUp.png Removing features/images/PersistenceWizardWindow.png Removing features/images/OpenWithImportKey.png Removing features/images/MACSpoofNetworkBlocked.png Removing features/images/KeyImportedNotification.png Removing features/images/I2P_starting_notification.png Removing features/images/GnomeTorIsReady.png Removing features/images/GnomeSSHServerSSH.png Removing features/images/GnomeSSHFTP.png Removing features/images/GnomeSSHConnectButton.png Removing features/images/GnomeSSHConnect.png Removing features/images/GnomePlacesConnectToServer.png Removing features/images/GnomeNotificationAppletCloseButton.png Removing features/images/GnomeNotificationAppletClearAllButton.png Removing features/images/GeditNewDocument.png Removing features/images/EvincePrintOutputFileSelected.png Removing features/images/EvincePrintOutputFile.png Removing config/chroot_sources/wheezy-backports.chroot Removing config/chroot_sources/wheezy-backports.binary Removing config/chroot_sources/jessie.chroot Removing config/chroot_sources/jessie.binary Removing config/chroot_sources/jessie-updates.chroot Removing config/chroot_sources/jessie-updates.binary Removing config/chroot_local-patches/zenity-fix-whitespacing-box-sizes.diff Removing config/chroot_local-patches/torsocks_whisperback.patch Removing config/chroot_local-patches/torsocks_seahorse.patch Removing config/chroot_local-patches/torsocks_liferea.patch Removing config/chroot_local-patches/torsocks_gobby-0.5.patch Removing config/chroot_local-patches/torsocks_claws-mail.diff Removing config/chroot_local-patches/keep_resolvconf_on_shutdown.diff Removing config/chroot_local-patches/gdm-background.diff Removing config/chroot_local-patches/florence_icon.patch Removing config/chroot_local-patches/do_not_start_tor_on_boot.diff Removing config/chroot_local-patches/do_not_start_network-manager_on_boot.diff Removing config/chroot_local-patches/do_not_start_i2p_on_boot.diff Removing config/chroot_local-patches/do_not_start_hdparm_on_boot.diff Removing config/chroot_local-patches/do_not_run_ttdnsd_initscript.diff Removing config/chroot_local-patches/do_not_run_pulseaudio_initscript.diff Removing config/chroot_local-patches/do_not_run_plymouth_on_shutdown.diff Removing config/chroot_local-patches/do_not_run_gdomap_initscript.diff Removing config/chroot_local-patches/disable_kexec_initscript.diff Removing config/chroot_local-patches/Greeter-Activate-win8-theme-using-a-script.patch Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/userChrome.css Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/theme.js Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/localstore.rdf Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userChrome.css Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/common/prefs.js Removing config/chroot_local-includes/usr/share/pixmaps/outlook_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/msn_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/ie_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/blue_dot.png Removing config/chroot_local-includes/usr/share/pixmaps/backgrounds/xp-bliss.jpg Auto-merging config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/memory_wipe Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/pidgin.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/iceweasel.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/icedove.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/florence.png Removing config/chroot_local-includes/usr/share/gnome-panel/4.0/applets/org.boum.tails.ShutdownHelper.panel-applet Removing config/chroot_local-includes/usr/share/gdm/greeter/autostart/spice-vdagent.desktop Removing config/chroot_local-includes/usr/share/dbus-1/services/org.gnome.panel.applet.ShutdownHelperFactory.service Removing config/chroot_local-includes/usr/share/applications/tails-activate-win8-theme.desktop Removing config/chroot_local-includes/usr/local/sbin/tails-unblock-network Removing config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector Removing config/chroot_local-includes/usr/local/sbin/tails-prepare-win8-theme Auto-merging config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper Auto-merging config/chroot_local-includes/usr/local/lib/tails-spoof-mac Auto-merging config/chroot_local-includes/usr/local/lib/tails-set-wireless-devices-state Auto-merging config/chroot_local-includes/usr/local/lib/tails-htp-notify-user Removing config/chroot_local-includes/usr/local/lib/shutdown-helper-applet Auto-merging config/chroot_local-includes/usr/local/lib/end-profile Removing config/chroot_local-includes/usr/local/bin/torified-claws-mail Removing config/chroot_local-includes/usr/local/bin/tails-warn-about-disabled-persistence Removing config/chroot_local-includes/usr/local/bin/tails-virt-notify-user Removing config/chroot_local-includes/usr/local/bin/tails-security-check-wrapper Removing config/chroot_local-includes/usr/local/bin/tails-save-im-environment Removing config/chroot_local-includes/usr/local/bin/tails-configure-keyboard Removing config/chroot_local-includes/usr/local/bin/tails-activate-win8-theme Removing config/chroot_local-includes/usr/lib/bonobo/servers/ShutdownHelper_Factory.server Removing config/chroot_local-includes/usr/lib/apt/methods/tor+http Removing config/chroot_local-includes/usr/bin/tor-launcher Removing config/chroot_local-includes/lib/live/config/2060-kiosk-mode Removing config/chroot_local-includes/lib/live/config/0000-resolv-conf Removing config/chroot_local-includes/etc/xdg/autostart/virt-notify.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-warn-about-disabled-persistence.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-upgrade-frontend.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-configure-keyboard.desktop Removing config/chroot_local-includes/etc/xdg/autostart/security-check.desktop Removing config/chroot_local-includes/etc/xdg/autostart/save-im-environment.desktop Removing config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-directories.desktop Removing config/chroot_local-includes/etc/xdg/autostart/add-GNOME-bookmarks.desktop Removing config/chroot_local-includes/etc/sudoers.d/zzz_tor-launcher Removing config/chroot_local-includes/etc/sudoers.d/zzz_tor-has-bootstrapped Removing config/chroot_local-includes/etc/skel/.config/menus/gnome-settings.menu Removing config/chroot_local-includes/etc/skel/.config/menus/gnome-applications.menu Removing config/chroot_local-includes/etc/skel/.config/gnome-panel/panel-default-layout.layout Removing config/chroot_local-includes/etc/skel/.claws-mail/dispheaderrc Removing config/chroot_local-includes/etc/skel/.claws-mail/clawsrc Removing config/chroot_local-includes/etc/skel/.claws-mail/accountrc.tmpl Removing config/chroot_local-includes/etc/resolvconf/interface-order Removing config/chroot_local-includes/etc/live/config.d/x-session-manager.conf Removing config/chroot_local-includes/etc/init.d/tor-controlport-filter Removing config/chroot_local-includes/etc/init.d/tails-set-wireless-devices-state Removing config/chroot_local-includes/etc/init.d/tails-sdmem-on-media-removal Removing config/chroot_local-includes/etc/init.d/tails-reconfigure-memlockd Removing config/chroot_local-includes/etc/init.d/tails-reconfigure-kexec Removing config/chroot_local-includes/etc/init.d/tails-kexec Removing config/chroot_local-includes/etc/init.d/tails-detect-virtualization Removing config/chroot_local-includes/etc/init.d/tails-autotest-remote-shell Removing config/chroot_local-includes/etc/init.d/htpdate Removing config/chroot_local-includes/etc/gdm3/greeter.gconf-defaults Removing config/chroot_local-includes/etc/fstab Removing config/chroot_local-includes/etc/fonts/conf.d/13-antialias.conf Removing config/chroot_local-includes/etc/fonts/conf.d/12-hintstyle-hintslight.conf Removing config/chroot_local-includes/etc/fonts/conf.d/11-lcdfilter-default.conf Removing config/chroot_local-includes/etc/fonts/conf.d/10-sub-pixel-rgb.conf Removing config/chroot_local-includes/etc/fonts/conf.d/10-autohint.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/13-antialias.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/12-hintstyle-hintslight.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/11-lcdfilter-default.conf Auto-merging config/chroot_local-includes/etc/default/htpdate.pools Removing config/chroot_local-includes/etc/X11/xorg.conf.d/disable-screen-blanking.conf Removing config/chroot_local-includes/etc/X11/Xsession.d/80im-starter Auto-merging config/chroot_local-includes/etc/NetworkManager/dispatcher.d/01-wait-for-notification-recipient.sh Removing config/chroot_local-hooks/99-zzz_resolvconf Removing config/chroot_local-hooks/50-fine-tune-syndaemon Auto-merging config/chroot_local-hooks/50-dkms Removing config/chroot_local-hooks/40-etc_modules Removing config/chroot_local-hooks/21-gdm_background Removing config/chroot_local-hooks/17-clean_up_resolvconf Removing config/chroot_local-hooks/04-nolvm Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
None
Resource updated |
The "
wiki/src/support.fr.po" file was changed.
9 years ago
|
|
None
Resource updated |
The "
wiki/src/doc/advanced_topics/internal_hard_disk.de.po" file was changed.
9 years ago
|
|
None
Resource updated |
The "
wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po" file was changed.
9 years ago
|
|
None
Resource updated |
The "
wiki/src/contribute.de.po" file was changed.
9 years ago
|
|
None
Resource updated |
The "
wiki/src/contribute.fr.po" file was changed.
9 years ago
|
|
None
Resource updated |
The "
wiki/src/contribute.pt.po" file was changed.
9 years ago
|
|
None
Resource updated |
The "
wiki/src/doc/anonymous_internet/pidgin.de.po" file was changed.
9 years ago
|
|
None
Resource updated |
The "
wiki/src/doc/anonymous_internet/electrum.de.po" file was changed.
9 years ago
|
|
None
Repository merge failed |
Auto-merging wiki/src/wishlist.fa.po CONFLICT (add/add): Merge conflict in wiki/src/wishlist.fa.po Auto-merging wiki/src/upgrade/v1/Tails/2.2/i386/stable/upgrades.yml Auto-merging wiki/src/upgrade/v1/Tails/2.0.1/i386/stable/upgrades.yml Auto-merging wiki/src/upgrade/v1/Tails/2.0.1/i386/alpha/upgrades.yml Removing wiki/src/upgrade/v1/Tails/1.9~rc1/i386/stable/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9~rc1/i386/alpha/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9/i386/stable/upgrades.yml.pgp Removing wiki/src/upgrade/v1/Tails/1.9/i386/alpha/upgrades.yml.pgp Auto-merging wiki/src/upgrade/v1/Tails/1.8.1/i386/alpha/upgrades.yml Removing wiki/src/torrents/files/tails-i386-1.7.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.7.torrent Removing wiki/src/torrents/files/tails-i386-1.7.packages Removing wiki/src/torrents/files/tails-i386-1.7.iso.sig Auto-merging wiki/src/torrents.fa.po CONFLICT (add/add): Merge conflict in wiki/src/torrents.fa.po Auto-merging wiki/src/todo.fa.po CONFLICT (add/add): Merge conflict in wiki/src/todo.fa.po Auto-merging wiki/src/support/talk.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/talk.fa.po Auto-merging wiki/src/support/tails-support.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/tails-support.fa.po Auto-merging wiki/src/support/learn.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/learn.fa.po Auto-merging wiki/src/support/known_issues.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/known_issues.fa.po Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/support/faq.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/faq.fa.po Auto-merging wiki/src/support/chat.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support/chat.fa.po Auto-merging wiki/src/support.fa.po CONFLICT (add/add): Merge conflict in wiki/src/support.fa.po Auto-merging wiki/src/sidebar.fa.po CONFLICT (add/add): Merge conflict in wiki/src/sidebar.fa.po Auto-merging wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fa.po Auto-merging wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.fa.po Auto-merging wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.pt.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.pt.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fa.po Auto-merging wiki/src/security/Upgrade_Tor.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Upgrade_Tor.fa.po Auto-merging wiki/src/security/Security_hole_in_I2P_0.9.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Security_hole_in_I2P_0.9.13.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.4.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.4.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.3.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.3.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.3.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.2.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.2.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.1.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.0.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.0.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_1.0.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_1.0.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.9.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.9.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.8.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.8.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.8.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.8.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.7.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.7.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.6.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.6.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.5.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.23.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.23.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.22.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.22.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.22.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.22.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.21.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.21.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.20.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.20.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.20.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.20.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.19.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.19.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.18.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.18.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.17.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.17.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.16.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.16.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.15.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.15.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.14.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.14.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.13.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.12.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.12.1.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.11.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.2.fa.po Auto-merging wiki/src/security/Numerous_security_holes_in_0.10.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Numerous_security_holes_in_0.10.1.fa.po Auto-merging wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fa.po Auto-merging wiki/src/security/IP_address_leak_with_icedove.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security/IP_address_leak_with_icedove.fa.po Auto-merging wiki/src/security.fa.po CONFLICT (add/add): Merge conflict in wiki/src/security.fa.po Auto-merging wiki/src/press/media_appearances_2015.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2015.fa.po Auto-merging wiki/src/press/media_appearances_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2014.fa.po Auto-merging wiki/src/press/media_appearances_2013.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2013.fa.po Auto-merging wiki/src/press/media_appearances_2012.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2012.fa.po Auto-merging wiki/src/press/media_appearances_2011.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press/media_appearances_2011.fa.po Auto-merging wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/press.fa.po CONFLICT (add/add): Merge conflict in wiki/src/press.fa.po Auto-merging wiki/src/news/windows_camouflage_jessie.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/windows_camouflage_jessie.fa.po Auto-merging wiki/src/news/who_are_you_helping.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/who_are_you_helping.fa.po Auto-merging wiki/src/news/version_1.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.5.fa.po Auto-merging wiki/src/news/version_1.4.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.4.fa.po Auto-merging wiki/src/news/version_1.4.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.4.1.fa.po Auto-merging wiki/src/news/version_1.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.fa.po Auto-merging wiki/src/news/version_1.3.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.2.fa.po Auto-merging wiki/src/news/version_1.3.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.3.1.fa.po Auto-merging wiki/src/news/version_1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.fa.po Auto-merging wiki/src/news/version_1.2.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.3.fa.po Auto-merging wiki/src/news/version_1.2.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.2.fa.po Auto-merging wiki/src/news/version_1.2.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.2.1.fa.po Auto-merging wiki/src/news/version_1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.fa.po Auto-merging wiki/src/news/version_1.1.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.2.fa.po Auto-merging wiki/src/news/version_1.1.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.1.1.fa.po Auto-merging wiki/src/news/version_1.0.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.0.fa.po Auto-merging wiki/src/news/version_1.0.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_1.0.1.fa.po Auto-merging wiki/src/news/version_0.9.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.9.fa.po Auto-merging wiki/src/news/version_0.8.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.8.fa.po Auto-merging wiki/src/news/version_0.8.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.8.1.fa.po Auto-merging wiki/src/news/version_0.7.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.fa.po Auto-merging wiki/src/news/version_0.7.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.2.fa.po Auto-merging wiki/src/news/version_0.7.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.7.1.fa.po Auto-merging wiki/src/news/version_0.6.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.fa.po Auto-merging wiki/src/news/version_0.6.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.2.fa.po Auto-merging wiki/src/news/version_0.6.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.6.1.fa.po Auto-merging wiki/src/news/version_0.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.5.fa.po Auto-merging wiki/src/news/version_0.4.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.4.2.fa.po Auto-merging wiki/src/news/version_0.4.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.4.1.fa.po Auto-merging wiki/src/news/version_0.3.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.3.fa.po Auto-merging wiki/src/news/version_0.23.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.23.fa.po Auto-merging wiki/src/news/version_0.22.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.22.fa.po Auto-merging wiki/src/news/version_0.22.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.22.1.fa.po Auto-merging wiki/src/news/version_0.21.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.21.fa.po Auto-merging wiki/src/news/version_0.20.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.20.fa.po Auto-merging wiki/src/news/version_0.20.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.20.1.fa.po Auto-merging wiki/src/news/version_0.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.2.fa.po Auto-merging wiki/src/news/version_0.19.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.19.fa.po Auto-merging wiki/src/news/version_0.18.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.18.fa.po Auto-merging wiki/src/news/version_0.17.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.fa.po Auto-merging wiki/src/news/version_0.17.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.2.fa.po Auto-merging wiki/src/news/version_0.17.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.17.1.fa.po Auto-merging wiki/src/news/version_0.16.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.16.fa.po Auto-merging wiki/src/news/version_0.15.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.15.fa.po Auto-merging wiki/src/news/version_0.14.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.14.fa.po Auto-merging wiki/src/news/version_0.13.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.13.fa.po Auto-merging wiki/src/news/version_0.12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.12.fa.po Auto-merging wiki/src/news/version_0.12.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.12.1.fa.po Auto-merging wiki/src/news/version_0.11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.11.fa.po Auto-merging wiki/src/news/version_0.10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.fa.po Auto-merging wiki/src/news/version_0.10.2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.2.fa.po Auto-merging wiki/src/news/version_0.10.1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/version_0.10.1.fa.po Auto-merging wiki/src/news/usability_testing_2014_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/usability_testing_2014_05.fa.po Auto-merging wiki/src/news/thedaywefightback.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/thedaywefightback.fa.po Auto-merging wiki/src/news/test_incremental_upgrades.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_incremental_upgrades.fa.po Auto-merging wiki/src/news/test_UEFI.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_UEFI.fa.po Auto-merging wiki/src/news/test_1.4-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.4-rc1.fa.po Auto-merging wiki/src/news/test_1.3-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.3-rc1.fa.po Auto-merging wiki/src/news/test_1.2-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.2-rc1.fa.po Auto-merging wiki/src/news/test_1.1-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.1-rc1.fa.po Auto-merging wiki/src/news/test_1.1-beta1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.1-beta1.fa.po Auto-merging wiki/src/news/test_1.0-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_1.0-rc1.fa.po Auto-merging wiki/src/news/test_0.23-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.23-rc1.fa.po Auto-merging wiki/src/news/test_0.22.1-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.22.1-rc1.fa.po Auto-merging wiki/src/news/test_0.22-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.22-rc1.fa.po Auto-merging wiki/src/news/test_0.21-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.21-rc1.fa.po Auto-merging wiki/src/news/test_0.20-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.20-rc1.fa.po Auto-merging wiki/src/news/test_0.19-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.19-rc1.fa.po Auto-merging wiki/src/news/test_0.18-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.18-rc1.fa.po Auto-merging wiki/src/news/test_0.17.2-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.17.2-rc1.fa.po Auto-merging wiki/src/news/test_0.17-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.17-rc1.fa.po Auto-merging wiki/src/news/test_0.16-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.16-rc1.fa.po Auto-merging wiki/src/news/test_0.15-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.15-rc1.fa.po Auto-merging wiki/src/news/test_0.14-rc2.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.14-rc2.fa.po Auto-merging wiki/src/news/test_0.14-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.14-rc1.fa.po Auto-merging wiki/src/news/test_0.13-rc1.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/test_0.13-rc1.fa.po Auto-merging wiki/src/news/tails-testers.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/tails-testers.fa.po Auto-merging wiki/src/news/summit_2013.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/summit_2013.fa.po Auto-merging wiki/src/news/spoof-mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/spoof-mac.fa.po Auto-merging wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/signing_key_transition.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/signing_key_transition.fa.po Auto-merging wiki/src/news/signing_key_transition.de.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.de.po Auto-merging wiki/src/news/report_end_of_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_end_of_2014.fa.po Auto-merging wiki/src/news/report_2015_08.mdwn Auto-merging wiki/src/news/report_2015_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_05.fa.po Auto-merging wiki/src/news/report_2015_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_04.fa.po Auto-merging wiki/src/news/report_2015_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_03.fa.po Auto-merging wiki/src/news/report_2015_01-02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2015_01-02.fa.po Auto-merging wiki/src/news/report_2014_06-07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_06-07.fa.po Auto-merging wiki/src/news/report_2014_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_05.fa.po Auto-merging wiki/src/news/report_2014_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_04.fa.po Auto-merging wiki/src/news/report_2014_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_03.fa.po Auto-merging wiki/src/news/report_2014_02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_02.fa.po Auto-merging wiki/src/news/report_2014_01.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2014_01.fa.po Auto-merging wiki/src/news/report_2013_12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_12.fa.po Auto-merging wiki/src/news/report_2013_11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_11.fa.po Auto-merging wiki/src/news/report_2013_10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_10.fa.po Auto-merging wiki/src/news/report_2013_09.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_09.fa.po Auto-merging wiki/src/news/report_2013_08.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_08.fa.po Auto-merging wiki/src/news/report_2013_07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_07.fa.po Auto-merging wiki/src/news/report_2013_06.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_06.fa.po Auto-merging wiki/src/news/report_2013_05.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_05.fa.po Auto-merging wiki/src/news/report_2013_04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_04.fa.po Auto-merging wiki/src/news/report_2013_03.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_03.fa.po Auto-merging wiki/src/news/report_2013_02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_02.fa.po Auto-merging wiki/src/news/report_2013_01.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2013_01.fa.po Auto-merging wiki/src/news/report_2012_12.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_12.fa.po Auto-merging wiki/src/news/report_2012_11.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_11.fa.po Auto-merging wiki/src/news/report_2012_10.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_10.fa.po Auto-merging wiki/src/news/report_2012_09.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_09.fa.po Auto-merging wiki/src/news/report_2012_08.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_08.fa.po Auto-merging wiki/src/news/report_2012_07.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_07.fa.po Auto-merging wiki/src/news/report_2012_01-04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2012_01-04.fa.po Auto-merging wiki/src/news/report_2011_05-06.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_05-06.fa.po Auto-merging wiki/src/news/report_2011_03-04.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_03-04.fa.po Auto-merging wiki/src/news/report_2011_01-02.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/report_2011_01-02.fa.po Auto-merging wiki/src/news/new_project_name.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/new_project_name.fa.po Auto-merging wiki/src/news/new_SSL_certificate.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/new_SSL_certificate.fa.po Auto-merging wiki/src/news/logo_contest.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/logo_contest.fa.po Auto-merging wiki/src/news/improve_the_infrastructure_behind_Tails.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/improve_the_infrastructure_behind_Tails.fa.po Auto-merging wiki/src/news/fpf_campaign.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/fpf_campaign.fa.po Auto-merging wiki/src/news/bounties_2013_report.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/bounties_2013_report.fa.po Auto-merging wiki/src/news/and_the_winner_is.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/and_the_winner_is.fa.po Auto-merging wiki/src/news/amnesia_may_now_work_on_the_Mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/amnesia_may_now_work_on_the_Mac.fa.po Auto-merging wiki/src/news/Tails_HackFest_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Tails_HackFest_2014.fa.po Auto-merging wiki/src/news/On_0days_exploits_and_disclosure.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/On_0days_exploits_and_disclosure.fa.po Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fa.po Auto-merging wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po Auto-merging wiki/src/news/IP_leakage_with_Icedove.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news/IP_leakage_with_Icedove.fa.po Auto-merging wiki/src/news.fa.po CONFLICT (add/add): Merge conflict in wiki/src/news.fa.po Auto-merging wiki/src/misc/unsafe_browser_warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/misc/unsafe_browser_warning.fa.po Removing wiki/src/lib/spip_out.gif Auto-merging wiki/src/lib/menu.png Removing wiki/src/install/v1/Tails/i386/stable/1.7.yml Removing wiki/src/install/inc/stylesheets/scenarios.css Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po Auto-merging wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po Auto-merging wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po Removing wiki/src/install/inc/screenshots/gnome_disks.png Removing wiki/src/install/inc/infography/temporary-tails.png Removing wiki/src/install/inc/infography/temporary-tails-on-dvd.png Auto-merging wiki/src/index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/index.fa.po Auto-merging wiki/src/inc/stable_i386_release_notes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/stable_i386_release_notes.fa.po Removing wiki/src/inc/stable_i386_iso_size_mib.html Auto-merging wiki/src/inc/stable_i386_date.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/stable_i386_date.fa.po Auto-merging wiki/src/inc/release_notes/1.5.fa.po CONFLICT (add/add): Merge conflict in wiki/src/inc/release_notes/1.5.fa.po Auto-merging wiki/src/getting_started.fa.po CONFLICT (add/add): Merge conflict in wiki/src/getting_started.fa.po Auto-merging wiki/src/download.fa.po CONFLICT (add/add): Merge conflict in wiki/src/download.fa.po Auto-merging wiki/src/doc/upgrade/error.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/upgrade/error.fa.po Auto-merging wiki/src/doc/sensitive_documents/sound_and_video.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/sound_and_video.fa.po Auto-merging wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po Auto-merging wiki/src/doc/sensitive_documents/office_suite.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/office_suite.fa.po Auto-merging wiki/src/doc/sensitive_documents/metadata.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fa.po Auto-merging wiki/src/doc/sensitive_documents/metadata.de.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.de.po Auto-merging wiki/src/doc/sensitive_documents/graphics.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/graphics.fa.po Auto-merging wiki/src/doc/sensitive_documents.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents.index.fa.po Auto-merging wiki/src/doc/sensitive_documents.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents.fa.po Auto-merging wiki/src/doc/introduction.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/introduction.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fa.po Auto-merging wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po Auto-merging wiki/src/doc/get/trusting_tails_signing_key.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/trusting_tails_signing_key.fa.po Auto-merging wiki/src/doc/get/signing_key_transition.inline.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fa.po Auto-merging wiki/src/doc/get.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/get.index.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.release_notes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/upgrade.release_notes.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/upgrade.fa.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage/windows_camouflage.jpg Removing wiki/src/doc/first_steps/startup_options/windows_camouflage/syslinux.png Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.pt.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.mdwn Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.fr.po Removing wiki/src/doc/first_steps/startup_options/windows_camouflage.de.po Auto-merging wiki/src/doc/first_steps/startup_options/network_configuration.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/network_configuration.fa.po Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.fa.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Auto-merging wiki/src/doc/first_steps/startup_options.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options.fa.po Auto-merging wiki/src/doc/first_steps/start_tails.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/start_tails.fa.po Auto-merging wiki/src/doc/first_steps/shutdown.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/shutdown.fa.po Auto-merging wiki/src/doc/first_steps/shutdown.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/shutdown.de.po Auto-merging wiki/src/doc/first_steps/reset/windows.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/windows.fa.po Auto-merging wiki/src/doc/first_steps/reset/mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/mac.fa.po Auto-merging wiki/src/doc/first_steps/reset/linux.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/linux.fa.po Auto-merging wiki/src/doc/first_steps/reset.intro.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.intro.fa.po Auto-merging wiki/src/doc/first_steps/reset.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.fa.po Auto-merging wiki/src/doc/first_steps/persistence/warnings.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/warnings.fa.po Auto-merging wiki/src/doc/first_steps/persistence/use.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/use.fa.po Auto-merging wiki/src/doc/first_steps/persistence/upgrade.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/upgrade.fa.po Auto-merging wiki/src/doc/first_steps/persistence/delete.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/delete.fa.po Auto-merging wiki/src/doc/first_steps/persistence/copy.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/copy.fa.po Auto-merging wiki/src/doc/first_steps/persistence/configure.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/configure.fa.po Removing wiki/src/doc/first_steps/persistence/claws-mail.png Auto-merging wiki/src/doc/first_steps/persistence/check_file_system.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/check_file_system.fa.po Auto-merging wiki/src/doc/first_steps/persistence/change_passphrase.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence/change_passphrase.fa.po Auto-merging wiki/src/doc/first_steps/persistence.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence.fa.po Auto-merging wiki/src/doc/first_steps/persistence.caution.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/persistence.caution.fa.po Auto-merging wiki/src/doc/first_steps/media.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/media.fa.po Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-starting.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-off.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/synaptic.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/sound.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/shutdown.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/power.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/keyboard-en.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/keyboard-de.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet-text.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/gpgApplet-seal.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/computer.png Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/claws-mail.png Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/windows.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/windows.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/first_steps/installation/manual.intro.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual.intro.fa.po Auto-merging wiki/src/doc/first_steps/installation/manual.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation/manual.fa.po Auto-merging wiki/src/doc/first_steps/installation.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/installation.fa.po Auto-merging wiki/src/doc/first_steps/dvd.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/dvd.fa.po Auto-merging wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fa.po Auto-merging wiki/src/doc/first_steps/bug_reporting.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/bug_reporting.fa.po Auto-merging wiki/src/doc/first_steps/accessibility.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/accessibility.fa.po Auto-merging wiki/src/doc/first_steps/accessibility.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.de.po Auto-merging wiki/src/doc/first_steps.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps.index.fa.po Auto-merging wiki/src/doc/first_steps.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po Auto-merging wiki/src/doc/encryption_and_privacy/virtual_keyboard.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/virtual_keyboard.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/truecrypt.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/truecrypt.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.pt.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.de.po Auto-merging wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/keyringer.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/keyringer.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/places_secret.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/encrypted_partition.fr.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/empty_device.fr.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.png Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes/create_partition.fr.png Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.pt.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/checksums.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/checksums.fa.po Auto-merging wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fa.po Auto-merging wiki/src/doc/encryption_and_privacy.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy.index.fa.po Auto-merging wiki/src/doc/encryption_and_privacy.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/encryption_and_privacy.fa.po Auto-merging wiki/src/doc/anonymous_internet/why_tor_is_slow.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/why_tor_is_slow.fa.po Auto-merging wiki/src/doc/anonymous_internet/vidalia.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/vidalia.fa.po Auto-merging wiki/src/doc/anonymous_internet/vidalia.de.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.fa.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.fa.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/thunderbird.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/thunderbird.fa.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.fa.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Removing wiki/src/doc/anonymous_internet/networkmanager/networkmanager.png Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fr.po Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fa.po Auto-merging wiki/src/doc/anonymous_internet/i2p.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/i2p.fa.po Auto-merging wiki/src/doc/anonymous_internet/electrum.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/electrum.fa.po Auto-merging wiki/src/doc/anonymous_internet/electrum.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.de.po Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.mdwn Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.fr.po Removing wiki/src/doc/anonymous_internet/claws_mail/persistence.bug.de.po Auto-merging wiki/src/doc/anonymous_internet/claws_mail.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/claws_mail.fa.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.fa.po Auto-merging wiki/src/doc/anonymous_internet.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet.index.fa.po Auto-merging wiki/src/doc/anonymous_internet.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/anonymous_internet.fa.po Auto-merging wiki/src/doc/advanced_topics/wireless_devices.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/wireless_devices.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization/boxes.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization/boxes.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization.fa.po Auto-merging wiki/src/doc/advanced_topics/virtualization.caution.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/virtualization.caution.fa.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fa.po Auto-merging wiki/src/doc/advanced_topics/cold_boot_attacks.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/cold_boot_attacks.fa.po Auto-merging wiki/src/doc/advanced_topics/cold_boot_attacks.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/cold_boot_attacks.de.po Auto-merging wiki/src/doc/advanced_topics/additional_software.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics/additional_software.fa.po Auto-merging wiki/src/doc/advanced_topics/additional_software.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/additional_software.de.po Auto-merging wiki/src/doc/advanced_topics.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.index.fa.po Auto-merging wiki/src/doc/advanced_topics.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.fa.po Auto-merging wiki/src/doc/about/warning.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/warning.fa.po Auto-merging wiki/src/doc/about/trust.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/trust.fa.po Auto-merging wiki/src/doc/about/tor.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/tor.fa.po Auto-merging wiki/src/doc/about/requirements.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/requirements.fa.po Auto-merging wiki/src/doc/about/openpgp_keys.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/openpgp_keys.fa.po Auto-merging wiki/src/doc/about/license.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/license.fa.po Auto-merging wiki/src/doc/about/fingerprint.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/fingerprint.fa.po Auto-merging wiki/src/doc/about/finances.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/finances.fa.po Auto-merging wiki/src/doc/about/features.fr.po Auto-merging wiki/src/doc/about/features.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/features.fa.po Auto-merging wiki/src/doc/about/features.de.po Auto-merging wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po Auto-merging wiki/src/doc/about.index.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about.index.fa.po Auto-merging wiki/src/doc.fa.po CONFLICT (add/add): Merge conflict in wiki/src/doc.fa.po Removing wiki/src/contribute/release_process/tor.mdwn Removing wiki/src/contribute/low-hanging_fruit_sessions.mdwn Auto-merging wiki/src/contribute/how/donate.fa.po CONFLICT (add/add): Merge conflict in wiki/src/contribute/how/donate.fa.po Auto-merging wiki/src/contribute.fa.po CONFLICT (add/add): Merge conflict in wiki/src/contribute.fa.po Auto-merging wiki/src/bugs.fa.po CONFLICT (add/add): Merge conflict in wiki/src/bugs.fa.po Removing wiki/src/blueprint/report_2015_12.mdwn Removing wiki/src/blueprint/report_2015_11.mdwn Removing wiki/src/blueprint/report_2015_10.mdwn Removing wiki/src/blueprint/report_2015_09.mdwn Removing wiki/src/blueprint/derivatives.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__9_-_2011-07-20.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__8_-_2011-07-15.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__7_-_2011-07-08.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__6_-_2011-06-28.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__5_-_2011-06-24.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__4_-_2011-06-20.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__3_-_2011-06-13.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__2_-_2011-06-03.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__1_-_2011-05-23.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__13_-_2011-08-18.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__12_-_2011-08-12.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__11_-_2011-08-05.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__10_-_2011-07-29.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/report___8470__0.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/build_-_ok.mdwn Removing wiki/src/blueprint/TailsGreeter/blog/20110508_-_Initial_post.mdwn Removing wiki/src/blueprint/SponsorS/reports/2016_01.mdwn Removing wiki/src/blueprint/SponsorS/reports/2015_12.mdwn Auto-merging wiki/src/about.fa.po CONFLICT (add/add): Merge conflict in wiki/src/about.fa.po Removing features/windows_camouflage.feature Removing features/step_definitions/windows_camouflage.rb Removing features/images/WindowsWindowButtons.png Removing features/images/WindowsTorBrowserWindow.png Removing features/images/WindowsTorBrowserTaskBar.png Removing features/images/WindowsTorBrowserOfflinePromptStart.png Removing features/images/WindowsTorBrowserOfflinePrompt.png Removing features/images/WindowsSysTraySound.png Removing features/images/WindowsSysTrayKeyboard.png Removing features/images/WindowsSysTrayGpgApplet.png Removing features/images/WindowsStartMenu.png Removing features/images/WindowsStartButton.png Removing features/images/WindowsRunDialog.png Removing features/images/WindowsNotificationX.png Removing features/images/WindowsDesktop.png Removing features/images/WindowsApplicationsTorBrowser.png Removing features/images/WindowsApplicationsTails.png Removing features/images/WindowsApplicationsMenu.png Removing features/images/WindowsApplicationsInternet.png Removing features/images/TotemMainWindow.png Removing features/images/TorBrowserWarningDialogOkButton.png Removing features/images/TorBrowserCouldNotReadTheContentsOfWarning.png Removing features/images/SynapticSearch.png Removing features/images/SynapticPolicyKitAuthPrompt.png Removing features/images/SeahorseEdit.png Removing features/images/PrintToFile.png Removing features/images/PidginScrollArrowUp.png Removing features/images/PersistenceWizardWindow.png Removing features/images/OpenWithImportKey.png Removing features/images/MACSpoofNetworkBlocked.png Removing features/images/KeyImportedNotification.png Removing features/images/I2P_starting_notification.png Removing features/images/GnomeTorIsReady.png Removing features/images/GnomeSSHServerSSH.png Removing features/images/GnomeSSHFTP.png Removing features/images/GnomeSSHConnectButton.png Removing features/images/GnomeSSHConnect.png Removing features/images/GnomePlacesConnectToServer.png Removing features/images/GnomeNotificationAppletCloseButton.png Removing features/images/GnomeNotificationAppletClearAllButton.png Removing features/images/GeditNewDocument.png Removing features/images/EvincePrintOutputFileSelected.png Removing features/images/EvincePrintOutputFile.png Removing config/chroot_sources/wheezy-backports.chroot Removing config/chroot_sources/wheezy-backports.binary Removing config/chroot_sources/jessie.chroot Removing config/chroot_sources/jessie.binary Removing config/chroot_sources/jessie-updates.chroot Removing config/chroot_sources/jessie-updates.binary Removing config/chroot_local-patches/zenity-fix-whitespacing-box-sizes.diff Removing config/chroot_local-patches/torsocks_whisperback.patch Removing config/chroot_local-patches/torsocks_seahorse.patch Removing config/chroot_local-patches/torsocks_liferea.patch Removing config/chroot_local-patches/torsocks_gobby-0.5.patch Removing config/chroot_local-patches/torsocks_claws-mail.diff Removing config/chroot_local-patches/keep_resolvconf_on_shutdown.diff Removing config/chroot_local-patches/gdm-background.diff Removing config/chroot_local-patches/florence_icon.patch Removing config/chroot_local-patches/do_not_start_tor_on_boot.diff Removing config/chroot_local-patches/do_not_start_network-manager_on_boot.diff Removing config/chroot_local-patches/do_not_start_i2p_on_boot.diff Removing config/chroot_local-patches/do_not_start_hdparm_on_boot.diff Removing config/chroot_local-patches/do_not_run_ttdnsd_initscript.diff Removing config/chroot_local-patches/do_not_run_pulseaudio_initscript.diff Removing config/chroot_local-patches/do_not_run_plymouth_on_shutdown.diff Removing config/chroot_local-patches/do_not_run_gdomap_initscript.diff Removing config/chroot_local-patches/disable_kexec_initscript.diff Removing config/chroot_local-patches/Greeter-Activate-win8-theme-using-a-script.patch Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/userChrome.css Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/theme.js Removing config/chroot_local-includes/usr/share/tails/tor-browser-win8-theme/localstore.rdf Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userChrome.css Auto-merging config/chroot_local-includes/usr/share/tails/chroot-browsers/common/prefs.js Removing config/chroot_local-includes/usr/share/pixmaps/outlook_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/msn_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/ie_launcher.png Removing config/chroot_local-includes/usr/share/pixmaps/blue_dot.png Removing config/chroot_local-includes/usr/share/pixmaps/backgrounds/xp-bliss.jpg Auto-merging config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/memory_wipe Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/pidgin.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/iceweasel.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/icedove.png Removing config/chroot_local-includes/usr/share/icons/GnomeXP/48x48/apps/florence.png Removing config/chroot_local-includes/usr/share/gnome-panel/4.0/applets/org.boum.tails.ShutdownHelper.panel-applet Removing config/chroot_local-includes/usr/share/gdm/greeter/autostart/spice-vdagent.desktop Removing config/chroot_local-includes/usr/share/dbus-1/services/org.gnome.panel.applet.ShutdownHelperFactory.service Removing config/chroot_local-includes/usr/share/applications/tails-activate-win8-theme.desktop Removing config/chroot_local-includes/usr/local/sbin/tails-unblock-network Removing config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector Removing config/chroot_local-includes/usr/local/sbin/tails-prepare-win8-theme Auto-merging config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper Auto-merging config/chroot_local-includes/usr/local/lib/tails-spoof-mac Auto-merging config/chroot_local-includes/usr/local/lib/tails-set-wireless-devices-state Auto-merging config/chroot_local-includes/usr/local/lib/tails-htp-notify-user Removing config/chroot_local-includes/usr/local/lib/shutdown-helper-applet Auto-merging config/chroot_local-includes/usr/local/lib/end-profile Removing config/chroot_local-includes/usr/local/bin/torified-claws-mail Removing config/chroot_local-includes/usr/local/bin/tails-warn-about-disabled-persistence Removing config/chroot_local-includes/usr/local/bin/tails-virt-notify-user Removing config/chroot_local-includes/usr/local/bin/tails-security-check-wrapper Removing config/chroot_local-includes/usr/local/bin/tails-save-im-environment Removing config/chroot_local-includes/usr/local/bin/tails-configure-keyboard Removing config/chroot_local-includes/usr/local/bin/tails-activate-win8-theme Removing config/chroot_local-includes/usr/lib/bonobo/servers/ShutdownHelper_Factory.server Removing config/chroot_local-includes/usr/lib/apt/methods/tor+http Removing config/chroot_local-includes/usr/bin/tor-launcher Removing config/chroot_local-includes/lib/live/config/2060-kiosk-mode Removing config/chroot_local-includes/lib/live/config/0000-resolv-conf Removing config/chroot_local-includes/etc/xdg/autostart/virt-notify.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-warn-about-disabled-persistence.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-upgrade-frontend.desktop Removing config/chroot_local-includes/etc/xdg/autostart/tails-configure-keyboard.desktop Removing config/chroot_local-includes/etc/xdg/autostart/security-check.desktop Removing config/chroot_local-includes/etc/xdg/autostart/save-im-environment.desktop Removing config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-directories.desktop Removing config/chroot_local-includes/etc/xdg/autostart/add-GNOME-bookmarks.desktop Removing config/chroot_local-includes/etc/sudoers.d/zzz_tor-launcher Removing config/chroot_local-includes/etc/sudoers.d/zzz_tor-has-bootstrapped Removing config/chroot_local-includes/etc/skel/.config/menus/gnome-settings.menu Removing config/chroot_local-includes/etc/skel/.config/menus/gnome-applications.menu Removing config/chroot_local-includes/etc/skel/.config/gnome-panel/panel-default-layout.layout Removing config/chroot_local-includes/etc/skel/.claws-mail/dispheaderrc Removing config/chroot_local-includes/etc/skel/.claws-mail/clawsrc Removing config/chroot_local-includes/etc/skel/.claws-mail/accountrc.tmpl Removing config/chroot_local-includes/etc/resolvconf/interface-order Removing config/chroot_local-includes/etc/live/config.d/x-session-manager.conf Removing config/chroot_local-includes/etc/init.d/tor-controlport-filter Removing config/chroot_local-includes/etc/init.d/tails-set-wireless-devices-state Removing config/chroot_local-includes/etc/init.d/tails-sdmem-on-media-removal Removing config/chroot_local-includes/etc/init.d/tails-reconfigure-memlockd Removing config/chroot_local-includes/etc/init.d/tails-reconfigure-kexec Removing config/chroot_local-includes/etc/init.d/tails-kexec Removing config/chroot_local-includes/etc/init.d/tails-detect-virtualization Removing config/chroot_local-includes/etc/init.d/tails-autotest-remote-shell Removing config/chroot_local-includes/etc/init.d/htpdate Removing config/chroot_local-includes/etc/gdm3/greeter.gconf-defaults Removing config/chroot_local-includes/etc/fstab Removing config/chroot_local-includes/etc/fonts/conf.d/13-antialias.conf Removing config/chroot_local-includes/etc/fonts/conf.d/12-hintstyle-hintslight.conf Removing config/chroot_local-includes/etc/fonts/conf.d/11-lcdfilter-default.conf Removing config/chroot_local-includes/etc/fonts/conf.d/10-sub-pixel-rgb.conf Removing config/chroot_local-includes/etc/fonts/conf.d/10-autohint.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/13-antialias.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/12-hintstyle-hintslight.conf Removing config/chroot_local-includes/etc/fonts/conf.avail/11-lcdfilter-default.conf Auto-merging config/chroot_local-includes/etc/default/htpdate.pools Removing config/chroot_local-includes/etc/X11/xorg.conf.d/disable-screen-blanking.conf Removing config/chroot_local-includes/etc/X11/Xsession.d/80im-starter Auto-merging config/chroot_local-includes/etc/NetworkManager/dispatcher.d/01-wait-for-notification-recipient.sh Removing config/chroot_local-hooks/99-zzz_resolvconf Removing config/chroot_local-hooks/50-fine-tune-syndaemon Auto-merging config/chroot_local-hooks/50-dkms Removing config/chroot_local-hooks/40-etc_modules Removing config/chroot_local-hooks/21-gdm_background Removing config/chroot_local-hooks/17-clean_up_resolvconf Removing config/chroot_local-hooks/04-nolvm Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
None
Changes committed |
Changes committed
9 years ago
|
|
None
Changes committed |
Changes committed
9 years ago
|
|
None
Changes committed |
Changes committed
9 years ago
|
|
None
Changes committed |
Changes committed
9 years ago
|
|
None
Changes committed |
Changes committed
9 years ago
|
|
None
Changes committed |
Changes committed
9 years ago
|
|
None
Changes committed |
Changes committed
9 years ago
|