Serna

Repository merge failed

  1. Tails
  2. wiki/src/index.*.po
 
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)
6 years ago
Serna

Repository merge failed

  1. Tails
  2. wiki/src/index.*.po
 
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)
6 years ago
Serna

Repository merge failed

  1. Tails
  2. wiki/src/index.*.po
 
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)
6 years ago
Serna

Repository merge failed

  1. Tails
  2. wiki/src/index.*.po
 
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)
6 years ago
Serna

Repository merge failed

  1. Tails
  2. wiki/src/index.*.po
 
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)
6 years ago
Serna

Suggestion added

  1. Tails
  2. wiki/src/install.*.po
  3. Spanish
macOS
 
6 years ago
Serna

Suggestion added

  1. Tails
  2. wiki/src/install.*.po
  3. Spanish
Windows
 
6 years ago
Serna

Suggestion accepted

  1. Tails
  2. wiki/src/install.*.po
  3. Spanish
|install/linux]]
|install/linux]]
6 years ago
Serna

Suggestion accepted

  1. Tails
  2. wiki/src/install.*.po
  3. Spanish
|install/mac]]
|install/mac]]
6 years ago
Serna

Repository merge failed

  1. Tails
  2. wiki/src/index.*.po
 
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)
6 years ago
Serna

Suggestion added

  1. Tails
  2. wiki/src/doc/reset/mac.*.po
  3. Spanish
<div class="caution">
<p>If you are unsure about the device name, you should stop proceeding or
<strong>you risk overwriting any hard disk on the system</strong>.</p>
</div>
 
6 years ago
Serna

Suggestion added

  1. Tails
  2. wiki/src/doc/reset/mac.*.po
  3. Spanish
Your USB stick appears as a new device in the list. Check
that its size corresponds to the size of your USB stick.
 
6 years ago
Serna

Suggestion accepted

  1. Tails
  2. wiki/src/doc/reset/mac.*.po
  3. Spanish
<div class="caution">
<p>If you are unsure about the device name, you should stop proceeding or
<strong>you risk overwriting any hard disk on the system</strong>.</p>
</div>
<div class="caution">
<p>Si no estás seguro del nombre del dispositivo deberías parar ahora o
<strong>te arriesgas a sobreescribir cualquier otro disco duro del sistema</strong>.</p>
</div>
6 years ago
Serna

Suggestion accepted

  1. Tails
  2. wiki/src/doc/reset/mac.*.po
  3. Spanish
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.
6 years ago
Serna

Suggestion accepted

  1. Tails
  2. wiki/src/news/veracrypt_ux_design.*.po
  3. Spanish
[[!img 33c3/t-shirt.jpg link="no"]]
[[!img 33c3/t-shirt.jpg link="no"]]
6 years ago
Serna

Suggestion accepted

  1. Tails
  2. wiki/src/news/additional_software_ux_design.*.po
  3. Spanish
[[!img 33c3/t-shirt.jpg link="no"]]
[[!img 33c3/t-shirt.jpg link="no"]]
6 years ago
Serna

Suggestion accepted

  1. Tails
  2. wiki/src/news/veracrypt_ux_design.*.po
  3. Spanish
We will give you a Tails T-shirt as a token of our thanks.
Te daremos una camiseta de Tails en agradecimiento.
6 years ago
Serna

Suggestion accepted

  1. Tails
  2. wiki/src/news/additional_software_ux_design.*.po
  3. Spanish
We will give you a Tails T-shirt as a token of our thanks.
Te daremos una camiseta de Tails en agradecimiento.
6 years ago
Serna

Suggestion accepted

  1. Tails
  2. wiki/src/news/additional_software_ux_design.*.po
  3. Spanish
Plan to stay with us for 1 hour.
Calcula al menos una hora para estar con nosotros.
6 years ago
Serna

Suggestion added

  1. Tails
  2. wiki/src/news/additional_software_ux_design.*.po
  3. Spanish
- Saturday 27 - Sunday 28 - Monday 29
 
6 years ago

Search