2. Changes

Auto-merging wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fr.po
CONFLICT (content): Merge conflict in wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fr.po
Auto-merging wiki/src/security/Security_hole_in_I2P_0.9.13.fr.po
CONFLICT (content): Merge conflict in wiki/src/security/Security_hole_in_I2P_0.9.13.fr.po
Auto-merging wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fr.po
CONFLICT (content): Merge conflict in wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fr.po
Auto-merging wiki/src/security/IP_address_leak_with_icedove.fr.po
CONFLICT (content): Merge conflict in wiki/src/security/IP_address_leak_with_icedove.fr.po
Auto-merging wiki/src/news/veracrypt_ux_design.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/veracrypt_ux_design.fr.po
Auto-merging wiki/src/news/test_incremental_upgrades.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/test_incremental_upgrades.fr.po
Auto-merging wiki/src/news/new_SSL_certificate.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/new_SSL_certificate.fr.po
Auto-merging wiki/src/news/logo_contest.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/logo_contest.fr.po
Auto-merging wiki/src/news/improve_the_infrastructure_behind_Tails.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/improve_the_infrastructure_behind_Tails.fr.po
Auto-merging wiki/src/news/bounties_2013_report.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/bounties_2013_report.fr.po
Auto-merging wiki/src/news/additional_software_ux_design.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/additional_software_ux_design.fr.po
Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fr.po
Auto-merging wiki/src/install/win/usb-overview.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.fr.po
Auto-merging wiki/src/install/win/clone-overview.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.fr.po
Auto-merging wiki/src/install/vm-download.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/vm-download.fr.po
Auto-merging wiki/src/install/linux/usb-overview.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.fr.po
Auto-merging wiki/src/install/linux/clone-overview.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)

8 years ago

Changes pushed 8 years ago

English Persian 0 characters editedPrevious translation 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Repository merged

Original revision: N/A
New revision: N/A 8 years ago

Changes pushed 8 years ago

Repository merged

Original revision: N/A
New revision: N/A 8 years ago

Changes pushed 8 years ago

Auto-merging wiki/src/press.pt.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/press.fr.po
Auto-merging wiki/src/press.de.po
Auto-merging wiki/src/news/report_2018_01.mdwn
Automatic merge failed; fix conflicts and then commit the result. (1)

8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago

Repository merged

Original revision: N/A
New revision: N/A 8 years ago

Changes pushed 8 years ago

Changes pushed 8 years ago