emmapeel

Suggestion removed
We generate a revocation certificate of the signing key and split it into a number of cryptographic shares, using for example Shamir's secret sharing scheme implemented by `gfshare`.
 
05/10/2018
emmapeel

Suggestion added
We generate a revocation certificate of the signing key and split it into a number of cryptographic shares, using for example Shamir's secret sharing scheme implemented by `gfshare`.
 
05/10/2018
emmapeel

Suggestion added
We generate a revocation certificate of the signing key and split it into a number of cryptographic shares, using for example Shamir's secret sharing scheme implemented by `gfshare`.
 
05/10/2018
emmapeel

Suggestion accepted
We generate a revocation certificate of the signing key and split it into a number of cryptographic shares, using for example Shamir's secret sharing scheme implemented by `gfshare`.
Generamos un certificado de revocación de la clave de firmado y la dividimos en un número de porciones criptgráficas, usando por ejemplo el esquema para compartir secretos de Shamir implementado por `gfshare`.
05/10/2018
emmapeel

Changes pushed
Changes pushed 05/10/2018
emmapeel

Suggestion accepted
Request someone from that group to send her share to the new person in the group.
Pedirle a alguien de ese grupo que le envíe su porción a la nueva persona del grupo.
05/10/2018
emmapeel

Suggestion accepted
The following combinations of people could get together and reassemble their shares to reconstruct a complete revocation certificate:
Las siguientes combinaciones de gente podrían juntarse y rearmar sus porciones para reconstruir un certificado de revocación completo:
05/10/2018
emmapeel

Suggestion accepted
All these people should have an OpenPGP key and understand what a revocation certificate is.
Todas estas personas tienen que tener una clave OpenPGP y entender lo que es un certificado de revocación.
05/10/2018
emmapeel

Changes pushed
Changes pushed 05/10/2018
emmapeel

Changes pushed
Changes pushed 05/10/2018
emmapeel

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/report_2018_04.mdwn
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)
05/10/2018
emmapeel

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/report_2018_04.mdwn
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)
05/10/2018
emmapeel

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/report_2018_04.mdwn
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)
05/10/2018
emmapeel

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/report_2018_04.mdwn
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)
05/10/2018
emmapeel

Translation completed
Translation completed 05/09/2018
emmapeel

Translation completed
Translation completed 05/09/2018
emmapeel

Changes pushed
Changes pushed 05/09/2018
emmapeel

Changes pushed
Changes pushed 05/09/2018
emmapeel

Changes pushed
Changes pushed 05/09/2018
emmapeel

Changes pushed
Changes pushed 05/09/2018

Search