cacu

Suggestion added

 
7 years ago
cacu

Suggestion added

 
7 years ago
cacu

Suggestion added

 
7 years ago
cacu

Repository merge failed

Auto-merging wiki/src/support/known_issues.es.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.es.po
Auto-merging wiki/src/security/Numerous_security_holes_in_3.5.es.po
CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.5.es.po
Auto-merging wiki/src/news/version_3.7.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.pt.po
Auto-merging wiki/src/news/version_3.7.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.it.po
Auto-merging wiki/src/news/version_3.7.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.fr.po
Auto-merging wiki/src/news/version_3.7.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.fa.po
Auto-merging wiki/src/news/version_3.7.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.es.po
Auto-merging wiki/src/news/version_3.7.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.de.po
Auto-merging wiki/src/news/version_3.6.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.pt.po
Auto-merging wiki/src/news/version_3.6.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.it.po
Auto-merging wiki/src/news/version_3.6.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.fa.po
Auto-merging wiki/src/news/version_3.6.2.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po
Auto-merging wiki/src/news/version_3.6.2.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.it.po
Auto-merging wiki/src/news/version_3.6.2.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fa.po
Auto-merging wiki/src/news/version_3.6.1.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.pt.po
Auto-merging wiki/src/news/version_3.6.1.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.it.po
Auto-merging wiki/src/news/version_3.6.1.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fa.po
Auto-merging wiki/src/install/win/usb-overview.es.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.es.po
Auto-merging wiki/src/install.it.po
Auto-merging wiki/src/donate.es.po
CONFLICT (content): Merge conflict in wiki/src/donate.es.po
Auto-merging wiki/src/doc/about/requirements.pt.po
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
cacu

Repository merge failed

Auto-merging wiki/src/torrents/files/tails-amd64-3.7.packages
Auto-merging wiki/src/torrents/files/tails-amd64-3.7.build-manifest
Removing wiki/src/torrents/files/tails-amd64-3.6.2.torrent
Removing wiki/src/torrents/files/tails-amd64-3.6.2.iso.sig
Auto-merging wiki/src/support.de.po
CONFLICT (content): Merge conflict in wiki/src/support.de.po
Auto-merging wiki/src/partners.fr.po
Auto-merging wiki/src/partners.de.po
CONFLICT (content): Merge conflict in wiki/src/partners.de.po
Auto-merging wiki/src/news/version_3.6.2.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po
Auto-merging wiki/src/news/version_3.6.2.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fr.po
Auto-merging wiki/src/news/test_3.6~rc1.de.po
CONFLICT (content): Merge conflict in wiki/src/news/test_3.6~rc1.de.po
Auto-merging wiki/src/news/duckduckgo_challenge.de.po
CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.de.po
Auto-merging wiki/src/doc/sensitive_documents/metadata.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fr.po
Auto-merging wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po
Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po
Auto-merging wiki/src/doc/about/requirements.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/requirements.pt.po
Auto-merging wiki/src/doc/about/finances.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/finances.de.po
Auto-merging po/ca.po
Removing features/images/TorBrowserSavedStartupPage.png
Removing features/images/TorBrowserPrintDialog.png
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
cacu

Suggestion accepted

7 years ago
cacu

Suggestion accepted

7 years ago
cacu

Suggestion accepted

7 years ago
cacu

Suggestion added

 
7 years ago
cacu

Suggestion accepted

7 years ago
cacu

Suggestion added

 
7 years ago
cacu

Changes pushed

Changes pushed 7 years ago
cacu

Changes pushed

Changes pushed 7 years ago
cacu

Translation completed

Translation completed 7 years ago
cacu

Repository merge failed

Auto-merging wiki/src/upgrade/tails.pt.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.pt.po
Auto-merging wiki/src/upgrade/tails.it.po
Auto-merging wiki/src/upgrade/tails.fa.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.fa.po
Auto-merging wiki/src/upgrade/tails.es.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.es.po
Auto-merging wiki/src/upgrade/tails-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.it.po
Auto-merging wiki/src/upgrade/tails-overview.fa.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fa.po
Auto-merging wiki/src/upgrade/tails-download.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.it.po
Auto-merging wiki/src/upgrade/tails-download.fa.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.fa.po
Auto-merging wiki/src/upgrade/tails-download.de.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po
Auto-merging wiki/src/upgrade/clone.pt.po
Auto-merging wiki/src/upgrade/clone.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.it.po
Auto-merging wiki/src/upgrade/clone.fa.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.fa.po
Auto-merging wiki/src/upgrade/clone.es.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.es.po
Auto-merging wiki/src/upgrade/clone-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.it.po
Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/upgrade.fa.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.fa.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win/usb.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.fr.po
Auto-merging wiki/src/install/win/usb.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.fa.po
Auto-merging wiki/src/install/win/usb.es.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.es.po
Auto-merging wiki/src/install/win/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.it.po
Auto-merging wiki/src/install/win/usb-download.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.it.po
Auto-merging wiki/src/install/win/usb-download.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.fa.po
Auto-merging wiki/src/install/win/clone-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/win.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/win.fa.po
Auto-merging wiki/src/install/vm-download.it.po
CONFLICT (content): Merge conflict in wiki/src/install/vm-download.it.po
Auto-merging wiki/src/install/vm-download.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/vm-download.fa.po
Auto-merging wiki/src/install/mac/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.it.po
Auto-merging wiki/src/install/mac/usb.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.fa.po
Auto-merging wiki/src/install/mac/usb.es.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.es.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/mac/usb-download.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.pt.po
Auto-merging wiki/src/install/mac/usb-download.es.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.es.po
Auto-merging wiki/src/install/mac/dvd.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd.it.po
Auto-merging wiki/src/install/mac/dvd.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd.fa.po
Auto-merging wiki/src/install/mac/dvd.es.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd.es.po
Auto-merging wiki/src/install/mac/dvd-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-overview.it.po
Auto-merging wiki/src/install/mac/dvd-overview.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-overview.fa.po
Auto-merging wiki/src/install/mac/dvd-download.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-download.it.po
Auto-merging wiki/src/install/mac/dvd-download.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-download.fa.po
Auto-merging wiki/src/install/mac/dvd-download.de.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-download.de.po
Auto-merging wiki/src/install/mac/clone.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/clone.it.po
Auto-merging wiki/src/install/mac/clone.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/clone.fa.po
Auto-merging wiki/src/install/mac/clone.es.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/clone.es.po
Auto-merging wiki/src/install/mac/clone-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.it.po
Auto-merging wiki/src/install/mac.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po
Auto-merging wiki/src/install/linux/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.it.po
Auto-merging wiki/src/install/linux/usb.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.fa.po
Auto-merging wiki/src/install/linux/usb.es.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.es.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.fa.po
Auto-merging wiki/src/install/linux/usb-download.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.pt.po
Auto-merging wiki/src/install/linux/usb-download.es.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.es.po
Auto-merging wiki/src/install/linux/clone-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.it.po
Auto-merging wiki/src/install/linux.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux.it.po
Auto-merging wiki/src/install/linux.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/linux.fa.po
Auto-merging wiki/src/install/expert/usb.it.po
Auto-merging wiki/src/install/expert/usb.fa.po
Auto-merging wiki/src/install/expert/usb.es.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.es.po
Auto-merging wiki/src/install/dvd-download.it.po
CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.it.po
Auto-merging wiki/src/install/dvd-download.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.fa.po
Auto-merging wiki/src/install/download.it.po
CONFLICT (content): Merge conflict in wiki/src/install/download.it.po
Auto-merging wiki/src/install/download.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/download.fa.po
Auto-merging wiki/src/install/debian/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po
Auto-merging wiki/src/install/debian/usb.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fa.po
Auto-merging wiki/src/install/debian/usb.es.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.es.po
Auto-merging wiki/src/install/debian/usb-download.it.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.it.po
Auto-merging wiki/src/install/debian/usb-download.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.fa.po
Auto-merging wiki/src/install/debian/clone-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.it.po
Auto-merging wiki/src/install/debian.it.po
CONFLICT (content): Merge conflict in wiki/src/install/debian.it.po
Auto-merging wiki/src/install/debian.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/debian.fa.po
Auto-merging wiki/src/install/clone.it.po
CONFLICT (content): Merge conflict in wiki/src/install/clone.it.po
Auto-merging wiki/src/install/clone.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/clone.fa.po
Auto-merging wiki/src/install/clone.es.po
CONFLICT (content): Merge conflict in wiki/src/install/clone.es.po
Auto-merging wiki/src/doc/advanced_topics/additional_software.pt.po
Auto-merging wiki/src/doc/advanced_topics/additional_software.it.po
Auto-merging wiki/src/doc/advanced_topics/additional_software.fa.po
Auto-merging wiki/src/doc/advanced_topics/additional_software.es.po
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
cacu

Changes pushed

Changes pushed 7 years ago
cacu

Changes pushed

Changes pushed 7 years ago
cacu

Resource updated

The “wiki/src/support/known_issues.fr.po” file was changed. 7 years ago
cacu

Resource updated

The “wiki/src/support/faq.fr.po” file was changed. 7 years ago
cacu

Resource updated

The “wiki/src/install/inc/steps/restart_first_time.inline.fr.po” file was changed. 7 years ago

Search