cacu
Resource updated |
|
cacu
Repository merged |
Repository merged
6 years ago
|
cacu
Changes pushed |
Changes pushed
6 years ago
|
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Suggestion added |
|
cacu
Suggestion added |
|
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Changes pushed |
Changes pushed
6 years ago
|
cacu
Changes pushed |
Changes pushed
6 years ago
|
cacu
Translation completed |
Translation completed
6 years ago
|
cacu
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po Auto-merging wiki/src/upgrade.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade.fr.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/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/win.fr.po CONFLICT (content): Merge conflict in wiki/src/install/win.fr.po Auto-merging wiki/src/install/mac/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.fr.po Auto-merging wiki/src/install/mac/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.fr.po Auto-merging wiki/src/install/mac/dvd-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-overview.fr.po Auto-merging wiki/src/install/mac/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.fr.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.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 Auto-merging wiki/src/install/linux.fr.po CONFLICT (content): Merge conflict in wiki/src/install/linux.fr.po Auto-merging wiki/src/install/expert/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.fr.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.fr.po Auto-merging wiki/src/install/debian/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.fr.po Auto-merging wiki/src/install/debian.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian.fr.po Automatic merge failed; fix conflicts and then commit the result. (1)6 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)6 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)6 years ago |
wiki/src/sponsors.de.po
" file was changed. 6 years ago