admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Translation completed |
Translation completed
7 years ago
|
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Translation completed |
Translation completed
7 years ago
|
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Translation added |
|
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Resource updated |
The "
wiki/src/news/amnesia_may_now_work_on_the_Mac.es.po " file was changed.
7 years ago
|
admin
Repository merge failed |
Removing wiki/src/upgrade/tails.es.po Removing wiki/src/upgrade/tails-overview.es.po CONFLICT (modify/delete): wiki/src/upgrade/tails-download.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/upgrade/tails-download.es.po left in tree. Removing wiki/src/upgrade/clone.es.po CONFLICT (modify/delete): wiki/src/upgrade/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/upgrade/clone-overview.es.po left in tree. Removing wiki/src/upgrade.es.po Removing wiki/src/torrents.es.po Removing wiki/src/support/talk/languages.inline.es.po Removing wiki/src/support/talk.es.po Removing wiki/src/support/learn/intro.inline.es.po Removing wiki/src/support/learn.es.po Removing wiki/src/support/known_issues.es.po Removing wiki/src/support/faq.es.po CONFLICT (modify/delete): wiki/src/support/chat.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/support/chat.es.po left in tree. Removing wiki/src/support.es.po CONFLICT (modify/delete): wiki/src/sidebar.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/sidebar.es.po left in tree. Removing wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.es.po Removing wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.es.po Removing wiki/src/security/ineffective_firewall-level_Tor_enforcement.es.po Removing wiki/src/security/claws_mail_leaks_plaintext_to_imap.es.po Removing wiki/src/security/Upgrade_Tor.es.po Removing wiki/src/security/Security_hole_in_I2P_0.9.13.es.po Removing wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.es.po Removing wiki/src/security/Numerous_security_holes_in_3.4.es.po Removing wiki/src/security/Numerous_security_holes_in_3.3.es.po Removing wiki/src/security/Numerous_security_holes_in_3.2.es.po Removing wiki/src/security/Numerous_security_holes_in_3.1.es.po Removing wiki/src/security/Numerous_security_holes_in_3.0.es.po Removing wiki/src/security/Numerous_security_holes_in_3.0.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.9.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.7.es.po Removing wiki/src/security/Numerous_security_holes_in_2.7.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.6.es.po Removing wiki/src/security/Numerous_security_holes_in_2.5.es.po Removing wiki/src/security/Numerous_security_holes_in_2.4.es.po Removing wiki/src/security/Numerous_security_holes_in_2.3.es.po Removing wiki/src/security/Numerous_security_holes_in_2.2.es.po Removing wiki/src/security/Numerous_security_holes_in_2.2.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.12.es.po Removing wiki/src/security/Numerous_security_holes_in_2.11.es.po Removing wiki/src/security/Numerous_security_holes_in_2.10.es.po Removing wiki/src/security/Numerous_security_holes_in_2.0.es.po Removing wiki/src/security/Numerous_security_holes_in_2.0.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.7.es.po Removing wiki/src/security/Numerous_security_holes_in_1.6.es.po Removing wiki/src/security/Numerous_security_holes_in_1.5.es.po Removing wiki/src/security/Numerous_security_holes_in_1.5.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.4.es.po Removing wiki/src/security/Numerous_security_holes_in_1.4.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.3.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.0.es.po Removing wiki/src/security/Numerous_security_holes_in_1.0.1.es.po Removing wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.es.po Removing wiki/src/security/IP_address_leak_with_icedove.es.po Removing wiki/src/security.es.po CONFLICT (modify/delete): wiki/src/press.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/press.es.po left in tree. Removing wiki/src/partners.es.po Removing wiki/src/news/windows_camouflage_jessie.es.po Removing wiki/src/news/why_we_need_donations.es.po Removing wiki/src/news/who_are_you_helping.es.po Removing wiki/src/news/what_we_do_with_your_money.es.po Removing wiki/src/news/what_we_accomplished_in_2017.es.po Removing wiki/src/news/version_3.5.es.po Removing wiki/src/news/version_3.4.es.po Removing wiki/src/news/version_3.3.es.po Removing wiki/src/news/version_3.2.es.po Removing wiki/src/news/version_3.1.es.po Removing wiki/src/news/version_3.0.es.po Removing wiki/src/news/version_3.0.1.es.po Removing wiki/src/news/version_2.9.1.es.po Removing wiki/src/news/version_2.7.es.po Removing wiki/src/news/version_2.7.1.es.po Removing wiki/src/news/version_2.6.es.po Removing wiki/src/news/version_2.5.es.po Removing wiki/src/news/version_2.4.es.po Removing wiki/src/news/version_2.3.es.po Removing wiki/src/news/version_2.2.es.po Removing wiki/src/news/version_2.2.1.es.po Removing wiki/src/news/version_2.12.es.po Removing wiki/src/news/version_2.11.es.po Removing wiki/src/news/version_2.10.es.po Removing wiki/src/news/version_2.0.es.po Removing wiki/src/news/version_2.0.1.es.po Removing wiki/src/news/version_1.8.es.po Removing wiki/src/news/version_1.8.2.es.po Removing wiki/src/news/version_1.8.1.es.po Removing wiki/src/news/version_1.7.es.po Removing wiki/src/news/version_1.6.es.po Removing wiki/src/news/version_1.5.es.po Removing wiki/src/news/version_1.5.1.es.po Removing wiki/src/news/version_1.3.es.po Removing wiki/src/news/version_1.3.2.es.po Removing wiki/src/news/version_1.3.1.es.po Removing wiki/src/news/version_1.2.es.po Removing wiki/src/news/version_1.2.3.es.po Removing wiki/src/news/version_1.2.2.es.po Removing wiki/src/news/version_1.2.1.es.po Removing wiki/src/news/version_1.1.es.po Removing wiki/src/news/version_1.1.2.es.po Removing wiki/src/news/version_1.1.1.es.po Removing wiki/src/news/version_1.0.1.es.po Removing wiki/src/news/version_0.22.1.es.po Removing wiki/src/news/version_0.19.es.po Removing wiki/src/news/version_0.18.es.po Removing wiki/src/news/version_0.17.es.po Removing wiki/src/news/version_0.17.1.es.po Removing wiki/src/news/version_0.16.es.po Removing wiki/src/news/version_0.15.es.po Removing wiki/src/news/version_0.14.es.po Removing wiki/src/news/version_0.13.es.po Removing wiki/src/news/version_0.12.1.es.po Removing wiki/src/news/version_0.11.es.po Removing wiki/src/news/version_0.10.es.po Removing wiki/src/news/veracrypt_ux_design.es.po Removing wiki/src/news/usability_testing_2014_05.es.po Removing wiki/src/news/thedaywefightback.es.po Removing wiki/src/news/test_redesigned_Tails_Greeter.es.po Removing wiki/src/news/test_incremental_upgrades.es.po Removing wiki/src/news/test_UEFI.es.po Removing wiki/src/news/tails-testers.es.po Removing wiki/src/news/tails-support.es.po Removing wiki/src/news/summit_2013.es.po Removing wiki/src/news/spoof-mac.es.po Removing wiki/src/news/social_contract.es.po Removing wiki/src/news/signing_key_transition.es.po Removing wiki/src/news/rescue_3.0.1.es.po Removing wiki/src/news/reproducible_Tails.es.po Removing wiki/src/news/report_end_of_2014.es.po Removing wiki/src/news/our_plans_for_2018.es.po Removing wiki/src/news/our_plans_for_2017.es.po Removing wiki/src/news/new_project_name.es.po Removing wiki/src/news/new_SSL_certificate.es.po Removing wiki/src/news/mediapart.es.po Removing wiki/src/news/many_hands_make_tails.es.po Removing wiki/src/news/logo_contest.es.po Removing wiki/src/news/improve_the_infrastructure_behind_Tails.es.po Removing wiki/src/news/fpf_campaign.es.po Removing wiki/src/news/closing_tails-support.es.po Removing wiki/src/news/bounties_2013_report.es.po Removing wiki/src/news/and_the_winner_is.es.po Removing wiki/src/news/amnesia_may_now_work_on_the_Mac.es.po Removing wiki/src/news/additional_software_ux_design.es.po Removing wiki/src/news/Tails_HackFest_2014.es.po Removing wiki/src/news/Tails_3.0_will_require_a_64-bit_processor.es.po Removing wiki/src/news/On_0days_exploits_and_disclosure.es.po Removing wiki/src/news/Mac_and_PC_UEFI_hardware_needed.es.po Removing wiki/src/news/Join_us_at_the_Tails_HackFest_2014.es.po Removing wiki/src/news/IP_leakage_with_Icedove.es.po Removing wiki/src/news/33c3.es.po Removing wiki/src/news.es.po Removing wiki/src/misc/unsafe_browser_warning.es.po Removing wiki/src/install/win/usb/overview.es.po Removing wiki/src/install/win/usb.es.po Removing wiki/src/install/win/usb-overview.es.po Removing wiki/src/install/win/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/win/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/win/clone-overview.es.po left in tree. Removing wiki/src/install/win.es.po Removing wiki/src/install/vm-download.es.po Removing wiki/src/install/os.es.po Removing wiki/src/install/mac/usb/overview.es.po Removing wiki/src/install/mac/usb.es.po Removing wiki/src/install/mac/usb-overview.es.po Removing wiki/src/install/mac/usb-download.es.po Removing wiki/src/install/mac/dvd/overview.es.po Removing wiki/src/install/mac/dvd.es.po CONFLICT (modify/delete): wiki/src/install/mac/dvd-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/dvd-overview.es.po left in tree. Removing wiki/src/install/mac/dvd-download.es.po Removing wiki/src/install/mac/clone.es.po CONFLICT (modify/delete): wiki/src/install/mac/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/clone-overview.es.po left in tree. Removing wiki/src/install/mac.es.po Removing wiki/src/install/linux/usb/overview.es.po Removing wiki/src/install/linux/usb.es.po Removing wiki/src/install/linux/usb-overview.es.po Removing wiki/src/install/linux/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/linux/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/linux/clone-overview.es.po left in tree. Removing wiki/src/install/linux.es.po Removing wiki/src/install/inc/tails-installation-assistant.inline.es.po Removing wiki/src/install/inc/steps/verify_up-to-date.inline.es.po Removing wiki/src/install/inc/steps/restart_second_time.inline.es.po Removing wiki/src/install/inc/steps/restart_first_time.inline.es.po Removing wiki/src/install/inc/steps/not_at_all.inline.es.po Removing wiki/src/install/inc/steps/mac_startup_disks.inline.es.po Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final.inline.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/download.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/download.inline.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/debian_requirements.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/debian_requirements.inline.es.po left in tree. Removing wiki/src/install/inc/steps/create_persistence.inline.es.po Removing wiki/src/install/inc/steps/bittorrent_verification.inline.es.po Removing wiki/src/install/inc/router/why_two.inline.es.po Removing wiki/src/install/inc/router/why_extra.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/router/clone.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/router/clone.es.po left in tree. Removing wiki/src/install/inc/overview/vm.es.po CONFLICT (modify/delete): wiki/src/install/inc/overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/overview.es.po left in tree. Removing wiki/src/install/expert/usb/overview.es.po CONFLICT (modify/delete): wiki/src/install/expert/usb.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/expert/usb.es.po left in tree. Removing wiki/src/install/expert/usb-overview.es.po Removing wiki/src/install/dvd.es.po Removing wiki/src/install/dvd-download.es.po CONFLICT (modify/delete): wiki/src/install/download/openpgp.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/download/openpgp.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/download.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/download.es.po left in tree. Removing wiki/src/install/debian/usb.es.po Removing wiki/src/install/debian/usb-overview.es.po Removing wiki/src/install/debian/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/debian/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian/clone-overview.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/debian.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian.es.po left in tree. Removing wiki/src/install/clone.es.po Removing wiki/src/install.es.po CONFLICT (modify/delete): wiki/src/index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/index.es.po left in tree. Removing wiki/src/home.es.po Removing wiki/src/getting_started.es.po CONFLICT (modify/delete): wiki/src/donate/thanks.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/donate/thanks.es.po left in tree. Removing wiki/src/donate/canceled.es.po Removing wiki/src/donate.es.po CONFLICT (modify/delete): wiki/src/doc/upgrade/error/install.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/upgrade/error/install.es.po left in tree. Removing wiki/src/doc/upgrade/error/download.es.po Removing wiki/src/doc/upgrade/error/check.es.po Removing wiki/src/doc/upgrade/error.es.po Removing wiki/src/doc/sensitive_documents/sound_and_video.es.po Removing wiki/src/doc/sensitive_documents/printing_and_scanning.es.po Removing wiki/src/doc/sensitive_documents/persistence.es.po Removing wiki/src/doc/sensitive_documents/office_suite.es.po Removing wiki/src/doc/sensitive_documents/metadata.es.po Removing wiki/src/doc/sensitive_documents/graphics.es.po Removing wiki/src/doc/sensitive_documents.index.es.po Removing wiki/src/doc/sensitive_documents.es.po Removing wiki/src/doc/introduction.es.po Removing wiki/src/doc/first_steps/upgrade/release_notes.es.po Removing wiki/src/doc/first_steps/upgrade.release_notes.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/upgrade.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/upgrade.es.po left in tree. Removing wiki/src/doc/first_steps/startup_options/offline_mode.es.po Removing wiki/src/doc/first_steps/startup_options/mac_spoofing.es.po Removing wiki/src/doc/first_steps/startup_options/bridge_mode.inline.es.po Removing wiki/src/doc/first_steps/startup_options/bridge_mode.es.po Removing wiki/src/doc/first_steps/startup_options/administration_password.es.po Removing wiki/src/doc/first_steps/startup_options.es.po Removing wiki/src/doc/first_steps/start_tails.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/shutdown.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/shutdown.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/windows.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/windows.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/mac.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/mac.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/linux.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/linux.es.po left in tree. Removing wiki/src/doc/first_steps/reset.intro.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/reset.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/warnings.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/warnings.es.po left in tree. Removing wiki/src/doc/first_steps/persistence/use.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/recover_insecure.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/recover_insecure.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/delete.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/delete.es.po left in tree. Removing wiki/src/doc/first_steps/persistence/copy.es.po Removing wiki/src/doc/first_steps/persistence/configure.es.po Removing wiki/src/doc/first_steps/persistence/check_file_system.es.po Removing wiki/src/doc/first_steps/persistence/change_passphrase.es.po Removing wiki/src/doc/first_steps/persistence.es.po Removing wiki/src/doc/first_steps/persistence.caution.es.po Removing wiki/src/doc/first_steps/media.es.po Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po Removing wiki/src/doc/first_steps/bug_reporting.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/accessibility.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/accessibility.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps.index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps.index.es.po left in tree. Removing wiki/src/doc/first_steps.es.po Removing wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.es.po Removing wiki/src/doc/encryption_and_privacy/virtual_keyboard.es.po Removing wiki/src/doc/encryption_and_privacy/truecrypt.es.po Removing wiki/src/doc/encryption_and_privacy/secure_deletion.es.po Removing wiki/src/doc/encryption_and_privacy/manage_passwords.es.po Removing wiki/src/doc/encryption_and_privacy/keyringer.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet.warning.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet.es.po Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes.es.po Removing wiki/src/doc/encryption_and_privacy/checksums.es.po Removing wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.es.po Removing wiki/src/doc/encryption_and_privacy.index.es.po Removing wiki/src/doc/encryption_and_privacy.es.po Removing wiki/src/doc/anonymous_internet/why_tor_is_slow.es.po Removing wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.es.po Removing wiki/src/doc/anonymous_internet/unsafe_browser.es.po Removing wiki/src/doc/anonymous_internet/tor_status.es.po Removing wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.es.po Removing wiki/src/doc/anonymous_internet/thunderbird.es.po Removing wiki/src/doc/anonymous_internet/pidgin.es.po CONFLICT (modify/delete): wiki/src/doc/anonymous_internet/onionshare.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/anonymous_internet/onionshare.es.po left in tree. Removing wiki/src/doc/anonymous_internet/networkmanager.es.po Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.es.po Removing wiki/src/doc/anonymous_internet/icedove/name.inline.es.po Removing wiki/src/doc/anonymous_internet/icedove/account_creation.inline.es.po Removing wiki/src/doc/anonymous_internet/electrum.es.po Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove.es.po Removing wiki/src/doc/anonymous_internet/Tor_Browser.es.po Removing wiki/src/doc/anonymous_internet.index.es.po Removing wiki/src/doc/anonymous_internet.es.po Removing wiki/src/doc/advanced_topics/wireless_devices.es.po Removing wiki/src/doc/advanced_topics/virtualization/virtualbox.es.po Removing wiki/src/doc/advanced_topics/virtualization/virt-manager.es.po Removing wiki/src/doc/advanced_topics/virtualization/boxes.es.po Removing wiki/src/doc/advanced_topics/virtualization.es.po Removing wiki/src/doc/advanced_topics/virtualization.caution.es.po Removing wiki/src/doc/advanced_topics/paperkey.es.po Removing wiki/src/doc/advanced_topics/lan.es.po Removing wiki/src/doc/advanced_topics/cold_boot_attacks.es.po Removing wiki/src/doc/advanced_topics/additional_software.es.po CONFLICT (modify/delete): wiki/src/doc/advanced_topics.index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/advanced_topics.index.es.po left in tree. Removing wiki/src/doc/advanced_topics.es.po Removing wiki/src/doc/about/warning.es.po Removing wiki/src/doc/about/trust.es.po Removing wiki/src/doc/about/tor.es.po Removing wiki/src/doc/about/requirements.es.po Removing wiki/src/doc/about/openpgp_keys/signing_key_revocation.es.po Removing wiki/src/doc/about/openpgp_keys.es.po Removing wiki/src/doc/about/license.es.po Removing wiki/src/doc/about/fingerprint.es.po CONFLICT (modify/delete): wiki/src/doc/about/finances.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/finances.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/about/features.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/features.es.po left in tree. Removing wiki/src/doc/about/acknowledgments_and_similar_projects.es.po Removing wiki/src/doc/about.index.es.po Removing wiki/src/doc/about.es.po CONFLICT (modify/delete): wiki/src/doc.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc.es.po left in tree. Removing wiki/src/contribute/how/donate.es.po Removing wiki/src/contribute.es.po Removing wiki/src/bugs.es.po Removing wiki/src/about/contact.es.po Removing wiki/src/about.es.po Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Repository merge failed |
Removing wiki/src/upgrade/tails.es.po Removing wiki/src/upgrade/tails-overview.es.po CONFLICT (modify/delete): wiki/src/upgrade/tails-download.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/upgrade/tails-download.es.po left in tree. Removing wiki/src/upgrade/clone.es.po CONFLICT (modify/delete): wiki/src/upgrade/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/upgrade/clone-overview.es.po left in tree. Removing wiki/src/upgrade.es.po Removing wiki/src/torrents.es.po Removing wiki/src/support/talk/languages.inline.es.po Removing wiki/src/support/talk.es.po Removing wiki/src/support/learn/intro.inline.es.po Removing wiki/src/support/learn.es.po Removing wiki/src/support/known_issues.es.po Removing wiki/src/support/faq.es.po CONFLICT (modify/delete): wiki/src/support/chat.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/support/chat.es.po left in tree. Removing wiki/src/support.es.po CONFLICT (modify/delete): wiki/src/sidebar.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/sidebar.es.po left in tree. Removing wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.es.po Removing wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.es.po Removing wiki/src/security/ineffective_firewall-level_Tor_enforcement.es.po Removing wiki/src/security/claws_mail_leaks_plaintext_to_imap.es.po Removing wiki/src/security/Upgrade_Tor.es.po Removing wiki/src/security/Security_hole_in_I2P_0.9.13.es.po Removing wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.es.po Removing wiki/src/security/Numerous_security_holes_in_3.4.es.po Removing wiki/src/security/Numerous_security_holes_in_3.3.es.po Removing wiki/src/security/Numerous_security_holes_in_3.2.es.po Removing wiki/src/security/Numerous_security_holes_in_3.1.es.po Removing wiki/src/security/Numerous_security_holes_in_3.0.es.po Removing wiki/src/security/Numerous_security_holes_in_3.0.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.9.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.7.es.po Removing wiki/src/security/Numerous_security_holes_in_2.7.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.6.es.po Removing wiki/src/security/Numerous_security_holes_in_2.5.es.po Removing wiki/src/security/Numerous_security_holes_in_2.4.es.po Removing wiki/src/security/Numerous_security_holes_in_2.3.es.po Removing wiki/src/security/Numerous_security_holes_in_2.2.es.po Removing wiki/src/security/Numerous_security_holes_in_2.2.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.12.es.po Removing wiki/src/security/Numerous_security_holes_in_2.11.es.po Removing wiki/src/security/Numerous_security_holes_in_2.10.es.po Removing wiki/src/security/Numerous_security_holes_in_2.0.es.po Removing wiki/src/security/Numerous_security_holes_in_2.0.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.7.es.po Removing wiki/src/security/Numerous_security_holes_in_1.6.es.po Removing wiki/src/security/Numerous_security_holes_in_1.5.es.po Removing wiki/src/security/Numerous_security_holes_in_1.5.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.4.es.po Removing wiki/src/security/Numerous_security_holes_in_1.4.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.3.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.0.es.po Removing wiki/src/security/Numerous_security_holes_in_1.0.1.es.po Removing wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.es.po Removing wiki/src/security/IP_address_leak_with_icedove.es.po Removing wiki/src/security.es.po CONFLICT (modify/delete): wiki/src/press.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/press.es.po left in tree. Removing wiki/src/partners.es.po Removing wiki/src/news/windows_camouflage_jessie.es.po Removing wiki/src/news/why_we_need_donations.es.po Removing wiki/src/news/who_are_you_helping.es.po Removing wiki/src/news/what_we_do_with_your_money.es.po Removing wiki/src/news/what_we_accomplished_in_2017.es.po Removing wiki/src/news/version_3.5.es.po Removing wiki/src/news/version_3.4.es.po Removing wiki/src/news/version_3.3.es.po Removing wiki/src/news/version_3.2.es.po Removing wiki/src/news/version_3.1.es.po Removing wiki/src/news/version_3.0.es.po Removing wiki/src/news/version_3.0.1.es.po Removing wiki/src/news/version_2.9.1.es.po Removing wiki/src/news/version_2.7.es.po Removing wiki/src/news/version_2.7.1.es.po Removing wiki/src/news/version_2.6.es.po Removing wiki/src/news/version_2.5.es.po Removing wiki/src/news/version_2.4.es.po Removing wiki/src/news/version_2.3.es.po Removing wiki/src/news/version_2.2.es.po Removing wiki/src/news/version_2.2.1.es.po Removing wiki/src/news/version_2.12.es.po Removing wiki/src/news/version_2.11.es.po Removing wiki/src/news/version_2.10.es.po Removing wiki/src/news/version_2.0.es.po Removing wiki/src/news/version_2.0.1.es.po Removing wiki/src/news/version_1.8.es.po Removing wiki/src/news/version_1.8.2.es.po Removing wiki/src/news/version_1.8.1.es.po Removing wiki/src/news/version_1.7.es.po Removing wiki/src/news/version_1.6.es.po Removing wiki/src/news/version_1.5.es.po Removing wiki/src/news/version_1.5.1.es.po Removing wiki/src/news/version_1.3.es.po Removing wiki/src/news/version_1.3.2.es.po Removing wiki/src/news/version_1.3.1.es.po Removing wiki/src/news/version_1.2.es.po Removing wiki/src/news/version_1.2.3.es.po Removing wiki/src/news/version_1.2.2.es.po Removing wiki/src/news/version_1.2.1.es.po Removing wiki/src/news/version_1.1.es.po Removing wiki/src/news/version_1.1.2.es.po Removing wiki/src/news/version_1.1.1.es.po Removing wiki/src/news/version_1.0.1.es.po Removing wiki/src/news/version_0.22.1.es.po Removing wiki/src/news/version_0.19.es.po Removing wiki/src/news/version_0.18.es.po Removing wiki/src/news/version_0.17.es.po Removing wiki/src/news/version_0.17.1.es.po Removing wiki/src/news/version_0.16.es.po Removing wiki/src/news/version_0.15.es.po Removing wiki/src/news/version_0.14.es.po Removing wiki/src/news/version_0.13.es.po Removing wiki/src/news/version_0.12.1.es.po Removing wiki/src/news/version_0.11.es.po Removing wiki/src/news/version_0.10.es.po Removing wiki/src/news/veracrypt_ux_design.es.po Removing wiki/src/news/usability_testing_2014_05.es.po Removing wiki/src/news/thedaywefightback.es.po Removing wiki/src/news/test_redesigned_Tails_Greeter.es.po Removing wiki/src/news/test_incremental_upgrades.es.po Removing wiki/src/news/test_UEFI.es.po Removing wiki/src/news/tails-testers.es.po Removing wiki/src/news/tails-support.es.po Removing wiki/src/news/summit_2013.es.po Removing wiki/src/news/spoof-mac.es.po Removing wiki/src/news/social_contract.es.po Removing wiki/src/news/signing_key_transition.es.po Removing wiki/src/news/rescue_3.0.1.es.po Removing wiki/src/news/reproducible_Tails.es.po Removing wiki/src/news/report_end_of_2014.es.po Removing wiki/src/news/our_plans_for_2018.es.po Removing wiki/src/news/our_plans_for_2017.es.po Removing wiki/src/news/new_project_name.es.po Removing wiki/src/news/new_SSL_certificate.es.po Removing wiki/src/news/mediapart.es.po Removing wiki/src/news/many_hands_make_tails.es.po Removing wiki/src/news/logo_contest.es.po Removing wiki/src/news/improve_the_infrastructure_behind_Tails.es.po Removing wiki/src/news/fpf_campaign.es.po Removing wiki/src/news/closing_tails-support.es.po Removing wiki/src/news/bounties_2013_report.es.po Removing wiki/src/news/and_the_winner_is.es.po Removing wiki/src/news/amnesia_may_now_work_on_the_Mac.es.po Removing wiki/src/news/additional_software_ux_design.es.po Removing wiki/src/news/Tails_HackFest_2014.es.po Removing wiki/src/news/Tails_3.0_will_require_a_64-bit_processor.es.po Removing wiki/src/news/On_0days_exploits_and_disclosure.es.po Removing wiki/src/news/Mac_and_PC_UEFI_hardware_needed.es.po Removing wiki/src/news/Join_us_at_the_Tails_HackFest_2014.es.po Removing wiki/src/news/IP_leakage_with_Icedove.es.po Removing wiki/src/news/33c3.es.po Removing wiki/src/news.es.po Removing wiki/src/misc/unsafe_browser_warning.es.po Removing wiki/src/install/win/usb/overview.es.po Removing wiki/src/install/win/usb.es.po Removing wiki/src/install/win/usb-overview.es.po Removing wiki/src/install/win/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/win/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/win/clone-overview.es.po left in tree. Removing wiki/src/install/win.es.po Removing wiki/src/install/vm-download.es.po Removing wiki/src/install/os.es.po Removing wiki/src/install/mac/usb/overview.es.po Removing wiki/src/install/mac/usb.es.po Removing wiki/src/install/mac/usb-overview.es.po Removing wiki/src/install/mac/usb-download.es.po Removing wiki/src/install/mac/dvd/overview.es.po Removing wiki/src/install/mac/dvd.es.po CONFLICT (modify/delete): wiki/src/install/mac/dvd-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/dvd-overview.es.po left in tree. Removing wiki/src/install/mac/dvd-download.es.po Removing wiki/src/install/mac/clone.es.po CONFLICT (modify/delete): wiki/src/install/mac/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/clone-overview.es.po left in tree. Removing wiki/src/install/mac.es.po Removing wiki/src/install/linux/usb/overview.es.po Removing wiki/src/install/linux/usb.es.po Removing wiki/src/install/linux/usb-overview.es.po Removing wiki/src/install/linux/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/linux/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/linux/clone-overview.es.po left in tree. Removing wiki/src/install/linux.es.po Removing wiki/src/install/inc/tails-installation-assistant.inline.es.po Removing wiki/src/install/inc/steps/verify_up-to-date.inline.es.po Removing wiki/src/install/inc/steps/restart_second_time.inline.es.po Removing wiki/src/install/inc/steps/restart_first_time.inline.es.po Removing wiki/src/install/inc/steps/not_at_all.inline.es.po Removing wiki/src/install/inc/steps/mac_startup_disks.inline.es.po Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final.inline.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/download.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/download.inline.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/debian_requirements.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/debian_requirements.inline.es.po left in tree. Removing wiki/src/install/inc/steps/create_persistence.inline.es.po Removing wiki/src/install/inc/steps/bittorrent_verification.inline.es.po Removing wiki/src/install/inc/router/why_two.inline.es.po Removing wiki/src/install/inc/router/why_extra.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/router/clone.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/router/clone.es.po left in tree. Removing wiki/src/install/inc/overview/vm.es.po CONFLICT (modify/delete): wiki/src/install/inc/overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/overview.es.po left in tree. Removing wiki/src/install/expert/usb/overview.es.po CONFLICT (modify/delete): wiki/src/install/expert/usb.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/expert/usb.es.po left in tree. Removing wiki/src/install/expert/usb-overview.es.po Removing wiki/src/install/dvd.es.po Removing wiki/src/install/dvd-download.es.po CONFLICT (modify/delete): wiki/src/install/download/openpgp.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/download/openpgp.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/download.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/download.es.po left in tree. Removing wiki/src/install/debian/usb.es.po Removing wiki/src/install/debian/usb-overview.es.po Removing wiki/src/install/debian/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/debian/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian/clone-overview.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/debian.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian.es.po left in tree. Removing wiki/src/install/clone.es.po Removing wiki/src/install.es.po CONFLICT (modify/delete): wiki/src/index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/index.es.po left in tree. Removing wiki/src/home.es.po Removing wiki/src/getting_started.es.po CONFLICT (modify/delete): wiki/src/donate/thanks.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/donate/thanks.es.po left in tree. Removing wiki/src/donate/canceled.es.po Removing wiki/src/donate.es.po CONFLICT (modify/delete): wiki/src/doc/upgrade/error/install.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/upgrade/error/install.es.po left in tree. Removing wiki/src/doc/upgrade/error/download.es.po Removing wiki/src/doc/upgrade/error/check.es.po Removing wiki/src/doc/upgrade/error.es.po Removing wiki/src/doc/sensitive_documents/sound_and_video.es.po Removing wiki/src/doc/sensitive_documents/printing_and_scanning.es.po Removing wiki/src/doc/sensitive_documents/persistence.es.po Removing wiki/src/doc/sensitive_documents/office_suite.es.po Removing wiki/src/doc/sensitive_documents/metadata.es.po Removing wiki/src/doc/sensitive_documents/graphics.es.po Removing wiki/src/doc/sensitive_documents.index.es.po Removing wiki/src/doc/sensitive_documents.es.po Removing wiki/src/doc/introduction.es.po Removing wiki/src/doc/first_steps/upgrade/release_notes.es.po Removing wiki/src/doc/first_steps/upgrade.release_notes.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/upgrade.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/upgrade.es.po left in tree. Removing wiki/src/doc/first_steps/startup_options/offline_mode.es.po Removing wiki/src/doc/first_steps/startup_options/mac_spoofing.es.po Removing wiki/src/doc/first_steps/startup_options/bridge_mode.inline.es.po Removing wiki/src/doc/first_steps/startup_options/bridge_mode.es.po Removing wiki/src/doc/first_steps/startup_options/administration_password.es.po Removing wiki/src/doc/first_steps/startup_options.es.po Removing wiki/src/doc/first_steps/start_tails.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/shutdown.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/shutdown.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/windows.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/windows.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/mac.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/mac.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/linux.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/linux.es.po left in tree. Removing wiki/src/doc/first_steps/reset.intro.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/reset.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/warnings.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/warnings.es.po left in tree. Removing wiki/src/doc/first_steps/persistence/use.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/recover_insecure.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/recover_insecure.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/delete.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/delete.es.po left in tree. Removing wiki/src/doc/first_steps/persistence/copy.es.po Removing wiki/src/doc/first_steps/persistence/configure.es.po Removing wiki/src/doc/first_steps/persistence/check_file_system.es.po Removing wiki/src/doc/first_steps/persistence/change_passphrase.es.po Removing wiki/src/doc/first_steps/persistence.es.po Removing wiki/src/doc/first_steps/persistence.caution.es.po Removing wiki/src/doc/first_steps/media.es.po Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po Removing wiki/src/doc/first_steps/bug_reporting.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/accessibility.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/accessibility.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps.index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps.index.es.po left in tree. Removing wiki/src/doc/first_steps.es.po Removing wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.es.po Removing wiki/src/doc/encryption_and_privacy/virtual_keyboard.es.po Removing wiki/src/doc/encryption_and_privacy/truecrypt.es.po Removing wiki/src/doc/encryption_and_privacy/secure_deletion.es.po Removing wiki/src/doc/encryption_and_privacy/manage_passwords.es.po Removing wiki/src/doc/encryption_and_privacy/keyringer.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet.warning.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet.es.po Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes.es.po Removing wiki/src/doc/encryption_and_privacy/checksums.es.po Removing wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.es.po Removing wiki/src/doc/encryption_and_privacy.index.es.po Removing wiki/src/doc/encryption_and_privacy.es.po Removing wiki/src/doc/anonymous_internet/why_tor_is_slow.es.po Removing wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.es.po Removing wiki/src/doc/anonymous_internet/unsafe_browser.es.po Removing wiki/src/doc/anonymous_internet/tor_status.es.po Removing wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.es.po Removing wiki/src/doc/anonymous_internet/thunderbird.es.po Removing wiki/src/doc/anonymous_internet/pidgin.es.po CONFLICT (modify/delete): wiki/src/doc/anonymous_internet/onionshare.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/anonymous_internet/onionshare.es.po left in tree. Removing wiki/src/doc/anonymous_internet/networkmanager.es.po Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.es.po Removing wiki/src/doc/anonymous_internet/icedove/name.inline.es.po Removing wiki/src/doc/anonymous_internet/icedove/account_creation.inline.es.po Removing wiki/src/doc/anonymous_internet/electrum.es.po Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove.es.po Removing wiki/src/doc/anonymous_internet/Tor_Browser.es.po Removing wiki/src/doc/anonymous_internet.index.es.po Removing wiki/src/doc/anonymous_internet.es.po Removing wiki/src/doc/advanced_topics/wireless_devices.es.po Removing wiki/src/doc/advanced_topics/virtualization/virtualbox.es.po Removing wiki/src/doc/advanced_topics/virtualization/virt-manager.es.po Removing wiki/src/doc/advanced_topics/virtualization/boxes.es.po Removing wiki/src/doc/advanced_topics/virtualization.es.po Removing wiki/src/doc/advanced_topics/virtualization.caution.es.po Removing wiki/src/doc/advanced_topics/paperkey.es.po Removing wiki/src/doc/advanced_topics/lan.es.po Removing wiki/src/doc/advanced_topics/cold_boot_attacks.es.po Removing wiki/src/doc/advanced_topics/additional_software.es.po CONFLICT (modify/delete): wiki/src/doc/advanced_topics.index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/advanced_topics.index.es.po left in tree. Removing wiki/src/doc/advanced_topics.es.po Removing wiki/src/doc/about/warning.es.po Removing wiki/src/doc/about/trust.es.po Removing wiki/src/doc/about/tor.es.po Removing wiki/src/doc/about/requirements.es.po Removing wiki/src/doc/about/openpgp_keys/signing_key_revocation.es.po Removing wiki/src/doc/about/openpgp_keys.es.po Removing wiki/src/doc/about/license.es.po Removing wiki/src/doc/about/fingerprint.es.po CONFLICT (modify/delete): wiki/src/doc/about/finances.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/finances.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/about/features.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/features.es.po left in tree. Removing wiki/src/doc/about/acknowledgments_and_similar_projects.es.po Removing wiki/src/doc/about.index.es.po Removing wiki/src/doc/about.es.po CONFLICT (modify/delete): wiki/src/doc.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc.es.po left in tree. Removing wiki/src/contribute/how/donate.es.po Removing wiki/src/contribute.es.po Removing wiki/src/bugs.es.po Removing wiki/src/about/contact.es.po Removing wiki/src/about.es.po Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Repository merge failed |
Removing wiki/src/upgrade/tails.es.po Removing wiki/src/upgrade/tails-overview.es.po CONFLICT (modify/delete): wiki/src/upgrade/tails-download.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/upgrade/tails-download.es.po left in tree. Removing wiki/src/upgrade/clone.es.po CONFLICT (modify/delete): wiki/src/upgrade/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/upgrade/clone-overview.es.po left in tree. Removing wiki/src/upgrade.es.po Removing wiki/src/torrents.es.po Removing wiki/src/support/talk/languages.inline.es.po Removing wiki/src/support/talk.es.po Removing wiki/src/support/learn/intro.inline.es.po Removing wiki/src/support/learn.es.po Removing wiki/src/support/known_issues.es.po Removing wiki/src/support/faq.es.po CONFLICT (modify/delete): wiki/src/support/chat.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/support/chat.es.po left in tree. Removing wiki/src/support.es.po CONFLICT (modify/delete): wiki/src/sidebar.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/sidebar.es.po left in tree. Removing wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.es.po Removing wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.es.po Removing wiki/src/security/ineffective_firewall-level_Tor_enforcement.es.po Removing wiki/src/security/claws_mail_leaks_plaintext_to_imap.es.po Removing wiki/src/security/Upgrade_Tor.es.po Removing wiki/src/security/Security_hole_in_I2P_0.9.13.es.po Removing wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.es.po Removing wiki/src/security/Numerous_security_holes_in_3.4.es.po Removing wiki/src/security/Numerous_security_holes_in_3.3.es.po Removing wiki/src/security/Numerous_security_holes_in_3.2.es.po Removing wiki/src/security/Numerous_security_holes_in_3.1.es.po Removing wiki/src/security/Numerous_security_holes_in_3.0.es.po Removing wiki/src/security/Numerous_security_holes_in_3.0.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.9.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.7.es.po Removing wiki/src/security/Numerous_security_holes_in_2.7.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.6.es.po Removing wiki/src/security/Numerous_security_holes_in_2.5.es.po Removing wiki/src/security/Numerous_security_holes_in_2.4.es.po Removing wiki/src/security/Numerous_security_holes_in_2.3.es.po Removing wiki/src/security/Numerous_security_holes_in_2.2.es.po Removing wiki/src/security/Numerous_security_holes_in_2.2.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.12.es.po Removing wiki/src/security/Numerous_security_holes_in_2.11.es.po Removing wiki/src/security/Numerous_security_holes_in_2.10.es.po Removing wiki/src/security/Numerous_security_holes_in_2.0.es.po Removing wiki/src/security/Numerous_security_holes_in_2.0.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.7.es.po Removing wiki/src/security/Numerous_security_holes_in_1.6.es.po Removing wiki/src/security/Numerous_security_holes_in_1.5.es.po Removing wiki/src/security/Numerous_security_holes_in_1.5.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.4.es.po Removing wiki/src/security/Numerous_security_holes_in_1.4.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.3.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.0.es.po Removing wiki/src/security/Numerous_security_holes_in_1.0.1.es.po Removing wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.es.po Removing wiki/src/security/IP_address_leak_with_icedove.es.po Removing wiki/src/security.es.po CONFLICT (modify/delete): wiki/src/press.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/press.es.po left in tree. Removing wiki/src/partners.es.po Removing wiki/src/news/windows_camouflage_jessie.es.po Removing wiki/src/news/why_we_need_donations.es.po Removing wiki/src/news/who_are_you_helping.es.po Removing wiki/src/news/what_we_do_with_your_money.es.po Removing wiki/src/news/what_we_accomplished_in_2017.es.po Removing wiki/src/news/version_3.5.es.po Removing wiki/src/news/version_3.4.es.po Removing wiki/src/news/version_3.3.es.po Removing wiki/src/news/version_3.2.es.po Removing wiki/src/news/version_3.1.es.po Removing wiki/src/news/version_3.0.es.po Removing wiki/src/news/version_3.0.1.es.po Removing wiki/src/news/version_2.9.1.es.po Removing wiki/src/news/version_2.7.es.po Removing wiki/src/news/version_2.7.1.es.po Removing wiki/src/news/version_2.6.es.po Removing wiki/src/news/version_2.5.es.po Removing wiki/src/news/version_2.4.es.po Removing wiki/src/news/version_2.3.es.po Removing wiki/src/news/version_2.2.es.po Removing wiki/src/news/version_2.2.1.es.po Removing wiki/src/news/version_2.12.es.po Removing wiki/src/news/version_2.11.es.po Removing wiki/src/news/version_2.10.es.po Removing wiki/src/news/version_2.0.es.po Removing wiki/src/news/version_2.0.1.es.po Removing wiki/src/news/version_1.8.es.po Removing wiki/src/news/version_1.8.2.es.po Removing wiki/src/news/version_1.8.1.es.po Removing wiki/src/news/version_1.7.es.po Removing wiki/src/news/version_1.6.es.po Removing wiki/src/news/version_1.5.es.po Removing wiki/src/news/version_1.5.1.es.po Removing wiki/src/news/version_1.3.es.po Removing wiki/src/news/version_1.3.2.es.po Removing wiki/src/news/version_1.3.1.es.po Removing wiki/src/news/version_1.2.es.po Removing wiki/src/news/version_1.2.3.es.po Removing wiki/src/news/version_1.2.2.es.po Removing wiki/src/news/version_1.2.1.es.po Removing wiki/src/news/version_1.1.es.po Removing wiki/src/news/version_1.1.2.es.po Removing wiki/src/news/version_1.1.1.es.po Removing wiki/src/news/version_1.0.1.es.po Removing wiki/src/news/version_0.22.1.es.po Removing wiki/src/news/version_0.19.es.po Removing wiki/src/news/version_0.18.es.po Removing wiki/src/news/version_0.17.es.po Removing wiki/src/news/version_0.17.1.es.po Removing wiki/src/news/version_0.16.es.po Removing wiki/src/news/version_0.15.es.po Removing wiki/src/news/version_0.14.es.po Removing wiki/src/news/version_0.13.es.po Removing wiki/src/news/version_0.12.1.es.po Removing wiki/src/news/version_0.11.es.po Removing wiki/src/news/version_0.10.es.po Removing wiki/src/news/veracrypt_ux_design.es.po Removing wiki/src/news/usability_testing_2014_05.es.po Removing wiki/src/news/thedaywefightback.es.po Removing wiki/src/news/test_redesigned_Tails_Greeter.es.po Removing wiki/src/news/test_incremental_upgrades.es.po Removing wiki/src/news/test_UEFI.es.po Removing wiki/src/news/tails-testers.es.po Removing wiki/src/news/tails-support.es.po Removing wiki/src/news/summit_2013.es.po Removing wiki/src/news/spoof-mac.es.po Removing wiki/src/news/social_contract.es.po Removing wiki/src/news/signing_key_transition.es.po Removing wiki/src/news/rescue_3.0.1.es.po Removing wiki/src/news/reproducible_Tails.es.po Removing wiki/src/news/report_end_of_2014.es.po Removing wiki/src/news/our_plans_for_2018.es.po Removing wiki/src/news/our_plans_for_2017.es.po Removing wiki/src/news/new_project_name.es.po Removing wiki/src/news/new_SSL_certificate.es.po Removing wiki/src/news/mediapart.es.po Removing wiki/src/news/many_hands_make_tails.es.po Removing wiki/src/news/logo_contest.es.po Removing wiki/src/news/improve_the_infrastructure_behind_Tails.es.po Removing wiki/src/news/fpf_campaign.es.po Removing wiki/src/news/closing_tails-support.es.po Removing wiki/src/news/bounties_2013_report.es.po Removing wiki/src/news/and_the_winner_is.es.po Removing wiki/src/news/amnesia_may_now_work_on_the_Mac.es.po Removing wiki/src/news/additional_software_ux_design.es.po Removing wiki/src/news/Tails_HackFest_2014.es.po Removing wiki/src/news/Tails_3.0_will_require_a_64-bit_processor.es.po Removing wiki/src/news/On_0days_exploits_and_disclosure.es.po Removing wiki/src/news/Mac_and_PC_UEFI_hardware_needed.es.po Removing wiki/src/news/Join_us_at_the_Tails_HackFest_2014.es.po Removing wiki/src/news/IP_leakage_with_Icedove.es.po Removing wiki/src/news/33c3.es.po Removing wiki/src/news.es.po Removing wiki/src/misc/unsafe_browser_warning.es.po Removing wiki/src/install/win/usb/overview.es.po Removing wiki/src/install/win/usb.es.po Removing wiki/src/install/win/usb-overview.es.po Removing wiki/src/install/win/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/win/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/win/clone-overview.es.po left in tree. Removing wiki/src/install/win.es.po Removing wiki/src/install/vm-download.es.po Removing wiki/src/install/os.es.po Removing wiki/src/install/mac/usb/overview.es.po Removing wiki/src/install/mac/usb.es.po Removing wiki/src/install/mac/usb-overview.es.po Removing wiki/src/install/mac/usb-download.es.po Removing wiki/src/install/mac/dvd/overview.es.po Removing wiki/src/install/mac/dvd.es.po CONFLICT (modify/delete): wiki/src/install/mac/dvd-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/dvd-overview.es.po left in tree. Removing wiki/src/install/mac/dvd-download.es.po Removing wiki/src/install/mac/clone.es.po CONFLICT (modify/delete): wiki/src/install/mac/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/clone-overview.es.po left in tree. Removing wiki/src/install/mac.es.po Removing wiki/src/install/linux/usb/overview.es.po Removing wiki/src/install/linux/usb.es.po Removing wiki/src/install/linux/usb-overview.es.po Removing wiki/src/install/linux/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/linux/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/linux/clone-overview.es.po left in tree. Removing wiki/src/install/linux.es.po Removing wiki/src/install/inc/tails-installation-assistant.inline.es.po Removing wiki/src/install/inc/steps/verify_up-to-date.inline.es.po Removing wiki/src/install/inc/steps/restart_second_time.inline.es.po Removing wiki/src/install/inc/steps/restart_first_time.inline.es.po Removing wiki/src/install/inc/steps/not_at_all.inline.es.po Removing wiki/src/install/inc/steps/mac_startup_disks.inline.es.po Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final.inline.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/download.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/download.inline.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/debian_requirements.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/debian_requirements.inline.es.po left in tree. Removing wiki/src/install/inc/steps/create_persistence.inline.es.po Removing wiki/src/install/inc/steps/bittorrent_verification.inline.es.po Removing wiki/src/install/inc/router/why_two.inline.es.po Removing wiki/src/install/inc/router/why_extra.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/router/clone.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/router/clone.es.po left in tree. Removing wiki/src/install/inc/overview/vm.es.po CONFLICT (modify/delete): wiki/src/install/inc/overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/overview.es.po left in tree. Removing wiki/src/install/expert/usb/overview.es.po CONFLICT (modify/delete): wiki/src/install/expert/usb.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/expert/usb.es.po left in tree. Removing wiki/src/install/expert/usb-overview.es.po Removing wiki/src/install/dvd.es.po Removing wiki/src/install/dvd-download.es.po CONFLICT (modify/delete): wiki/src/install/download/openpgp.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/download/openpgp.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/download.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/download.es.po left in tree. Removing wiki/src/install/debian/usb.es.po Removing wiki/src/install/debian/usb-overview.es.po Removing wiki/src/install/debian/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/debian/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian/clone-overview.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/debian.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian.es.po left in tree. Removing wiki/src/install/clone.es.po Removing wiki/src/install.es.po CONFLICT (modify/delete): wiki/src/index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/index.es.po left in tree. Removing wiki/src/home.es.po Removing wiki/src/getting_started.es.po CONFLICT (modify/delete): wiki/src/donate/thanks.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/donate/thanks.es.po left in tree. Removing wiki/src/donate/canceled.es.po Removing wiki/src/donate.es.po CONFLICT (modify/delete): wiki/src/doc/upgrade/error/install.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/upgrade/error/install.es.po left in tree. Removing wiki/src/doc/upgrade/error/download.es.po Removing wiki/src/doc/upgrade/error/check.es.po Removing wiki/src/doc/upgrade/error.es.po Removing wiki/src/doc/sensitive_documents/sound_and_video.es.po Removing wiki/src/doc/sensitive_documents/printing_and_scanning.es.po Removing wiki/src/doc/sensitive_documents/persistence.es.po Removing wiki/src/doc/sensitive_documents/office_suite.es.po Removing wiki/src/doc/sensitive_documents/metadata.es.po Removing wiki/src/doc/sensitive_documents/graphics.es.po Removing wiki/src/doc/sensitive_documents.index.es.po Removing wiki/src/doc/sensitive_documents.es.po Removing wiki/src/doc/introduction.es.po Removing wiki/src/doc/first_steps/upgrade/release_notes.es.po Removing wiki/src/doc/first_steps/upgrade.release_notes.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/upgrade.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/upgrade.es.po left in tree. Removing wiki/src/doc/first_steps/startup_options/offline_mode.es.po Removing wiki/src/doc/first_steps/startup_options/mac_spoofing.es.po Removing wiki/src/doc/first_steps/startup_options/bridge_mode.inline.es.po Removing wiki/src/doc/first_steps/startup_options/bridge_mode.es.po Removing wiki/src/doc/first_steps/startup_options/administration_password.es.po Removing wiki/src/doc/first_steps/startup_options.es.po Removing wiki/src/doc/first_steps/start_tails.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/shutdown.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/shutdown.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/windows.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/windows.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/mac.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/mac.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/linux.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/linux.es.po left in tree. Removing wiki/src/doc/first_steps/reset.intro.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/reset.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/warnings.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/warnings.es.po left in tree. Removing wiki/src/doc/first_steps/persistence/use.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/recover_insecure.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/recover_insecure.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/delete.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/delete.es.po left in tree. Removing wiki/src/doc/first_steps/persistence/copy.es.po Removing wiki/src/doc/first_steps/persistence/configure.es.po Removing wiki/src/doc/first_steps/persistence/check_file_system.es.po Removing wiki/src/doc/first_steps/persistence/change_passphrase.es.po Removing wiki/src/doc/first_steps/persistence.es.po Removing wiki/src/doc/first_steps/persistence.caution.es.po Removing wiki/src/doc/first_steps/media.es.po Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po Removing wiki/src/doc/first_steps/bug_reporting.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/accessibility.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/accessibility.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps.index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps.index.es.po left in tree. Removing wiki/src/doc/first_steps.es.po Removing wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.es.po Removing wiki/src/doc/encryption_and_privacy/virtual_keyboard.es.po Removing wiki/src/doc/encryption_and_privacy/truecrypt.es.po Removing wiki/src/doc/encryption_and_privacy/secure_deletion.es.po Removing wiki/src/doc/encryption_and_privacy/manage_passwords.es.po Removing wiki/src/doc/encryption_and_privacy/keyringer.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet.warning.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet.es.po Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes.es.po Removing wiki/src/doc/encryption_and_privacy/checksums.es.po Removing wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.es.po Removing wiki/src/doc/encryption_and_privacy.index.es.po Removing wiki/src/doc/encryption_and_privacy.es.po Removing wiki/src/doc/anonymous_internet/why_tor_is_slow.es.po Removing wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.es.po Removing wiki/src/doc/anonymous_internet/unsafe_browser.es.po Removing wiki/src/doc/anonymous_internet/tor_status.es.po Removing wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.es.po Removing wiki/src/doc/anonymous_internet/thunderbird.es.po Removing wiki/src/doc/anonymous_internet/pidgin.es.po CONFLICT (modify/delete): wiki/src/doc/anonymous_internet/onionshare.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/anonymous_internet/onionshare.es.po left in tree. Removing wiki/src/doc/anonymous_internet/networkmanager.es.po Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.es.po Removing wiki/src/doc/anonymous_internet/icedove/name.inline.es.po Removing wiki/src/doc/anonymous_internet/icedove/account_creation.inline.es.po Removing wiki/src/doc/anonymous_internet/electrum.es.po Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove.es.po Removing wiki/src/doc/anonymous_internet/Tor_Browser.es.po Removing wiki/src/doc/anonymous_internet.index.es.po Removing wiki/src/doc/anonymous_internet.es.po Removing wiki/src/doc/advanced_topics/wireless_devices.es.po Removing wiki/src/doc/advanced_topics/virtualization/virtualbox.es.po Removing wiki/src/doc/advanced_topics/virtualization/virt-manager.es.po Removing wiki/src/doc/advanced_topics/virtualization/boxes.es.po Removing wiki/src/doc/advanced_topics/virtualization.es.po Removing wiki/src/doc/advanced_topics/virtualization.caution.es.po Removing wiki/src/doc/advanced_topics/paperkey.es.po Removing wiki/src/doc/advanced_topics/lan.es.po Removing wiki/src/doc/advanced_topics/cold_boot_attacks.es.po Removing wiki/src/doc/advanced_topics/additional_software.es.po CONFLICT (modify/delete): wiki/src/doc/advanced_topics.index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/advanced_topics.index.es.po left in tree. Removing wiki/src/doc/advanced_topics.es.po Removing wiki/src/doc/about/warning.es.po Removing wiki/src/doc/about/trust.es.po Removing wiki/src/doc/about/tor.es.po Removing wiki/src/doc/about/requirements.es.po Removing wiki/src/doc/about/openpgp_keys/signing_key_revocation.es.po Removing wiki/src/doc/about/openpgp_keys.es.po Removing wiki/src/doc/about/license.es.po Removing wiki/src/doc/about/fingerprint.es.po CONFLICT (modify/delete): wiki/src/doc/about/finances.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/finances.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/about/features.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/features.es.po left in tree. Removing wiki/src/doc/about/acknowledgments_and_similar_projects.es.po Removing wiki/src/doc/about.index.es.po Removing wiki/src/doc/about.es.po CONFLICT (modify/delete): wiki/src/doc.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc.es.po left in tree. Removing wiki/src/contribute/how/donate.es.po Removing wiki/src/contribute.es.po Removing wiki/src/bugs.es.po Removing wiki/src/about/contact.es.po Removing wiki/src/about.es.po Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Translation completed |
Translation completed
7 years ago
|
admin
Repository merge failed |
Removing wiki/src/upgrade/tails.es.po Removing wiki/src/upgrade/tails-overview.es.po CONFLICT (modify/delete): wiki/src/upgrade/tails-download.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/upgrade/tails-download.es.po left in tree. Removing wiki/src/upgrade/clone.es.po CONFLICT (modify/delete): wiki/src/upgrade/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/upgrade/clone-overview.es.po left in tree. Removing wiki/src/upgrade.es.po Removing wiki/src/torrents.es.po Removing wiki/src/support/talk/languages.inline.es.po Removing wiki/src/support/talk.es.po Removing wiki/src/support/learn/intro.inline.es.po Removing wiki/src/support/learn.es.po Removing wiki/src/support/known_issues.es.po Removing wiki/src/support/faq.es.po CONFLICT (modify/delete): wiki/src/support/chat.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/support/chat.es.po left in tree. Removing wiki/src/support.es.po CONFLICT (modify/delete): wiki/src/sidebar.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/sidebar.es.po left in tree. Removing wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.es.po Removing wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.es.po Removing wiki/src/security/ineffective_firewall-level_Tor_enforcement.es.po Removing wiki/src/security/claws_mail_leaks_plaintext_to_imap.es.po Removing wiki/src/security/Upgrade_Tor.es.po Removing wiki/src/security/Security_hole_in_I2P_0.9.13.es.po Removing wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.es.po Removing wiki/src/security/Numerous_security_holes_in_3.4.es.po Removing wiki/src/security/Numerous_security_holes_in_3.3.es.po Removing wiki/src/security/Numerous_security_holes_in_3.2.es.po Removing wiki/src/security/Numerous_security_holes_in_3.1.es.po Removing wiki/src/security/Numerous_security_holes_in_3.0.es.po Removing wiki/src/security/Numerous_security_holes_in_3.0.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.9.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.7.es.po Removing wiki/src/security/Numerous_security_holes_in_2.7.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.6.es.po Removing wiki/src/security/Numerous_security_holes_in_2.5.es.po Removing wiki/src/security/Numerous_security_holes_in_2.4.es.po Removing wiki/src/security/Numerous_security_holes_in_2.3.es.po Removing wiki/src/security/Numerous_security_holes_in_2.2.es.po Removing wiki/src/security/Numerous_security_holes_in_2.2.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.12.es.po Removing wiki/src/security/Numerous_security_holes_in_2.11.es.po Removing wiki/src/security/Numerous_security_holes_in_2.10.es.po Removing wiki/src/security/Numerous_security_holes_in_2.0.es.po Removing wiki/src/security/Numerous_security_holes_in_2.0.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.7.es.po Removing wiki/src/security/Numerous_security_holes_in_1.6.es.po Removing wiki/src/security/Numerous_security_holes_in_1.5.es.po Removing wiki/src/security/Numerous_security_holes_in_1.5.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.4.es.po Removing wiki/src/security/Numerous_security_holes_in_1.4.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.3.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.0.es.po Removing wiki/src/security/Numerous_security_holes_in_1.0.1.es.po Removing wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.es.po Removing wiki/src/security/IP_address_leak_with_icedove.es.po Removing wiki/src/security.es.po CONFLICT (modify/delete): wiki/src/press.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/press.es.po left in tree. Removing wiki/src/partners.es.po Removing wiki/src/news/windows_camouflage_jessie.es.po Removing wiki/src/news/why_we_need_donations.es.po Removing wiki/src/news/who_are_you_helping.es.po Removing wiki/src/news/what_we_do_with_your_money.es.po Removing wiki/src/news/what_we_accomplished_in_2017.es.po Removing wiki/src/news/version_3.5.es.po Removing wiki/src/news/version_3.4.es.po Removing wiki/src/news/version_3.3.es.po Removing wiki/src/news/version_3.2.es.po Removing wiki/src/news/version_3.1.es.po Removing wiki/src/news/version_3.0.es.po Removing wiki/src/news/version_3.0.1.es.po Removing wiki/src/news/version_2.9.1.es.po Removing wiki/src/news/version_2.7.es.po Removing wiki/src/news/version_2.7.1.es.po Removing wiki/src/news/version_2.6.es.po Removing wiki/src/news/version_2.5.es.po Removing wiki/src/news/version_2.4.es.po Removing wiki/src/news/version_2.3.es.po Removing wiki/src/news/version_2.2.es.po Removing wiki/src/news/version_2.2.1.es.po Removing wiki/src/news/version_2.12.es.po Removing wiki/src/news/version_2.11.es.po Removing wiki/src/news/version_2.10.es.po Removing wiki/src/news/version_2.0.es.po Removing wiki/src/news/version_2.0.1.es.po Removing wiki/src/news/version_1.8.es.po Removing wiki/src/news/version_1.8.2.es.po Removing wiki/src/news/version_1.8.1.es.po Removing wiki/src/news/version_1.7.es.po Removing wiki/src/news/version_1.6.es.po Removing wiki/src/news/version_1.5.es.po Removing wiki/src/news/version_1.5.1.es.po Removing wiki/src/news/version_1.3.es.po Removing wiki/src/news/version_1.3.2.es.po Removing wiki/src/news/version_1.3.1.es.po Removing wiki/src/news/version_1.2.es.po Removing wiki/src/news/version_1.2.3.es.po Removing wiki/src/news/version_1.2.2.es.po Removing wiki/src/news/version_1.2.1.es.po Removing wiki/src/news/version_1.1.es.po Removing wiki/src/news/version_1.1.2.es.po Removing wiki/src/news/version_1.1.1.es.po Removing wiki/src/news/version_1.0.1.es.po Removing wiki/src/news/version_0.22.1.es.po Removing wiki/src/news/version_0.19.es.po Removing wiki/src/news/version_0.18.es.po Removing wiki/src/news/version_0.17.es.po Removing wiki/src/news/version_0.17.1.es.po Removing wiki/src/news/version_0.16.es.po Removing wiki/src/news/version_0.15.es.po Removing wiki/src/news/version_0.14.es.po Removing wiki/src/news/version_0.13.es.po Removing wiki/src/news/version_0.12.1.es.po Removing wiki/src/news/version_0.11.es.po Removing wiki/src/news/version_0.10.es.po Removing wiki/src/news/veracrypt_ux_design.es.po Removing wiki/src/news/usability_testing_2014_05.es.po Removing wiki/src/news/thedaywefightback.es.po Removing wiki/src/news/test_redesigned_Tails_Greeter.es.po Removing wiki/src/news/test_incremental_upgrades.es.po Removing wiki/src/news/test_UEFI.es.po Removing wiki/src/news/tails-testers.es.po Removing wiki/src/news/tails-support.es.po Removing wiki/src/news/summit_2013.es.po Removing wiki/src/news/spoof-mac.es.po Removing wiki/src/news/social_contract.es.po Removing wiki/src/news/signing_key_transition.es.po Removing wiki/src/news/rescue_3.0.1.es.po Removing wiki/src/news/reproducible_Tails.es.po Removing wiki/src/news/report_end_of_2014.es.po Removing wiki/src/news/our_plans_for_2018.es.po Removing wiki/src/news/our_plans_for_2017.es.po Removing wiki/src/news/new_project_name.es.po Removing wiki/src/news/new_SSL_certificate.es.po Removing wiki/src/news/mediapart.es.po Removing wiki/src/news/many_hands_make_tails.es.po Removing wiki/src/news/logo_contest.es.po Removing wiki/src/news/improve_the_infrastructure_behind_Tails.es.po Removing wiki/src/news/fpf_campaign.es.po Removing wiki/src/news/closing_tails-support.es.po Removing wiki/src/news/bounties_2013_report.es.po Removing wiki/src/news/and_the_winner_is.es.po Removing wiki/src/news/amnesia_may_now_work_on_the_Mac.es.po Removing wiki/src/news/additional_software_ux_design.es.po Removing wiki/src/news/Tails_HackFest_2014.es.po Removing wiki/src/news/Tails_3.0_will_require_a_64-bit_processor.es.po Removing wiki/src/news/On_0days_exploits_and_disclosure.es.po Removing wiki/src/news/Mac_and_PC_UEFI_hardware_needed.es.po Removing wiki/src/news/Join_us_at_the_Tails_HackFest_2014.es.po Removing wiki/src/news/IP_leakage_with_Icedove.es.po Removing wiki/src/news/33c3.es.po Removing wiki/src/news.es.po Removing wiki/src/misc/unsafe_browser_warning.es.po Removing wiki/src/install/win/usb/overview.es.po Removing wiki/src/install/win/usb.es.po Removing wiki/src/install/win/usb-overview.es.po Removing wiki/src/install/win/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/win/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/win/clone-overview.es.po left in tree. Removing wiki/src/install/win.es.po Removing wiki/src/install/vm-download.es.po Removing wiki/src/install/os.es.po Removing wiki/src/install/mac/usb/overview.es.po Removing wiki/src/install/mac/usb.es.po Removing wiki/src/install/mac/usb-overview.es.po Removing wiki/src/install/mac/usb-download.es.po Removing wiki/src/install/mac/dvd/overview.es.po Removing wiki/src/install/mac/dvd.es.po CONFLICT (modify/delete): wiki/src/install/mac/dvd-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/dvd-overview.es.po left in tree. Removing wiki/src/install/mac/dvd-download.es.po Removing wiki/src/install/mac/clone.es.po CONFLICT (modify/delete): wiki/src/install/mac/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/clone-overview.es.po left in tree. Removing wiki/src/install/mac.es.po Removing wiki/src/install/linux/usb/overview.es.po Removing wiki/src/install/linux/usb.es.po Removing wiki/src/install/linux/usb-overview.es.po Removing wiki/src/install/linux/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/linux/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/linux/clone-overview.es.po left in tree. Removing wiki/src/install/linux.es.po Removing wiki/src/install/inc/tails-installation-assistant.inline.es.po Removing wiki/src/install/inc/steps/verify_up-to-date.inline.es.po Removing wiki/src/install/inc/steps/restart_second_time.inline.es.po Removing wiki/src/install/inc/steps/restart_first_time.inline.es.po Removing wiki/src/install/inc/steps/not_at_all.inline.es.po Removing wiki/src/install/inc/steps/mac_startup_disks.inline.es.po Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final.inline.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/download.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/download.inline.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/debian_requirements.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/debian_requirements.inline.es.po left in tree. Removing wiki/src/install/inc/steps/create_persistence.inline.es.po Removing wiki/src/install/inc/steps/bittorrent_verification.inline.es.po Removing wiki/src/install/inc/router/why_two.inline.es.po Removing wiki/src/install/inc/router/why_extra.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/router/clone.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/router/clone.es.po left in tree. Removing wiki/src/install/inc/overview/vm.es.po CONFLICT (modify/delete): wiki/src/install/inc/overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/overview.es.po left in tree. Removing wiki/src/install/expert/usb/overview.es.po CONFLICT (modify/delete): wiki/src/install/expert/usb.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/expert/usb.es.po left in tree. Removing wiki/src/install/expert/usb-overview.es.po Removing wiki/src/install/dvd.es.po Removing wiki/src/install/dvd-download.es.po CONFLICT (modify/delete): wiki/src/install/download/openpgp.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/download/openpgp.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/download.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/download.es.po left in tree. Removing wiki/src/install/debian/usb.es.po Removing wiki/src/install/debian/usb-overview.es.po Removing wiki/src/install/debian/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/debian/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian/clone-overview.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/debian.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian.es.po left in tree. Removing wiki/src/install/clone.es.po Removing wiki/src/install.es.po CONFLICT (modify/delete): wiki/src/index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/index.es.po left in tree. Removing wiki/src/home.es.po Removing wiki/src/getting_started.es.po CONFLICT (modify/delete): wiki/src/donate/thanks.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/donate/thanks.es.po left in tree. Removing wiki/src/donate/canceled.es.po Removing wiki/src/donate.es.po CONFLICT (modify/delete): wiki/src/doc/upgrade/error/install.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/upgrade/error/install.es.po left in tree. Removing wiki/src/doc/upgrade/error/download.es.po Removing wiki/src/doc/upgrade/error/check.es.po Removing wiki/src/doc/upgrade/error.es.po Removing wiki/src/doc/sensitive_documents/sound_and_video.es.po Removing wiki/src/doc/sensitive_documents/printing_and_scanning.es.po Removing wiki/src/doc/sensitive_documents/persistence.es.po Removing wiki/src/doc/sensitive_documents/office_suite.es.po Removing wiki/src/doc/sensitive_documents/metadata.es.po Removing wiki/src/doc/sensitive_documents/graphics.es.po Removing wiki/src/doc/sensitive_documents.index.es.po Removing wiki/src/doc/sensitive_documents.es.po Removing wiki/src/doc/introduction.es.po Removing wiki/src/doc/first_steps/upgrade/release_notes.es.po Removing wiki/src/doc/first_steps/upgrade.release_notes.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/upgrade.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/upgrade.es.po left in tree. Removing wiki/src/doc/first_steps/startup_options/offline_mode.es.po Removing wiki/src/doc/first_steps/startup_options/mac_spoofing.es.po Removing wiki/src/doc/first_steps/startup_options/bridge_mode.inline.es.po Removing wiki/src/doc/first_steps/startup_options/bridge_mode.es.po Removing wiki/src/doc/first_steps/startup_options/administration_password.es.po Removing wiki/src/doc/first_steps/startup_options.es.po Removing wiki/src/doc/first_steps/start_tails.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/shutdown.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/shutdown.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/windows.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/windows.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/mac.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/mac.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/linux.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/linux.es.po left in tree. Removing wiki/src/doc/first_steps/reset.intro.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/reset.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/warnings.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/warnings.es.po left in tree. Removing wiki/src/doc/first_steps/persistence/use.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/recover_insecure.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/recover_insecure.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/delete.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/delete.es.po left in tree. Removing wiki/src/doc/first_steps/persistence/copy.es.po Removing wiki/src/doc/first_steps/persistence/configure.es.po Removing wiki/src/doc/first_steps/persistence/check_file_system.es.po Removing wiki/src/doc/first_steps/persistence/change_passphrase.es.po Removing wiki/src/doc/first_steps/persistence.es.po Removing wiki/src/doc/first_steps/persistence.caution.es.po Removing wiki/src/doc/first_steps/media.es.po Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po Removing wiki/src/doc/first_steps/bug_reporting.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/accessibility.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/accessibility.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps.index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps.index.es.po left in tree. Removing wiki/src/doc/first_steps.es.po Removing wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.es.po Removing wiki/src/doc/encryption_and_privacy/virtual_keyboard.es.po Removing wiki/src/doc/encryption_and_privacy/truecrypt.es.po Removing wiki/src/doc/encryption_and_privacy/secure_deletion.es.po Removing wiki/src/doc/encryption_and_privacy/manage_passwords.es.po Removing wiki/src/doc/encryption_and_privacy/keyringer.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet.warning.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet.es.po Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes.es.po Removing wiki/src/doc/encryption_and_privacy/checksums.es.po Removing wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.es.po Removing wiki/src/doc/encryption_and_privacy.index.es.po Removing wiki/src/doc/encryption_and_privacy.es.po Removing wiki/src/doc/anonymous_internet/why_tor_is_slow.es.po Removing wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.es.po Removing wiki/src/doc/anonymous_internet/unsafe_browser.es.po Removing wiki/src/doc/anonymous_internet/tor_status.es.po Removing wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.es.po Removing wiki/src/doc/anonymous_internet/thunderbird.es.po Removing wiki/src/doc/anonymous_internet/pidgin.es.po CONFLICT (modify/delete): wiki/src/doc/anonymous_internet/onionshare.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/anonymous_internet/onionshare.es.po left in tree. Removing wiki/src/doc/anonymous_internet/networkmanager.es.po Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.es.po Removing wiki/src/doc/anonymous_internet/icedove/name.inline.es.po Removing wiki/src/doc/anonymous_internet/icedove/account_creation.inline.es.po Removing wiki/src/doc/anonymous_internet/electrum.es.po Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove.es.po Removing wiki/src/doc/anonymous_internet/Tor_Browser.es.po Removing wiki/src/doc/anonymous_internet.index.es.po Removing wiki/src/doc/anonymous_internet.es.po Removing wiki/src/doc/advanced_topics/wireless_devices.es.po Removing wiki/src/doc/advanced_topics/virtualization/virtualbox.es.po Removing wiki/src/doc/advanced_topics/virtualization/virt-manager.es.po Removing wiki/src/doc/advanced_topics/virtualization/boxes.es.po Removing wiki/src/doc/advanced_topics/virtualization.es.po Removing wiki/src/doc/advanced_topics/virtualization.caution.es.po Removing wiki/src/doc/advanced_topics/paperkey.es.po Removing wiki/src/doc/advanced_topics/lan.es.po Removing wiki/src/doc/advanced_topics/cold_boot_attacks.es.po Removing wiki/src/doc/advanced_topics/additional_software.es.po CONFLICT (modify/delete): wiki/src/doc/advanced_topics.index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/advanced_topics.index.es.po left in tree. Removing wiki/src/doc/advanced_topics.es.po Removing wiki/src/doc/about/warning.es.po Removing wiki/src/doc/about/trust.es.po Removing wiki/src/doc/about/tor.es.po CONFLICT (modify/delete): wiki/src/doc/about/requirements.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/requirements.es.po left in tree. Removing wiki/src/doc/about/openpgp_keys/signing_key_revocation.es.po Removing wiki/src/doc/about/openpgp_keys.es.po Removing wiki/src/doc/about/license.es.po Removing wiki/src/doc/about/fingerprint.es.po CONFLICT (modify/delete): wiki/src/doc/about/finances.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/finances.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/about/features.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/features.es.po left in tree. Removing wiki/src/doc/about/acknowledgments_and_similar_projects.es.po Removing wiki/src/doc/about.index.es.po Removing wiki/src/doc/about.es.po CONFLICT (modify/delete): wiki/src/doc.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc.es.po left in tree. Removing wiki/src/contribute/how/donate.es.po Removing wiki/src/contribute.es.po Removing wiki/src/bugs.es.po Removing wiki/src/about/contact.es.po Removing wiki/src/about.es.po Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Translation completed |
Translation completed
7 years ago
|
admin
Repository merge failed |
Removing wiki/src/upgrade/tails.es.po Removing wiki/src/upgrade/tails-overview.es.po CONFLICT (modify/delete): wiki/src/upgrade/tails-download.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/upgrade/tails-download.es.po left in tree. Removing wiki/src/upgrade/clone.es.po CONFLICT (modify/delete): wiki/src/upgrade/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/upgrade/clone-overview.es.po left in tree. Removing wiki/src/upgrade.es.po Removing wiki/src/torrents.es.po Removing wiki/src/support/talk/languages.inline.es.po Removing wiki/src/support/talk.es.po Removing wiki/src/support/learn/intro.inline.es.po Removing wiki/src/support/learn.es.po Removing wiki/src/support/known_issues.es.po Removing wiki/src/support/faq.es.po CONFLICT (modify/delete): wiki/src/support/chat.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/support/chat.es.po left in tree. Removing wiki/src/support.es.po CONFLICT (modify/delete): wiki/src/sidebar.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/sidebar.es.po left in tree. Removing wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.es.po Removing wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.es.po Removing wiki/src/security/ineffective_firewall-level_Tor_enforcement.es.po Removing wiki/src/security/claws_mail_leaks_plaintext_to_imap.es.po Removing wiki/src/security/Upgrade_Tor.es.po Removing wiki/src/security/Security_hole_in_I2P_0.9.13.es.po Removing wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.es.po Removing wiki/src/security/Numerous_security_holes_in_3.4.es.po Removing wiki/src/security/Numerous_security_holes_in_3.3.es.po Removing wiki/src/security/Numerous_security_holes_in_3.2.es.po Removing wiki/src/security/Numerous_security_holes_in_3.1.es.po Removing wiki/src/security/Numerous_security_holes_in_3.0.es.po Removing wiki/src/security/Numerous_security_holes_in_3.0.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.9.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.7.es.po Removing wiki/src/security/Numerous_security_holes_in_2.7.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.6.es.po Removing wiki/src/security/Numerous_security_holes_in_2.5.es.po Removing wiki/src/security/Numerous_security_holes_in_2.4.es.po Removing wiki/src/security/Numerous_security_holes_in_2.3.es.po Removing wiki/src/security/Numerous_security_holes_in_2.2.es.po Removing wiki/src/security/Numerous_security_holes_in_2.2.1.es.po Removing wiki/src/security/Numerous_security_holes_in_2.12.es.po Removing wiki/src/security/Numerous_security_holes_in_2.11.es.po Removing wiki/src/security/Numerous_security_holes_in_2.10.es.po Removing wiki/src/security/Numerous_security_holes_in_2.0.es.po Removing wiki/src/security/Numerous_security_holes_in_2.0.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.8.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.7.es.po Removing wiki/src/security/Numerous_security_holes_in_1.6.es.po Removing wiki/src/security/Numerous_security_holes_in_1.5.es.po Removing wiki/src/security/Numerous_security_holes_in_1.5.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.4.es.po Removing wiki/src/security/Numerous_security_holes_in_1.4.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.3.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.3.es.po Removing wiki/src/security/Numerous_security_holes_in_1.2.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.2.es.po Removing wiki/src/security/Numerous_security_holes_in_1.1.1.es.po Removing wiki/src/security/Numerous_security_holes_in_1.0.es.po Removing wiki/src/security/Numerous_security_holes_in_1.0.1.es.po Removing wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.es.po Removing wiki/src/security/IP_address_leak_with_icedove.es.po Removing wiki/src/security.es.po CONFLICT (modify/delete): wiki/src/press.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/press.es.po left in tree. Removing wiki/src/partners.es.po Removing wiki/src/news/windows_camouflage_jessie.es.po Removing wiki/src/news/why_we_need_donations.es.po Removing wiki/src/news/who_are_you_helping.es.po Removing wiki/src/news/what_we_do_with_your_money.es.po Removing wiki/src/news/what_we_accomplished_in_2017.es.po Removing wiki/src/news/version_3.5.es.po Removing wiki/src/news/version_3.4.es.po Removing wiki/src/news/version_3.3.es.po Removing wiki/src/news/version_3.2.es.po Removing wiki/src/news/version_3.1.es.po Removing wiki/src/news/version_3.0.es.po Removing wiki/src/news/version_3.0.1.es.po Removing wiki/src/news/version_2.9.1.es.po Removing wiki/src/news/version_2.7.es.po Removing wiki/src/news/version_2.7.1.es.po Removing wiki/src/news/version_2.6.es.po Removing wiki/src/news/version_2.5.es.po Removing wiki/src/news/version_2.4.es.po Removing wiki/src/news/version_2.3.es.po Removing wiki/src/news/version_2.2.es.po Removing wiki/src/news/version_2.2.1.es.po Removing wiki/src/news/version_2.12.es.po Removing wiki/src/news/version_2.11.es.po Removing wiki/src/news/version_2.10.es.po Removing wiki/src/news/version_2.0.es.po Removing wiki/src/news/version_2.0.1.es.po Removing wiki/src/news/version_1.8.es.po Removing wiki/src/news/version_1.8.2.es.po Removing wiki/src/news/version_1.8.1.es.po Removing wiki/src/news/version_1.7.es.po Removing wiki/src/news/version_1.6.es.po Removing wiki/src/news/version_1.5.es.po Removing wiki/src/news/version_1.5.1.es.po Removing wiki/src/news/version_1.3.es.po Removing wiki/src/news/version_1.3.2.es.po Removing wiki/src/news/version_1.3.1.es.po Removing wiki/src/news/version_1.2.es.po Removing wiki/src/news/version_1.2.3.es.po Removing wiki/src/news/version_1.2.2.es.po Removing wiki/src/news/version_1.2.1.es.po Removing wiki/src/news/version_1.1.es.po Removing wiki/src/news/version_1.1.2.es.po Removing wiki/src/news/version_1.1.1.es.po Removing wiki/src/news/version_1.0.1.es.po Removing wiki/src/news/version_0.22.1.es.po Removing wiki/src/news/version_0.19.es.po Removing wiki/src/news/version_0.18.es.po Removing wiki/src/news/version_0.17.es.po Removing wiki/src/news/version_0.17.1.es.po Removing wiki/src/news/version_0.16.es.po Removing wiki/src/news/version_0.15.es.po Removing wiki/src/news/version_0.14.es.po Removing wiki/src/news/version_0.13.es.po Removing wiki/src/news/version_0.12.1.es.po Removing wiki/src/news/version_0.11.es.po Removing wiki/src/news/version_0.10.es.po Removing wiki/src/news/veracrypt_ux_design.es.po Removing wiki/src/news/usability_testing_2014_05.es.po Removing wiki/src/news/thedaywefightback.es.po Removing wiki/src/news/test_redesigned_Tails_Greeter.es.po Removing wiki/src/news/test_incremental_upgrades.es.po Removing wiki/src/news/test_UEFI.es.po Removing wiki/src/news/tails-testers.es.po Removing wiki/src/news/tails-support.es.po Removing wiki/src/news/summit_2013.es.po Removing wiki/src/news/spoof-mac.es.po Removing wiki/src/news/social_contract.es.po Removing wiki/src/news/signing_key_transition.es.po Removing wiki/src/news/rescue_3.0.1.es.po Removing wiki/src/news/reproducible_Tails.es.po Removing wiki/src/news/report_end_of_2014.es.po Removing wiki/src/news/our_plans_for_2018.es.po Removing wiki/src/news/our_plans_for_2017.es.po Removing wiki/src/news/new_project_name.es.po Removing wiki/src/news/new_SSL_certificate.es.po Removing wiki/src/news/mediapart.es.po Removing wiki/src/news/many_hands_make_tails.es.po Removing wiki/src/news/logo_contest.es.po Removing wiki/src/news/improve_the_infrastructure_behind_Tails.es.po Removing wiki/src/news/fpf_campaign.es.po Removing wiki/src/news/closing_tails-support.es.po Removing wiki/src/news/bounties_2013_report.es.po Removing wiki/src/news/and_the_winner_is.es.po Removing wiki/src/news/amnesia_may_now_work_on_the_Mac.es.po Removing wiki/src/news/additional_software_ux_design.es.po Removing wiki/src/news/Tails_HackFest_2014.es.po Removing wiki/src/news/Tails_3.0_will_require_a_64-bit_processor.es.po Removing wiki/src/news/On_0days_exploits_and_disclosure.es.po Removing wiki/src/news/Mac_and_PC_UEFI_hardware_needed.es.po Removing wiki/src/news/Join_us_at_the_Tails_HackFest_2014.es.po Removing wiki/src/news/IP_leakage_with_Icedove.es.po Removing wiki/src/news/33c3.es.po Removing wiki/src/news.es.po Removing wiki/src/misc/unsafe_browser_warning.es.po Removing wiki/src/install/win/usb/overview.es.po Removing wiki/src/install/win/usb.es.po Removing wiki/src/install/win/usb-overview.es.po Removing wiki/src/install/win/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/win/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/win/clone-overview.es.po left in tree. Removing wiki/src/install/win.es.po Removing wiki/src/install/vm-download.es.po Removing wiki/src/install/os.es.po Removing wiki/src/install/mac/usb/overview.es.po Removing wiki/src/install/mac/usb.es.po Removing wiki/src/install/mac/usb-overview.es.po Removing wiki/src/install/mac/usb-download.es.po Removing wiki/src/install/mac/dvd/overview.es.po Removing wiki/src/install/mac/dvd.es.po CONFLICT (modify/delete): wiki/src/install/mac/dvd-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/dvd-overview.es.po left in tree. Removing wiki/src/install/mac/dvd-download.es.po Removing wiki/src/install/mac/clone.es.po CONFLICT (modify/delete): wiki/src/install/mac/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/mac/clone-overview.es.po left in tree. Removing wiki/src/install/mac.es.po Removing wiki/src/install/linux/usb/overview.es.po Removing wiki/src/install/linux/usb.es.po Removing wiki/src/install/linux/usb-overview.es.po Removing wiki/src/install/linux/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/linux/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/linux/clone-overview.es.po left in tree. Removing wiki/src/install/linux.es.po Removing wiki/src/install/inc/tails-installation-assistant.inline.es.po Removing wiki/src/install/inc/steps/verify_up-to-date.inline.es.po Removing wiki/src/install/inc/steps/restart_second_time.inline.es.po Removing wiki/src/install/inc/steps/restart_first_time.inline.es.po Removing wiki/src/install/inc/steps/not_at_all.inline.es.po Removing wiki/src/install/inc/steps/mac_startup_disks.inline.es.po Removing wiki/src/install/inc/steps/install_intermediary_outro.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final.inline.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/download.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/download.inline.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/debian_requirements.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/debian_requirements.inline.es.po left in tree. Removing wiki/src/install/inc/steps/create_persistence.inline.es.po Removing wiki/src/install/inc/steps/bittorrent_verification.inline.es.po Removing wiki/src/install/inc/router/why_two.inline.es.po Removing wiki/src/install/inc/router/why_extra.inline.es.po CONFLICT (modify/delete): wiki/src/install/inc/router/clone.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/router/clone.es.po left in tree. Removing wiki/src/install/inc/overview/vm.es.po CONFLICT (modify/delete): wiki/src/install/inc/overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/overview.es.po left in tree. Removing wiki/src/install/expert/usb/overview.es.po CONFLICT (modify/delete): wiki/src/install/expert/usb.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/expert/usb.es.po left in tree. Removing wiki/src/install/expert/usb-overview.es.po Removing wiki/src/install/dvd.es.po Removing wiki/src/install/dvd-download.es.po CONFLICT (modify/delete): wiki/src/install/download/openpgp.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/download/openpgp.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/download.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/download.es.po left in tree. Removing wiki/src/install/debian/usb.es.po Removing wiki/src/install/debian/usb-overview.es.po Removing wiki/src/install/debian/usb-download.es.po CONFLICT (modify/delete): wiki/src/install/debian/clone-overview.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian/clone-overview.es.po left in tree. CONFLICT (modify/delete): wiki/src/install/debian.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/debian.es.po left in tree. Removing wiki/src/install/clone.es.po Removing wiki/src/install.es.po CONFLICT (modify/delete): wiki/src/index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/index.es.po left in tree. Removing wiki/src/home.es.po Removing wiki/src/getting_started.es.po CONFLICT (modify/delete): wiki/src/donate/thanks.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/donate/thanks.es.po left in tree. Removing wiki/src/donate/canceled.es.po Removing wiki/src/donate.es.po CONFLICT (modify/delete): wiki/src/doc/upgrade/error/install.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/upgrade/error/install.es.po left in tree. Removing wiki/src/doc/upgrade/error/download.es.po Removing wiki/src/doc/upgrade/error/check.es.po Removing wiki/src/doc/upgrade/error.es.po Removing wiki/src/doc/sensitive_documents/sound_and_video.es.po Removing wiki/src/doc/sensitive_documents/printing_and_scanning.es.po Removing wiki/src/doc/sensitive_documents/persistence.es.po Removing wiki/src/doc/sensitive_documents/office_suite.es.po Removing wiki/src/doc/sensitive_documents/metadata.es.po Removing wiki/src/doc/sensitive_documents/graphics.es.po Removing wiki/src/doc/sensitive_documents.index.es.po Removing wiki/src/doc/sensitive_documents.es.po Removing wiki/src/doc/introduction.es.po Removing wiki/src/doc/first_steps/upgrade/release_notes.es.po Removing wiki/src/doc/first_steps/upgrade.release_notes.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/upgrade.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/upgrade.es.po left in tree. Removing wiki/src/doc/first_steps/startup_options/offline_mode.es.po Removing wiki/src/doc/first_steps/startup_options/mac_spoofing.es.po Removing wiki/src/doc/first_steps/startup_options/bridge_mode.inline.es.po Removing wiki/src/doc/first_steps/startup_options/bridge_mode.es.po Removing wiki/src/doc/first_steps/startup_options/administration_password.es.po Removing wiki/src/doc/first_steps/startup_options.es.po Removing wiki/src/doc/first_steps/start_tails.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/shutdown.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/shutdown.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/windows.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/windows.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/mac.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/mac.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/reset/linux.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset/linux.es.po left in tree. Removing wiki/src/doc/first_steps/reset.intro.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/reset.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/reset.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/warnings.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/warnings.es.po left in tree. Removing wiki/src/doc/first_steps/persistence/use.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/recover_insecure.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/recover_insecure.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/delete.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/delete.es.po left in tree. Removing wiki/src/doc/first_steps/persistence/copy.es.po Removing wiki/src/doc/first_steps/persistence/configure.es.po Removing wiki/src/doc/first_steps/persistence/check_file_system.es.po Removing wiki/src/doc/first_steps/persistence/change_passphrase.es.po Removing wiki/src/doc/first_steps/persistence.es.po Removing wiki/src/doc/first_steps/persistence.caution.es.po Removing wiki/src/doc/first_steps/media.es.po Removing wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po Removing wiki/src/doc/first_steps/bug_reporting.es.po CONFLICT (modify/delete): wiki/src/doc/first_steps/accessibility.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/accessibility.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/first_steps.index.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps.index.es.po left in tree. Removing wiki/src/doc/first_steps.es.po Removing wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.es.po Removing wiki/src/doc/encryption_and_privacy/virtual_keyboard.es.po Removing wiki/src/doc/encryption_and_privacy/truecrypt.es.po Removing wiki/src/doc/encryption_and_privacy/secure_deletion.es.po Removing wiki/src/doc/encryption_and_privacy/manage_passwords.es.po Removing wiki/src/doc/encryption_and_privacy/keyringer.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet.warning.es.po Removing wiki/src/doc/encryption_and_privacy/gpgapplet.es.po Removing wiki/src/doc/encryption_and_privacy/encrypted_volumes.es.po Removing wiki/src/doc/encryption_and_privacy/checksums.es.po Removing wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.es.po Removing wiki/src/doc/encryption_and_privacy.index.es.po Removing wiki/src/doc/encryption_and_privacy.es.po Removing wiki/src/doc/anonymous_internet/why_tor_is_slow.es.po Removing wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.es.po Removing wiki/src/doc/anonymous_internet/unsafe_browser.es.po Removing wiki/src/doc/anonymous_internet/tor_status.es.po Removing wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.es.po Removing wiki/src/doc/anonymous_internet/thunderbird.es.po Removing wiki/src/doc/anonymous_internet/pidgin.es.po CONFLICT (modify/delete): wiki/src/doc/anonymous_internet/onionshare.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/anonymous_internet/onionshare.es.po left in tree. Removing wiki/src/doc/anonymous_internet/networkmanager.es.po Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.es.po Removing wiki/src/doc/anonymous_internet/icedove/name.inline.es.po Removing wiki/src/doc/anonymous_internet/icedove/account_creation.inline.es.po Removing wiki/src/doc/anonymous_internet/electrum.es.po Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove.es.po Removing wiki/src/doc/anonymous_internet/Tor_Browser.es.po Removing wiki/src/doc/anonymous_internet.index.es.po Removing wiki/src/doc/anonymous_internet.es.po Removing wiki/src/doc/advanced_topics/wireless_devices.es.po Removing wiki/src/doc/advanced_topics/virtualization/virtualbox.es.po Removing wiki/src/doc/advanced_topics/virtualization/virt-manager.es.po Removing wiki/src/doc/advanced_topics/virtualization/boxes.es.po Removing wiki/src/doc/advanced_topics/virtualization.es.po Removing wiki/src/doc/advanced_topics/virtualization.caution.es.po Removing wiki/src/doc/advanced_topics/paperkey.es.po Removing wiki/src/doc/advanced_topics/lan.es.po Removing wiki/src/doc/advanced_topics/cold_boot_attacks.es.po Removing wiki/src/doc/advanced_topics/additional_software.es.po Removing wiki/src/doc/advanced_topics.index.es.po Removing wiki/src/doc/advanced_topics.es.po Removing wiki/src/doc/about/warning.es.po Removing wiki/src/doc/about/trust.es.po Removing wiki/src/doc/about/tor.es.po Removing wiki/src/doc/about/requirements.es.po Removing wiki/src/doc/about/openpgp_keys/signing_key_revocation.es.po Removing wiki/src/doc/about/openpgp_keys.es.po Removing wiki/src/doc/about/license.es.po Removing wiki/src/doc/about/fingerprint.es.po CONFLICT (modify/delete): wiki/src/doc/about/finances.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/finances.es.po left in tree. CONFLICT (modify/delete): wiki/src/doc/about/features.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/about/features.es.po left in tree. Removing wiki/src/doc/about/acknowledgments_and_similar_projects.es.po Removing wiki/src/doc/about.index.es.po Removing wiki/src/doc/about.es.po CONFLICT (modify/delete): wiki/src/doc.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc.es.po left in tree. Removing wiki/src/contribute/how/donate.es.po Removing wiki/src/contribute.es.po Removing wiki/src/bugs.es.po Removing wiki/src/about/contact.es.po Removing wiki/src/about.es.po Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Translation added |
|