Viewing all changes in revision 4330.4.30.
- Committer: Jonathan Lange
- Date: 2007-06-20 02:49:22 UTC
- mfrom: (4419 launchpad)
- mto: (4386.1.5 codehosting-privacy)
- mto: This revision was merged to the branch mainline in revision 4450.
- Revision ID: jml@canonical.com-20070620024922-y3t5rctip9li232y
Merge RF, resolving conflicts
- files added:
- database/schema/patch-87-14-0.sql
- lib/canonical/launchpad/translationformat
- lib/canonical/launchpad/translationformat/tests
- lib/canonical/launchpad/translationformat/tests/firefox-data
- lib/canonical/launchpad/translationformat/tests/firefox-data/en-US
- lib/canonical/launchpad/translationformat/tests/firefox-data/en-US/en-US-jar
- lib/canonical/launchpad/translationformat/tests/firefox-data/en-US/en-US-jar/subdir
- lib/canonical/launchpad/translationformat/tests/firefox-data/en-US/en-US-jar/subdir/test2.properties
- files removed:
- lib/canonical/launchpad/pagetests/malone-private-product/xx-malone-landscape-hack.txt
- files renamed:
- lib/canonical/launchpad/interfaces/poparser.py => lib/canonical/launchpad/interfaces/gettext_po_parser.py
- lib/canonical/launchpad/pagetests/distribution/xx-distrorelease-translations.txt => lib/canonical/launchpad/pagetests/distribution/xx-distroseries-translations.txt
- lib/canonical/launchpad/pagetests/malone-private-product/xx-malone-redfish-hack.txt => lib/canonical/launchpad/pagetests/malone-private-product/xx-malone-private-bug-by-default.txt
- lib/canonical/launchpad/pagetests/openid/xx-basics.txt => lib/canonical/launchpad/pagetests/openid/basics.txt
- lib/canonical/launchpad/pagetests/openid/xx-op-identifier.txt => lib/canonical/launchpad/pagetests/openid/directed-identity.txt
- lib/canonical/launchpad/pagetests/openid/xx-insane-trust-root.txt => lib/canonical/launchpad/pagetests/openid/insane-trust-root.txt
- lib/canonical/launchpad/pagetests/openid/xx-limited-sreg.txt => lib/canonical/launchpad/pagetests/openid/limited-sreg.txt
- lib/canonical/launchpad/pagetests/openid/xx-mismatched-trust-root.txt => lib/canonical/launchpad/pagetests/openid/mismatched-trust-root.txt
- lib/canonical/launchpad/components/poparser.py => lib/canonical/launchpad/translationformat/gettext_po_parser.py
- lib/canonical/launchpad/tests/test_poparser.py => lib/canonical/launchpad/translationformat/tests/test_gettext_po_parser.py
- lib/canonical/launchpad/components/poimport.py => lib/canonical/launchpad/translationformat/translation_import.py
- files modified:
- configs/default/launchpad.conf
expand all
collapse all
added
removed
lib/canonical/launchpad/translationformat/tests/firefox-data/en-US/copyover3.png
