2. Changes

The "wiki/src/doc/anonymous_internet.index.fr.po" file was changed. 9 years ago

The "wiki/src/doc/anonymous_internet.fr.po" file was changed. 9 years ago

The "wiki/src/doc/advanced_topics.fr.po" file was changed. 9 years ago

The "wiki/src/doc/advanced_topics.index.fr.po" file was changed. 9 years ago

The "wiki/src/news/amnesia_may_now_work_on_the_Mac.fr.po" file was changed. 9 years ago

The "wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po" file was changed. 9 years ago

The "wiki/src/doc/first_steps/accessibility.pt.po" file was changed. 9 years ago

The "wiki/src/doc/first_steps/accessibility.fr.po" file was changed. 9 years ago

The "wiki/src/doc/first_steps/accessibility.de.po" file was changed. 9 years ago

The "wiki/src/doc/about.index.fr.po" file was changed. 9 years ago

The "wiki/src/about.fr.po" file was changed. 9 years ago

The "wiki/src/about.de.po" file was changed. 9 years ago

Repository reset 9 years ago

The "wiki/src/index.de.po" file was changed. 9 years ago

Translation completed 9 years ago

Removing wiki/src/torrents/files/tails-i386-1.4.torrent.sig
Removing wiki/src/torrents/files/tails-i386-1.4.torrent
Removing wiki/src/torrents/files/tails-i386-1.4.iso.sig
Auto-merging wiki/src/torrents/files/tails-i386-1.4.1.packages
Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/inc/stable_i386_release_notes.fr.po
Auto-merging wiki/src/inc/stable_i386_date.fr.po
Auto-merging wiki/src/doc/get/verify_the_iso_image_using_gnome.fr.po
Auto-merging wiki/src/doc/first_steps/upgrade.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.fr.po
Auto-merging wiki/src/doc/first_steps/startup_options.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options.fr.po
Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fr.po
Auto-merging wiki/src/doc/anonymous_internet/i2p.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/i2p.fr.po
Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Removing features/scripts/convertkey.py
Removing features/images/ElectrumStartVerification.png
Automatic merge failed; fix conflicts and then commit the result. (1)

9 years ago

Removing wiki/src/torrents/files/tails-i386-1.4.torrent.sig
Removing wiki/src/torrents/files/tails-i386-1.4.torrent
Removing wiki/src/torrents/files/tails-i386-1.4.iso.sig
Auto-merging wiki/src/torrents/files/tails-i386-1.4.1.packages
Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/inc/stable_i386_release_notes.fr.po
Auto-merging wiki/src/inc/stable_i386_date.fr.po
Auto-merging wiki/src/doc/get/verify_the_iso_image_using_gnome.fr.po
Auto-merging wiki/src/doc/first_steps/upgrade.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.fr.po
Auto-merging wiki/src/doc/first_steps/startup_options.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options.fr.po
Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fr.po
Auto-merging wiki/src/doc/anonymous_internet/i2p.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/i2p.fr.po
Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Removing features/scripts/convertkey.py
Removing features/images/ElectrumStartVerification.png
Automatic merge failed; fix conflicts and then commit the result. (1)

9 years ago

Removing wiki/src/torrents/files/tails-i386-1.4.torrent.sig
Removing wiki/src/torrents/files/tails-i386-1.4.torrent
Removing wiki/src/torrents/files/tails-i386-1.4.iso.sig
Auto-merging wiki/src/torrents/files/tails-i386-1.4.1.packages
Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/inc/stable_i386_release_notes.fr.po
Auto-merging wiki/src/inc/stable_i386_date.fr.po
Auto-merging wiki/src/doc/get/verify_the_iso_image_using_gnome.fr.po
Auto-merging wiki/src/doc/first_steps/upgrade.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.fr.po
Auto-merging wiki/src/doc/first_steps/startup_options.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options.fr.po
Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
Auto-merging wiki/src/doc/anonymous_internet/networkmanager.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.fr.po
Auto-merging wiki/src/doc/anonymous_internet/i2p.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/i2p.fr.po
Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Removing features/scripts/convertkey.py
Removing features/images/ElectrumStartVerification.png
Automatic merge failed; fix conflicts and then commit the result. (1)

9 years ago

English German 19 characters edited 9 years ago

English German 19 characters edited 9 years ago