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
emmapeel

Changes pushed
Changes pushed 05/09/2018
emmapeel

Changes pushed
Changes pushed 05/09/2018
emmapeel

Suggestion added
|install/linux]]
 
05/09/2018
emmapeel

Suggestion added
|install/mac]]
 
05/09/2018
emmapeel

Suggestion removed
<div class="tip">
 
05/09/2018
emmapeel

Suggestion accepted
The revision number is *a2*. Your graphics card might have no revision number.
El numero de revisión es *a2*. Tu tarjeta gráfica puede no tener numero de revisión.
05/09/2018
emmapeel

Suggestion accepted
The ID is *[10de:0a6c]*. The ID is unique to the model of your graphics card, it is not unique to your computer.
El ID es *[10de:0a6c]*. El ID es único con respecto al modelo de tu tarjeta gráfica, no es único de tu computadora.
05/09/2018
emmapeel

Suggestion accepted
The name is *NVIDIA Corporation GT218M [NVS 3100M]*.
El nombre es *NVIDIA Corporation GT218M [NVS 3100M]*.
05/09/2018
emmapeel

Suggestion accepted
For example, if your error message starts with:
Por ejemplo, si tu mensaje de error empieza con:
05/09/2018
emmapeel

Suggestion accepted
Identify the name, ID, and revision number (if any) of your graphics card.
Identifica el nombre, ID, y numero de revisión (si existe) de tu tarjeta gráfica.
05/09/2018
emmapeel

Suggestion accepted
This section applies if you see the following error message when starting Tails:
Esta sección aplica si ves uno de los siguientes mensajes de error al arrancar Tails:
05/09/2018
emmapeel

Changes pushed
Changes pushed 05/09/2018
emmapeel

Repository merge failed

 
Auto-merging wiki/src/install/inc/steps/install_final_in_debian.inline.it.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/install_final_in_debian.inline.it.po
Auto-merging wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po
Auto-merging wiki/src/install/inc/steps/debian_requirements.inline.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.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po
Auto-merging wiki/src/install/debian/usb.fa.po
Auto-merging wiki/src/install/debian/usb.de.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
05/09/2018
emmapeel

Changes pushed
Changes pushed 05/08/2018
emmapeel

Repository merge failed

 
Auto-merging wiki/src/upgrade/tails-overview.it.po
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/tails-overview.fa.po
Auto-merging wiki/src/upgrade/clone-overview.it.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.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/upgrade.fr.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.fr.po
Auto-merging wiki/src/upgrade.fa.po
Auto-merging wiki/src/upgrade.de.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po
Auto-merging wiki/src/install/win/usb.es.po
Auto-merging wiki/src/install/win/usb-overview.it.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/usb-overview.es.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.es.po
Auto-merging wiki/src/install/win/clone-overview.it.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/clone-overview.de.po
CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.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.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/win.fr.po
Auto-merging wiki/src/install/win.fa.po
Auto-merging wiki/src/install/win.de.po
CONFLICT (content): Merge conflict in wiki/src/install/win.de.po
Removing wiki/src/install/os.pt.po
Removing wiki/src/install/os.it.po
Removing wiki/src/install/os.html
Removing wiki/src/install/os.fr.po
CONFLICT (modify/delete): wiki/src/install/os.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/os.fa.po left in tree.
Removing wiki/src/install/os.es.po
Removing wiki/src/install/os.de.po
Auto-merging wiki/src/install/mac/usb-overview.it.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/usb-overview.de.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po
Auto-merging wiki/src/install/mac/dvd-overview.it.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/dvd-overview.fa.po
Auto-merging wiki/src/install/mac/dvd-overview.de.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-overview.de.po
Auto-merging wiki/src/install/mac/clone-overview.it.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/clone-overview.de.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po
Auto-merging wiki/src/install/mac.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac.it.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/mac.fa.po
Auto-merging wiki/src/install/mac.de.po
CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po
Auto-merging wiki/src/install/linux/usb-overview.it.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/usb-overview.fa.po
Auto-merging wiki/src/install/linux/clone-overview.it.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/clone-overview.de.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.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.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/linux.fr.po
Auto-merging wiki/src/install/linux.fa.po
Auto-merging wiki/src/install/linux.de.po
CONFLICT (content): Merge conflict in wiki/src/install/linux.de.po
Removing wiki/src/install/inc/stylesheets/router-install.css
Auto-merging wiki/src/install/expert/usb-overview.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.pt.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-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.it.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.it.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/clone-overview.de.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po
Auto-merging wiki/src/install/debian.it.po
Auto-merging wiki/src/install/debian.fr.po
CONFLICT (content): Merge conflict in wiki/src/install/debian.fr.po
Auto-merging wiki/src/install/debian.fa.po
Auto-merging wiki/src/install/debian.de.po
CONFLICT (content): Merge conflict in wiki/src/install/debian.de.po
Auto-merging wiki/src/install.it.po
CONFLICT (content): Merge conflict in wiki/src/install.it.po
Auto-merging wiki/src/install.fa.po
CONFLICT (content): Merge conflict in wiki/src/install.fa.po
Automatic merge failed; fix conflicts and then commit the result. (1)
05/08/2018
emmapeel

Changes pushed
Changes pushed 05/07/2018

Search