emmapeel

Resource updated

  1. Tails
  2. wiki/src/doc/about/requirements.*.po
  3. Turkish
The "wiki/src/doc/about/requirements.tr.po" file was changed. 8 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/doc/anonymous_internet/tor/why.*.po
  3. Catalan
The "wiki/src/doc/anonymous_internet/tor/why.ca.po" file was changed. 8 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/doc/anonymous_internet/tor/why.*.po
  3. Spanish
The "wiki/src/doc/anonymous_internet/tor/why.es.po" file was changed. 8 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/doc/about/openpgp_keys.*.po
  3. Polish
The "wiki/src/doc/about/openpgp_keys.pl.po" file was changed. 8 years ago
emmapeel

Resource updated

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

Resource updated

  1. Tails
  2. wiki/src/doc/about/openpgp_keys.*.po
  3. Turkish
The "wiki/src/doc/about/openpgp_keys.tr.po" file was changed. 8 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/doc/about/requirements.*.po
  3. Catalan
The "wiki/src/doc/about/requirements.ca.po" file was changed. 8 years ago
emmapeel

Resource updated

  1. Tails
  2. wiki/src/doc/about/openpgp_keys.*.po
  3. Italian
The "wiki/src/doc/about/openpgp_keys.it.po" file was changed. 8 years ago
emmapeel

Repository merge failed

  1. Tails
  2. wiki/src/index.*.po
 
Removing wiki/src/news/test_2.4-rc1.pt.po
Removing wiki/src/news/test_2.4-rc1.it.po
Removing wiki/src/news/test_2.4-rc1.fr.po
Removing wiki/src/news/test_2.4-rc1.fa.po
Removing wiki/src/news/test_2.4-rc1.de.po
Removing wiki/src/news/test_2.2-rc1.pt.po
Removing wiki/src/news/test_2.2-rc1.it.po
Removing wiki/src/news/test_2.2-rc1.fr.po
Removing wiki/src/news/test_2.2-rc1.fa.po
Removing wiki/src/news/test_2.2-rc1.de.po
Removing wiki/src/news/test_2.0-rc1.pt.po
Removing wiki/src/news/test_2.0-rc1.it.po
Removing wiki/src/news/test_2.0-rc1.fr.po
Removing wiki/src/news/test_2.0-rc1.fa.po
Removing wiki/src/news/test_2.0-rc1.de.po
Removing wiki/src/news/test_1.7-rc1.pt.po
Removing wiki/src/news/test_1.7-rc1.it.po
Removing wiki/src/news/test_1.7-rc1.fr.po
Removing wiki/src/news/test_1.7-rc1.fa.po
Removing wiki/src/news/test_1.7-rc1.de.po
Removing wiki/src/news/test_1.5-rc1.pt.po
Removing wiki/src/news/test_1.5-rc1.it.po
Removing wiki/src/news/test_1.5-rc1.fr.po
Removing wiki/src/news/test_1.5-rc1.fa.po
Removing wiki/src/news/test_1.5-rc1.de.po
Removing wiki/src/news/test_1.4-rc1.pt.po
Removing wiki/src/news/test_1.4-rc1.it.po
CONFLICT (modify/delete): wiki/src/news/test_1.4-rc1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.4-rc1.fr.po left in tree.
Removing wiki/src/news/test_1.4-rc1.fa.po
Removing wiki/src/news/test_1.4-rc1.de.po
Removing wiki/src/news/test_1.3-rc1.pt.po
Removing wiki/src/news/test_1.3-rc1.it.po
CONFLICT (modify/delete): wiki/src/news/test_1.3-rc1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.3-rc1.fr.po left in tree.
Removing wiki/src/news/test_1.3-rc1.fa.po
Removing wiki/src/news/test_1.3-rc1.de.po
Removing wiki/src/news/test_1.2-rc1.pt.po
Removing wiki/src/news/test_1.2-rc1.it.po
CONFLICT (modify/delete): wiki/src/news/test_1.2-rc1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.2-rc1.fr.po left in tree.
Removing wiki/src/news/test_1.2-rc1.fa.po
Removing wiki/src/news/test_1.2-rc1.de.po
Removing wiki/src/news/test_1.1-rc1.pt.po
Removing wiki/src/news/test_1.1-rc1.it.po
CONFLICT (modify/delete): wiki/src/news/test_1.1-rc1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.1-rc1.fr.po left in tree.
Removing wiki/src/news/test_1.1-rc1.fa.po
Removing wiki/src/news/test_1.1-rc1.de.po
Removing wiki/src/news/test_1.0-rc1.pt.po
Removing wiki/src/news/test_1.0-rc1.it.po
CONFLICT (modify/delete): wiki/src/news/test_1.0-rc1.fr.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/test_1.0-rc1.fr.po left in tree.
Removing wiki/src/news/test_1.0-rc1.fa.po
Removing wiki/src/news/test_1.0-rc1.de.po
Auto-merging ikiwiki.setup
CONFLICT (content): Merge conflict in ikiwiki.setup
Automatic merge failed; fix conflicts and then commit the result. (1)
8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/support/faq.*.po
  3. Spanish
Changes committed 8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/news/signing_key_transition.*.po
  3. Spanish
Changes committed 8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/security/claws_mail_leaks_plaintext_to_imap.*.po
  3. Spanish
Changes committed 8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/security/Upgrade_Tor.*.po
  3. Spanish
Changes committed 8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/news/windows_camouflage_jessie.*.po
  3. French
Changes committed 8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/news/tails-testers.*.po
  3. French
Changes committed 8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/news/Tails_HackFest_2014.*.po
  3. French
Changes committed 8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/news/Mac_and_PC_UEFI_hardware_needed.*.po
  3. French
Changes committed 8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/news/new_project_name.*.po
  3. French
Changes committed 8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/news/new_SSL_certificate.*.po
  3. French
Changes committed 8 years ago
None

Changes committed

  1. Tails
  2. wiki/src/news/fpf_campaign.*.po
  3. French
Changes committed 8 years ago

Search