emmapeel

Repository merge failed

Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po
CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po
Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po
Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
9 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po
CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po
Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po
Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
9 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po
CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po
Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po
Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
9 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po
CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po
Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po
Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
9 years ago
emmapeel

Resource updated

The "wiki/src/doc/advanced_topics/virtualization.de.po" file was changed. 9 years ago
emmapeel

Resource updated

The "wiki/src/doc/advanced_topics/virtualization.pt.po" file was changed. 9 years ago
emmapeel

Resource updated

The "wiki/src/security/Upgrade_Tor.pt.po" file was changed. 9 years ago
emmapeel

Resource updated

The "wiki/src/security/Upgrade_Tor.fr.po" file was changed. 9 years ago
None

Source string added

9 years ago
None

Source string added

9 years ago
None

Source string added

9 years ago
emmapeel

Resource updated

The "wiki/src/security/Upgrade_Tor.de.po" file was changed. 9 years ago
None

Source string added

9 years ago
emmapeel

Resource updated

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

Resource updated

The "wiki/src/doc/upgrade.pt.po" file was changed. 9 years ago
emmapeel

Resource updated

The "wiki/src/doc/anonymous_internet/unsafe_browser.de.po" file was changed. 9 years ago
emmapeel

Resource updated

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

Resource updated

The "wiki/src/doc/anonymous_internet/unsafe_browser.pt.po" file was changed. 9 years ago
emmapeel

Resource updated

The "wiki/src/doc/anonymous_internet/Tor_Browser.pt.po" file was changed. 9 years ago
emmapeel

Resource updated

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

Search