Serna
Changes pushed |
Changes pushed
6 years ago
|
Serna
Changes pushed |
Changes pushed
6 years ago
|
Serna
Changes pushed |
Changes pushed
6 years ago
|
Serna
Translation completed |
Translation completed
6 years ago
|
Serna
Suggestion added |
|
Serna
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po Auto-merging wiki/src/upgrade.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade.fr.po Auto-merging wiki/src/news/version_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.de.po Auto-merging wiki/src/install/win/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.fr.po Auto-merging wiki/src/install/win/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.fr.po Auto-merging wiki/src/install/win.fr.po CONFLICT (content): Merge conflict in wiki/src/install/win.fr.po Auto-merging wiki/src/install/mac/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.fr.po Auto-merging wiki/src/install/mac/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.fr.po Auto-merging wiki/src/install/mac/dvd-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-overview.fr.po Auto-merging wiki/src/install/mac/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.fr.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/linux/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.fr.po Auto-merging wiki/src/install/linux/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.fr.po Auto-merging wiki/src/install/linux.fr.po CONFLICT (content): Merge conflict in wiki/src/install/linux.fr.po Auto-merging wiki/src/install/expert/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.fr.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.fr.po Auto-merging wiki/src/install/debian/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.fr.po Auto-merging wiki/src/install/debian.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian.fr.po Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |
Serna
Suggestion accepted |
|
Serna
Suggestion accepted |
|
Serna
Suggestion accepted |
|
Serna
Translation completed |
Translation completed
6 years ago
|
Serna
Translation completed |
Translation completed
6 years ago
|
Serna
Translation completed |
Translation completed
6 years ago
|
Serna
Suggestion added |
|
Serna
Translation completed |
Translation completed
6 years ago
|
Serna
Translation completed |
Translation completed
6 years ago
|
Serna
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-amd64-3.7.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.7.build-manifest Removing wiki/src/torrents/files/tails-amd64-3.6.2.torrent Removing wiki/src/torrents/files/tails-amd64-3.6.2.iso.sig Auto-merging wiki/src/support.de.po CONFLICT (content): Merge conflict in wiki/src/support.de.po Auto-merging wiki/src/partners.fr.po Auto-merging wiki/src/partners.de.po CONFLICT (content): Merge conflict in wiki/src/partners.de.po Auto-merging wiki/src/news/version_3.6.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po Auto-merging wiki/src/news/version_3.6.2.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fr.po Auto-merging wiki/src/news/test_3.6~rc1.de.po CONFLICT (content): Merge conflict in wiki/src/news/test_3.6~rc1.de.po Auto-merging wiki/src/news/duckduckgo_challenge.de.po CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.de.po Auto-merging wiki/src/doc/sensitive_documents/metadata.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fr.po Auto-merging wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po Auto-merging wiki/src/doc/about/requirements.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/about/requirements.pt.po Auto-merging wiki/src/doc/about/finances.de.po CONFLICT (content): Merge conflict in wiki/src/doc/about/finances.de.po Auto-merging po/ca.po Removing features/images/TorBrowserSavedStartupPage.png Removing features/images/TorBrowserPrintDialog.png Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |
Serna
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-amd64-3.7.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.7.build-manifest Removing wiki/src/torrents/files/tails-amd64-3.6.2.torrent Removing wiki/src/torrents/files/tails-amd64-3.6.2.iso.sig Auto-merging wiki/src/support.de.po CONFLICT (content): Merge conflict in wiki/src/support.de.po Auto-merging wiki/src/partners.fr.po Auto-merging wiki/src/partners.de.po CONFLICT (content): Merge conflict in wiki/src/partners.de.po Auto-merging wiki/src/news/version_3.6.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po Auto-merging wiki/src/news/version_3.6.2.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fr.po Auto-merging wiki/src/news/test_3.6~rc1.de.po CONFLICT (content): Merge conflict in wiki/src/news/test_3.6~rc1.de.po Auto-merging wiki/src/news/duckduckgo_challenge.de.po CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.de.po Auto-merging wiki/src/doc/sensitive_documents/metadata.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fr.po Auto-merging wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po Auto-merging wiki/src/doc/about/requirements.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/about/requirements.pt.po Auto-merging wiki/src/doc/about/finances.de.po CONFLICT (content): Merge conflict in wiki/src/doc/about/finances.de.po Auto-merging po/ca.po Removing features/images/TorBrowserSavedStartupPage.png Removing features/images/TorBrowserPrintDialog.png Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |
Serna
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-amd64-3.7.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.7.build-manifest Removing wiki/src/torrents/files/tails-amd64-3.6.2.torrent Removing wiki/src/torrents/files/tails-amd64-3.6.2.iso.sig Auto-merging wiki/src/support.de.po CONFLICT (content): Merge conflict in wiki/src/support.de.po Auto-merging wiki/src/partners.fr.po Auto-merging wiki/src/partners.de.po CONFLICT (content): Merge conflict in wiki/src/partners.de.po Auto-merging wiki/src/news/version_3.6.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po Auto-merging wiki/src/news/version_3.6.2.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fr.po Auto-merging wiki/src/news/test_3.6~rc1.de.po CONFLICT (content): Merge conflict in wiki/src/news/test_3.6~rc1.de.po Auto-merging wiki/src/news/duckduckgo_challenge.de.po CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.de.po Auto-merging wiki/src/doc/sensitive_documents/metadata.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fr.po Auto-merging wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po Auto-merging wiki/src/doc/about/requirements.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/about/requirements.pt.po Auto-merging wiki/src/doc/about/finances.de.po CONFLICT (content): Merge conflict in wiki/src/doc/about/finances.de.po Auto-merging po/ca.po Removing features/images/TorBrowserSavedStartupPage.png Removing features/images/TorBrowserPrintDialog.png Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |
Serna
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-amd64-3.7.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.7.build-manifest Removing wiki/src/torrents/files/tails-amd64-3.6.2.torrent Removing wiki/src/torrents/files/tails-amd64-3.6.2.iso.sig Auto-merging wiki/src/support.de.po CONFLICT (content): Merge conflict in wiki/src/support.de.po Auto-merging wiki/src/partners.fr.po Auto-merging wiki/src/partners.de.po CONFLICT (content): Merge conflict in wiki/src/partners.de.po Auto-merging wiki/src/news/version_3.6.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po Auto-merging wiki/src/news/version_3.6.2.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fr.po Auto-merging wiki/src/news/test_3.6~rc1.de.po CONFLICT (content): Merge conflict in wiki/src/news/test_3.6~rc1.de.po Auto-merging wiki/src/news/duckduckgo_challenge.de.po CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.de.po Auto-merging wiki/src/doc/sensitive_documents/metadata.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fr.po Auto-merging wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po Auto-merging wiki/src/doc/about/requirements.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/about/requirements.pt.po Auto-merging wiki/src/doc/about/finances.de.po CONFLICT (content): Merge conflict in wiki/src/doc/about/finances.de.po Auto-merging po/ca.po Removing features/images/TorBrowserSavedStartupPage.png Removing features/images/TorBrowserPrintDialog.png Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |
Serna
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-amd64-3.7.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.7.build-manifest Removing wiki/src/torrents/files/tails-amd64-3.6.2.torrent Removing wiki/src/torrents/files/tails-amd64-3.6.2.iso.sig Auto-merging wiki/src/support.de.po CONFLICT (content): Merge conflict in wiki/src/support.de.po Auto-merging wiki/src/partners.fr.po Auto-merging wiki/src/partners.de.po CONFLICT (content): Merge conflict in wiki/src/partners.de.po Auto-merging wiki/src/news/version_3.6.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po Auto-merging wiki/src/news/version_3.6.2.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fr.po Auto-merging wiki/src/news/test_3.6~rc1.de.po CONFLICT (content): Merge conflict in wiki/src/news/test_3.6~rc1.de.po Auto-merging wiki/src/news/duckduckgo_challenge.de.po CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.de.po Auto-merging wiki/src/doc/sensitive_documents/metadata.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fr.po Auto-merging wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po Auto-merging wiki/src/doc/about/requirements.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/about/requirements.pt.po Auto-merging wiki/src/doc/about/finances.de.po CONFLICT (content): Merge conflict in wiki/src/doc/about/finances.de.po Auto-merging po/ca.po Removing features/images/TorBrowserSavedStartupPage.png Removing features/images/TorBrowserPrintDialog.png Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |