Serna

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)
05/09/2018
Serna

Suggestion added
Your USB stick appears as a new device in the list. Check
that its size corresponds to the size of your USB stick.
 
05/09/2018
Serna

Suggestion accepted
Your USB stick appears as a new device in the list. Check
that its size corresponds to the size of your USB stick.
Tu memoria USB debería aparecer como un nuevo dispositivo en la lista. Verifica
que su tamaño corresponde al tamaño de tu memoria USB.
05/09/2018
Serna

Suggestion added
All these people should have an OpenPGP key and understand what a revocation certificate is.
 
05/09/2018
Serna

Suggestion accepted
So, can we count on you for this?
Entonces, ¿Podemos contar contigo para esto?
05/09/2018
Serna

Suggestion accepted
Hi,
Hola,
05/09/2018
Serna

Suggestion accepted
<pre>
Subject: distribution
<pre>
Asunto: distribución
05/09/2018
Serna

Suggestion accepted
Send new shares to everybody except to the person who is being removed.
Enviar nuevas porciones a todo el mundo, excepto a la persona que se está removiendo.
05/09/2018
Serna

Suggestion accepted
To remove someone from a given group:
Para remover a alguien de un grupo:
05/09/2018
Serna

Suggestion added
Request someone from that group to send her share to the new person in the group.
 
05/09/2018
Serna

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

Suggestion accepted
To add someone to a given group:
Para agregar a alguien a un grupo determinado:
05/09/2018
Serna

Suggestion accepted
This mailing list is hosted on a trusted server different from boum.org to be more resilient than our usual communication channels.
Esta lista de correo está alojada en un servidor de confianza distinto de boum.org para ser más estable que nuestros canales de comunicación habituales.
05/09/2018
Serna

Suggestion accepted
Everybody who owns a share is subscribed to a mailing list.
Toda persona que tenga una porción está suscrita a una lista de correo.
05/09/2018
Serna

Suggestion accepted
1 share for people in group D
Una porción para las personas en el grupo D
05/09/2018
Serna

Suggestion accepted
1 share for people in group C
Una porción para las personas en el grupo C
05/09/2018
Serna

Suggestion accepted
1 share for people in group B
Una porción para las personas en el grupo B
05/09/2018
Serna

Suggestion accepted
We generate these shares:
Generamos estas porciones:
05/09/2018
Serna

Suggestion added
The following combinations of people could get together and reassemble their shares to reconstruct a complete revocation certificate:
 
05/09/2018
Serna

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 completo de revocación:
05/09/2018

Search