« back to all changes in this revision
Viewing changes to lib/lp/translations/translationmerger.py
- Committer: James Westby
- Date: 2011-12-21 15:57:03 UTC
- mto: This revision was merged to the branch mainline in revision 14568.
- Revision ID: james.westby@canonical.com-20111221155703-eax3knjnxr33f6ci
Add the new file.
- files added:
- lib/canonical/launchpad/browser
- lib/canonical/launchpad/browser/ftests
- lib/canonical/launchpad/browser/tests
- lib/canonical/launchpad/components
- lib/canonical/launchpad/database
- lib/canonical/launchpad/database/tests
- lib/canonical/launchpad/doc
- lib/canonical/launchpad/interfaces
- lib/canonical/launchpad/javascript
- lib/canonical/launchpad/javascript/inlinehelp
- lib/canonical/launchpad/javascript/worlddata
- lib/canonical/launchpad/pagetests
- lib/canonical/launchpad/rest
- lib/canonical/launchpad/scripts
- lib/canonical/launchpad/scripts/ftests
- lib/canonical/launchpad/scripts/tests
- lib/canonical/launchpad/testing
- lib/canonical/launchpad/testing/tests
- lib/canonical/launchpad/utilities
- lib/canonical/launchpad/utilities/tests
- lib/canonical/launchpad/zcml
- lib/lp/soyuz/notifications
- files removed:
- database/schema/patch-2209-00-0.sql
- lib/canonical/launchpad/scripts
- lib/lp/app/javascript/inlinehelp
- lib/lp/app/javascript/worlddata
- lib/lp/services/authserver
- lib/lp/services/authserver/doc
- lib/lp/services/librarian
- lib/lp/services/librarian/doc
- lib/lp/services/librarian/tests
- lib/lp/services/librarian/tests/data
- lib/lp/services/webservice/doc
- lib/lp/testing/doc
- lib/lp/xmlrpc/doc
- lib/lp/xmlrpc/tests
- files renamed:
- database/schema/launchpad-2209-00-0.sql => database/schema/launchpad-2208-00-0.sql
- database/schema/archive/patch-2208-00-0.sql => database/schema/patch-2208-00-0.sql
- database/schema/archive/patch-2208-01-0.sql => database/schema/patch-2208-01-0.sql
- database/schema/archive/patch-2208-01-1.sql => database/schema/patch-2208-01-1.sql
- database/schema/archive/patch-2208-01-2.sql => database/schema/patch-2208-01-2.sql
- database/schema/archive/patch-2208-01-3.sql => database/schema/patch-2208-01-3.sql
- database/schema/archive/patch-2208-02-0.sql => database/schema/patch-2208-02-0.sql
- database/schema/archive/patch-2208-03-0.sql => database/schema/patch-2208-03-0.sql
- database/schema/archive/patch-2208-04-0.sql => database/schema/patch-2208-04-0.sql
- database/schema/archive/patch-2208-05-0.sql => database/schema/patch-2208-05-0.sql
- database/schema/archive/patch-2208-07-0.sql => database/schema/patch-2208-07-0.sql
- database/schema/archive/patch-2208-08-0.sql => database/schema/patch-2208-08-0.sql
- database/schema/archive/patch-2208-08-1.sql => database/schema/patch-2208-08-1.sql
- database/schema/archive/patch-2208-08-2.sql => database/schema/patch-2208-08-2.sql
- database/schema/archive/patch-2208-08-3.sql => database/schema/patch-2208-08-3.sql
- database/schema/archive/patch-2208-09-0.sql => database/schema/patch-2208-09-0.sql
- database/schema/archive/patch-2208-10-0.sql => database/schema/patch-2208-10-0.sql
- database/schema/archive/patch-2208-12-0.sql => database/schema/patch-2208-12-0.sql
- database/schema/archive/patch-2208-13-0.sql => database/schema/patch-2208-13-0.sql
- database/schema/archive/patch-2208-14-0.sql => database/schema/patch-2208-14-0.sql
- database/schema/archive/patch-2208-15-0.sql => database/schema/patch-2208-15-0.sql
- database/schema/archive/patch-2208-16-0.sql => database/schema/patch-2208-16-0.sql
- database/schema/archive/patch-2208-17-0.sql => database/schema/patch-2208-17-0.sql
- database/schema/archive/patch-2208-18-0.sql => database/schema/patch-2208-18-0.sql
- database/schema/archive/patch-2208-19-0.sql => database/schema/patch-2208-19-0.sql
- database/schema/archive/patch-2208-20-0.sql => database/schema/patch-2208-20-0.sql
- database/schema/archive/patch-2208-21-0.sql => database/schema/patch-2208-21-0.sql
- database/schema/archive/patch-2208-22-0.sql => database/schema/patch-2208-22-0.sql
- database/schema/archive/patch-2208-23-0.sql => database/schema/patch-2208-23-0.sql
- database/schema/archive/patch-2208-24-0.sql => database/schema/patch-2208-24-0.sql
- database/schema/archive/patch-2208-25-0.sql => database/schema/patch-2208-25-0.sql
- database/schema/archive/patch-2208-26-0.sql => database/schema/patch-2208-26-0.sql
- database/schema/archive/patch-2208-27-0.sql => database/schema/patch-2208-27-0.sql
- database/schema/archive/patch-2208-28-0.sql => database/schema/patch-2208-28-0.sql
- database/schema/archive/patch-2208-28-1.sql => database/schema/patch-2208-28-1.sql
- database/schema/archive/patch-2208-29-0.sql => database/schema/patch-2208-29-0.sql
- database/schema/archive/patch-2208-30-0.sql => database/schema/patch-2208-30-0.sql
- database/schema/archive/patch-2208-31-0.sql => database/schema/patch-2208-31-0.sql
- database/schema/archive/patch-2208-32-0.sql => database/schema/patch-2208-32-0.sql
- database/schema/archive/patch-2208-33-0.sql => database/schema/patch-2208-33-0.sql
- database/schema/archive/patch-2208-34-0.sql => database/schema/patch-2208-34-0.sql
- database/schema/archive/patch-2208-35-0.sql => database/schema/patch-2208-35-0.sql
- database/schema/archive/patch-2208-36-0.sql => database/schema/patch-2208-36-0.sql
- database/schema/archive/patch-2208-37-0.sql => database/schema/patch-2208-37-0.sql
- database/schema/archive/patch-2208-38-0.sql => database/schema/patch-2208-38-0.sql
- database/schema/archive/patch-2208-38-1.sql => database/schema/patch-2208-38-1.sql
- database/schema/archive/patch-2208-39-0.sql => database/schema/patch-2208-39-0.sql
- database/schema/archive/patch-2208-40-0.sql => database/schema/patch-2208-40-0.sql
- database/schema/archive/patch-2208-41-0.sql => database/schema/patch-2208-41-0.sql
- database/schema/archive/patch-2208-42-0.sql => database/schema/patch-2208-42-0.sql
- database/schema/archive/patch-2208-43-0.sql => database/schema/patch-2208-43-0.sql
- database/schema/archive/patch-2208-44-0.sql => database/schema/patch-2208-44-0.sql
- database/schema/archive/patch-2208-45-0.sql => database/schema/patch-2208-45-0.sql
- database/schema/archive/patch-2208-46-0.sql => database/schema/patch-2208-46-0.sql
- database/schema/archive/patch-2208-47-0.sql => database/schema/patch-2208-47-0.sql
- database/schema/archive/patch-2208-48-0.sql => database/schema/patch-2208-48-0.sql
- database/schema/archive/patch-2208-49-0.sql => database/schema/patch-2208-49-0.sql
- database/schema/archive/patch-2208-50-0.sql => database/schema/patch-2208-50-0.sql
- database/schema/archive/patch-2208-51-0.sql => database/schema/patch-2208-51-0.sql
- database/schema/archive/patch-2208-52-0.sql => database/schema/patch-2208-52-0.sql
- database/schema/archive/patch-2208-53-0.sql => database/schema/patch-2208-53-0.sql
- database/schema/archive/patch-2208-54-0.sql => database/schema/patch-2208-54-0.sql
- database/schema/archive/patch-2208-55-0.sql => database/schema/patch-2208-55-0.sql
- database/schema/archive/patch-2208-56-0.sql => database/schema/patch-2208-56-0.sql
- database/schema/archive/patch-2208-57-0.sql => database/schema/patch-2208-57-0.sql
- database/schema/archive/patch-2208-57-1.sql => database/schema/patch-2208-57-1.sql
- database/schema/archive/patch-2208-58-0.sql => database/schema/patch-2208-58-0.sql
- database/schema/archive/patch-2208-59-0.sql => database/schema/patch-2208-59-0.sql
- database/schema/archive/patch-2208-59-1.sql => database/schema/patch-2208-59-1.sql
- database/schema/archive/patch-2208-59-2.sql => database/schema/patch-2208-59-2.sql
- database/schema/archive/patch-2208-60-0.sql => database/schema/patch-2208-60-0.sql
- database/schema/archive/patch-2208-60-1.sql => database/schema/patch-2208-60-1.sql
- database/schema/archive/patch-2208-61-0.sql => database/schema/patch-2208-61-0.sql
- database/schema/archive/patch-2208-62-0.sql => database/schema/patch-2208-62-0.sql
- database/schema/archive/patch-2208-63-0.sql => database/schema/patch-2208-63-0.sql
- database/schema/archive/patch-2208-63-1.sql => database/schema/patch-2208-63-1.sql
- database/schema/archive/patch-2208-63-2.sql => database/schema/patch-2208-63-2.sql
- database/schema/archive/patch-2208-63-3.sql => database/schema/patch-2208-63-3.sql
- database/schema/archive/patch-2208-63-4.sql => database/schema/patch-2208-63-4.sql
- database/schema/archive/patch-2208-64-0.sql => database/schema/patch-2208-64-0.sql
- database/schema/archive/patch-2208-65-0.sql => database/schema/patch-2208-65-0.sql
- database/schema/archive/patch-2208-65-1.sql => database/schema/patch-2208-65-1.sql
- database/schema/archive/patch-2208-65-2.sql => database/schema/patch-2208-65-2.sql
- database/schema/archive/patch-2208-67-0.sql => database/schema/patch-2208-67-0.sql
- database/schema/archive/patch-2208-68-0.sql => database/schema/patch-2208-68-0.sql
- database/schema/archive/patch-2208-69-0.sql => database/schema/patch-2208-69-0.sql
- database/schema/archive/patch-2208-70-0.sql => database/schema/patch-2208-70-0.sql
- database/schema/archive/patch-2208-71-0.sql => database/schema/patch-2208-71-0.sql
- database/schema/archive/patch-2208-72-0.sql => database/schema/patch-2208-72-0.sql
- database/schema/archive/patch-2208-73-0.sql => database/schema/patch-2208-73-0.sql
- database/schema/archive/patch-2208-73-1.sql => database/schema/patch-2208-73-1.sql
- database/schema/archive/patch-2208-73-2.sql => database/schema/patch-2208-73-2.sql
- database/schema/archive/patch-2208-74-0.sql => database/schema/patch-2208-74-0.sql
- database/schema/archive/patch-2208-75-0.sql => database/schema/patch-2208-75-0.sql
- database/schema/archive/patch-2208-75-1.sql => database/schema/patch-2208-75-1.sql
- database/schema/archive/patch-2208-76-0.sql => database/schema/patch-2208-76-0.sql
- database/schema/archive/patch-2208-76-1.sql => database/schema/patch-2208-76-1.sql
- database/schema/archive/patch-2208-76-2.sql => database/schema/patch-2208-76-2.sql
- database/schema/archive/patch-2208-76-3.sql => database/schema/patch-2208-76-3.sql
- database/schema/archive/patch-2208-76-4.sql => database/schema/patch-2208-76-4.sql
- database/schema/archive/patch-2208-77-0.sql => database/schema/patch-2208-77-0.sql
- database/schema/archive/patch-2208-78-0.sql => database/schema/patch-2208-78-0.sql
- database/schema/archive/patch-2208-78-1.sql => database/schema/patch-2208-78-1.sql
- database/schema/archive/patch-2208-78-2.sql => database/schema/patch-2208-78-2.sql
- database/schema/archive/patch-2208-79-0.sql => database/schema/patch-2208-79-0.sql
- database/schema/archive/patch-2208-79-1.sql => database/schema/patch-2208-79-1.sql
- database/schema/archive/patch-2208-80-1.sql => database/schema/patch-2208-80-1.sql
- database/schema/archive/patch-2208-81-1.sql => database/schema/patch-2208-81-1.sql
- database/schema/archive/patch-2208-82-1.sql => database/schema/patch-2208-82-1.sql
- database/schema/archive/patch-2208-83-1.sql => database/schema/patch-2208-83-1.sql
- database/schema/archive/patch-2208-83-2.sql => database/schema/patch-2208-83-2.sql
- database/schema/archive/patch-2208-84-1.sql => database/schema/patch-2208-84-1.sql
- database/schema/archive/patch-2208-85-1.sql => database/schema/patch-2208-85-1.sql
- database/schema/archive/patch-2208-87-1.sql => database/schema/patch-2208-87-1.sql
- database/schema/archive/patch-2208-87-2.sql => database/schema/patch-2208-87-2.sql
- database/schema/archive/patch-2208-88-1.sql => database/schema/patch-2208-88-1.sql
- database/schema/archive/patch-2208-89-1.sql => database/schema/patch-2208-89-1.sql
- database/schema/archive/patch-2208-90-1.sql => database/schema/patch-2208-90-1.sql
- database/schema/archive/patch-2208-91-1.sql => database/schema/patch-2208-91-1.sql
- database/schema/archive/patch-2208-92-1.sql => database/schema/patch-2208-92-1.sql
- database/schema/archive/patch-2208-92-2.sql => database/schema/patch-2208-92-2.sql
- database/schema/archive/patch-2208-93-0.sql => database/schema/patch-2208-93-0.sql
- database/schema/archive/patch-2208-93-1.sql => database/schema/patch-2208-93-1.sql
- database/schema/archive/patch-2208-93-2.sql => database/schema/patch-2208-93-2.sql
- lib/lp/services/librarian/browser.py => lib/canonical/launchpad/browser/librarian.py
- lib/lp/services/librarian/tests/test_libraryfilealiasview.py => lib/canonical/launchpad/browser/tests/test_libraryfilealiasview.py
- lib/lp/services/webservice/apihelpers.py => lib/canonical/launchpad/components/apihelpers.py
- lib/lp/services/tokens.py => lib/canonical/launchpad/components/tokens.py
- lib/lp/services/librarian/model.py => lib/canonical/launchpad/database/librarian.py
- lib/lp/services/librarian/tests/test_timelimitedtoken.py => lib/canonical/launchpad/database/tests/test_timelimitedtoken.py
- lib/lp/services/webservice/doc/launchpadlib.txt => lib/canonical/launchpad/doc/launchpadlib.txt
- lib/lp/services/librarian/doc/librarian.txt => lib/canonical/launchpad/doc/librarian.txt
- lib/lp/services/doc/looptuner.txt => lib/canonical/launchpad/doc/looptuner.txt
- lib/lp/services/doc/orderingcheck.txt => lib/canonical/launchpad/doc/orderingcheck.txt
- lib/lp/testing/doc/pagetest-helpers.txt => lib/canonical/launchpad/doc/pagetest-helpers.txt
- lib/lp/xmlrpc/doc/private-xmlrpc.txt => lib/canonical/launchpad/doc/private-xmlrpc.txt
- lib/lp/testing/doc/sample-data-assertions.txt => lib/canonical/launchpad/doc/sample-data-assertions.txt
- lib/canonical/launchpad/webapp/doc/timeout.txt => lib/canonical/launchpad/doc/timeout.txt
- lib/lp/registry/tests/ubuntu-releases.testdata => lib/canonical/launchpad/doc/ubuntu-releases.testdata
- lib/lp/services/webservice/doc/webservice-configuration.txt => lib/canonical/launchpad/doc/webservice-configuration.txt
- lib/lp/services/webservice/doc/webservice-error.txt => lib/canonical/launchpad/doc/webservice-error.txt
- lib/lp/services/webservice/doc/webservice-marshallers.txt => lib/canonical/launchpad/doc/webservice-marshallers.txt
- lib/lp/services/authserver/doc/xmlrpc-authserver.txt => lib/canonical/launchpad/doc/xmlrpc-authserver.txt
- lib/canonical/launchpad/webapp/doc/xmlrpc-infrastructure.txt => lib/canonical/launchpad/doc/xmlrpc-infrastructure.txt
- lib/lp/xmlrpc/doc/xmlrpc-selftest.txt => lib/canonical/launchpad/doc/xmlrpc-selftest.txt
- lib/lp/testing/script.py => lib/canonical/launchpad/ftests/script.py
- lib/lp/services/librarian/tests/test_libraryfilealias.py => lib/canonical/launchpad/ftests/test_libraryfilealias.py
- lib/lp/tests/test_opensource.py => lib/canonical/launchpad/ftests/test_opensource.py
- lib/lp/services/webservice/tests/test_wadl_generation.py => lib/canonical/launchpad/ftests/test_wadl_generation.py
- lib/lp/services/webservice/tests/test_wadllib.py => lib/canonical/launchpad/ftests/test_wadllib.py
- lib/lp/services/helpers.py => lib/canonical/launchpad/helpers.py
- lib/lp/_schema_circular_imports.py => lib/canonical/launchpad/interfaces/_schema_circular_imports.py
- lib/lp/services/authserver/interfaces.py => lib/canonical/launchpad/interfaces/authserver.py
- lib/lp/services/librarian/interfaces.py => lib/canonical/launchpad/interfaces/librarian.py
- lib/lp/services/database/lpstorm.py => lib/canonical/launchpad/interfaces/lpstorm.py
- lib/lp/patchwebservice.py => lib/canonical/launchpad/interfaces/webservice.py
- lib/lp/app/javascript/sorttable/ => lib/canonical/launchpad/javascript/sorttable/
- lib/lp/services/mail/notification.py => lib/canonical/launchpad/mailnotification.py
- lib/lp/services/webservice/stories/ => lib/canonical/launchpad/pagetests/webservice/
- lib/lp/services/webservice/bytestorage.py => lib/canonical/launchpad/rest/bytestorage.py
- lib/lp/services/webservice/configuration.py => lib/canonical/launchpad/rest/configuration.py
- lib/lp/services/webservice/me.py => lib/canonical/launchpad/rest/me.py
- lib/lp/services/webservice/pillarset.py => lib/canonical/launchpad/rest/pillarset.py
- lib/lp/services/webservice/wadl.py => lib/canonical/launchpad/rest/wadl.py
- lib/lp/services/scripts/__init__.py => lib/canonical/launchpad/scripts/__init__.py
- lib/lp/services/scripts/tests/librarianformatter.txt => lib/canonical/launchpad/scripts/ftests/librarianformatter.txt
- lib/lp/services/scripts/tests/raiseexception.py => lib/canonical/launchpad/scripts/ftests/raiseexception.py
- lib/lp/services/scripts/tests/test_librarianformatter.py => lib/canonical/launchpad/scripts/ftests/test_librarianformatter.py
- lib/lp/services/scripts/logger.py => lib/canonical/launchpad/scripts/logger.py
- lib/lp/services/scripts/loghandlers.py => lib/canonical/launchpad/scripts/loghandlers.py
- lib/lp/scripts/runlaunchpad.py => lib/canonical/launchpad/scripts/runlaunchpad.py
- lib/lp/scripts/scriptmonitor.py => lib/canonical/launchpad/scripts/scriptmonitor.py
- lib/canonical/database/sort_sql.py => lib/canonical/launchpad/scripts/sort_sql.py
- lib/lp/bugs/tests/data/cvedb_init.xml.gz => lib/canonical/launchpad/scripts/tests/cvedb_init.xml.gz
- lib/lp/bugs/tests/data/cvedb_update.xml.gz => lib/canonical/launchpad/scripts/tests/cvedb_update.xml.gz
- lib/lp/services/scripts/tests/librarianformatter_noca.txt => lib/canonical/launchpad/scripts/tests/librarianformatter_noca.txt
- lib/lp/services/scripts/tests/loglevels.py => lib/canonical/launchpad/scripts/tests/loglevels.py
- lib/lp/services/scripts/tests/test_librarianformatter_noca.py => lib/canonical/launchpad/scripts/tests/test_librarianformatter_noca.py
- lib/lp/services/scripts/tests/test_logger.py => lib/canonical/launchpad/scripts/tests/test_logger.py
- lib/lp/services/scripts/tests/test_logger.txt => lib/canonical/launchpad/scripts/tests/test_logger.txt
- lib/lp/services/scripts/tests/test_rundoctests.py => lib/canonical/launchpad/scripts/tests/test_rundoctests.py
- lib/lp/scripts/tests/test_runlaunchpad.py => lib/canonical/launchpad/scripts/tests/test_runlaunchpad.py
- lib/lp/scripts/tests/test_scriptmonitor.py => lib/canonical/launchpad/scripts/tests/test_scriptmonitor.py
- lib/lp/services/searchbuilder.py => lib/canonical/launchpad/searchbuilder.py
- lib/lp/testing/browser.py => lib/canonical/launchpad/testing/browser.py
- lib/lp/code/tests/codeimporthelpers.py => lib/canonical/launchpad/testing/codeimporthelpers.py
- lib/lp/soyuz/tests/fakepackager.py => lib/canonical/launchpad/testing/fakepackager.py
- lib/lp/testing/librarianhelpers.py => lib/canonical/launchpad/testing/librarianhelpers.py
- lib/lp/testing/pages.py => lib/canonical/launchpad/testing/pages.py
- lib/lp/testing/systemdocs.py => lib/canonical/launchpad/testing/systemdocs.py
- lib/lp/testing/tests/test_pages.py => lib/canonical/launchpad/testing/tests/test_pages.py
- lib/lp/testing/tests/test_systemdocs.py => lib/canonical/launchpad/testing/tests/test_systemdocs.py
- lib/lp/services/tests/test_helpers.py => lib/canonical/launchpad/tests/test_helpers.py
- lib/lp/services/webservice/tests/test_launchpadlib.py => lib/canonical/launchpad/tests/test_launchpadlib.py
- lib/lp/services/librarian/tests/test_libraryfilealias_with_parent.py => lib/canonical/launchpad/tests/test_libraryfilealias_with_parent.py
- lib/lp/testing/tests/test_sampledata.py => lib/canonical/launchpad/tests/test_sampledata.py
- lib/lp/services/looptuner.py => lib/canonical/launchpad/utilities/looptuner.py
- lib/lp/services/orderingcheck.py => lib/canonical/launchpad/utilities/orderingcheck.py
- lib/lp/services/tests/test_looptuner.py => lib/canonical/launchpad/utilities/tests/test_looptuner.py
- lib/lp/xmlrpc/ => lib/canonical/launchpad/xmlrpc/
- lib/lp/services/authserver/xmlrpc.py => lib/canonical/launchpad/xmlrpc/authserver.py
- lib/lp/services/authserver/tests/ => lib/canonical/launchpad/xmlrpc/tests/
- lib/lp/services/librarian/configure.zcml => lib/canonical/launchpad/zcml/librarian.zcml
- lib/lp/configure.zcml => lib/canonical/launchpad/zcml/webservice.zcml
- lib/lp/services/librarian/apachelogparser.py => lib/lp/services/apachelogparser/librarian_apache_log_parser.py
- lib/lp/services/librarian/tests/data/apache-log-files-for-sampledata/ => lib/lp/services/apachelogparser/tests/apache-log-files-for-sampledata/
- lib/lp/services/librarian/tests/test_apachelogparser.py => lib/lp/services/apachelogparser/tests/test_librarian_apache_log_parser.py
- files modified:
- Makefile
added
removed
lib/lp/translations/translationmerger.py
