Merge lp://staging/~henninge/launchpad/bug-612583-test-errors into lp://staging/launchpad/db-devel

database/sampledata/current-dev.sql (+3966/-2821)
database/sampledata/current.sql (+3933/-2812)
database/schema/comments.sql (+6/-6)
database/schema/patch-2207-99-0.sql (+39/-0)
database/schema/patch-2207-99-1.sql (+9/-0)
database/schema/security.cfg (+2/-1)
lib/canonical/launchpad/ftests/__init__.py (+0/-41)
lib/canonical/launchpad/helpers.py (+0/-24)
lib/lp/answers/doc/karma.txt (+1/-1)
lib/lp/archiveuploader/tests/upload-karma.txt (+1/-3)
lib/lp/bugs/doc/externalbugtracker-comment-imports.txt (+1/-1)
lib/lp/bugs/doc/malone-karma.txt (+1/-1)
lib/lp/code/doc/branch-karma.txt (+1/-1)
lib/lp/registry/doc/person-karma.txt (+1/-1)
lib/lp/registry/stories/object/xx-object-branding.txt (+2/-5)
lib/lp/registry/stories/person/xx-person-edit-profile-picture.txt (+1/-1)
lib/lp/registry/stories/person/xx-person-rdf.txt (+1/-1)
lib/lp/soyuz/interfaces/sourcepackagerelease.py (+7/-2)
lib/lp/soyuz/model/sourcepackagerelease.py (+2/-2)
lib/lp/testing/__init__.py (+12/-0)
lib/lp/testing/branding.py (+48/-0)
lib/lp/testing/factory.py (+42/-8)
lib/lp/testing/karma.py (+88/-19)
lib/lp/translations/browser/pofile.py (+10/-14)
lib/lp/translations/browser/tests/test_pofile_view.py (+4/-4)
lib/lp/translations/browser/tests/test_translationmessage_view.py (+1/-1)
lib/lp/translations/browser/tests/translationmessage-views.txt (+4/-4)
lib/lp/translations/browser/translationimportqueue.py (+1/-1)
lib/lp/translations/browser/translationmessage.py (+11/-10)
lib/lp/translations/doc/distroseries-translations-copy.txt (+1/-1)
lib/lp/translations/doc/gettext-check-messages.txt (+13/-13)
lib/lp/translations/doc/poexport-language-pack.txt (+5/-5)
lib/lp/translations/doc/pofile-verify-stats.txt (+2/-2)
lib/lp/translations/doc/pofile.txt (+42/-33)
lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt (+16/-16)
lib/lp/translations/doc/poimport-pofile-old-po-imported.txt (+12/-11)
lib/lp/translations/doc/poimport-pofile-syntax-error.txt (+4/-4)
lib/lp/translations/doc/poimport-potemplate-syntax-error.txt (+4/-4)
lib/lp/translations/doc/poimport.txt (+10/-10)
lib/lp/translations/doc/potemplate.txt (+6/-2)
lib/lp/translations/doc/potmsgset.txt (+23/-23)
lib/lp/translations/doc/remove-translations-by.txt (+5/-5)
lib/lp/translations/doc/remove-upstream-translations-script.txt (+0/-142)
lib/lp/translations/doc/rosetta-karma.txt (+6/-6)
lib/lp/translations/doc/rosetta-translation.txt (+29/-28)
lib/lp/translations/doc/translationimportqueue.txt (+16/-16)
lib/lp/translations/doc/translationmessage.txt (+7/-7)
lib/lp/translations/help/imported-upload.html (+0/-61)
lib/lp/translations/help/pofile-upload.html (+3/-7)
lib/lp/translations/interfaces/pofile.py (+5/-4)
lib/lp/translations/interfaces/potemplate.py (+23/-0)
lib/lp/translations/interfaces/potmsgset.py (+43/-11)
lib/lp/translations/interfaces/rosettastats.py (+1/-1)
lib/lp/translations/interfaces/translatablemessage.py (+10/-10)
lib/lp/translations/interfaces/translationimporter.py (+2/-2)
lib/lp/translations/interfaces/translationimportqueue.py (+11/-10)
lib/lp/translations/interfaces/translationmessage.py (+22/-4)
lib/lp/translations/interfaces/translations.py (+12/-3)
lib/lp/translations/interfaces/vpoexport.py (+2/-2)
lib/lp/translations/model/pofile.py (+37/-36)
lib/lp/translations/model/potemplate.py (+161/-61)
lib/lp/translations/model/potmsgset.py (+408/-82)
lib/lp/translations/model/translatablemessage.py (+1/-1)
lib/lp/translations/model/translationimportqueue.py (+7/-7)
lib/lp/translations/model/translationmessage.py (+73/-86)
lib/lp/translations/model/vpoexport.py (+2/-2)
lib/lp/translations/scripts/gettext_check_messages.py (+12/-9)
lib/lp/translations/scripts/message_sharing_migration.py (+29/-20)
lib/lp/translations/scripts/migrate_kde_potemplates.py (+0/-337)
lib/lp/translations/scripts/remove_translations.py (+25/-18)
lib/lp/translations/scripts/tests/test_message_sharing_migration.py (+39/-37)
lib/lp/translations/scripts/tests/test_remove_translations.py (+81/-74)
lib/lp/translations/stories/standalone/xx-pofile-details.txt (+1/-1)
lib/lp/translations/stories/standalone/xx-pofile-translate-alternative-language.txt (+1/-1)
lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt (+5/-5)
lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt (+1/-1)
lib/lp/translations/stories/translationgroups/55-pofile-upload.txt (+4/-18)
lib/lp/translations/stories/translations/43-distrorelease-translations.txt (+5/-5)
lib/lp/translations/stories/translations/55-rosetta-potemplates.txt (+5/-5)
lib/lp/translations/templates/pofile-translate.pt (+3/-3)
lib/lp/translations/templates/pofile-upload.pt (+4/-31)
lib/lp/translations/templates/potemplate-chart.pt (+1/-1)
lib/lp/translations/templates/rosetta-status-legend.pt (+1/-1)
lib/lp/translations/templates/serieslanguage-index.pt (+1/-1)
lib/lp/translations/tests/helpers.py (+143/-0)
lib/lp/translations/tests/potmsgset-update-translation.txt (+12/-12)
lib/lp/translations/tests/test_doc.py (+1/-5)
lib/lp/translations/tests/test_empty_messages.py (+34/-32)
lib/lp/translations/tests/test_helpers.py (+182/-0)
lib/lp/translations/tests/test_pofile.py (+112/-111)
lib/lp/translations/tests/test_potmsgset.py (+474/-134)
lib/lp/translations/tests/test_setcurrenttranslation.py (+1194/-0)
lib/lp/translations/tests/test_shared_potemplate.py (+474/-14)
lib/lp/translations/tests/test_suggestions.py (+12/-13)
lib/lp/translations/tests/test_translatablemessage.py (+13/-12)
lib/lp/translations/tests/test_translationmessage.py (+41/-2)
lib/lp/translations/tests/test_translations_to_review.py (+1/-1)
lib/lp/translations/utilities/gettext_po_importer.py (+2/-2)
lib/lp/translations/utilities/mozilla_xpi_importer.py (+3/-3)
lib/lp/translations/utilities/sanitize.py (+191/-0)
lib/lp/translations/utilities/tests/helpers.py (+5/-5)
lib/lp/translations/utilities/tests/import-flags.txt (+8/-8)
lib/lp/translations/utilities/tests/test_file_importer.py (+25/-25)
lib/lp/translations/utilities/tests/test_gettext_po_importer.py (+4/-4)
lib/lp/translations/utilities/tests/test_kde_po_importer.py (+13/-10)
lib/lp/translations/utilities/tests/test_sanitize.py (+246/-0)
lib/lp/translations/utilities/tests/test_superfastimports.py (+19/-11)
lib/lp/translations/utilities/tests/test_validate.py (+69/-0)
lib/lp/translations/utilities/tests/test_xpi_import.py (+3/-4)
lib/lp/translations/utilities/tests/test_xpi_po_exporter.py (+2/-2)
lib/lp/translations/utilities/translation_import.py (+80/-66)
lib/lp/translations/utilities/validate.py (+51/-0)
scripts/rosetta/remove-upstream-translations.py (+0/-240)
scripts/rosetta/share-jaunty-translations.py (+0/-135)