emmapeel

Repository merge failed

  1. Tails
  2. wiki/src/index.*.po
 
Auto-merging wiki/src/news/report_2015_05.mdwn
Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
9 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/news/Mac_and_PC_UEFI_hardware_needed.*.po
  3. French
The "wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fr.po" file was changed. 9 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/news/Mac_and_PC_UEFI_hardware_needed.*.po
  3. Portuguese
The "wiki/src/news/Mac_and_PC_UEFI_hardware_needed.pt.po" file was changed. 9 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/doc/first_steps/desktop.*.po
  3. German
The "wiki/src/doc/first_steps/desktop.de.po" file was changed. 9 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/support/faq.*.po
  3. German
The "wiki/src/support/faq.de.po" file was changed. 9 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/doc/encryption_and_privacy/encrypted_volumes.*.po
  3. German
The "wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po" file was changed. 9 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/news/amnesia_may_now_work_on_the_Mac.*.po
  3. French
The "wiki/src/news/amnesia_may_now_work_on_the_Mac.fr.po" file was changed. 9 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/about.*.po
  3. Portuguese
The "wiki/src/about.pt.po" file was changed. 9 years ago
emmapeel

Repository merge failed

  1. Tails
  2. wiki/src/index.*.po
 
Auto-merging wiki/src/news/report_2015_05.mdwn
Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
9 years ago
emmapeel

Translation changed

  1. Tails
  2. wiki/src/news/Mac_and_PC_UEFI_hardware_needed.*.po
  3. French
[[!tag announce]]
[[!tag announce]]
9 years ago
emmapeel

Translation added

  1. Tails
  2. wiki/src/news/amnesia_may_now_work_on_the_Mac.*.po
  3. French
[[!tag announce]]
[[!tag announce]]
9 years ago
emmapeel

Translation added

  1. Tails
  2. wiki/src/news/Mac_and_PC_UEFI_hardware_needed.*.po
  3. Portuguese
[[!toc levels=2]]
[[!toc levels=2]]
9 years ago
emmapeel

Translation added

  1. Tails
  2. wiki/src/doc/advanced_topics/virtualization.*.po
  3. Portuguese
[[!toc levels=2]]
[[!toc levels=2]]
9 years ago
emmapeel

Changes pushed

  1. Tails
  2. wiki/src/index.*.po
Changes pushed 9 years ago
emmapeel

Translation completed

  1. Tails
  2. wiki/src/doc/first_steps/accessibility.*.po
  3. French
Translation completed 9 years ago
emmapeel

Translation changed

  1. Tails
  2. wiki/src/doc/about/openpgp_keys.*.po
  3. French
[[!toc levels=1]]
[[!toc levels=1]]
9 years ago
emmapeel

Translation changed

  1. Tails
  2. wiki/src/doc/first_steps/desktop.*.po
  3. German
</div>
</div>
9 years ago
emmapeel

Translation changed

  1. Tails
  2. wiki/src/support/faq.*.po
  3. German
</div>
</div>
9 years ago
emmapeel

Translation changed

  1. Tails
  2. wiki/src/doc/advanced_topics/internal_hard_disk.*.po
  3. German
</div>
</div>
9 years ago
emmapeel

Translation changed

  1. Tails
  2. wiki/src/doc/anonymous_internet/Tor_Browser.*.po
  3. German
</div>
</div>
9 years ago

Search