Merge lp://staging/~jtv/launchpad/recife-rollback-10-12 into lp://staging/launchpad/db-devel

database/sampledata/current-dev.sql (+655/-655)
database/sampledata/current.sql (+655/-655)
database/schema/comments.sql (+6/-6)
database/schema/patch-2208-30-0.sql (+0/-29)
database/schema/security.cfg (+1/-2)
lib/canonical/launchpad/ftests/__init__.py (+39/-0)
lib/canonical/launchpad/helpers.py (+23/-0)
lib/canonical/launchpad/interfaces/_schema_circular_imports.py (+1/-1)
lib/canonical/launchpad/security.py (+7/-4)
lib/canonical/launchpad/windmill/testing/widgets.py (+1/-1)
lib/lp/answers/doc/karma.txt (+1/-1)
lib/lp/archivepublisher/scripts/generate_ppa_htaccess.py (+4/-6)
lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py (+1/-1)
lib/lp/archiveuploader/dscfile.py (+1/-1)
lib/lp/archiveuploader/tests/test_utils.py (+1/-1)
lib/lp/archiveuploader/tests/upload-karma.txt (+3/-1)
lib/lp/archiveuploader/utils.py (+1/-1)
lib/lp/blueprints/browser/configure.zcml (+1/-1)
lib/lp/blueprints/browser/specification.py (+1/-1)
lib/lp/blueprints/browser/tests/test_specification.py (+1/-4)
lib/lp/blueprints/configure.zcml (+1/-1)
lib/lp/blueprints/interfaces/specification.py (+1/-1)
lib/lp/blueprints/model/specification.py (+1/-1)
lib/lp/blueprints/subscribers.py (+1/-1)
lib/lp/bugs/browser/bugsubscription.py (+2/-1)
lib/lp/bugs/doc/externalbugtracker-comment-imports.txt (+1/-1)
lib/lp/bugs/doc/malone-karma.txt (+1/-1)
lib/lp/bugs/interfaces/bugtask.py (+1/-1)
lib/lp/bugs/javascript/official_bug_tags.js (+1/-1)
lib/lp/bugs/model/bugtask.py (+1/-1)
lib/lp/bugs/scripts/checkwatches/core.py (+1/-1)
lib/lp/bugs/tests/test_bugtask_search.py (+5/-2)
lib/lp/code/browser/branch.py (+1/-1)
lib/lp/code/browser/branchmergeproposal.py (+1/-1)
lib/lp/code/browser/tests/test_branchmergeproposal.py (+4/-2)
lib/lp/code/browser/tests/test_branchmergeproposallisting.py (+1/-1)
lib/lp/code/doc/branch-karma.txt (+1/-1)
lib/lp/code/interfaces/branchmergeproposal.py (+1/-1)
lib/lp/code/interfaces/diff.py (+1/-1)
lib/lp/code/interfaces/sourcepackagerecipe.py (+1/-1)
lib/lp/code/mail/codehandler.py (+1/-1)
lib/lp/code/mail/tests/test_branchmergeproposal.py (+1/-1)
lib/lp/code/mail/tests/test_codehandler.py (+1/-1)
lib/lp/code/model/branchmergeproposal.py (+2/-6)
lib/lp/code/model/diff.py (+2/-1)
lib/lp/code/model/sourcepackagerecipe.py (+4/-2)
lib/lp/code/model/tests/test_branch.py (+1/-1)
lib/lp/code/model/tests/test_branchmergeproposal.py (+3/-6)
lib/lp/code/model/tests/test_branchmergeproposaljobs.py (+1/-4)
lib/lp/code/model/tests/test_codereviewvote.py (+1/-1)
lib/lp/code/model/tests/test_diff.py (+2/-6)
lib/lp/code/model/tests/test_sourcepackagerecipe.py (+3/-1)
lib/lp/code/scripts/tests/test_merge_proposal_jobs.py (+3/-3)
lib/lp/code/tests/helpers.py (+2/-2)
lib/lp/code/windmill/tests/test_branchmergeproposal_review.py (+1/-1)
lib/lp/codehosting/scanner/tests/test_bzrsync.py (+3/-8)
lib/lp/coop/answersbugs/model.py (+1/-1)
lib/lp/registry/browser/peoplemerge.py (+1/-1)
lib/lp/registry/browser/team.py (+1/-1)
lib/lp/registry/browser/tests/test_peoplemerge.py (+1/-1)
lib/lp/registry/configure.zcml (+2/-2)
lib/lp/registry/doc/person-karma.txt (+1/-1)
lib/lp/registry/interfaces/distribution.py (+1/-1)
lib/lp/registry/interfaces/distroseries.py (+1/-1)
lib/lp/registry/interfaces/product.py (+6/-2)
lib/lp/registry/interfaces/projectgroup.py (+1/-1)
lib/lp/registry/model/distribution.py (+1/-28)
lib/lp/registry/model/distroseries.py (+2/-3)
lib/lp/registry/model/product.py (+21/-23)
lib/lp/registry/model/projectgroup.py (+3/-15)
lib/lp/registry/stories/object/xx-object-branding.txt (+5/-2)
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/registry/tests/karma.py (+17/-86)
lib/lp/registry/tests/test_teammembership.py (+1/-1)
lib/lp/registry/windmill/tests/test_product_configuration_hidden.py (+0/-1)
lib/lp/scripts/garbo.py (+1/-1)
lib/lp/scripts/utilities/pageperformancereport.py (+3/-3)
lib/lp/scripts/utilities/tests/test_pageperformancereport.py (+2/-1)
lib/lp/services/features/testing.py (+1/-5)
lib/lp/services/features/tests/test_helpers.py (+1/-1)
lib/lp/services/features/tests/test_webapp.py (+1/-1)
lib/lp/services/mail/incoming.py (+1/-1)
lib/lp/services/mail/mailbox.py (+1/-1)
lib/lp/services/mail/notificationrecipientset.py (+1/-1)
lib/lp/services/mail/signedmessage.py (+1/-1)
lib/lp/services/mailman/testing/sync.py (+1/-1)
lib/lp/services/scripts/base.py (+1/-1)
lib/lp/services/scripts/model/scriptactivity.py (+1/-1)
lib/lp/services/worlddata/interfaces/language.py (+0/-4)
lib/lp/services/worlddata/model/language.py (+1/-11)
lib/lp/services/worlddata/tests/test_language.py (+2/-11)
lib/lp/soyuz/adapters/archivesourcepublication.py (+1/-1)
lib/lp/soyuz/interfaces/distributionjob.py (+3/-2)
lib/lp/soyuz/interfaces/sourcepackagerelease.py (+4/-4)
lib/lp/soyuz/model/publishing.py (+4/-2)
lib/lp/soyuz/model/sourcepackagerelease.py (+2/-2)
lib/lp/soyuz/scripts/gina/packages.py (+1/-1)
lib/lp/soyuz/tests/test_initialisedistroseriesjob.py (+3/-1)
lib/lp/testing/__init__.py (+0/-12)
lib/lp/testing/branding.py (+0/-48)
lib/lp/testing/factory.py (+14/-176)
lib/lp/testing/mail.py (+1/-1)
lib/lp/testing/tests/test_factory.py (+5/-98)
lib/lp/testing/tests/test_karma.py (+0/-130)
lib/lp/translations/browser/configure.zcml (+2/-2)
lib/lp/translations/browser/customlanguagecode.py (+1/-1)
lib/lp/translations/browser/pofile.py (+41/-23)
lib/lp/translations/browser/potemplate.py (+3/-1)
lib/lp/translations/browser/tests/pofile-base-views.txt (+3/-1)
lib/lp/translations/browser/tests/test_pofile_view.py (+7/-7)
lib/lp/translations/browser/tests/test_translatablemessage_view.py (+3/-3)
lib/lp/translations/browser/tests/test_translationmessage_view.py (+60/-339)
lib/lp/translations/browser/tests/translationmessage-views.txt (+152/-40)
lib/lp/translations/browser/translationimportqueue.py (+4/-4)
lib/lp/translations/browser/translationmessage.py (+203/-290)
lib/lp/translations/configure.zcml (+0/-13)
lib/lp/translations/doc/distroseries-translations-copy.txt (+1/-1)
lib/lp/translations/doc/gettext-check-messages.txt (+38/-34)
lib/lp/translations/doc/poexport-language-pack.txt (+9/-7)
lib/lp/translations/doc/poexport-queue.txt (+4/-13)
lib/lp/translations/doc/pofile-verify-stats.txt (+2/-2)
lib/lp/translations/doc/pofile.txt (+109/-42)
lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt (+16/-16)
lib/lp/translations/doc/poimport-pofile-old-po-imported.txt (+11/-12)
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-script.txt (+0/-342)
lib/lp/translations/doc/poimport.txt (+418/-71)
lib/lp/translations/doc/potemplate.txt (+2/-6)
lib/lp/translations/doc/potmsgset.txt (+40/-35)
lib/lp/translations/doc/remove-translations-by.txt (+8/-7)
lib/lp/translations/doc/rosetta-karma.txt (+18/-18)
lib/lp/translations/doc/rosetta-translation.txt (+28/-29)
lib/lp/translations/doc/translationimportqueue.txt (+16/-16)
lib/lp/translations/doc/translationmessage.txt (+7/-7)
lib/lp/translations/doc/translations-export-to-branch.txt (+3/-4)
lib/lp/translations/doc/vpoexport.txt (+7/-16)
lib/lp/translations/help/imported-upload.html (+61/-0)
lib/lp/translations/help/updated-upload.html (+7/-3)
lib/lp/translations/interfaces/pofile.py (+12/-21)
lib/lp/translations/interfaces/potemplate.py (+0/-40)
lib/lp/translations/interfaces/potmsgset.py (+19/-105)
lib/lp/translations/interfaces/rosettastats.py (+1/-1)
lib/lp/translations/interfaces/side.py (+0/-73)
lib/lp/translations/interfaces/translatablemessage.py (+10/-10)
lib/lp/translations/interfaces/translationgroup.py (+19/-0)
lib/lp/translations/interfaces/translationimporter.py (+2/-2)
lib/lp/translations/interfaces/translationimportqueue.py (+11/-14)
lib/lp/translations/interfaces/translationmessage.py (+7/-58)
lib/lp/translations/interfaces/translationpolicy.py (+0/-153)
lib/lp/translations/interfaces/translations.py (+3/-4)
lib/lp/translations/interfaces/vpoexport.py (+2/-2)
lib/lp/translations/model/pofile.py (+250/-112)
lib/lp/translations/model/potemplate.py (+95/-210)
lib/lp/translations/model/potmsgset.py (+138/-646)
lib/lp/translations/model/side.py (+0/-72)
lib/lp/translations/model/translatablemessage.py (+14/-12)
lib/lp/translations/model/translationgroup.py (+6/-20)
lib/lp/translations/model/translationimportqueue.py (+12/-12)
lib/lp/translations/model/translationmessage.py (+95/-116)
lib/lp/translations/model/translationpolicy.py (+0/-186)
lib/lp/translations/model/translationsperson.py (+2/-2)
lib/lp/translations/model/vpoexport.py (+2/-2)
lib/lp/translations/scripts/gettext_check_messages.py (+15/-22)
lib/lp/translations/scripts/message_sharing_migration.py (+20/-28)
lib/lp/translations/scripts/migrate_current_flag.py (+5/-5)
lib/lp/translations/scripts/remove_translations.py (+17/-24)
lib/lp/translations/scripts/tests/test_message_sharing_migration.py (+37/-40)
lib/lp/translations/scripts/tests/test_migrate_current_flag.py (+41/-46)
lib/lp/translations/scripts/tests/test_remove_translations.py (+74/-81)
lib/lp/translations/scripts/tests/test_translations_to_branch.py (+1/-1)
lib/lp/translations/stories/standalone/xx-licensing.txt (+11/-0)
lib/lp/translations/stories/standalone/xx-pofile-details.txt (+1/-1)
lib/lp/translations/stories/standalone/xx-pofile-export.txt (+20/-7)
lib/lp/translations/stories/standalone/xx-pofile-translate-alternative-language.txt (+1/-1)
lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt (+6/-6)
lib/lp/translations/stories/standalone/xx-pofile-translate.txt (+15/-0)
lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt (+12/-12)
lib/lp/translations/stories/translationgroups/55-pofile-upload.txt (+18/-4)
lib/lp/translations/stories/translationgroups/60-translation-suggestions.txt (+2/-2)
lib/lp/translations/stories/translations/30-rosetta-pofile-translation-gettext-error.txt (+20/-12)
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/currenttranslationmessage-translate-one.pt (+6/-6)
lib/lp/translations/templates/pofile-translate.pt (+3/-3)
lib/lp/translations/templates/pofile-upload.pt (+31/-4)
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/templates/translations-macros.pt (+1/-1)
lib/lp/translations/tests/helpers.py (+0/-150)
lib/lp/translations/tests/potmsgset-update-translation.txt (+37/-30)
lib/lp/translations/tests/test_clearcurrenttranslation.py (+0/-284)
lib/lp/translations/tests/test_empty_messages.py (+32/-34)
lib/lp/translations/tests/test_helpers.py (+0/-180)
lib/lp/translations/tests/test_pofile.py (+508/-741)
lib/lp/translations/tests/test_potemplate.py (+4/-56)
lib/lp/translations/tests/test_potmsgset.py (+273/-1084)
lib/lp/translations/tests/test_setcurrenttranslation.py (+0/-1184)
lib/lp/translations/tests/test_shared_potemplate.py (+13/-474)
lib/lp/translations/tests/test_side.py (+0/-186)
lib/lp/translations/tests/test_suggestions.py (+11/-12)
lib/lp/translations/tests/test_translatablemessage.py (+37/-48)
lib/lp/translations/tests/test_translatedlanguage.py (+48/-71)
lib/lp/translations/tests/test_translationmessage.py (+1/-461)
lib/lp/translations/tests/test_translationpermission.py (+24/-7)
lib/lp/translations/tests/test_translationpolicy.py (+0/-411)
lib/lp/translations/tests/test_translations_to_review.py (+3/-3)
lib/lp/translations/utilities/doc/kde-po-file-format.txt (+2/-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 (+0/-194)
lib/lp/translations/utilities/tests/helpers.py (+5/-7)
lib/lp/translations/utilities/tests/import-flags.txt (+8/-8)
lib/lp/translations/utilities/tests/test_file_importer.py (+34/-173)
lib/lp/translations/utilities/tests/test_gettext_po_exporter.py (+3/-3)
lib/lp/translations/utilities/tests/test_gettext_po_importer.py (+4/-4)
lib/lp/translations/utilities/tests/test_kde_po_importer.py (+10/-13)
lib/lp/translations/utilities/tests/test_sanitize.py (+0/-276)
lib/lp/translations/utilities/tests/test_superfastimports.py (+51/-62)
lib/lp/translations/utilities/tests/test_translation_importer.py (+76/-73)
lib/lp/translations/utilities/tests/test_validate.py (+0/-86)
lib/lp/translations/utilities/tests/test_xpi_import.py (+4/-3)
lib/lp/translations/utilities/tests/test_xpi_po_exporter.py (+2/-2)
lib/lp/translations/utilities/translation_import.py (+220/-215)
lib/lp/translations/utilities/validate.py (+0/-51)
lib/lp/translations/windmill/tests/test_pofile_translate.py (+5/-4)
scripts/ftpmaster-tools/sync-source.py (+9/-6)
scripts/rosetta/migrate_current_flag.py (+4/-4)
scripts/rosetta/share-jaunty-translations.py (+134/-0)
setup.py (+0/-2)