2. Changes

Removing wiki/src/security/Numerous_security_holes_in_1.8.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.2.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.8.1.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.7.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.6.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.5.1.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.4.1.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.2.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.3.1.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.3.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.2.2.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.2.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.1.1.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.es.po
Removing wiki/src/security/Numerous_security_holes_in_1.0.1.es.po
CONFLICT (modify/delete): wiki/src/news/version_1.8.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.8.es.po left in tree.
CONFLICT (modify/delete): wiki/src/news/version_1.8.2.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.8.2.es.po left in tree.
CONFLICT (modify/delete): wiki/src/news/version_1.8.1.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.8.1.es.po left in tree.
CONFLICT (modify/delete): wiki/src/news/version_1.7.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.7.es.po left in tree.
CONFLICT (modify/delete): wiki/src/news/version_1.6.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_1.6.es.po left in tree.
Removing wiki/src/news/version_1.5.es.po
Removing wiki/src/news/version_1.5.1.es.po
Removing wiki/src/news/version_1.3.es.po
Removing wiki/src/news/version_1.3.2.es.po
Removing wiki/src/news/version_1.3.1.es.po
Removing wiki/src/news/version_1.2.es.po
Removing wiki/src/news/version_1.2.3.es.po
Removing wiki/src/news/version_1.2.2.es.po
Removing wiki/src/news/version_1.2.1.es.po
Removing wiki/src/news/version_1.1.es.po
Removing wiki/src/news/version_1.1.2.es.po
Removing wiki/src/news/version_1.1.1.es.po
Removing wiki/src/news/version_1.0.1.es.po
Removing wiki/src/news/version_0.22.1.es.po
Removing wiki/src/news/version_0.19.es.po
Removing wiki/src/news/version_0.18.es.po
Removing wiki/src/news/version_0.17.es.po
Removing wiki/src/news/version_0.17.1.es.po
Removing wiki/src/news/version_0.16.es.po
Removing wiki/src/news/version_0.15.es.po
Removing wiki/src/news/version_0.14.es.po
Removing wiki/src/news/version_0.13.es.po
Removing wiki/src/news/version_0.12.1.es.po
Removing wiki/src/news/version_0.11.es.po
Removing wiki/src/news/version_0.10.es.po
Removing wiki/src/misc/unsafe_browser_warning.es.po
Removing wiki/src/install/win/usb/overview.es.po
Automatic merge failed; fix conflicts and then commit the result. (1)

02/13/2018

Auto-merging wiki/src/upgrade/tails-overview.fr.po
Auto-merging wiki/src/upgrade/tails-download.fr.po
Auto-merging wiki/src/upgrade/clone-overview.fr.po
Auto-merging wiki/src/support/known_issues.es.po
CONFLICT (add/add): Merge conflict in wiki/src/support/known_issues.es.po
Auto-merging wiki/src/news/windows_camouflage_jessie.fr.po
Auto-merging wiki/src/news/our_plans_for_2018.fr.po
Auto-merging wiki/src/install/win/usb-download.fr.po
Auto-merging wiki/src/install/mac/usb-download.fr.po
Auto-merging wiki/src/install/mac/dvd-download.fr.po
Auto-merging wiki/src/install/linux/usb-download.fr.po
Auto-merging wiki/src/install/dvd-download.fr.po
Auto-merging wiki/src/install/debian/usb-download.fr.po
Auto-merging wiki/src/index.es.po
CONFLICT (add/add): Merge conflict in wiki/src/index.es.po
Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.inline.fr.po
Auto-merging wiki/src/contribute.es.po
CONFLICT (add/add): Merge conflict in wiki/src/contribute.es.po
Auto-merging ikiwiki.setup
Auto-merging ikiwiki-cgi.setup
Automatic merge failed; fix conflicts and then commit the result. (1)

02/13/2018

Auto-merging wiki/src/support/known_issues.es.po
CONFLICT (add/add): Merge conflict in wiki/src/support/known_issues.es.po
Auto-merging wiki/src/index.es.po
CONFLICT (add/add): Merge conflict in wiki/src/index.es.po
Auto-merging wiki/src/contribute.es.po
CONFLICT (add/add): Merge conflict in wiki/src/contribute.es.po
Auto-merging ikiwiki.setup
Auto-merging ikiwiki-cgi.setup
Automatic merge failed; fix conflicts and then commit the result. (1)

02/13/2018

Changes pushed 02/13/2018

Changes pushed 02/13/2018

The “wiki/src/support/known_issues.it.po” file was changed. 02/13/2018

The “wiki/src/support/known_issues.pt.po” file was changed. 02/13/2018

The “wiki/src/support/known_issues.fr.po” file was changed. 02/13/2018

The “wiki/src/support/known_issues.fa.po” file was changed. 02/13/2018

The “wiki/src/support/known_issues.de.po” file was changed. 02/13/2018

Repository merged

Original revision: N/A
New revision: N/A 02/13/2018

Changes pushed 02/13/2018

Changes pushed 02/13/2018

Repository merged

Original revision: N/A
New revision: N/A 02/13/2018

Changes pushed 02/12/2018

Repository merged

Original revision: N/A
New revision: N/A 02/12/2018

Translation completed 02/11/2018

Changes pushed 02/11/2018

Component unlocked 02/11/2018

Component unlocked 02/11/2018